From 5f54ba90abcc0ccf1b578472eac54fc98056767c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 08 四月 2025 17:15:13 +0800
Subject: [PATCH] 灌溉计划终止接口,包括远程关阀和取消灌溉计划

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java
index 63194d6..8fa92b8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java
@@ -1,6 +1,8 @@
 package com.dy.pipIrrGlobal.voSt;
 
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -10,19 +12,14 @@
  * @Description
  */
 @Data
-public class VoIntakeUnReported {
-
-    /**
-     * 鍙栨按鍙g紪鍙�
-     */
-    private String intakeNum;
+@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat"
+        ,"rtuAddr"
+})
+@EqualsAndHashCode(callSuper=false)
+public class VoIntakeUnReported extends VoIntake{
     /**
      * 闃�鎺у櫒鍦板潃
      */
-    private String rtuAddr;
-    /**
-     * 闃�鎺у櫒鏃堕棿
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private String rtuDt;
+    public String rtuAddr;
+
 }

--
Gitblit v1.8.0