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/voAllRound/VoArIntakeRemote.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeRemote.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeRemote.java
new file mode 100644
index 0000000..d9d848e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeRemote.java
@@ -0,0 +1,65 @@
+package com.dy.pipIrrGlobal.voAllRound;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/1/14 17:03
+ * @Description
+ */
+@Data
+@JsonPropertyOrder({"intakeId", "onLine", "alarm", "alarmDt", "lastOpenDt", "lastCloseDt", "lossAmount", "lossDt"})
+public class VoArIntakeRemote {
+ private static final long serialVersionUID = 202501141703001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long intakeId;
+
+ /**
+ * 鍦ㄧ嚎鎯呭喌, true鍦ㄧ嚎锛宖alse绂荤嚎锛宯ull鏈煡
+ */
+ public Boolean onLine ;
+
+ /**
+ * 鏈�鏂版姤璀︿俊鎭�
+ */
+ public String alarm ;
+
+ /**
+ * 鏈�鏂版姤璀︽椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ public Date alarmDt ;
+
+ /**
+ * 鏈�鍚庡紑闃�鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ public Date lastOpenDt ;
+
+ /**
+ * 鏈�鍚庡叧闂椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ public Date lastCloseDt ;
+
+ /**
+ * 鏈�鍚庣粺璁℃紡鎹熼噺
+ */
+ public Double lossAmount ;
+
+ /**
+ * 鏈�鍚庣粺璁℃紡鎹熸棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ public Date lossDt ;
+
+
+
+}
--
Gitblit v1.8.0