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/DevicePayloadController.java |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 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 4a768a2..17a7658 100644
--- a/src/main/java/com/dji/sample/manage/controller/DevicePayloadController.java
+++ b/src/main/java/com/dji/sample/manage/controller/DevicePayloadController.java
@@ -3,12 +3,10 @@
 import com.dji.sample.component.mqtt.model.ChannelName;
 import com.dji.sample.manage.model.receiver.DeviceBasicReceiver;
 import com.dji.sample.manage.service.IDevicePayloadService;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.messaging.MessageHeaders;
 import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
 
 /**
  * @author sean.zhou
@@ -16,7 +14,6 @@
  * @version 0.1
  */
 @RestController
-@Slf4j
 public class DevicePayloadController {
 
     @Autowired
@@ -28,17 +25,11 @@
      * Note: Only the data of the drone payload is handled here. You can handle other data from the drone
      * according to your business needs.
      * @param deviceBasic   basic drone data
-     * @return  drone's sn
+     * @param headers
      */
     @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()));
+    public void stateBasic(DeviceBasicReceiver deviceBasic, MessageHeaders headers) {
 
-        // Save the new payload information.
-        boolean isSave = devicePayloadService.savePayloadDTOs(deviceBasic.getPayloads());
-
-        log.debug("The result of saving the payloads is {}.", isSave);
-
+        devicePayloadService.saveDeviceBasicPayload(deviceBasic.getPayloads(), headers.getTimestamp());
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3