针对王江海制定的协议： 1、优化相关注释； 2、优化代码； 3、协议中报警信息有变化：外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。

liurunyu

2025-02-21 d9765e031e100e1d8eea34e086cb9c81766e1a00

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml

@@ -7,24 +7,57 @@
   -->
   <task id="TkReceive" name="接收数据" enable="true" class="com.dy.rtuMw.server.rtuData.TkReceive">
      <task id="TkRtuData" name="接收RTU数据" enable="true" class="com.dy.rtuMw.server.rtuData.TkRtuData">
         <task id="TkFindP206V1_0_0" name="识别P206V1_0_0数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkFindP206V1_0_0">
            <task id="TkPreGenObjs" name="预先准备各对象并识别流浪控制器" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkPreGenObjs">
         <task id="TkFindP206V1" name="识别P206V1数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkFindP206V1">
            <task id="TkPreGenObjs" name="预先准备各对象并识别流浪控制器" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkPreGenObjs">
               <!-- 处理流浪控制器 -->
               <task id="TkDealControllerTramp" name="处理流浪控制器" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealControllerTramp" />
               <task id="TkDealControllerTramp" name="处理流浪控制器" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealControllerTramp" />
               <!-- 非流浪者RTU，必须放在TkDealControllerTramp后面 -->
               <task id="TkDealControllerNoTramp" name="非流浪者RTU" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealControllerNoTramp">
               <task id="TkDealControllerNoTramp" name="非流浪者RTU" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealControllerNoTramp">
                  <!-- 识别非命令应答上行数据 -->
                  <task id="TkFindReport" name="识别非命令应答上行数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkFindReport">
                     <task id="TkDealAlarmStatus" name="控制器报警与状态数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealAlarmStatus" />
                     <task id="TkDealAutoReport" name="控制器自报数据（整点报）" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealAutoReport" />
                     <task id="TkDealWorkReport" name="控制器阀开工作上报" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealWorkReport" />
                     <task id="TkDealOpenValveReport" name="控制器开阀上报" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealOpenValveReport" />
                     <task id="TkDealCloseValveReport" name="控制器关阀上报" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealCloseValveReport" />
                     <task id="TkDealLoss" name="控制器漏损统计（待新协议出来后修改实现）" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkDealLoss" />
                  <task id="TkFindReport" name="识别非命令应答上行数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkFindReport">
                     <task id="TkDealAlarmStatus" name="控制器报警与状态及向钉钉发送报警信息" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealAlarmStatus">
                        <task id="TkDealVirCardState" name="虚拟卡占用状态恢复" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealVirCardState" />
                     </task>
                     <task id="TkDealOnHourReport" name="控制器自报数据（整点报）(功能码C0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealOnHourReport" />
                     <task id="TkDealWorkReport" name="控制器阀开工作上报(功能码84)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealWorkReport" />
                     <task id="TkDealOpenValveReport" name="控制器开阀上报(功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealOpenValveReport" />
                     <task id="TkDealCloseValveReport" name="控制器关阀上报(功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealCloseValveReport" />
                     <task id="TkDealLoss" name="取水口日漏损量(功能码C0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealLoss" />
                     <task id="TkDealIntakeAmountDay" name="取水口日用水量(功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealIntakeAmountDay" />
                     <task id="TkDealClientAmountDay" name="农户日用水量(功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealClientAmountDay" />
                     <task id="TkDealIcRemainMoney" name="IC卡剩余金额(功能码84、功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealIcRemainMoney" />
                  </task>
                  <!-- 识别命令响应数据 -->
                  <task id="TkFindComResponse" name="识别响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkFindComResponse">
                     <task id="TkRtuDealCommandResponse" name="RTU响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1_0_0.TkRtuDealCommandResponse" >
                  <task id="TkFindComResponse" name="识别响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkFindComResponse">
                     <task id="TkRtuDealCommandResponse" name="RTU响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkRtuDealCommandResponse" />
                  </task>
               </task>
            </task>
         </task>
         <task id="TkFindP206V2" name="识别P206V1数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkFindP206V2">
            <task id="TkDealHearBeatV2" name="处理心跳(链路维持报)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealHearBeatV2">
               <task id="TkPreGenObjsV2" name="预先准备各对象并识别流浪控制器" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkPreGenObjsV2">
                  <!-- 处理流浪控制器 -->
                  <task id="TkDealControllerTrampV2" name="处理流浪控制器" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealControllerTrampV2" />
                  <!-- 非流浪者RTU，必须放在TkDealControllerTramp后面 -->
                  <task id="TkDealControllerNoTrampV2" name="非流浪者RTU" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealControllerNoTrampV2">
                     <!-- 识别非命令应答上行数据 -->
                     <task id="TkFindReportV2" name="识别非命令应答上行数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkFindReportV2">
                        <task id="TkDealAlarmStatusV2" name="控制器报警与状态及向钉钉发送报警信息" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealAlarmStatusV2">
                           <task id="TkDealVirCardStateV2" name="虚拟卡占用状态恢复" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealVirCardStateV2" />
                        </task>
                        <task id="TkDealOnHourReportV2" name="控制器自报数据（整点报）(功能码C0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealOnHourReportV2" />
                        <task id="TkDealWorkReportV2" name="控制器阀开工作上报(功能码84)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealWorkReportV2" />
                        <task id="TkDealOpenValveReportV2" name="控制器开阀上报(功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealOpenValveReportV2" />
                        <task id="TkDealCloseValveReportV2" name="控制器关阀上报(功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealCloseValveReportV2" />
                        <task id="TkDealLossV2" name="取水口日漏损量(功能码C0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealLossV2" />
                        <task id="TkDealIntakeAmountDayV2" name="取水口日用水量(功能码84、功能码83、功能码C0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealIntakeAmountDayV2" />
                        <task id="TkDealClientAmountDayV2" name="农户日用水量(功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealClientAmountDayV2" />
                        <task id="TkDealIcRemainMoneyV2" name="IC卡剩余金额(功能码84、功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkDealIcRemainMoneyV2" />
                     </task>
                     <!-- 识别命令响应数据 -->
                     <task id="TkFindComResponseV2" name="识别响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkFindComResponseV2">
                        <task id="TkRtuDealCommandResponseV2" name="RTU响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V2.TkRtuDealCommandResponseV2" />
                     </task>
                  </task>
               </task>
@@ -38,10 +71,13 @@
               <task id="TkDealControllerNoTrampV202404" name="非流浪者RTU" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealControllerNoTrampV202404">
                  <!-- 识别非命令应答上行数据 -->
                  <task id="TkFindReportV202404" name="识别非命令应答上行数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindReportV202404">
                     <task id="TkDealAlarmStatusV202404" name="控制器报警与状态" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealAlarmStatusV202404" />
                     <task id="TkDealAlarmStatusV202404" name="控制器报警与状态及向钉钉发送报警信息" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealAlarmStatusV202404">
                        <task id="TkDealVirCardStateV202404" name="虚拟卡占用状态恢复" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealVirCardStateV202404" />
                     </task>
                     <task id="TkDealWorkingReportV202404" name="控制器工作报(功能码80)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealWorkingReportV202404" />
                     <task id="TkDealTimingReportV202404" name="控制器定时上报(功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealTimingReportV202404" />
                     <task id="TkDealTimingReportV202404" name="控制器定时（一天一次）上报(功能码83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealTimingReportV202404" />
                     <task id="TkDealOpenValveReportV202404" name="控制器开阀上报(功能码84)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealOpenValveReportV202404" />
                     <task id="TkDealCloseValveReportV202404" name="控制器关阀上报(功能码85)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealCloseValveReportV202404" />
                  </task>
                  <!-- 识别命令响应数据 -->
                  <task id="TkFindComResponseV202404" name="识别响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindComResponseV202404">