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/VoCommand.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java
index 73f38e6..0ac5f2c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java
@@ -19,9 +19,9 @@
private static final long serialVersionUID = 1L;
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- private Long id;
+ private Long comId;
- private String commandName;
+ private String commandName; //鍛戒护鍚嶇О
private String intakeName;
@@ -35,7 +35,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date resultTime;
- private String result;
+ private String state;//鎵ц鐘舵��
- private String userName;
+ private String result;//鍛戒护缁撴灉
+
+ private String userName;//鎿嶄綔浜�
}
--
Gitblit v1.8.0