From 46ea49c9452002f2c01a10fd9550339a8aaa7cd1 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 18 六月 2025 14:19:15 +0800 Subject: [PATCH] 1、新了解到,FBox可接多台套水肥机、气象站、墒情站,相应修改协议(主要是主题部分); 2、编写《水肥机、气象站、墒情站协议》(未完)。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/ProtocolParserSdV1.java | 168 +++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 105 insertions(+), 63 deletions(-) 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 1ca98b2..77c38d8 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 @@ -3,9 +3,18 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.dy.common.mw.protocol.Command; -import com.dy.common.mw.protocol4Mqtt.pSdV1.downVos.ComCtrlVo; +import com.dy.common.mw.protocol4Mqtt.MqttCallback; +import com.dy.common.mw.protocol4Mqtt.MqttTopic; +import com.dy.common.mw.protocol4Mqtt.Vo4Up; +import com.dy.common.mw.protocol4Mqtt.pSdV1.comParam.ComCtrlVo; +import com.dy.common.mw.protocol4Mqtt.pSdV1.comParam.ComSetParamVo; +import com.dy.common.mw.protocol4Mqtt.pSdV1.downVos.FaultClearVo; +import com.dy.common.mw.protocol4Mqtt.pSdV1.downVos.InjectStartVo; +import com.dy.common.mw.protocol4Mqtt.pSdV1.downVos.ParamSetVo; +import com.dy.common.mw.protocol4Mqtt.pSdV1.downVos.StirStartVo; +import com.dy.common.mw.protocol4Mqtt.pSdV1.upVos.*; +import com.dy.common.mw.protocol4Mqtt.status.DevRunInfo; import org.eclipse.paho.client.mqttv3.MqttMessage; - /** * @Author: liurunyu @@ -13,44 +22,90 @@ * @Description */ public class ProtocolParserSdV1 { - public MqttSubMsgSdV1 parseSubMsg(String deviceId, String topic, MqttMessage mqttMsg) throws Exception { - MqttSubMsgSdV1 ms = new MqttSubMsgSdV1(deviceId, topic, new String(mqttMsg.getPayload(), "UTF-8")); - return ms; + public MqttSubMsgSdV1 parseSubMsg(MqttTopic subTopic, MqttMessage mqttMsg, MqttCallback callback) throws Exception { + String strTxt = new String(mqttMsg.getPayload(), "UTF-8"); + if(!JSON.isValid(strTxt)){ + throw new Exception("鎺ユ敹鍒癕QTT娑堟伅锛屽崗璁�" + subTopic.protocol + "锛岃澶嘔D" + subTopic.devId + "锛屼富棰�" + subTopic.longName() + "娑堟伅鏍煎紡闈瀓son鏁版嵁(" + strTxt + ")") ; + } + MqttSubMsgSdV1 msg = new MqttSubMsgSdV1(subTopic, strTxt); + Vo4Up vo ; + DevRunInfo stInfo = null ; + switch (subTopic.type) { + case ProtocolConstantSdV1.SubTopicWeather -> { + vo = JSON.parseObject(strTxt, WeatherVo.class); + break; + } + case ProtocolConstantSdV1.SubTopicSoil -> { + vo = JSON.parseObject(strTxt, SoilVo.class); + break; + } + 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 ; + stInfo = new DevRunInfo() ; + stInfo.devId = msg.deviceId ; + stInfo.stirRunning = (stVo.stirRunning==null?false:(stVo.stirRunning.byteValue()==1?true:false)) ; //鎼呮媽杩愯 true鏄� false鍚� + stInfo.injectRunning = (stVo.injectRunning==null?false:(stVo.injectRunning.byteValue()==1?true:false)) ; //娉ㄨ偉杩愯 true鏄� false鍚� + stInfo.irrRunning = (stVo.irrRunning==null?false:(stVo.irrRunning.byteValue()==1?true:false)) ; //鐏屾簤杩愯 true鏄� false鍚� + stInfo.alarm = (stVo.alarm==null?false:(stVo.alarm.byteValue()==1?true:false)) ; //鎶ヨ true鏄� false鍚� + break; + } + default -> { + throw new Exception("鎺ユ敹鍒癕QTT娑堟伅锛屽崗璁�" + subTopic.protocol + "锛岃澶嘔D" + subTopic.devId + "锛屼富棰�" + subTopic.type + "娑堟伅瑙f瀽閫昏緫鏈疄鐜�"); + } + } + vo.setNo(subTopic.no) ; + msg.vo4Up = vo ; + callback.callback(msg); + callback.notify(msg.deviceId, stInfo); + return msg; } public MqttPubMsgSdV1 createPubMsg(String orgTag, Command com) throws Exception { - MqttPubMsgSdV1 msg = null ; - switch (com.code){ - case CodeSdV1.cd_Fault:{ + MqttPubMsgSdV1 msg ; + switch (com.code) { + case CodeSdV1.cd_Fault -> { //鏁呴殰瑙i櫎鍛戒护 this.checkParam(com); this.checkRtnWebUrl(com); - msg = this.createPubMsgOfFault(orgTag, com) ; - break ; + msg = this.createPubMsgOfFault(orgTag, com); + break; } - case CodeSdV1.cd_Stir:{ + case CodeSdV1.cd_Stir -> { //鎼呮媽鍚仠鍛戒护 this.checkParam(com); this.checkRtnWebUrl(com); - msg = this.createPubMsgOfStir(orgTag, com) ; - break ; + msg = this.createPubMsgOfStir(orgTag, com); + break; } - case CodeSdV1.cd_Inject:{ + case CodeSdV1.cd_Inject -> { //娉ㄨ偉鍚仠鍛戒护 this.checkParam(com); this.checkRtnWebUrl(com); - msg = this.createPubMsgOfInject(orgTag, com) ; - break ; + msg = this.createPubMsgOfInject(orgTag, com); + break; } - case CodeSdV1.cd_Irr:{ + case CodeSdV1.cd_Irr -> { //鐏屾簤鍚仠鍛戒护 this.checkParam(com); this.checkRtnWebUrl(com); - msg = this.createPubMsgOfIrr(orgTag, com) ; - break ; + msg = this.createPubMsgOfIrr(orgTag, com); + break; } - default:{ - throw new Exception("鎺ユ敹鍒癕QTT鍛戒护锛屽崗璁�" + com.protocol + "鐗堟湰" + com.protocolVersion + "鍔熻兘鐮�" + com.code + "鏋勯�犲櫒鏈疄鐜�") ; + case CodeSdV1.cd_Param -> { + //璁剧疆鍙傛暟 + this.checkParam(com); + this.checkRtnWebUrl(com); + msg = this.createPubMsgOfParam(orgTag, com); + break; + } + default -> { + throw new Exception("鎺ユ敹鍒癕QTT鍛戒护锛屽崗璁�" + com.protocol + "鐗堟湰" + com.protocolVersion + "鍔熻兘鐮�" + com.code + "鏋勯�犲櫒鏈疄鐜�"); } } return msg ; @@ -76,10 +131,9 @@ this.setPubMsgBase(com, msg); msg.isCacheForOffLine = false ; msg.hasResponse = true ; - msg.address = 123 ; - msg.value = "" + (cvo.isDo?1:0); - msg.topic = createTopic(orgTag, com) ; - msg.msg = "" ; + msg.cd = CodeSdV1.cd_Fault ; + msg.topic = new MqttTopic(orgTag, com.protocol, com.rtuAddr, ProtocolConstantSdV1.PubTopicFault, cvo.no) ; + msg.msg = JSON.toJSONString(new FaultClearVo(cvo.startTrueStopFalse ?(byte)1:0)) ; return msg ; } private MqttPubMsgSdV1 createPubMsgOfStir(String orgTag, Command com) throws Exception { @@ -93,10 +147,9 @@ this.setPubMsgBase(com, msg); msg.isCacheForOffLine = false ; msg.hasResponse = true ; - msg.address = 123 ; - msg.value = "" + (cvo.isDo?1:0); - msg.topic = createTopic(orgTag, com) ; - msg.msg = "" ; + msg.cd = CodeSdV1.cd_Fault ; + msg.topic = new MqttTopic(orgTag, com.protocol, com.rtuAddr, ProtocolConstantSdV1.PubTopicStir, cvo.no) ; + msg.msg = JSON.toJSONString(new StirStartVo(cvo.startTrueStopFalse ?(byte)1:0)) ; return msg ; } private MqttPubMsgSdV1 createPubMsgOfInject(String orgTag, Command com) throws Exception { @@ -110,10 +163,9 @@ this.setPubMsgBase(com, msg); msg.isCacheForOffLine = false ; msg.hasResponse = true ; - msg.address = 123 ; - msg.value = "" + (cvo.isDo?1:0); - msg.topic = createTopic(orgTag, com) ; - msg.msg = "" ; + msg.cd = CodeSdV1.cd_Fault ; + msg.topic = new MqttTopic(orgTag, com.protocol, com.rtuAddr, ProtocolConstantSdV1.PubTopicInject, cvo.no) ; + msg.msg = JSON.toJSONString(new InjectStartVo(cvo.startTrueStopFalse ?(byte)1:0)) ; return msg ; } private MqttPubMsgSdV1 createPubMsgOfIrr(String orgTag, Command com) throws Exception { @@ -127,10 +179,26 @@ this.setPubMsgBase(com, msg); msg.isCacheForOffLine = false ; msg.hasResponse = true ; - msg.address = 123 ; - msg.value = "" + (cvo.isDo?1:0); - msg.topic = createTopic(orgTag, com) ; - msg.msg = "" ; + msg.cd = CodeSdV1.cd_Fault ; + msg.topic = new MqttTopic(orgTag, com.protocol, com.rtuAddr, ProtocolConstantSdV1.PubTopicIrr, cvo.no) ; + msg.msg = JSON.toJSONString(new StirStartVo(cvo.startTrueStopFalse ?(byte)1:0)) ; + return msg ; + } + + private MqttPubMsgSdV1 createPubMsgOfParam(String orgTag, Command com) throws Exception { + JSONObject obj = (JSONObject) com.param; + String json = obj.toJSONString(); + ComSetParamVo cvo = JSON.parseObject(json, ComSetParamVo.class); + if(cvo == null){ + throw new Exception("json杞珻omSetParamVo涓簄ull") ; + } + MqttPubMsgSdV1 msg = new MqttPubMsgSdV1() ; + this.setPubMsgBase(com, msg); + msg.isCacheForOffLine = false ; + msg.hasResponse = false ; + msg.cd = CodeSdV1.cd_Param ; + msg.topic = new MqttTopic(orgTag, com.protocol, com.rtuAddr, ProtocolConstantSdV1.PubTopicParam, cvo.no) ; + msg.msg = JSON.toJSONString(new ParamSetVo(cvo.stirDuration, cvo.injectDuration)) ; return msg ; } @@ -140,31 +208,5 @@ msg.mqttResultSendWebUrl = com.rtuResultSendWebUrl ; } - private String createTopic(String orgTag, Command com){ - String topic = null ; - switch (com.code){ - case CodeSdV1.cd_Fault:{ - topic = orgTag + "/" + com.protocol + com.protocolVersion + "/" + com.rtuAddr + "/control/m4" ; - break ; - } - case CodeSdV1.cd_Stir:{ - topic = orgTag + "/" + com.protocol + com.protocolVersion + "/" + com.rtuAddr + "/control/m80" ; - break ; - } - case CodeSdV1.cd_Inject:{ - topic = orgTag + "/" + com.protocol + com.protocolVersion + "/" + com.rtuAddr + "/control/m1" ; - break ; - } - case CodeSdV1.cd_Irr:{ - topic = orgTag + "/" + com.protocol + com.protocolVersion + "/" + com.rtuAddr + "/control/m2" ; - break ; - } - default:{ - topic = null ; - break; - } - } - return topic ; - } } -- Gitblit v1.8.0