2024-09-19 朱宝民 修改监测控制模块及微信小程序模块tag获取方式，开阀代码优化

zhubaomin

2024-09-19 b609239eb3c722500ae4e942f66784ec95e846be

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java

@@ -11,7 +11,8 @@
   }

   public String commandId ;//发送命令的ID，如果是命令结果，并且匹配了下发命令，此值不为空
	

   public String rtuResultSendWebUrl ;//rtu返回命令结果 发向目的地web URL
   public String protocolName ;//协议名称
   public String rtuAddr ;//Rtu地址
   public String upCode ;//上行数据中的功能码
@@ -25,11 +26,42 @@
      ProtocolUnit.getInstance().adapter.getSingleActionFromRtu(this.protocolName).doAction(this); 
   }
   
   public void setCommandId(String commandId){
   public void matchedCommand(String commandId, String rtuResultSendWebUrl){
      this.commandId = commandId ;
      if(this.data != null){
         this.data.setCommandId(commandId);
      }
      /*
      if(toRtuMidResultParam != null){
         if(protocolName != null && protocolName.equals(ProtocolConstantV206V1_0_0.protocolName)){
            if(upCode != null && upCode.equals(CodeV1_0_1.cd_97)){
               if(data.subData != null && data.subData instanceof DataV1_0_1){
                  DataV1_0_1 dataV1_0_1 = (DataV1_0_1)data.subData ;
                  if(dataV1_0_1 != null && dataV1_0_1.subData != null && dataV1_0_1.subData instanceof DataCd97Vo){
                     DataCd97Vo dataCd97Vo = (DataCd97Vo)dataV1_0_1.subData ;
                     if(dataCd97Vo != null && dataCd97Vo.cardNo != null){
                        dataCd97Vo.cardNo = (String)toRtuMidResultParam + dataCd97Vo.cardNo ;
                     }
                  }
               }
            }else if(upCode != null && upCode.equals(CodeV1_0_1.cd_98)){
               if(data.subData != null && data.subData instanceof DataV1_0_1){
                  DataV1_0_1 dataV1_0_1 = (DataV1_0_1)data.subData ;
                  if(dataV1_0_1 != null && dataV1_0_1.subData != null && dataV1_0_1.subData instanceof DataCd98Vo){
                     DataCd98Vo dataCd98Vo = (DataCd98Vo)dataV1_0_1.subData ;
                     if(dataCd98Vo != null && dataCd98Vo.cardNo != null){
                        dataCd98Vo.cardNo = (String)toRtuMidResultParam + dataCd98Vo.cardNo ;
                     }
                  }
               }
            }
         }
      }
       */
      this.rtuResultSendWebUrl = rtuResultSendWebUrl ;
      if(this.data != null){
         this.data.setRtuResultSendWebUrl(rtuResultSendWebUrl);
      }
   }

}