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/VoWeather.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java
index 2b16a61..58e82b1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java
@@ -3,6 +3,7 @@
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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -14,6 +15,13 @@
* @Description
*/
@Data
+@JsonPropertyOrder({
+ "id", "weatherId", "weatherName", "dt",
+ "airTemperature", "airHumidity",
+ "ultraviolet", "lightIntensity",
+ "rainfall", "windSpeed",
+ "windDirection", "windDirectionStr"
+})
public class VoWeather {
public static final long serialVersionUID = 202506260903001L;
@@ -34,7 +42,7 @@
* 姘旇薄绔欏悕绉�
*/
@Schema(description = "姘旇薄绔欏悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long weatherName;
+ public String weatherName;
/**
@@ -114,8 +122,7 @@
瑗垮寳锛圢W锛� 146掳~169掳 157.5掳
鍖楋紙N锛� 169掳~191掳 180掳
*/
- @Schema(description = "椋庡悜", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String windDirectionStr;
+ @JSONField(name = "windDirectionStr") // 鎸囧畾 JSON 涓殑瀛楁鍚�
public String getWindDirectionStr() {
String str = "" ;
if (windDirection != null) {
--
Gitblit v1.8.0