From f7c748120263ee6fbed1b137cbd7dad64e249c02 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 11 一月 2025 12:41:34 +0800
Subject: [PATCH] 1、通信中间件中,取水口日取水量统计重新实现,统计数据来源只采用关阀报,不再采用工作报和开阀报了; 2、临时任务中,增加统计取水口是取水量统计。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java
index c813a62..a93cfe3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java
@@ -1,7 +1,9 @@
 package com.dy.pipIrrGlobal.voSt;
 
 
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author :WuZeYu
@@ -11,6 +13,10 @@
  *                鐢ㄦ按鏃堕暱 > 鎸囧畾鍊�  (鍒嗛挓)
  */
 @Data
+@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat"
+        ,"recordCount"
+})
+@EqualsAndHashCode(callSuper=false)
 public class VoIntakeOpenCount extends VoIntake{
     private static final long serialVersionUID = 202408051046001L;
 

--
Gitblit v1.8.0