From 9b2eedb85d53ca32610c32c6e50b5230ab3b16cf Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 22 Jul 2022 20:16:03 +0800
Subject: [PATCH] V1.1.0 for dock
---
src/main/java/com/dji/sample/manage/controller/LiveStreamController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
index ef89f34..7f6e90c 100644
--- a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
+++ b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
@@ -2,13 +2,13 @@
import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.component.mqtt.model.Chan;
import com.dji.sample.component.mqtt.model.ChannelName;
import com.dji.sample.component.mqtt.model.CommonTopicReceiver;
-import com.dji.sample.manage.model.Chan;
+import com.dji.sample.component.mqtt.model.ServiceReply;
import com.dji.sample.manage.model.dto.CapacityDeviceDTO;
import com.dji.sample.manage.model.dto.LiveTypeDTO;
-import com.dji.sample.manage.model.receiver.CapacityDeviceReceiver;
-import com.dji.sample.manage.model.receiver.ServiceReplyReceiver;
+import com.dji.sample.manage.model.receiver.LiveCapacityReceiver;
import com.dji.sample.manage.service.ILiveStreamService;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -38,15 +38,17 @@
@Autowired
private ILiveStreamService liveStreamService;
+ @Autowired
+ private ObjectMapper mapper;
+
/**
* Analyze the live streaming capabilities of drones.
* This data is necessary if drones are required for live streaming.
- * @param device the capacity of drone
+ * @param liveCapacity the capacity of drone and dock
*/
@ServiceActivator(inputChannel = ChannelName.INBOUND_STATE_CAPACITY)
- public void stateCapacity(CapacityDeviceReceiver device) {
- boolean parseCapacity = liveStreamService.saveLiveCapacity(device);
- log.debug("The result of parsing the live capacity is {}.", parseCapacity);
+ public void stateCapacity(LiveCapacityReceiver liveCapacity) {
+ liveStreamService.saveLiveCapacity(liveCapacity);
}
/**
@@ -102,9 +104,8 @@
@ServiceActivator(inputChannel = ChannelName.INBOUND_SERVICE_REPLY)
public void serviceReply(Message<?> message) throws IOException {
byte[] payload = (byte[])message.getPayload();
- ObjectMapper mapper = new ObjectMapper();
- CommonTopicReceiver<ServiceReplyReceiver> receiver = mapper.readValue(payload,
- new TypeReference<CommonTopicReceiver<ServiceReplyReceiver>>() {
+ CommonTopicReceiver<ServiceReply> receiver = mapper.readValue(payload,
+ new TypeReference<CommonTopicReceiver<ServiceReply>>() {
});
Chan<CommonTopicReceiver> chan = Chan.getInstance();
// Put the message to the chan object.
--
Gitblit v1.9.3