From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改; 2、RTU升级模拟器增加命令行设置服务端IP和端口功能; 3、应王江海要求,井电双控协议中也实现远程升级功能,因井电双控协议、阀控器协议不同,而双方协议中的升级子协议相同,所以通信中间件做增量开发、适应性修改,以适应这种混合协议情况,同时也提高通信中间件运行效率。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java
index b846f7e..1395032 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java
@@ -40,6 +40,11 @@
     private String clientName;
 
     /**
+     * 鍐滄埛濮撳悕
+     */
+    private String clientAddr;
+
+    /**
      * 寮�闃�IC鍗$紪鍙�
      */
     private String openIcNum;
@@ -58,7 +63,7 @@
     /**
      * 寮�闃�绫诲瀷
      */
-    private Byte openType_;
+    private Byte opType;
     private String openType;
 
     /**
@@ -108,7 +113,7 @@
     /**
      * 鍏抽榾绫诲瀷
      */
-    private Byte closeType_;
+    private Byte clType;
     private String closeType;
 
     /**

--
Gitblit v1.8.0