From 56df98ce4952239fbf7d0e99dbeb0e5c71531d6f Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 18 Nov 2022 18:29:06 +0800
Subject: [PATCH] initial v1.3.0
---
src/main/java/com/dji/sample/manage/controller/DevicePayloadController.java | 41 +++++------------------------------------
1 files changed, 5 insertions(+), 36 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..17a7658 100644
--- a/src/main/java/com/dji/sample/manage/controller/DevicePayloadController.java
+++ b/src/main/java/com/dji/sample/manage/controller/DevicePayloadController.java
@@ -2,14 +2,11 @@
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;
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
@@ -17,30 +14,10 @@
* @version 0.1
*/
@RestController
-@Slf4j
public class DevicePayloadController {
@Autowired
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.
@@ -48,19 +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,
- outputChannel = ChannelName.INBOUND_STATE_PAYLOAD_UPDATE)
- public String stateBasic(DeviceBasicReceiver deviceBasic) {
- // Delete all payload information for the drone based on the drone's sn.
- devicePayloadService.deletePayloadsByDeviceSn(List.of(deviceBasic.getDeviceSn()));
+ @ServiceActivator(inputChannel = ChannelName.INBOUND_STATE_BASIC)
+ 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);
-
- return deviceBasic.getDeviceSn();
+ devicePayloadService.saveDeviceBasicPayload(deviceBasic.getPayloads(), headers.getTimestamp());
}
}
\ No newline at end of file
--
Gitblit v1.9.3