From 24f53bb77f9ac80feb2e62e8ee670be4aa5f3c6e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 13 二月 2025 11:56:42 +0800
Subject: [PATCH] 1、远程模块remote模块实现： （1、系统启动时向通信中间件注册消息接收者； （2、消息接收者ctr实现（测试阶段）； 2、在配置文件增加配置Springboot RestTemplate网络请求超时时长； 3、其他一些测试与优化。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java | 23 ++++++++++++++++++++---
1 files changed, 20 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 530f5ad..3626863 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
@@ -22,7 +22,7 @@
*/
@Data
-@JsonPropertyOrder({ "intakeId", "intakeName", "divideId", "divideName", "blockId", "blockName", "isBind", "address", "lng", "lat", "operator", "operateDt", "remarks", "controllerId", "rtuAddr"})
+@JsonPropertyOrder({ "intakeId", "intakeName", "divideId", "divideName", "blockId", "blockName", "isBind", "address", "lng", "lat", "operator", "operateDt", "remarks", "controllerId", "rtuAddr", "protocol", "findDt", "isOnLine", "bindNumber"})
@HeadRowHeight(30)
@ContentRowHeight(20)
public class VoIntake implements BaseEntity {
@@ -55,8 +55,8 @@
@ColumnWidth(15)
private String blockName;
- @Schema(title = "缁戝畾璁惧")
- @ExcelProperty(value = {"${title}", "缁戝畾璁惧"})
+ @Schema(title = "鏄惁缁戝畾璁惧")
+ @ExcelProperty(value = {"${title}", "鏄惁缁戝畾璁惧"})
@ColumnWidth(10)
private String isBind;
@@ -98,4 +98,21 @@
@ExcelProperty(value = {"${title}", "鎺у埗鍣ㄥ湴鍧�"})
@ColumnWidth(15)
private String rtuAddr;
+
+ @Schema(title = "閫氳鍗忚")
+ @ExcelIgnore
+ private String protocol;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Schema(title = "鍙戠幇鏃ユ湡鏃堕棿")
+ @ExcelProperty(value = {"${title}", "鍙戠幇鏃堕棿"})
+ @ColumnWidth(20)
+ private Date findDt;
+
+ @Schema(title = "缁戝畾娆℃暟")
+ @ExcelProperty(value = {"${title}", "缁戝畾娆℃暟"})
+ @ColumnWidth(10)
+ private Integer bindNumber;
+
}
--
Gitblit v1.8.0