From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
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;
/**
* 鍙栨按鍙ｇ紪鍙�
--
Gitblit v1.8.0