From bc545f12a50774dc36bf01ac3df2e78ba06e42f2 Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Thu, 5 Jun 2025 11:19:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BB=B6=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gb28181/service/impl/DeviceServiceImpl.java | 12 ++++++++++-- .../task/deviceStatus/DeviceStatusTaskRunner.java | 7 ------- .../task/deviceSubscribe/SubscribeTaskRunner.java | 7 ------- .../platformStatus/PlatformStatusTaskRunner.java | 14 -------------- 4 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java index 6d0082f93..6197ac217 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java @@ -506,7 +506,11 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner { if (device == null || device.getSubscribeCycleForCatalog() < 0) { return false; } - log.info("[添加目录订阅] 设备 {}", device.getDeviceId()); + if (transactionInfo == null) { + log.info("[添加目录订阅] 设备 {}", device.getDeviceId()); + }else { + log.info("[目录订阅续期] 设备 {}", device.getDeviceId()); + } try { sipCommander.catalogSubscribe(device, transactionInfo, eventResult -> { ResponseEvent event = (ResponseEvent) eventResult.event; @@ -566,7 +570,11 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner { @Override public boolean addMobilePositionSubscribe(@NotNull Device device, SipTransactionInfo transactionInfo) { - log.info("[添加移动位置订阅] 设备 {}", device.getDeviceId()); + if (transactionInfo == null) { + log.info("[添加移动位置订阅] 设备 {}", device.getDeviceId()); + }else { + log.info("[移动位置订阅续期] 设备 {}", device.getDeviceId()); + } try { sipCommander.mobilePositionSubscribe(device, transactionInfo, eventResult -> { ResponseEvent event = (ResponseEvent) eventResult.event; diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java index 6b90d1feb..a94c3363a 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceStatus/DeviceStatusTaskRunner.java @@ -94,14 +94,7 @@ public class DeviceStatusTaskRunner { return false; } log.debug("[更新状态任务时间] 编号： {}", key); - if (delayQueue.contains(task)) { - boolean remove = delayQueue.remove(task); - if (!remove) { - log.info("[更新状态任务时间] 从延时队列内移除失败： {}", key); - } - } task.setDelayTime(expirationTime); - delayQueue.offer(task); String redisKey = String.format("%s_%s_%s", prefix, userSetting.getServerId(), task.getDeviceId()); Duration duration = Duration.ofSeconds((expirationTime - System.currentTimeMillis())/1000); redisTemplate.expire(redisKey, duration); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskRunner.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskRunner.java index 7019121d3..996f8b970 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskRunner.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/deviceSubscribe/SubscribeTaskRunner.java @@ -94,14 +94,7 @@ public class SubscribeTaskRunner{ return false; } log.info("[更新订阅任务时间] {}, 编号： {}", task.getName(), key); - if (delayQueue.contains(task)) { - boolean remove = delayQueue.remove(task); - if (!remove) { - log.info("[更新订阅任务时间] 从延时队列内移除失败： {}", key); - } - } task.setDelayTime(expirationTime); - delayQueue.offer(task); String redisKey = String.format("%s_%s_%s", prefix, userSetting.getServerId(), task.getKey()); Duration duration = Duration.ofSeconds((expirationTime - System.currentTimeMillis())/1000); redisTemplate.expire(redisKey, duration); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformStatusTaskRunner.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformStatusTaskRunner.java index eaa96aedf..7b3ffffb4 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformStatusTaskRunner.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/platformStatus/PlatformStatusTaskRunner.java @@ -114,14 +114,7 @@ public class PlatformStatusTaskRunner { return false; } log.info("[更新平台注册任务时间] 平台上级编号： {}", platformServerId); - if (registerDelayQueue.contains(task)) { - boolean remove = registerDelayQueue.remove(task); - if (!remove) { - log.info("[更新平台注册任务时间] 从延时队列内移除失败： {}", platformServerId); - } - } task.setDelayTime(expirationTime); - registerDelayQueue.offer(task); String redisKey = String.format("%s_%s_%s", prefix, userSetting.getServerId(), platformServerId); Duration duration = Duration.ofSeconds((expirationTime - System.currentTimeMillis())/1000); redisTemplate.expire(redisKey, duration); @@ -165,14 +158,7 @@ public class PlatformStatusTaskRunner { return false; } log.info("[更新平台心跳任务时间] 平台上级编号： {}", platformServerId); - if (keepaliveTaskDelayQueue.contains(task)) { - boolean remove = keepaliveTaskDelayQueue.remove(task); - if (!remove) { - log.info("[更新平台心跳任务时间] 从延时队列内移除失败： {}", platformServerId); - } - } task.setDelayTime(expirationTime); - keepaliveTaskDelayQueue.offer(task); return true; }