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/VoUnclosedValve.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
index e09b215..beca40c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
@@ -1,7 +1,10 @@
package com.dy.pipIrrGlobal.voRm;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
+
+import java.util.Date;
/**
* @author ZhuBaoMin
@@ -11,22 +14,54 @@
*/
@Data
+@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned", "dt", "waterInstant"})
public class VoUnclosedValve implements BaseEntity {
private static final long serialVersionUID = 202405241634001L;
//private String commandCode;
+ /**
+ * 鍙栨按鍙ｇ紪鍙�
+ */
private String intakeNum;
+ /**
+ * 鏄惁鍦ㄧ嚎
+ */
private Boolean isOnLine;
+ /**
+ * 闃�鎺у櫒鍦板潃
+ */
private String rtuAddr;
+ /**
+ * 铏氭嫙鍗＄紪鍙�
+ */
private String vcNum;
+ /**
+ * 璁㈠崟鍙�
+ */
private String orderNo;
+ /**
+ * 鐘舵��
+ */
private String state;
- //private Date openTime;
+ /**
+ * 鏄惁璁″垝鎬у紑闃�
+ */
+ private Boolean planned;
+
+ /**
+ * 宸ヤ綔鎶ユ椂闂�
+ */
+ private Date dt;
+
+ /**
+ * 鐬椂娴侀噺
+ */
+ private Double waterInstant;
}
--
Gitblit v1.8.0