From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 八月 2024 11:36:41 +0800
Subject: [PATCH] 1、完善代码和application.yml配置文件，去掉不用的引入文件； 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断； 3、凡是有Server的应用，加载资源方式改为用springboot的工具类加载； 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2，以实现可以在jar包情况下能够扫描类（.class）注解。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
index d5d4934..1042061 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
@@ -5,6 +5,8 @@
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -20,22 +22,17 @@
@Data
@Schema(title = "鎺у埗鍣ㄨ鍥惧璞�")
public class VoController implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202401241704003L;
@Schema(title = "ID")
@ExcelProperty("ID")
@ColumnWidth(10)
- private Long id;
+ private String id;
- @Schema(title = "鎺у埗鍣ㄧ紪鍙�")
- @ExcelProperty("鎺у埗鍣ㄧ紪鍙�")
+ @Schema(title = "鎺у埗鍣ㄥ湴鍧�")
+ @ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
@ColumnWidth(15)
- private String controllerCode;
-
- @Schema(title = "鍦ㄧ嚎鐘舵��")
- @ExcelProperty("鍦ㄧ嚎鐘舵��")
- @ColumnWidth(15)
- private String onlineState;
+ private String rtuAddr;
@Schema(title = "缁戝畾鍙栨按鍙�")
@ExcelProperty("缁戝畾鍙栨按鍙�")
@@ -49,8 +46,29 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Schema(title = "鏈�杩戜笂鎶ユ椂闂�")
- @ExcelProperty("鏈�杩戜笂鎶ユ椂闂�")
+ @Schema(title = "鍙戠幇鏃ユ湡鏃堕棿")
+ @ExcelProperty("鍙戠幇鏃ユ湡鏃堕棿")
@ColumnWidth(30)
- private Date reportTime;
+ private Date findDt;
+
+// @Schema(title = "鍦ㄧ嚎鐘舵��")
+// @ExcelProperty("鍦ㄧ嚎鐘舵��")
+// @ColumnWidth(6)
+// private String onlineState;
+
+ /**
+ * 鏄惁鍦ㄧ嚎
+ */
+ private Boolean isOnLine;
+
+
+ @Schema(title = "閫氳鍗忚")
+ @ExcelProperty("閫氳鍗忚")
+ @ColumnWidth(10)
+ private String protocol;
+
+ @Schema(title = "澶囨敞")
+ @ExcelProperty("澶囨敞")
+ @ColumnWidth(10)
+ private String remarks;
}
--
Gitblit v1.8.0