From 4f023af6fd0eac21b28bfec1369245dd73cc1496 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 11 十一月 2024 17:15:50 +0800
Subject: [PATCH] 巡检仪问题上报接口、农户问题上报接口代码优化

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
index 01f6c46..c869671 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
@@ -1,6 +1,8 @@
 package com.dy.pipIrrGlobal.voPr;
 
 import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
 
 /**
@@ -11,6 +13,7 @@
  */
 
 @Data
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine"})
 public class VoOnLineIntake implements BaseEntity {
     private static final long serialVersionUID = 202405271703001L;
 
@@ -30,7 +33,34 @@
     private String intakeNum;
 
     /**
+     * 鍙栨按鍙g粡搴�
+     */
+    private Double lng;
+
+    /**
+     * 鍙栨按鍙g含搴�
+     */
+    private Double lat;
+
+    /**
+     * 绱娴侀噺
+     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    private Double totalAmount;
+
+    /**
      * 鏄惁鍦ㄧ嚎
      */
     private Boolean isOnLine;
+
+    /**
+     * 鏄惁缁戝畾
+     */
+    private Boolean isBinded;
+
+
+    /**
+     * 鎶ヨ淇℃伅Json鏁扮粍
+     */
+    private String alarm;
 }

--
Gitblit v1.8.0