1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议...

liurunyu

2024-11-01 001f24d4efd7b818bc2224b976c82faf4f9e564c

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

@@ -31,33 +31,6 @@
      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);