From 42155cb925930831293dd10ac5037c04619e92c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 17 十月 2024 16:05:08 +0800
Subject: [PATCH] 修改通信中间件上行数据的漏损量处理逻辑,对于当天绑定(发现并绑定)的控制器,控制器计算的漏损量一定不正确,强制设置成0,本次修改是把原实现用发现日期时间控制,变成绑定日期时间控制。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 c0c3512..015acd2 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,5 @@
 package com.dy.pipIrrGlobal.voPr;
 
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.dy.common.po.BaseEntity;
 import lombok.Data;
 
@@ -31,6 +30,21 @@
     private String intakeNum;
 
     /**
+     * 鍙栨按鍙g粡搴�
+     */
+    private Double lng;
+
+    /**
+     * 鍙栨按鍙g含搴�
+     */
+    private Double lat;
+
+    /**
+     * 绱娴侀噺
+     */
+    private Double totalAmount;
+
+    /**
      * 鏄惁鍦ㄧ嚎
      */
     private Boolean isOnLine;
@@ -39,4 +53,10 @@
      * 鏄惁缁戝畾
      */
     private Boolean isBinded;
+
+
+    /**
+     * 鎶ヨ淇℃伅Json鏁扮粍
+     */
+    private String alarm;
 }

--
Gitblit v1.8.0