From 50864934bd29f13e6014d566630e14a1e8021f19 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 08 五月 2024 13:54:58 +0800
Subject: [PATCH] 1、全部实现王江海制定的协议，但还未联调； 2、通信中间件软件工程改名称为pipIrr-mw-rtu;
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
index 89a2e92..d6d1963 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
@@ -23,20 +23,30 @@
public class VoIntake implements BaseEntity {
private static final long serialVersionUID = 202312261049001L;
- @Schema(title = "ID")
- @ExcelProperty("ID")
+ @Schema(title = "鍙栨按鍙D")
+ @ExcelProperty("鍙栨按鍙D")
@ColumnWidth(10)
- private Long id;
+ private String intakeId;
@Schema(title = "鍙栨按鍙ｅ悕绉�")
@ExcelProperty("鍙栨按鍙ｅ悕绉�")
@ColumnWidth(15)
private String intakeName;
+ @Schema(title = "鍒嗘按鎴縄D")
+ @ExcelProperty("鍒嗘按鎴縄D")
+ @ColumnWidth(10)
+ private String divideId;
+
@Schema(title = "鎵�灞炲垎姘存埧")
@ExcelProperty("鎵�灞炲垎姘存埧")
@ColumnWidth(15)
private String divideName;
+
+ @Schema(title = "鐗囧尯ID")
+ @ExcelProperty("鐗囧尯ID")
+ @ColumnWidth(15)
+ private String blockId;
@Schema(title = "鎵�灞炵墖鍖�")
@ExcelProperty("鎵�灞炵墖鍖�")
@@ -53,9 +63,29 @@
@ColumnWidth(25)
private String address;
+ @Schema(title = "缁忓害")
+ @ExcelProperty("缁忓害")
+ @ColumnWidth(25)
+ private String lng;
+
+ @Schema(title = "绾害")
+ @ExcelProperty("绾害")
+ @ColumnWidth(25)
+ private String lat;
+
+ @Schema(title = "鎿嶄綔浜�")
+ @ExcelProperty("鎿嶄綔浜�")
+ @ColumnWidth(25)
+ private String operator;
+
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "鎿嶄綔鏃堕棿")
@ExcelIgnore
private Date operateDt;
+
+ @Schema(title = "澶囨敞")
+ @ExcelProperty("澶囨敞")
+ @ColumnWidth(250)
+ private String remarks;
}
--
Gitblit v1.8.0