pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoClientAmountStatistics.java
@@ -5,7 +5,7 @@ /** * @Author: liurunyu * @Date: 2024/7/24 17:09 * @Description * @Description 以用水户统计用水量 */ @Data public class VoClientAmountStatistics { pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeAmountStatistics.java
@@ -5,7 +5,7 @@ /** * @Author: liurunyu * @Date: 2024/7/24 14:16 * @Description 以取水口统计漏损 * @Description 以取水口统计取水量 */ @Data public class VoIntakeAmountStatistics { pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java
@@ -29,7 +29,7 @@ return this.stopTcpSv(com) ; }else if(code.equals(CodeLocal.recoverTcpSv)){ return this.recoverTcpSv(com) ; }else if(code.equals(CodeLocal.mwInfo)){ }else if(code.equals(CodeLocal.mwState)){ return this.mwInfo(com) ; } return ReturnCommand.errored("出错，收到内部命令的功能码不能识别！", com.getId(), com.getCode()) ; pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/CodeLocal.java
@@ -12,6 +12,6 @@ public static final String recoverTcpSv = "LCD0112" ;//重启TCP服务，接入新的TCP连接 public static final String mwInfo = "LCD0200" ;//得到通信中间件运行信息 public static final String mwState = "LCD0200" ;//得到通信中间件运行信息 } pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/Config.xml
@@ -4,5 +4,5 @@ <base rtuAddr="532328059995" onlyOneHeartBeat="true" icCardAddr="3B7D1E1A" icCardNo="61181622830147821"></base> <!-- --> <tcpCl mwServerIp="192.168.40.182" mwServerPort="60000" connectTimeout="3000" /> <tcpCl mwServerIp="127.0.0.1" mwServerPort="60000" connectTimeout="3000" /> </config> pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/common/CodeLocal.java
@@ -12,6 +12,6 @@ public static final String recoverTcpSv = "LCD0112" ;//恢复TCP服务，接入新的TCP连接 public static final String mwInfo = "LCD0200" ;//得到通信中间件运行信息 public static final String mwState = "LCD0200" ;//得到通信中间件运行信息 } pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
@@ -35,8 +35,8 @@ rt = this.stopTcpSv() ; }else if(com.equals(CodeLocal.recoverTcpSv)){ rt = this.recoverTcpSv() ; }else if(com.equals(CodeLocal.mwInfo)){ rt = this.mwInfo() ; }else if(com.equals(CodeLocal.mwState)){ rt = this.mwState() ; }else if(com.equals("10")){ rt = this.cd10() ; }else if(com.equals("21")){ @@ -110,8 +110,8 @@ return this.sendCom2Mw(this.commandLocal(CodeLocal.recoverTcpSv, null, null)) ; } private BaseResponse mwInfo(){ return this.sendCom2Mw(this.commandLocal(CodeLocal.mwInfo, null, null)) ; private BaseResponse mwState(){ return this.sendCom2Mw(this.commandLocal(CodeLocal.mwState, null, null)) ; } private BaseResponse cd10(){
