From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 153 insertions(+), 0 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
new file mode 100644
index 0000000..1395032
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java
@@ -0,0 +1,153 @@
+package com.dy.pipIrrGlobal.voRm;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-07-24 15:55
+ * @LastEditTime 2024-07-24 15:55
+ * @Description 寮�鍏抽榾鎶ヨ鍥惧璞�
+ */
+
+@Data
+public class VoOpenCloseValve {
+ private static final long serialVersionUID = 202407241556001L;
+
+ /**
+ * 鍙栨按鍙D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long intakeId;
+
+ /**
+ * 鍙栨按鍙ｇ紪鍙�
+ */
+ private String intakeNum;
+
+ /**
+ * 闃�鎺у櫒鍦板潃
+ */
+ private String rtuAddr;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
+ private String clientName;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
+ private String clientAddr;
+
+ /**
+ * 寮�闃�IC鍗＄紪鍙�
+ */
+ private String openIcNum;
+
+ /**
+ * 寮�闃�IC鍗″湴鍧�
+ */
+ private String openIcAddr;
+
+ /**
+ * 寮�闃�鏁版嵁鎺ユ敹鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date openTime;
+
+ /**
+ * 寮�闃�绫诲瀷
+ */
+ private Byte opType;
+ private String openType;
+
+ /**
+ * 寮�闃�璁㈠崟鍙�
+ */
+ private String openOrderNo;
+
+ /**
+ * 寮�闃�鏃剁疮璁℃祦閲�
+ */
+ @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;
+
+ /**
+ * 鍏抽榾IC鍗＄紪鍙�
+ */
+ private String closeIcNum;
+
+ /**
+ * 鍏抽榾IC鍗″湴鍧�
+ */
+ private String closeIcAddr;
+
+ /**
+ * 鍏抽榾鏁版嵁鎺ユ敹鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date closeTime;
+
+ /**
+ * 鍏抽榾绫诲瀷
+ */
+ private Byte clType;
+ private String closeType;
+
+ /**
+ * 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double closeThisAmount;
+
+ /**
+ * 鍏抽榾鎶ヤ腑鏈湴鐢ㄦ按鏃堕暱锛堝垎閽燂級
+ */
+ 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