From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/component/mqtt/handler/EventsRouter.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/mqtt/handler/EventsRouter.java b/src/main/java/com/dji/sample/component/mqtt/handler/EventsRouter.java
index a2baabe..152ae81 100644
--- a/src/main/java/com/dji/sample/component/mqtt/handler/EventsRouter.java
+++ b/src/main/java/com/dji/sample/component/mqtt/handler/EventsRouter.java
@@ -1,16 +1,20 @@
package com.dji.sample.component.mqtt.handler;
-import com.dji.sample.component.mqtt.model.ChannelName;
-import com.dji.sample.component.mqtt.model.CommonTopicReceiver;
-import com.dji.sample.component.mqtt.model.EventsMethodEnum;
+import com.dji.sample.component.mqtt.model.*;
+import com.dji.sample.component.mqtt.service.IMessageSenderService;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.integration.dsl.IntegrationFlow;
import org.springframework.integration.dsl.IntegrationFlows;
+import org.springframework.integration.mqtt.support.MqttHeaders;
+import org.springframework.messaging.MessageHeaders;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.Optional;
/**
* @author sean
@@ -22,6 +26,9 @@
@Autowired
private ObjectMapper mapper;
+
+ @Autowired
+ private IMessageSenderService messageSenderService;
@Bean
public IntegrationFlow eventsMethodRouterFlow() {
@@ -37,12 +44,25 @@
})
.<CommonTopicReceiver, EventsMethodEnum>route(
receiver -> EventsMethodEnum.find(receiver.getMethod()),
- mapping -> {
- mapping.channelMapping(EventsMethodEnum.FILE_UPLOAD_CALLBACK, ChannelName.INBOUND_EVENTS_FILE_UPLOAD_CALLBACK);
- mapping.channelMapping(EventsMethodEnum.FLIGHT_TASK_PROGRESS, ChannelName.INBOUND_EVENTS_FLIGHT_TASK_PROGRESS);
- mapping.channelMapping(EventsMethodEnum.HMS, ChannelName.INBOUND_EVENTS_HMS);
- mapping.channelMapping(EventsMethodEnum.UNKNOWN, ChannelName.DEFAULT);
- })
+ mapping -> Arrays.stream(EventsMethodEnum.values()).forEach(
+ methodEnum -> mapping.channelMapping(methodEnum, methodEnum.getChannelName())))
.get();
}
+
+ @ServiceActivator(inputChannel = ChannelName.OUTBOUND_EVENTS, outputChannel = ChannelName.OUTBOUND)
+ public void replyEventsOutbound(CommonTopicReceiver receiver, MessageHeaders headers) {
+ if (Optional.ofNullable(receiver).map(CommonTopicReceiver::getNeedReply).flatMap(val -> Optional.of(1 != val)).orElse(true)) {
+ return;
+ }
+ messageSenderService.publish(headers.get(MqttHeaders.RECEIVED_TOPIC) + TopicConst._REPLY_SUF,
+ CommonTopicResponse.builder()
+ .tid(receiver.getTid())
+ .bid(receiver.getBid())
+ .method(receiver.getMethod())
+ .timestamp(System.currentTimeMillis())
+ .data(RequestsReply.success())
+ .build());
+
+ }
+
}
--
Gitblit v1.9.3