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/VoUnclosedValve.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
index 65dc623..beca40c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrGlobal.voRm;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
import java.util.Date;
@@ -13,18 +14,54 @@
*/
@Data
+@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned", "dt", "waterInstant"})
public class VoUnclosedValve implements BaseEntity {
private static final long serialVersionUID = 202405241634001L;
- private String commandCode;
+ //private String commandCode;
+ /**
+ * 鍙栨按鍙ｇ紪鍙�
+ */
private String intakeNum;
+ /**
+ * 鏄惁鍦ㄧ嚎
+ */
+ private Boolean isOnLine;
+
+ /**
+ * 闃�鎺у櫒鍦板潃
+ */
private String rtuAddr;
- private String orderNo;
-
+ /**
+ * 铏氭嫙鍗＄紪鍙�
+ */
private String vcNum;
- private Date openTime;
+ /**
+ * 璁㈠崟鍙�
+ */
+ private String orderNo;
+
+ /**
+ * 鐘舵��
+ */
+ private String state;
+
+ /**
+ * 鏄惁璁″垝鎬у紑闃�
+ */
+ private Boolean planned;
+
+ /**
+ * 宸ヤ綔鎶ユ椂闂�
+ */
+ private Date dt;
+
+ /**
+ * 鐬椂娴侀噺
+ */
+ private Double waterInstant;
}
--
Gitblit v1.8.0