From 5c514cf50eb825b02c839b5b0e6ba2a5880586bd Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 20 六月 2025 10:52:00 +0800
Subject: [PATCH] 基于酒泉水肥机FBox配置，进行协议与值对象等调整
---
/dev/null | 64 ---------------------
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java | 46 +++++++++------
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/ProtocolParserSdV1.java | 7 --
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java | 24 +++++---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java | 32 ++++++++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java | 1
6 files changed, 67 insertions(+), 107 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java
index c654c22..651a13f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java
@@ -3,7 +3,6 @@
import com.dy.common.mw.protocol4Mqtt.MqttPubMsg;
import com.dy.common.mw.protocol4Mqtt.MqttSubMsg;
import com.dy.common.mw.protocol4Mqtt.MqttTopic;
-import com.dy.common.mw.protocol4Mqtt.pSdV1.upVos.StateVo;
import com.dy.common.mw.protocol4Mqtt.Vo4Up;
import com.dy.common.util.Callback;
import lombok.Data;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/ProtocolParserSdV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/ProtocolParserSdV1.java
index 77c38d8..5c7bb13 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/ProtocolParserSdV1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/ProtocolParserSdV1.java
@@ -41,12 +41,7 @@
}
case ProtocolConstantSdV1.SubTopicManure -> {
vo = JSON.parseObject(strTxt, ManureVo.class);
- break;
- }
- case ProtocolConstantSdV1.SubTopicState -> {
- //姝ゅ鏈畬鎴愶紝搴旇浜х敓涓�浜涢�氫俊鐨刬nfo锛屼緵涓嬮潰callback.notify(objs)閫氱煡鍑哄幓
- vo = JSON.parseObject(strTxt, StateVo.class);
- StateVo stVo = (StateVo)vo ;
+ ManureVo stVo = (ManureVo)vo ;
stInfo = new DevRunInfo() ;
stInfo.devId = msg.deviceId ;
stInfo.stirRunning = (stVo.stirRunning==null?false:(stVo.stirRunning.byteValue()==1?true:false)) ; //鎼呮媽杩愯 true鏄� false鍚�
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java
index 9244e7f..10e0875 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java
@@ -15,16 +15,28 @@
@JSONField(name = "flexem_message_id")
public Integer messageId ;//娑堟伅ID
- public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏朵腑涓婚涓�
+ public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏跺湪涓婚涓�
+
+ @JSONField(name = "鎼呮媽杩愯")
+ public Byte stirRunning ;//鎼呮媽杩愯
+
+ @JSONField(name = "娉ㄨ偉杩愯")
+ public Byte injectRunning ;//娉ㄨ偉杩愯
+
+ @JSONField(name = "鐏屾簤杩愯")
+ public Byte irrRunning ;//鐏屾簤杩愯
+
+ @JSONField(name = "鎶ヨ")
+ public Byte alarm ;//鎶ヨ
@JSONField(name = "鑲ユ枡娴侀噺")
- public Float manureFlow ;//鑲ユ枡娴侀噺
+ public Float manureFlow ;
- @JSONField(name = "娉ㄨ偉鏃堕暱")
- public Integer manureTime ;//娉ㄨ偉鏃堕暱
+ @JSONField(name = "娉ㄨ偉缁忚繃鏃堕棿")
+ public Integer manureTime ;
- @JSONField(name = "鎼呮媽鏃堕暱")
- public Integer stirTime ;//鎼呮媽鏃堕暱
+ @JSONField(name = "鎼呮媽缁忚繃鏃堕棿")
+ public Integer stirTime ;
@JSONField(name = "flexem_timestamp")
public Long devDt ;//璁惧鏃堕棿
@@ -49,9 +61,13 @@
StringBuilder sb = new StringBuilder();
sb.append("姘磋偉鏁版嵁=>") ;
sb.append(" 娑堟伅ID锛�" + messageId + ", ") ;
+ sb.append(" 鎼呮媽杩愯锛�" + stirRunning + ", ") ;
+ sb.append(" 娉ㄨ偉杩愯锛�" + injectRunning + ", ") ;
+ sb.append(" 鐏屾簤杩愯锛�" + irrRunning + ", ") ;
+ sb.append(" 鎶ヨ锛�" + alarm + ", ") ;
sb.append(" 鑲ユ枡娴侀噺锛�" + manureFlow + ", ") ;
- sb.append(" 娉ㄨ偉鏃堕暱锛�" + manureTime + ", ") ;
- sb.append(" 鎼呮媽鏃堕暱锛�" + stirTime + ", ") ;
+ sb.append(" 娉ㄨ偉缁忚繃鏃堕棿锛�" + manureTime + ", ") ;
+ sb.append(" 鎼呮媽缁忚繃鏃堕棿锛�" + stirTime + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
sb.append("\n") ;
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 b4f8d7a..9f3a71e 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
@@ -15,31 +15,37 @@
@JSONField(name = "flexem_message_id")
public Integer messageId ;//娑堟伅ID
- public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏朵腑涓婚涓�
+ public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏跺湪涓婚涓�
@JSONField(name = "鍦熷￥婀垮害1")
- public Float soilHumidity1 ;//鍦熷￥婀垮害1
+ public Integer soilHumidity1 ;
@JSONField(name = "鍦熷￥婀垮害2")
- public Float soilHumidity2 ;//鍦熷￥婀垮害2
+ public Integer soilHumidity2 ;
@JSONField(name = "鍦熷￥婀垮害3")
- public Float soilHumidity3 ;//鍦熷￥婀垮害3
+ public Integer soilHumidity3 ;
@JSONField(name = "鍦熷￥婀垮害4")
- public Float soilHumidity4 ;//鍦熷￥婀垮害4
+ public Integer soilHumidity4 ;
+
+ @JSONField(name = "鍦熷￥婀垮害5")
+ public Integer soilHumidity5 ;
@JSONField(name = "鍦熷￥婀垮害1")
- public Float soilTemperature1 ;//鍦熷￥娓╁害1
+ public Integer soilTemperature1 ;
@JSONField(name = "鍦熷￥娓╁害2")
- public Float soilTemperature2 ;//鍦熷￥娓╁害2
+ public Integer soilTemperature2 ;
@JSONField(name = "鍦熷￥娓╁害3")
- public Float soilTemperature3 ;//鍦熷￥娓╁害3
+ public Integer soilTemperature3 ;
@JSONField(name = "鍦熷￥娓╁害4")
- public Float soilTemperature4 ;//鍦熷￥娓╁害4
+ public Integer soilTemperature4 ;
+
+ @JSONField(name = "鍦熷￥娓╁害5")
+ public Integer soilTemperature5 ;
@JSONField(name = "flexem_timestamp")
public Long devDt ;//璁惧鏃堕棿
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/StateVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/StateVo.java
deleted file mode 100644
index da78e62..0000000
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/StateVo.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.dy.common.mw.protocol4Mqtt.pSdV1.upVos;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.dy.common.mw.protocol4Mqtt.Vo4Up;
-import com.dy.common.util.DateTime;
-import lombok.Data;
-
-/**
- * @Author: liurunyu
- * @Date: 2025/6/10 10:05
- * @Description
- */
-@Data
-public class StateVo implements Vo4Up {
- @JSONField(name = "flexem_message_id")
- public Integer messageId ;//娑堟伅ID
-
- public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏朵腑涓婚涓�
-
- @JSONField(name = "鎼呮媽杩愯")
- public Byte stirRunning ;//鎼呮媽杩愯
-
- @JSONField(name = "娉ㄨ偉杩愯")
- public Byte injectRunning ;//娉ㄨ偉杩愯
-
- @JSONField(name = "鐏屾簤杩愯")
- public Byte irrRunning ;//鐏屾簤杩愯
-
- @JSONField(name = "鎶ヨ")
- public Byte alarm ;//鎶ヨ
-
- @JSONField(name = "flexem_timestamp")
- public Long devDt ;//璁惧鏃堕棿
-
- public String devDtStr ;//璁惧鏃堕棿
-
- @Override
- public void setNo(Integer no ){
- this.no = no ;
- }
-
- public String getDevDtStr() {
- if(devDt == null){
- return DateTime.yyyy_MM_dd_HH_mm_ss(DateTime.getDate(devDt)) ;
- }else{
- return "" ;
- }
- }
-
- @Override
- public String toString(){
- StringBuilder sb = new StringBuilder();
- sb.append("鐘舵�佹暟鎹�=>") ;
- sb.append(" 娑堟伅ID锛�" + messageId + ", ") ;
- sb.append(" 鎼呮媽杩愯锛�" + stirRunning + ", ") ;
- sb.append(" 娉ㄨ偉杩愯锛�" + injectRunning + ", ") ;
- sb.append(" 鐏屾簤杩愯锛�" + irrRunning + ", ") ;
- sb.append(" 鎶ヨ锛�" + alarm + ", ") ;
- sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
- sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
- sb.append("\n") ;
- return sb.toString() ;
- }
-}
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 1b2b510..58926a5 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
@@ -16,28 +16,34 @@
@JSONField(name = "flexem_message_id")
public Integer messageId ;//娑堟伅ID
- public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏朵腑涓婚涓�
+ public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏跺湪涓婚涓�
- @JSONField(name = "浜屾哀鍖栫⒊")
- public Integer carbonDioxide ;//浜屾哀鍖栫⒊
+ //@JSONField(name = "浜屾哀鍖栫⒊")
+ //public Integer carbonDioxide ;
- @JSONField(name = "鍏夌収寮哄害")
- public Integer lightIntensity ;//鍏夌収寮哄害
-
- @JSONField(name = "澶ф皵鍘嬪姏")
- public Integer atmosphericPressure ;//澶ф皵鍘嬪姏
+ //@JSONField(name = "澶ф皵鍘嬪姏")
+ //public Integer atmosphericPressure ;
@JSONField(name = "绌烘皵娓╁害")
- public Integer airTemperature ;//绌烘皵娓╁害
+ public Integer airTemperature ;
@JSONField(name = "绌烘皵婀垮害")
- public Integer airHumidity ;//绌烘皵婀垮害
+ public Integer airHumidity ;
- @JSONField(name = "PM2.5")
- public Integer pm25 ;//PM2.5
+ @JSONField(name = "绱绾�")
+ public Integer ultraviolet ;
- @JSONField(name = "PM10")
- public Integer pm10 ;//PM10
+ @JSONField(name = "鍏夌収寮哄害")
+ public Integer lightIntensity ;
+
+ @JSONField(name = "闆ㄩ噺")
+ public Integer rainfall ;
+
+ @JSONField(name = "椋庨��")
+ public Integer windSpeed ;
+
+ @JSONField(name = "椋庡悜")
+ public Integer windDirection ;
@JSONField(name = "flexem_timestamp")
@@ -62,14 +68,16 @@
public String toString(){
StringBuilder sb = new StringBuilder();
sb.append("姘旇薄鏁版嵁=>") ;
+ //sb.append(" 浜屾哀鍖栫⒊锛�" + carbonDioxide + ", ") ;
+ //sb.append(" 澶ф皵鍘嬪姏锛�" + atmosphericPressure + ", ") ;
sb.append(" 娑堟伅ID锛�" + messageId + ", ") ;
- sb.append(" 浜屾哀鍖栫⒊锛�" + carbonDioxide + ", ") ;
- sb.append(" 鍏夌収寮哄害锛�" + lightIntensity + ", ") ;
- sb.append(" 澶ф皵鍘嬪姏锛�" + atmosphericPressure + ", ") ;
sb.append(" 绌烘皵娓╁害锛�" + airTemperature + ", ") ;
sb.append(" 绌烘皵婀垮害锛�" + airHumidity + ", ") ;
- sb.append(" PM2.5锛�" + pm25 + ", ") ;
- sb.append(" PM10锛�" + pm10 + ", ") ;
+ sb.append(" 绱绾匡細" + ultraviolet + ", ") ;
+ sb.append(" 鍏夌収寮哄害锛�" + lightIntensity + ", ") ;
+ sb.append(" 闆ㄩ噺锛�" + rainfall + ", ") ;
+ sb.append(" 椋庨�燂細" + windSpeed + ", ") ;
+ sb.append(" 椋庡悜锛�" + windDirection + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
sb.append("\n") ;
--
Gitblit v1.8.0