From 2705061ebd89a2ad3fd4186251d2e36d86c4bb21 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 17 Nov 2025 09:22:46 +0800
Subject: [PATCH] 1.修改。
---
ard-sample/src/main/java/com/ard/sample/component/mqtt/handler/ServicesReplyHandler.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/component/mqtt/handler/ServicesReplyHandler.java b/ard-sample/src/main/java/com/ard/sample/component/mqtt/handler/ServicesReplyHandler.java
index c51ca26..c1909e5 100644
--- a/ard-sample/src/main/java/com/ard/sample/component/mqtt/handler/ServicesReplyHandler.java
+++ b/ard-sample/src/main/java/com/ard/sample/component/mqtt/handler/ServicesReplyHandler.java
@@ -4,12 +4,15 @@
import com.ard.sample.component.mqtt.model.ChannelName;
import com.ard.sample.component.mqtt.model.CommonTopicReceiver;
import com.ard.sample.component.mqtt.model.ServiceReply;
+import com.ard.sample.component.websocket.enums.MessageType;
+import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
import com.ard.sample.manage.model.enums.LogsFileMethodEnum;
import com.ard.sample.manage.model.receiver.LogsFileUploadList;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.integration.mqtt.support.MqttHeaders;
import org.springframework.messaging.Message;
import org.springframework.stereotype.Component;
@@ -26,6 +29,9 @@
@Autowired
private ObjectMapper mapper;
+ @Autowired
+ private DockWebSocketHandler _dockWebSocketHandler;
+
/**
* Handle the reply message from the pilot side to the on-demand video.
* @param message reply message
@@ -33,9 +39,17 @@
*/
@ServiceActivator(inputChannel = ChannelName.INBOUND_SERVICE_REPLY)
public void serviceReply(Message<?> message) throws IOException {
+ String topic = message.getHeaders().get(MqttHeaders.RECEIVED_TOPIC).toString();
+ // thing/product/7CTDLCE00A1UPE/services_reply
+ String[] parts = topic.split("/");
+ // 目标子串是分割后数组的第3个元素（索引2）
+ String deviceSn = parts.length > 2 ? parts[2] : ""; // 加判断避免数组越界
+
byte[] payload = (byte[])message.getPayload();
CommonTopicReceiver receiver = mapper.readValue(payload, new TypeReference<CommonTopicReceiver>() {});
+ receiver.setGateway(deviceSn);
+ receiver.setType(MessageType.CONTROL.getType());
if (LogsFileMethodEnum.FILE_UPLOAD_LIST.getMethod().equals(receiver.getMethod())) {
LogsFileUploadList list = mapper.convertValue(receiver.getData(), new TypeReference<LogsFileUploadList>() {});
receiver.setData(list);
@@ -46,5 +60,12 @@
Chan<CommonTopicReceiver<?>> chan = Chan.getInstance();
// Put the message to the chan object.
chan.put(receiver);
+ // WebSocket 接口，发给前端
+ String dockControl="";
+ dockControl=mapper.writeValueAsString(receiver);
+
+ _dockWebSocketHandler.sendMessageToSubscribers(deviceSn, MessageType.CONTROL.getType(),dockControl);
+
+// DockControlProgressWebSockerHandler.
}
}
--
Gitblit v1.9.3