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/manage/service/impl/DeviceHmsServiceImpl.java |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/dji/sample/manage/service/impl/DeviceHmsServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/DeviceHmsServiceImpl.java
index 2b76e49..de1d03f 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/DeviceHmsServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/DeviceHmsServiceImpl.java
@@ -63,9 +63,6 @@
     private ObjectMapper objectMapper;
 
     @Autowired
-    private RedisOpsUtils redisOps;
-
-    @Autowired
     private SendMessageServiceImpl sendMessageService;
 
     @Autowired
@@ -95,9 +92,9 @@
                 .build();
         String key = RedisConst.HMS_PREFIX + sn;
         // Query all unread hms messages of the device in redis.
-        Set<String> hmsMap = redisOps.listGetAll(key).stream().map(String::valueOf).collect(Collectors.toSet());
+        Set<String> hmsMap = RedisOpsUtils.listGetAll(key).stream().map(String::valueOf).collect(Collectors.toSet());
 
-        DeviceDTO device = (DeviceDTO) redisOps.get(RedisConst.DEVICE_ONLINE_PREFIX + sn);
+        DeviceDTO device = (DeviceDTO) RedisOpsUtils.get(RedisConst.DEVICE_ONLINE_PREFIX + sn);
 
         List<DeviceHmsDTO> unReadList = new ArrayList<>();
         objectMapper.convertValue(((Map) (receiver.getData())).get(MapKeyConst.LIST),
@@ -117,7 +114,7 @@
         if (unReadList.isEmpty()) {
             return;
         }
-        redisOps.listRPush(key, unReadList.stream().map(DeviceHmsDTO::getKey).toArray(String[]::new));
+        RedisOpsUtils.listRPush(key, unReadList.stream().map(DeviceHmsDTO::getKey).toArray(String[]::new));
         // push to the web
         Collection<ConcurrentWebSocketSession> sessions = webSocketManageService.getValueWithWorkspaceAndUserType(
                 device.getWorkspaceId(), UserTypeEnum.WEB.getVal());
@@ -162,7 +159,7 @@
                         .eq(DeviceHmsEntity::getSn, deviceSn)
                         .eq(DeviceHmsEntity::getUpdateTime, 0L));
         // Delete unread messages cached in redis.
-        redisOps.del(RedisConst.HMS_PREFIX + deviceSn);
+        RedisOpsUtils.del(RedisConst.HMS_PREFIX + deviceSn);
     }
 
     private DeviceHmsDTO entity2Dto(DeviceHmsEntity entity) {

--
Gitblit v1.9.3