code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2026-09-20 11:52:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(规则引擎): topic转换失败修复

Browse Source
This commit is contained in:
gx_ma
2026-08-10 14:02:50 +08:00
parent dd7fe18ec8
commit 54a05f34be
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
springboot/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/mq/TopicsUtils.java
View File

@@ -149,7 +149,11 @@ public class TopicsUtils {
@SneakyThrows @SneakyThrows
public String parseSerialNumber(String topic) { public String parseSerialNumber(String topic) {
String[] values = topic.split("/"); String[] values = topic.split("/");
return values[2]; // 从topic分段中按长度识别设备编号，设备编号通常长度>9
return Arrays.stream(values)
.filter(s -> s.length() > 9)
.findFirst()
.orElseGet(() -> values.length > 2 ? values[2] : values[0]);
} }
/** /**

2
springboot/fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/handler/MqttPublish.java
View File

@@ -118,7 +118,7 @@ public class MqttPublish implements MqttHandler {
reportBo.setTopicName(context.getTopic()); reportBo.setTopicName(context.getTopic());
reportBo.setData(context.getPayload().getBytes(StandardCharsets.UTF_8)); reportBo.setData(context.getPayload().getBytes(StandardCharsets.UTF_8));
} }
if (topicName.contains("property")) { if (reportBo.getTopicName().contains("property")) {
deviceReportMessageService.parseReportMsg(reportBo); deviceReportMessageService.parseReportMsg(reportBo);
} }