From d9d08181a94d727a4fe5933ac9efd1ff5c8a7c5a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 16 七月 2025 13:49:13 +0800 Subject: [PATCH] 中间件修改内容: 1、当没农业综合站时即没相关配置项目内容为空时,启动时会产生bug; 2、整理优化代码。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java | 10 +++++++++- 1 files changed, 9 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 dd4a4c0..476b14a 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 @@ -16,7 +16,7 @@ */ @Data -@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine", "isBinded", "alarm" ,"instantAmount", "totalAmount"}) +@JsonPropertyOrder({ "intakeId", "rtuAddr", "protocol", "protocolVersion", "intakeNum", "isOnLine", "isBinded", "alarm" ,"instantAmount", "totalAmount"}) public class VoOnLineIntake implements BaseEntity { private static final long serialVersionUID = 202405271703001L; @@ -29,6 +29,14 @@ * 闃�鎺у櫒鍦板潃 */ private String rtuAddr; + /** + * 闃�鎺у櫒閫氫俊鍗忚 + */ + private String protocol; + /** + * 闃�鎺у櫒閫氫俊鍗忚 + */ + private Integer protocolVersion; /** * 鍙栨按鍙g紪鍙� -- Gitblit v1.8.0