From 4faf659ac4d1287d41d1a9afab3c302356100185 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 八月 2024 10:11:04 +0800
Subject: [PATCH] 在pipIrr-web-remote模块中实现RTU上下行数据日志下载功能RtuLogCtrl.java， 为此在pipIrr-global模块中增加了ByteArrayHttpMessageConverter.java和ByteArrayHttpMessageConverterConfig.java pipIrr-global模块的application-global.yml文件中增加了通信中间件相关URL
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
index d65d10f..28edc55 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
@@ -21,7 +21,7 @@
@Data
@Schema(title = "鍒嗘按鎴胯鍥惧璞�")
public class VoDivide implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202401241704004L;
@Schema(title = "ID")
@ExcelProperty("ID")
@@ -38,8 +38,13 @@
@ColumnWidth(15)
private String divideName;
- @Schema(title = "鎵�灞炵墖鍖�")
- @ExcelProperty("鎵�灞炵墖鍖�")
+ @Schema(title = "鎵�灞炵墖鍖篒D")
+ @ExcelProperty("鎵�灞炵墖鍖篒D")
+ @ColumnWidth(19)
+ private String blockId;
+
+ @Schema(title = "鎵�灞炵墖鍖哄悕绉�")
+ @ExcelProperty("鎵�灞炵墖鍖哄悕绉�")
@ColumnWidth(15)
private String blockName;
@@ -58,9 +63,39 @@
@ColumnWidth(25)
private String address;
+ @Schema(title = "瑕嗙洊鏉�")
+ @ExcelProperty("瑕嗙洊鏉�")
+ @ColumnWidth(25)
+ private String villages;
+
+ @Schema(title = "瑕嗙洊闈㈢Н")
+ @ExcelProperty("瑕嗙洊闈㈢Н")
+ @ColumnWidth(25)
+ private String area;
+
+ @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