From c6213d06e5e725a28b41e214c7e667b428145a88 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 12 Aug 2024 09:28:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/access/listener/RedisKeyExpirationListener.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 e09ceb3..d5831ec 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 @@ -88,8 +88,9 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene try { String version = csTopicService.getVersion(nDid); //装置没有心跳，则立马发起接入请求 - log.info("装置掉线3分钟发送接入请求"); csDeviceService.devAccess(nDid,version); + logDto.setOperate("装置掉线3分钟发送接入请求"); + csLogsFeignClient.addUserLog(logDto); Integer status = csEquipmentDeliveryService.queryEquipmentBynDid(nDid).getRunStatus(); if (Objects.equals(status,AccessEnum.ONLINE.getCode())){ throw new BusinessException(CommonResponseEnum.SUCCESS); @@ -98,18 +99,18 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene for (int i = 1; i < 4; i++) { //接入再次失败，则定时发起接入请求 Thread.sleep(1000 * 60); - log.info("装置定时1分钟发送接入请求，第" + i + "次尝试"); csDeviceService.devAccess(nDid,version); status = csEquipmentDeliveryService.queryEquipmentBynDid(nDid).getRunStatus(); if (Objects.equals(status,AccessEnum.ONLINE.getCode())){ break; } + logDto.setOperate("装置定时1分钟发送接入请求，第" + i + "次尝试"); + csLogsFeignClient.addUserLog(logDto); } if (!Objects.isNull(status) && Objects.equals(status,AccessEnum.OFFLINE.getCode())){ final int[] mid = {2}; ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(2); ScheduledFuture runnableFuture = executor.scheduleAtFixedRate(() -> { - log.info("装置10分钟定时发送接入请求..."); csDeviceService.devAccessMid(nDid,version, mid[0]); Integer status2 = csEquipmentDeliveryService.queryEquipmentBynDid(nDid).getRunStatus(); if (Objects.equals(status2,AccessEnum.ONLINE.getCode())){ @@ -118,7 +119,7 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene mid[0] = mid[0] + 1; } //记录日志 - logDto.setOperate("装置掉线,定时发送接入请求，装置为:" + nDid + ",请求的时间戳为:" + System.currentTimeMillis()); + logDto.setOperate("装置掉线,定时10分钟发送接入请求，装置为:" + nDid + ",请求的时间戳为:" + System.currentTimeMillis()); csLogsFeignClient.addUserLog(logDto); }, 1, 600, TimeUnit.SECONDS); }