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/component/GlobalScheduleService.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/GlobalScheduleService.java b/src/main/java/com/dji/sample/component/GlobalScheduleService.java
index 2813388..e092ad4 100644
--- a/src/main/java/com/dji/sample/component/GlobalScheduleService.java
+++ b/src/main/java/com/dji/sample/component/GlobalScheduleService.java
@@ -6,6 +6,7 @@
import com.dji.sample.manage.model.dto.DeviceDTO;
import com.dji.sample.manage.model.enums.DeviceDomainEnum;
import com.dji.sample.manage.service.IDeviceService;
+import com.dji.sample.wayline.service.IWaylineJobService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -27,10 +28,10 @@
private IDeviceService deviceService;
@Autowired
- private RedisOpsUtils redisOps;
+ private IMqttTopicService topicService;
@Autowired
- private IMqttTopicService topicService;
+ private IWaylineJobService waylineJobService;
/**
* Check the status of the devices every 30 seconds. It is recommended to use cache.
@@ -39,17 +40,19 @@
private void deviceStatusListen() {
int start = RedisConst.DEVICE_ONLINE_PREFIX.length();
- redisOps.getAllKeys(RedisConst.DEVICE_ONLINE_PREFIX + "*").forEach(key -> {
- long expire = redisOps.getExpire(key);
+ RedisOpsUtils.getAllKeys(RedisConst.DEVICE_ONLINE_PREFIX + "*").forEach(key -> {
+ long expire = RedisOpsUtils.getExpire(key);
if (expire <= 30) {
- DeviceDTO device = (DeviceDTO) redisOps.get(key);
- if (device.getDomain().equals(DeviceDomainEnum.SUB_DEVICE.getDesc())) {
+ DeviceDTO device = (DeviceDTO) RedisOpsUtils.get(key);
+ if (DeviceDomainEnum.SUB_DEVICE.getVal() == device.getDomain()) {
deviceService.subDeviceOffline(key.substring(start));
} else {
deviceService.unsubscribeTopicOffline(key.substring(start));
deviceService.pushDeviceOfflineTopo(device.getWorkspaceId(), device.getDeviceSn());
+ RedisOpsUtils.hashDel(RedisConst.LIVE_CAPACITY, new String[]{key});
+ RedisOpsUtils.del(RedisConst.HMS_PREFIX + key);
}
- redisOps.del(key);
+ RedisOpsUtils.del(key);
}
});
--
Gitblit v1.9.3