From b397edee2be2dfcc3f28eeac50298b4de26b1afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 16:53:45 +0800
Subject: [PATCH] 取水口日取水量表中,出现一些大数,明显不正确,发析系统日志,发现一些阀控器会上报一些累计流量为0的数据,且无规律,推测是其不能从水表读取到累计流量时会上报0值。如果间歇上报0值,间歇上报一些非0值,非0值减去0值,就会出现大数,一天中出现几次那么会大数进行累加,数值将更大。为此变更算法,规避这种情况,但也会丢失一些流量值。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java
index 1597b7f..c70dfe5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java
@@ -1,36 +1,33 @@
 package com.dy.pipIrrRemote.common.dto;
 
-import jakarta.validation.constraints.NotBlank;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * @author ZhuBaoMin
  * @date 2024-07-23 10:36
  * @LastEditTime 2024-07-23 10:36
- * @Description 鑷姩鍏抽榾锛堝畾鏃跺叧闃�銆佸畾閲忓叧闃�锛変紶杈撳璞�
+ * @Description 鑷姩鍏抽榾寮�闃�浼犺緭瀵硅薄
  */
 
 @Data
+@EqualsAndHashCode(callSuper=true)
 public class AutomaticClose extends DtoBase {
     public static final long serialVersionUID = 202407231039001L;
 
     /**
-     * 闃�鎺у櫒鍦板潃
+     * 铏氭嫙鍗D
      */
-    @NotBlank(message = "闃�鎺у櫒鍦板潃涓嶈兘涓虹┖")
-    private String rtuAddr;
+    private Long vcId;
 
     /**
-     * 铏氭嫙鍗$紪鍙�
+     * 璁″垝寮�闃�鏃堕棿
      */
-    @NotBlank(message = "铏氭嫙鍗$紪鍙蜂笉鑳戒负绌�")
-    private String vcNum;
-
-    /**
-     * 璁㈠崟鍙�
-     */
-    @NotBlank(message = "璁㈠崟鍙蜂笉鑳戒负绌�")
-    private String orderNo;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date plannedOpenTime;
 
     /**
      * 鐢ㄦ按鏃堕暱锛屾嫢鏈夊畾鏃跺叧闃�
@@ -41,4 +38,5 @@
      * 棰勭敤姘撮噺锛屾嫢鏈夊畾閲忓叧闃�
      */
     private Integer waterAmount;
+
 }

--
Gitblit v1.8.0