From d8eb22351c6d0bfe0c9f233edfd593538e6838c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 四月 2025 13:58:49 +0800
Subject: [PATCH] 1、表阀一体机协议开阀类型变化; 2、表阀一体机协议开关阀报中增加水价数据;

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeOpenCloseValve.java |  110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 110 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeOpenCloseValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeOpenCloseValve.java
new file mode 100644
index 0000000..e45f0ef
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeOpenCloseValve.java
@@ -0,0 +1,110 @@
+package com.dy.pipIrrGlobal.voAllRound;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/2/5 9:36
+ * @Description
+ */
+@Data
+@JsonPropertyOrder({ "intakeId", "clientId",
+        "clientName", "clientAddr",
+        "openTime" , "openType" ,
+        "openIcNum" , "openRemainMoney" ,
+        "closeTime" , "closeType" ,
+        "closeIcNum" , "closeRemainMoney" ,
+        "thisTime" , "thisAmount" ,
+        "thisMoney"  })
+public class VoArIntakeOpenCloseValve {
+    public static final long serialVersionUID = 202502050936001L;
+
+    /**
+     * 鍙栨按鍙D
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long intakeId;
+
+    /**
+     * 寮�鍏抽榾鍐滄埛ID
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long clientId;
+
+    /**
+     * 寮�鍏抽榾鍐滄埛
+     */
+    public String clientName;
+
+    /**
+     * 鍐滄埛鍦板潃
+     */
+    public String clientAddr;
+
+
+    /**
+     * 寮�闃�鏃ユ湡鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date openTime ;
+
+    /**
+     * 寮�闃�绫诲瀷
+     */
+    @JSONField(serialize=false)
+    public Byte opType;
+    public String openType;
+
+    /**
+     * 寮�闃�IC鍗$紪鍙�
+     */
+    public String openIcNum;
+
+    /**
+     * 寮�闃�鏃跺崱鍐呭墿浣欓噾棰�
+     */
+    public Double openRemainMoney;
+
+
+    /**
+     * 鍏抽榾鏃ユ湡鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date closeTime ;
+
+    /**
+     * 鍏抽榾绫诲瀷
+     */
+    @JSONField(serialize=false)
+    public Byte clType;
+    public String closeType;
+
+    /**
+     * 鍏抽榾IC鍗$紪鍙�
+     */
+    public String closeIcNum;
+
+    /**
+     * 鍏抽榾鏃跺崱鍐呭墿浣欓噾棰�
+     */
+    public Double closeRemainMoney;
+
+    /**
+     * 鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級
+     */
+    public Integer thisTime;
+    /**
+     * 鏈鐢ㄦ按閲�
+     */
+    public Double thisAmount;
+    /**
+     * 鏈娑堣垂閲戦
+     */
+    public Double thisMoney;
+}

--
Gitblit v1.8.0