From 8077e8b67bc017a9e0016180a6eacc114cec28c8 Mon Sep 17 00:00:00 2001
From: DJIsean <102007705+DJIsean@users.noreply.github.com>
Date: Thu, 15 Dec 2022 16:14:24 +0800
Subject: [PATCH] Update DeviceServiceImpl.java
---
src/main/java/com/dji/sample/component/GlobalScheduleService.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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..81229ab 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,17 @@
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);
+ DeviceDTO device = (DeviceDTO) RedisOpsUtils.get(key);
if (device.getDomain().equals(DeviceDomainEnum.SUB_DEVICE.getDesc())) {
deviceService.subDeviceOffline(key.substring(start));
} else {
deviceService.unsubscribeTopicOffline(key.substring(start));
deviceService.pushDeviceOfflineTopo(device.getWorkspaceId(), device.getDeviceSn());
}
- redisOps.del(key);
+ RedisOpsUtils.del(key);
}
});
--
Gitblit v1.9.3