From 2b6cd5a6e64e00b365707468d600085259d2f069 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 十二月 2024 16:13:29 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 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 9eed8fd..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,8 @@
/**
* 寮�闃�绫诲瀷
*/
- private Byte openType;
+ private Byte opType;
+ private String openType;
/**
* 寮�闃�璁㈠崟鍙�
@@ -68,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;
/**
@@ -104,11 +113,13 @@
/**
* 鍏抽榾绫诲瀷
*/
- private Byte closeType;
+ private Byte clType;
+ private String closeType;
/**
- * 鍏抽榾鎶ヤ腑鏈湴鐢ㄦ按閲�
+ * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double closeThisAmount;
/**
@@ -117,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