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/voRm/VoIntakeVc.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java
index 51a78be..a7abce6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java
@@ -7,21 +7,26 @@
* @author ZhuBaoMin
* @date 2025-04-07 21:08
* @LastEditTime 2025-04-07 21:08
- * @Description 鍙栨按鍙ｃ�佽櫄鎷熷崱瑙嗗浘瀵硅薄锛岀粓姝㈢亴婧夎鍒掓椂浣跨敤锛岀敤鏉ユ墽琛岃繙绋嬪叧闃�
+ * @Description 寮�闃�淇℃伅瑙嗗浘瀵硅薄锛岀粓姝㈢亴婧夎鍒掓椂浣跨敤锛岀敤鏉ユ墽琛岃繙绋嬪叧闃�
*/
@Data
-@JsonPropertyOrder({"intakeId", "vcId"})
+@JsonPropertyOrder({"rtuAddr", "vcNum", "orderNo"})
public class VoIntakeVc {
public static final long serialVersionUID = 202411281712001L;
/**
- * 鍙栨按鍙D
+ * 闃�鎺у櫒鍦板潃
*/
- private Long intakeId;
+ private String rtuAddr;
/**
- * 铏氭嫙鍗D
+ * 铏氭嫙鍗＄紪鍙�
*/
- private Long vcId;
+ private String vcNum;
+
+ /**
+ * 璁㈠崟鍙�
+ */
+ private String orderNo;
}
--
Gitblit v1.8.0