From d2108ee735894d73bf655bda1651ecaefbc4c09d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 23 Mar 2024 09:35:02 +0800
Subject: [PATCH] 图斑
---
src/main/java/com/dji/sample/component/GlobalScheduleService.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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..7e77a34 100644
--- a/src/main/java/com/dji/sample/component/GlobalScheduleService.java
+++ b/src/main/java/com/dji/sample/component/GlobalScheduleService.java
@@ -6,6 +6,8 @@
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 com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -27,29 +29,33 @@
private IDeviceService deviceService;
@Autowired
- private RedisOpsUtils redisOps;
-
- @Autowired
private IMqttTopicService topicService;
+ @Autowired
+ private IWaylineJobService waylineJobService;
+ @Autowired
+ private ObjectMapper mapper;
/**
* Check the status of the devices every 30 seconds. It is recommended to use cache.
*/
- @Scheduled(initialDelay = 30, fixedRate = 30, timeUnit = TimeUnit.SECONDS)
+ @Scheduled(initialDelay = 10, fixedRate = 30, timeUnit = TimeUnit.SECONDS)
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[]{device.getDeviceSn()});
+ RedisOpsUtils.del(RedisConst.HMS_PREFIX + device.getDeviceSn());
+ RedisOpsUtils.del(RedisConst.OSD_PREFIX + device.getDeviceSn());
}
- redisOps.del(key);
+ RedisOpsUtils.del(key);
}
});
--
Gitblit v1.9.3