From 18c51d40be82435289ba3be6bd5f8e15fdf786f7 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期六, 04 四月 2026 00:26:56 +0800
Subject: [PATCH] mqtt
---
src/main/java/com/zy/integration/iot/handler/impl/IotInboundMessageHandlerImpl.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/integration/iot/handler/impl/IotInboundMessageHandlerImpl.java b/src/main/java/com/zy/integration/iot/handler/impl/IotInboundMessageHandlerImpl.java
index 1d21e4b..bf6290d 100644
--- a/src/main/java/com/zy/integration/iot/handler/impl/IotInboundMessageHandlerImpl.java
+++ b/src/main/java/com/zy/integration/iot/handler/impl/IotInboundMessageHandlerImpl.java
@@ -1,13 +1,15 @@
package com.zy.integration.iot.handler.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
import com.core.common.Cools;
import com.zy.integration.iot.biz.IotInstructionService;
import com.zy.integration.iot.handler.IotInboundMessageHandler;
import com.zy.integration.iot.publish.IotPublishService;
-import com.zy.iot.config.IotProperties;
+import com.zy.iot.service.IotDbConfigService;
import com.zy.iot.entity.IotFeedbackMessage;
import com.zy.iot.entity.IotInstructionMessage;
+import com.zy.iot.entity.IotTopicConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,7 +23,7 @@
public class IotInboundMessageHandlerImpl implements IotInboundMessageHandler {
@Autowired
- private IotProperties iotProperties;
+ private IotDbConfigService iotDbConfigService;
@Autowired
private IotInstructionService iotInstructionService;
@Autowired
@@ -32,17 +34,30 @@
*/
@Override
public void handleMessage(String topic, String payload) {
- if (!iotProperties.isEnabled() || Cools.isEmpty(topic) || payload == null) {
+ if (!iotDbConfigService.isMqttEnabled() || Cools.isEmpty(topic) || payload == null) {
return;
}
try {
+ IotTopicConfig topics = iotDbConfigService.getEffectiveTopics();
Long recordId = null;
- if (topic.equals(iotProperties.getTopics().getEgressStow())) {
- recordId = iotInstructionService.handleStowInstruction(JSON.parseObject(payload, IotInstructionMessage.class), topic, payload);
- } else if (topic.equals(iotProperties.getTopics().getEgressPick())) {
- recordId = iotInstructionService.handlePickInstruction(JSON.parseObject(payload, IotInstructionMessage.class), topic, payload);
- } else if (topic.equals(iotProperties.getTopics().getEgressFeedback())) {
- iotInstructionService.handleFeedbackAck(JSON.parseObject(payload, IotFeedbackMessage.class), topic, payload);
+ if (topic.equals(topics.getEgressStow())) {
+ IotInstructionMessage stow = parseJsonPayload(payload, topic, IotInstructionMessage.class);
+ if (stow == null) {
+ return;
+ }
+ recordId = iotInstructionService.handleStowInstruction(stow, topic, payload);
+ } else if (topic.equals(topics.getEgressPick())) {
+ IotInstructionMessage pick = parseJsonPayload(payload, topic, IotInstructionMessage.class);
+ if (pick == null) {
+ return;
+ }
+ recordId = iotInstructionService.handlePickInstruction(pick, topic, payload);
+ } else if (topic.equals(topics.getEgressFeedback())) {
+ IotFeedbackMessage ack = parseJsonPayload(payload, topic, IotFeedbackMessage.class);
+ if (ack == null) {
+ return;
+ }
+ iotInstructionService.handleFeedbackAck(ack, topic, payload);
} else {
log.warn("ignore unknown iot topic={}, payload={}", topic, payload);
}
@@ -54,4 +69,13 @@
log.error("handle iot inbound message failed, topic={}, payload={}", topic, payload, e);
}
}
+
+ private <T> T parseJsonPayload(String payload, String topic, Class<T> type) {
+ try {
+ return JSON.parseObject(payload, type);
+ } catch (JSONException e) {
+ log.warn("IoT MQTT 闈炲悎娉� JSON topic={} payload={}", topic, payload, e);
+ return null;
+ }
+ }
}
--
Gitblit v1.9.1