From e059d06932a35d26be1c030dce61964bd04a1488 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 一月 2025 16:41:35 +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 {
-
- /**
- * 鍙栨按鍙ｇ紪鍙�
- */
- 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