From 33e1f47419d28736b17d6947bb15ccc290b2905a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 二月 2025 17:42:45 +0800
Subject: [PATCH] 1、代码完善; 2、江海协议解析不正确处修改,如金额是4位小数; 3、根据江海协议,新建RTU模拟器模块,可以上报心跳、开阀、关阀数据。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java
index ea38505..cd9351e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java
@@ -1,7 +1,8 @@
 package com.dy.pipIrrStatistics.intake.qo;
 
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author :WuZeYu
@@ -10,12 +11,19 @@
  * @Description
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class IntakeCountValueQO extends CommonQO {
 
 
     /**
      * 鍊�
      */
-    @NotBlank(message = "鍊间笉鑳戒负绌�")
-    private int value;
+    @NotNull(message = "鍊间笉鑳戒负绌�")
+    public Integer value;
+
+
+    ///////////////////////
+    //闈炲墠绔彁浜ょ殑鍙傛暟
+    public Long idStart ;
+    public Long idEnd ;
 }

--
Gitblit v1.8.0