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 | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 15af3f4..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;
/**
@@ -69,21 +74,24 @@
/**
* 寮�闃�鏃剁疮璁℃祦閲�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double openTotalAmount;
-
/**
* 寮�闃�鏃跺墿浣欓噾棰�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double openRemainMoney;
/**
* 寮�闃�鏃剁敤鎴峰墿浣欏墿浣欐按閲�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double openWaterRemain;
/**
* 寮�闃�鐢佃〃绱鐢甸噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double openEleTotalAmount;
/**
@@ -105,12 +113,13 @@
/**
* 鍏抽榾绫诲瀷
*/
- //private Byte closeType;
+ private Byte clType;
private String closeType;
/**
- * 鍏抽榾鎶ヤ腑鏈湴鐢ㄦ按閲�
+ * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double closeThisAmount;
/**
@@ -119,17 +128,26 @@
private Integer thisTime;
/**
+ * 鍏抽榾鎶ヤ腑鏈湴鐢ㄦ按鏃堕暱锛堝垎閽燂級
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double closePrice;
+
+ /**
* 鍏抽榾鎶ヤ腑鏈湴娑堣垂閲戦
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double thisMoney;
/**
* 鍏抽榾鏃跺墿浣欓噾棰�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double closeRemainMoney;
/**
* 鍏抽榾鏃剁疮璁℃祦閲�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double closeTotalAmount;
}
--
Gitblit v1.8.0