From 2d8ded3e77b22e44985265ca4063102662e452c1 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Mon, 12 Dec 2022 18:32:19 +0800
Subject: [PATCH] initial v1.3.1

---
 src/main/java/com/dji/sample/manage/service/impl/DevicePayloadServiceImpl.java |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/dji/sample/manage/service/impl/DevicePayloadServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/DevicePayloadServiceImpl.java
index 1e6f52b..89a7308 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/DevicePayloadServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/DevicePayloadServiceImpl.java
@@ -43,9 +43,6 @@
     @Autowired
     private ICapacityCameraService capacityCameraService;
 
-    @Autowired
-    private RedisOpsUtils redisOps;
-
     @Override
     public Integer checkPayloadExist(String payloadSn) {
         DevicePayloadEntity devicePayload = mapper.selectOne(
@@ -72,7 +69,7 @@
 
         String deviceSn = payloadReceiverList.get(0).getDeviceSn();
         String key = RedisConst.DEVICE_ONLINE_PREFIX + deviceSn;
-        DeviceDTO device = (DeviceDTO) redisOps.get(key);
+        DeviceDTO device = (DeviceDTO) RedisOpsUtils.get(key);
         List<DevicePayloadDTO> payloads = new ArrayList<>();
 
         for (DevicePayloadReceiver payloadReceiver : payloadReceiverList) {
@@ -87,7 +84,7 @@
             payloads = this.getDevicePayloadEntitiesByDeviceSn(deviceSn);
         }
         device.setPayloadsList(payloads);
-        redisOps.setWithExpire(RedisConst.DEVICE_ONLINE_PREFIX + device.getDeviceSn(), device, RedisConst.DEVICE_ALIVE_SECOND);
+        RedisOpsUtils.setWithExpire(RedisConst.DEVICE_ONLINE_PREFIX + device.getDeviceSn(), device, RedisConst.DEVICE_ALIVE_SECOND);
         return true;
     }
 
@@ -133,7 +130,7 @@
         String deviceSn = payloadReceiverList.stream().findAny().get().getDeviceSn();
         String key = RedisConst.STATE_PAYLOAD_PREFIX + deviceSn;
         // Solve timing problems
-        long last = (long) Objects.requireNonNullElse(redisOps.get(key), 0L);
+        long last = (long) Objects.requireNonNullElse(RedisOpsUtils.get(key), 0L);
         if (last > timestamp) {
             return;
         }
@@ -153,7 +150,7 @@
         // Save the new payload information.
         boolean isSave = this.savePayloadDTOs(needToSave);
         if (isSave) {
-            redisOps.setWithExpire(key, timestamp, RedisConst.DEVICE_ALIVE_SECOND);
+            RedisOpsUtils.setWithExpire(key, timestamp, RedisConst.DEVICE_ALIVE_SECOND);
         }
         log.debug("The result of saving the payloads is {}.", isSave);
     }

--
Gitblit v1.9.3