From a3360878835e4606c968441e432b0c3d4bd921ae Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 23 Sep 2022 18:04:07 +0800
Subject: [PATCH] V1.2.0
---
src/main/java/com/dji/sample/manage/controller/LiveStreamController.java | 26 +++-----------------------
1 files changed, 3 insertions(+), 23 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 7f6e90c..6154e94 100644
--- a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
+++ b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
@@ -2,24 +2,19 @@
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.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.LiveCapacityReceiver;
import com.dji.sample.manage.service.ILiveStreamService;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.annotation.ServiceActivator;
-import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHeaders;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
import java.util.List;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -47,8 +42,8 @@
* @param liveCapacity the capacity of drone and dock
*/
@ServiceActivator(inputChannel = ChannelName.INBOUND_STATE_CAPACITY)
- public void stateCapacity(LiveCapacityReceiver liveCapacity) {
- liveStreamService.saveLiveCapacity(liveCapacity);
+ public void stateCapacity(LiveCapacityReceiver liveCapacity, MessageHeaders headers) {
+ liveStreamService.saveLiveCapacity(liveCapacity, headers.getTimestamp());
}
/**
@@ -96,19 +91,4 @@
return liveStreamService.liveSetQuality(liveParam);
}
- /**
- * Handle the reply message from the pilot side to the on-demand video.
- * @param message reply message
- * @throws IOException
- */
- @ServiceActivator(inputChannel = ChannelName.INBOUND_SERVICE_REPLY)
- public void serviceReply(Message<?> message) throws IOException {
- byte[] payload = (byte[])message.getPayload();
- CommonTopicReceiver<ServiceReply> receiver = mapper.readValue(payload,
- new TypeReference<CommonTopicReceiver<ServiceReply>>() {
- });
- Chan<CommonTopicReceiver> chan = Chan.getInstance();
- // Put the message to the chan object.
- chan.put(receiver);
- }
}
\ No newline at end of file
--
Gitblit v1.9.3