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/DevicePayloadController.java |   26 ++------------------------
 1 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/dji/sample/manage/controller/DevicePayloadController.java b/src/main/java/com/dji/sample/manage/controller/DevicePayloadController.java
index 0c0ba2c..4a768a2 100644
--- a/src/main/java/com/dji/sample/manage/controller/DevicePayloadController.java
+++ b/src/main/java/com/dji/sample/manage/controller/DevicePayloadController.java
@@ -2,7 +2,6 @@
 
 import com.dji.sample.component.mqtt.model.ChannelName;
 import com.dji.sample.manage.model.receiver.DeviceBasicReceiver;
-import com.dji.sample.manage.model.receiver.DevicePayloadReceiver;
 import com.dji.sample.manage.service.IDevicePayloadService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,25 +23,6 @@
     private IDevicePayloadService devicePayloadService;
 
     /**
-     * Handles the data for the payload messages in the state topic.
-     * @param payloadsList  List of payload information.
-     * @return  drone's sn
-     */
-    @ServiceActivator(inputChannel = ChannelName.INBOUND_STATE_PAYLOAD,
-            outputChannel = ChannelName.INBOUND_STATE_PAYLOAD_UPDATE)
-    public String statePayload(List<DevicePayloadReceiver> payloadsList) {
-        // Delete all payload information for the drone based on the drone's sn.
-        devicePayloadService.deletePayloadsByDeviceSn(List.of(payloadsList.get(0).getDeviceSn()));
-
-        // Save the new payload information.
-        devicePayloadService.savePayloadDTOs(payloadsList);
-
-        log.debug("The result of saving the payload is successful.");
-
-        return payloadsList.get(0).getDeviceSn();
-    }
-
-    /**
      * Handles messages in the state topic about basic drone data.
      *
      * Note: Only the data of the drone payload is handled here. You can handle other data from the drone
@@ -50,9 +30,8 @@
      * @param deviceBasic   basic drone data
      * @return  drone's sn
      */
-    @ServiceActivator(inputChannel = ChannelName.INBOUND_STATE_BASIC,
-            outputChannel = ChannelName.INBOUND_STATE_PAYLOAD_UPDATE)
-    public String stateBasic(DeviceBasicReceiver deviceBasic) {
+    @ServiceActivator(inputChannel = ChannelName.INBOUND_STATE_BASIC)
+    public void stateBasic(DeviceBasicReceiver deviceBasic) {
         // Delete all payload information for the drone based on the drone's sn.
         devicePayloadService.deletePayloadsByDeviceSn(List.of(deviceBasic.getDeviceSn()));
 
@@ -61,6 +40,5 @@
 
         log.debug("The result of saving the payloads is {}.", isSave);
 
-        return deviceBasic.getDeviceSn();
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3