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-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java
index 58926a5..573e631 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java
@@ -25,10 +25,10 @@
//public Integer atmosphericPressure ;
@JSONField(name = "绌烘皵娓╁害")
- public Integer airTemperature ;
+ public Float airTemperature ;
@JSONField(name = "绌烘皵婀垮害")
- public Integer airHumidity ;
+ public Float airHumidity ;
@JSONField(name = "绱绾�")
public Integer ultraviolet ;
@@ -37,10 +37,10 @@
public Integer lightIntensity ;
@JSONField(name = "闆ㄩ噺")
- public Integer rainfall ;
+ public Float rainfall ;
@JSONField(name = "椋庨��")
- public Integer windSpeed ;
+ public Float windSpeed ;
@JSONField(name = "椋庡悜")
public Integer windDirection ;
@@ -79,7 +79,7 @@
sb.append(" 椋庨�燂細" + windSpeed + ", ") ;
sb.append(" 椋庡悜锛�" + windDirection + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
- sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
+ sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() ) ;
sb.append("\n") ;
return sb.toString() ;
}
--
Gitblit v1.8.0