From 0c870ae5b2af348e19b10cc1a99f103f95c5a1cc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 21 六月 2025 11:47:09 +0800
Subject: [PATCH] 1、通信中间件重构MQTT相关下行命令的逻辑； 2、remote模块完善MQTT相关下行命令解除报警、搅拌启停、注肥启停、灌溉启停功能类；
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java
index 9f3a71e..7a01088 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java
@@ -18,34 +18,34 @@
public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏跺湪涓婚涓�
@JSONField(name = "鍦熷￥婀垮害1")
- public Integer soilHumidity1 ;
+ public Float soilHumidity1 ;
@JSONField(name = "鍦熷￥婀垮害2")
- public Integer soilHumidity2 ;
+ public Float soilHumidity2 ;
@JSONField(name = "鍦熷￥婀垮害3")
- public Integer soilHumidity3 ;
+ public Float soilHumidity3 ;
@JSONField(name = "鍦熷￥婀垮害4")
- public Integer soilHumidity4 ;
+ public Float soilHumidity4 ;
@JSONField(name = "鍦熷￥婀垮害5")
- public Integer soilHumidity5 ;
+ public Float soilHumidity5 ;
@JSONField(name = "鍦熷￥婀垮害1")
- public Integer soilTemperature1 ;
+ public Float soilTemperature1 ;
@JSONField(name = "鍦熷￥娓╁害2")
- public Integer soilTemperature2 ;
+ public Float soilTemperature2 ;
@JSONField(name = "鍦熷￥娓╁害3")
- public Integer soilTemperature3 ;
+ public Float soilTemperature3 ;
@JSONField(name = "鍦熷￥娓╁害4")
- public Integer soilTemperature4 ;
+ public Float soilTemperature4 ;
@JSONField(name = "鍦熷￥娓╁害5")
- public Integer soilTemperature5 ;
+ public Float soilTemperature5 ;
@JSONField(name = "flexem_timestamp")
public Long devDt ;//璁惧鏃堕棿
@@ -58,7 +58,7 @@
}
public String getDevDtStr() {
- if(devDt == null){
+ if(devDt != null){
return DateTime.yyyy_MM_dd_HH_mm_ss(DateTime.getDate(devDt)) ;
}else{
return "" ;
@@ -79,7 +79,7 @@
sb.append(" 鍦熷￥娓╁害3锛�" + soilTemperature3 + ", ") ;
sb.append(" 鍦熷￥娓╁害4锛�" + soilTemperature4 + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
- sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
+ sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr()) ;
sb.append("\n") ;
return sb.toString() ;
--
Gitblit v1.8.0