From a7aaeabc7873a0eafb4a7ecad7f65b018b7a9bc9 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 24 Feb 2023 19:31:23 +0800
Subject: [PATCH] What's new? 1. Add license for dock. 2. Modify the logic corresponding to the firmware file and device type. 3. Add multiple mqtt clients options. 4. Modify the structure of the interface for obtaining the device list. 5. Fixed some issues.
---
src/main/java/com/dji/sample/manage/service/impl/TopologyServiceImpl.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/service/impl/TopologyServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/TopologyServiceImpl.java
index 64d7d07..a255068 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/TopologyServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/TopologyServiceImpl.java
@@ -36,20 +36,27 @@
List<TopologyDTO> topologyList = new ArrayList<>();
- gatewayList.forEach(device -> {
- List<TopologyDeviceDTO> parents = new ArrayList<>();
- TopologyDeviceDTO gateway = deviceService.deviceConvertToTopologyDTO(device);
- parents.add(gateway);
-
- // Query the topology data of the drone based on the drone sn.
- Optional<TopologyDeviceDTO> deviceTopo = deviceService.getDeviceTopoForPilot(device.getChildDeviceSn());
- List<TopologyDeviceDTO> deviceTopoList = new ArrayList<>();
- deviceTopo.ifPresent(deviceTopoList::add);
-
- topologyList.add(TopologyDTO.builder().parents(parents).hosts(deviceTopoList).build());
- });
+ gatewayList.forEach(device -> this.getDeviceTopologyByGatewaySn(device.getDeviceSn())
+ .ifPresent(topologyList::add));
return topologyList;
}
+ public Optional<TopologyDTO> getDeviceTopologyByGatewaySn(String gatewaySn) {
+ Optional<DeviceDTO> dtoOptional = deviceService.getDeviceBySn(gatewaySn);
+ if (dtoOptional.isEmpty()) {
+ return Optional.empty();
+ }
+ List<TopologyDeviceDTO> parents = new ArrayList<>();
+ DeviceDTO device = dtoOptional.get();
+ TopologyDeviceDTO gateway = deviceService.deviceConvertToTopologyDTO(device);
+ parents.add(gateway);
+
+ // Query the topology data of the drone based on the drone sn.
+ Optional<TopologyDeviceDTO> deviceTopo = deviceService.getDeviceTopoForPilot(device.getChildDeviceSn());
+ List<TopologyDeviceDTO> deviceTopoList = new ArrayList<>();
+ deviceTopo.ifPresent(deviceTopoList::add);
+
+ return Optional.ofNullable(TopologyDTO.builder().parents(parents).hosts(deviceTopoList).build());
+ }
}
--
Gitblit v1.9.3