From f035eab005b79290fffd4c9f1c29ae23139f88c9 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 21 Aug 2024 16:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../access/listener/RedisKeyExpirationListener.java | 11 ++++++----- .../njcn/access/service/impl/CsDeviceServiceImpl.java | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java index 37be393..eb41278 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java @@ -51,7 +51,6 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene // 最大尝试次数 private static final int MAX_ATTEMPTS = 4; - // 当前尝试次数 private static int attemptCount = 1; @@ -110,16 +109,18 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene scheduler.shutdown(); } } else { + scheduler.shutdown(); attemptCount++; logDto.setResult(0); - startSecondScheduledTask(scheduler,nDid,version); + startSecondScheduledTask(nDid,version); } csLogsFeignClient.addUserLog(logDto); - }, 0, 5, TimeUnit.SECONDS); + }, 0, 1, TimeUnit.MINUTES); } //启动第二个定时任务 - private void startSecondScheduledTask(ScheduledExecutorService scheduler, String nDid, String version) { + private void startSecondScheduledTask(String nDid, String version) { + ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); ScheduledFuture future = scheduler.scheduleAtFixedRate(() -> { System.out.println(nDid + "执行第二阶段重连定时任务..."); DeviceLogDTO logDto = new DeviceLogDTO(); @@ -133,6 +134,6 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene logDto.setResult(0); } csLogsFeignClient.addUserLog(logDto); - }, 0, 10, TimeUnit.SECONDS); + }, 0, 10, TimeUnit.MINUTES); } } diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java index c45adf0..f874b76 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java @@ -520,6 +520,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService { public boolean devAccessAskTemplate(String nDid,String version,Integer mid) { boolean result = false; try { + redisUtil.delete(AppRedisKey.MODEL + nDid); //询问装置当前所用模板 ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req(); reqAndResParam.setMid(mid);