From 1e567af8bbdda31ce3342cd41bb40157168b3da9 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 17:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
index d047b4f..4ddcf26 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
@@ -190,7 +190,7 @@
             myParam.setComId(comId);
             myParam.setComType((byte)1);
             myParam.setCommandCode(commandCode);
-            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
             myParam.setIntakeId(intakeId);
             myParam.setRtuAddr(rtuAddr);
             myParam.setProtocol(protocol);
@@ -295,7 +295,7 @@
             myParam.setComId(comId);
             myParam.setComType((byte)2);
             myParam.setCommandCode(commandCode);
-            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
             myParam.setIntakeId(intakeId);
             myParam.setRtuAddr(rtuAddr);
             myParam.setProtocol(protocol);
@@ -389,7 +389,7 @@
             myParam.setComId(comId);
             myParam.setComType((byte)2);
             myParam.setCommandCode(commandCode);
-            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
             myParam.setIntakeId(intakeId);
             myParam.setRtuAddr(rtuAddr);
             myParam.setProtocol(protocol);
@@ -483,7 +483,7 @@
             myParam.setComId(comId);
             myParam.setComType((byte)2);
             myParam.setCommandCode(commandCode);
-            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
             myParam.setIntakeId(intakeId);
             myParam.setRtuAddr(rtuAddr);
             myParam.setProtocol(protocol);
@@ -589,7 +589,7 @@
             myParam.setComId(comId);
             myParam.setComType((byte)2);
             myParam.setCommandCode(commandCode);
-            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
             myParam.setIntakeId(intakeId);
             myParam.setRtuAddr(rtuAddr);
             myParam.setProtocol(protocol);
@@ -695,7 +695,7 @@
             myParam.setComId(comId);
             myParam.setComType((byte)2);
             myParam.setCommandCode(commandCode);
-            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
             myParam.setIntakeId(intakeId);
             myParam.setRtuAddr(rtuAddr);
             myParam.setProtocol(protocol);

--
Gitblit v1.8.0