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/voMd/VoCrops.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
index 2704449..4eb11a1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
@@ -4,7 +4,6 @@
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -17,9 +16,15 @@
*/
@Data
-@JsonPropertyOrder({"id", "name", "startDt", "endDt",
-
- "stopped", "stoppedStr", "remarks", "createDt"})
+@JsonPropertyOrder({"id", "weatherId",
+ "name", "startDt", "endDt",
+ "life1Start", "life1End", "life1Factor",
+ "life2Start", "life2End", "life2Factor",
+ "life3Start", "life3End", "life3Factor",
+ "life4Start", "life4End", "life4Factor",
+ "stopped", "remarks", "createDt",
+ "lifeLen", "lifeCur", "lifeFactor", "stoppedStr"
+})
public class VoCrops implements Serializable {
public static final long serialVersionUID = 202508061124001L;
@@ -29,6 +34,11 @@
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long id;
+ /**
+ * 鎸囧悜姘旇薄绔欏閿�
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long weatherId;
/**
* 浣滅墿鍚嶇О
@@ -107,10 +117,6 @@
*/
public Double life4Factor ;
- /**
- * 绾害
- */
- public Double lat;
/**
* 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
@@ -132,7 +138,7 @@
* 宸茬粡鐢熸垚鏃堕暱锛堝ぉ锛�
*/
public Integer lifeLen;
- /**
+ /**
* 褰撳墠鐢熼暱闃舵
*/
public String lifeCur ;
@@ -144,5 +150,17 @@
* 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
*/
public String stoppedStr;
+ /**
+ * 宸茬粡鐢熸垚鏃堕暱锛堝ぉ锛�
+ */
+ public String lifeLenStr;
+
+ /**
+ * 瀵瑰簲浣滅墿鐢熼暱闃舵鐨勭郴鏁�
+ */
+ public String lifeFactorStr ;
+
+ //鍏宠仈姘旇薄绔欏悕绉�
+ public String weatherName ;
}
--
Gitblit v1.8.0