From 9d0512aa6a192ee105ff9251e68a4360c7355319 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 10 六月 2025 18:34:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttMsgParser.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttMsgParser.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttMsgParser.java
index 15ec6b0..11cfbd6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttMsgParser.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttMsgParser.java
@@ -11,25 +11,38 @@
* @Description
*/
public class MqttMsgParser {
- public MqttSubMsg parseSubMsg(String topic, MqttMessage mqttMsg) throws Exception {
+ public static MqttTopic parseSubTopic(String topic) throws Exception {
if(topic != null && topic.trim().length() != 0){
String[] topicGrp = topic.split("/") ;
if(topicGrp.length != 4){
throw new Exception("鎺ユ敹鐨刴qtt娑堟伅涓婚涓嶅彲璇嗗埆") ;
}else{
- if(topicGrp[1].equals("sd1")){
- //灞变笢璁惧(鍗忚)锛屼笖鐗堟湰鍙蜂负1
- return new ProtocolParserSdV1().parseSubMsg(topicGrp[2], topic, mqttMsg);
- }else{
- throw new Exception("鎺ユ敹鐨刴qtt娑堟伅涓婚涓崗璁紙鍘傚鍙婄増鏈級涓嶅彲璇嗗埆") ;
- }
+ MqttTopic vo = new MqttTopic() ;
+ vo.orgTag = topicGrp[0] ;
+ vo.protocol = topicGrp[1] ;
+ vo.devId = topicGrp[2] ;
+ vo.topic = topicGrp[3] ;
+ return vo ;
}
}else{
- throw new Exception("鎺ユ敹鐨刴qtt娑堟伅涓婚涓虹┖") ;
+ throw new Exception("鎺ユ敹鐨刴qtt娑堟伅涓婚涓嶅悎娉�") ;
}
}
- public MqttPubMsg createPubMsg(String orgTag, Command com) throws Exception {
+ public static String createPubTopic(MqttTopic tp) throws Exception {
+ return tp.orgTag + "/" + tp.protocol + "/" + tp.devId + "/" + tp.topic ;
+ }
+
+ public static MqttSubMsg parseSubMsg(MqttTopic subTopic, MqttMessage mqttMsg, MqttCallback callback) throws Exception {
+ if(subTopic.protocol.equals(ProtocolConstantSdV1.protocolName + ProtocolConstantSdV1.protocolVer)){
+ //灞变笢璁惧(鍗忚)锛屼笖鐗堟湰鍙蜂负1
+ return new ProtocolParserSdV1().parseSubMsg(subTopic, mqttMsg, callback);
+ }else{
+ throw new Exception("鎺ユ敹鐨刴qtt娑堟伅涓婚涓崗璁紙鍘傚鍙婄増鏈級涓嶅彲璇嗗埆") ;
+ }
+ }
+
+ public static MqttPubMsg createPubMsg(String orgTag, Command com) throws Exception {
if(com.protocol == null && com.protocol.trim().length() != 0){
throw new Exception("鎺ユ敹鍒癕QTT鍛戒护锛屼絾鏈彁渚涘崗璁�") ;
}
--
Gitblit v1.8.0