From 70b2c7a1f5b54cf9157d8fce4d6a9b0f2fadaebe Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 15 四月 2025 17:13:28 +0800
Subject: [PATCH] 获取终止操作结果

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 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..dd4a4c0 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,7 +1,12 @@
 package com.dy.pipIrrGlobal.voPr;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
+
+import java.util.Date;
 
 /**
  * @author ZhuBaoMin
@@ -11,6 +16,7 @@
  */
 
 @Data
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine", "isBinded", "alarm" ,"instantAmount", "totalAmount"})
 public class VoOnLineIntake implements BaseEntity {
     private static final long serialVersionUID = 202405271703001L;
 
@@ -30,7 +36,46 @@
     private String intakeNum;
 
     /**
+     * 鍙栨按鍙g粡搴�
+     */
+    private Double lng;
+
+    /**
+     * 鍙栨按鍙g含搴�
+     */
+    private Double lat;
+
+    /**
+     * 鐬椂娴侀噺
+     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    private Double instantAmount;
+
+    /**
+     * 绱娴侀噺
+     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    private Double totalAmount;
+
+    /**
      * 鏄惁鍦ㄧ嚎
      */
     private Boolean isOnLine;
+
+    /**
+     * 鏄惁缁戝畾
+     */
+    private Boolean isBinded;
+
+
+    /**
+     * 鎶ヨ淇℃伅Json鏁扮粍鍜屾帴鏀跺埌鎶ヨ鏃堕棿
+     */
+    private String alarm;
+
+    /**
+     * 鎺ユ敹鍒版姤璀︽椂闂�
+     */
+    @JSONField(serialize = false)
+    private Date alarmDt;
 }

--
Gitblit v1.8.0