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/VoTiming.java | 86 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java
new file mode 100644
index 0000000..f7c4f9f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java
@@ -0,0 +1,86 @@
+package com.dy.pipIrrGlobal.voRm;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-07-25 9:45
+ * @LastEditTime 2024-07-25 9:45
+ * @Description 瀹氭椂鎶ヨ鍥惧璞�
+ */
+@Data
+public class VoTiming {
+ private static final long serialVersionUID = 202407250946001L;
+
+ /**
+ * 鍙栨按鍙D
+ */
+ private Long intakeId;
+
+ /**
+ * 鍙栨按鍙ｇ紪鍙�
+ */
+ private String intakeNum;
+
+ /**
+ * 闃�鎺у櫒鍦板潃
+ */
+ private String rtuAddr;
+
+ /**
+ * 鏁版嵁鎺ユ敹鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date receiveTime;
+
+ /**
+ * 鏈勾绱娴侀噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double waterTotalAmountYear;
+
+ /**
+ * 姘磋〃绱娴侀噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double waterTotalAmountMeter;
+
+ /**
+ * 鏈勾绱鐢甸噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double eleTotalAmountYear;
+
+ /**
+ * 鐢佃〃绱鐢甸噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double eleTotalAmountMeter;
+
+ /**
+ * 褰撴棩姘磋〃鍑�娴侀噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double waterTotalAmountDay;
+
+ /**
+ * 褰撴棩鐢ㄦ埛鐢ㄦ按閲�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double waterUserTotalAmountDay;
+
+ /**
+ * 婕忔崯姘撮噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double lossTotalAmountDay;
+
+ /**
+ * 鍚庡鐢垫睜鐢靛帇
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double batteryVolt;
+}
--
Gitblit v1.8.0