From cb46d99ac8c302334e8c39600de0d9a4ffbf5533 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 09:39:48 +0800
Subject: [PATCH] 1、删除global模块中Contant中的一些无用代码； 2、删除global模块中一些无用的备份； 3、一些有继承关系并注解有@Data的类中增加注解@EqualsAndHashCode(callSuper=false)，防止编译时警告
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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..daf3aa0 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,7 @@
package com.dy.pipIrrGlobal.voPr;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
/**
@@ -12,6 +12,7 @@
*/
@Data
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine"})
public class VoOnLineIntake implements BaseEntity {
private static final long serialVersionUID = 202405271703001L;
@@ -31,6 +32,21 @@
private String intakeNum;
/**
+ * 鍙栨按鍙ｇ粡搴�
+ */
+ private Double lng;
+
+ /**
+ * 鍙栨按鍙ｇ含搴�
+ */
+ private Double lat;
+
+ /**
+ * 绱娴侀噺
+ */
+ private Double totalAmount;
+
+ /**
* 鏄惁鍦ㄧ嚎
*/
private Boolean isOnLine;
@@ -39,4 +55,10 @@
* 鏄惁缁戝畾
*/
private Boolean isBinded;
+
+
+ /**
+ * 鎶ヨ淇℃伅Json鏁扮粍
+ */
+ private String alarm;
}
--
Gitblit v1.8.0