From 6a30a8a5721d07cad8f31f920f94c6eba80817a7 Mon Sep 17 00:00:00 2001
From: fengyarnom <fengyarnom@gmail.com>
Date: Fri, 21 Feb 2025 12:36:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E9=AB=98=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=92=8C=E6=B5=81=E9=87=8F=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E9=A2=91=E7=8E=87=EF=BC=8C=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sideslope/task/SimStatusChecker.java      | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/task/SimStatusChecker.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/task/SimStatusChecker.java
index 319be556..e3d1b289 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/task/SimStatusChecker.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/task/SimStatusChecker.java
@@ -52,14 +52,16 @@ public class SimStatusChecker {
     private SimCardQueryServiceImpl simCardQueryServiceImpl;
 
     // 每小时执行一次状态检查调度
-    @Scheduled(cron = "0 0 * * * ?")
+    //@Scheduled(cron = "0 0 * * * ?")
+    @Scheduled(cron = "0 */10 * * * ?")
     private void scheduleSimCardStatusCheck() {
         List<GnssStatusJoin> onlineDevices = gnssStatusMapper.queryOnline();
-        //logger.debug("当前在线设备数量: {}", onlineDevices.size());
+        logger.debug("当前在线设备数量: {}", onlineDevices.size());
 
         for (GnssStatusJoin onlineDevice : onlineDevices) {
-            int delay = Math.abs(onlineDevice.getDeviceid().hashCode() % 3600 );
-            //logger.debug("设备: {}, SIM状态查询，延迟执行: {}秒", onlineDevice.getDeviceid(), delay);
+            //int delay = Math.abs(onlineDevice.getDeviceid().hashCode() % 3600 );
+            int delay = Math.abs(onlineDevice.getDeviceid().hashCode() % 600 );
+            logger.debug("设备: {}, SIM状态查询，延迟执行: {}秒", onlineDevice.getDeviceid(), delay);
 
             scheduler.schedule(() -> checkDeviceSimCardStatus(onlineDevice.getDeviceid()),
                     delay, TimeUnit.SECONDS);
@@ -67,14 +69,15 @@ public class SimStatusChecker {
     }
 
     // 每两小时执行一次流量检查调度
-    @Scheduled(cron = "0 0 0/2 * * ?")
+    //@Scheduled(cron = "0 0 0/2 * * ?")
+    @Scheduled(cron = "0 */20 * * * ?")
     private void scheduleSimCardTrafficCheck() {
         List<GnssStatusJoin> onlineDevices = gnssStatusMapper.queryOnline();
-        //logger.debug("当前在线设备数量: {}", onlineDevices.size());
+        logger.debug("当前在线设备数量: {}", onlineDevices.size());
 
         for (GnssStatusJoin onlineDevice : onlineDevices) {
-            int delay = Math.abs(onlineDevice.getDeviceid().hashCode() % 7200);
-            //logger.debug("设备: {}, SIM流量查询，延迟执行: {}秒", onlineDevice.getDeviceid(), delay);
+            int delay = Math.abs(onlineDevice.getDeviceid().hashCode() % 1200);
+            logger.debug("设备: {}, SIM流量查询，延迟执行: {}秒", onlineDevice.getDeviceid(), delay);
 
             scheduler.schedule(() -> checkDeviceSimCardTraffic(onlineDevice.getDeviceid()),
                     delay, TimeUnit.SECONDS);
@@ -137,8 +140,8 @@ public class SimStatusChecker {
             simCard.setMsisdn(info.getMsisdn());
             simCardsMapper.updateSimCardInfo(simCard);
 
-            // logger.debug("更新SIM卡基本信息 - imsi: {}, msisdn: {}, iccid: {}",
-            // info.getImsi(), info.getMsisdn(), info.getIccid());
+            logger.info("更新SIM卡基本信息 - imsi: {}, msisdn: {}, iccid: {}",
+            info.getImsi(), info.getMsisdn(), info.getIccid());
         } catch (Exception e) {
             logger.error("更新设备{}的SIM卡基本信息失败: ", device.getDeviceId(), e);
             throw e;
@@ -158,8 +161,8 @@ public class SimStatusChecker {
 
             warningService.checkSimCardStatus(device, simCard);
 
-//            logger.debug("更新SIM卡状态 - Code: {}, 描述: {}",
-//                    status.getStatusCode(), status.getStatusDesc());
+            logger.info("更新SIM卡状态 - Code: {}, 描述: {}",
+                    status.getStatusCode(), status.getStatusDesc());
         } catch (Exception e) {
             logger.error("更新设备{}的SIM卡状态失败: ", device.getDeviceId(), e);
             throw e;
@@ -188,11 +191,11 @@ public class SimStatusChecker {
 
             warningService.checkSimCardTraffic(device, simCard);
 
-//            logger.info("更新流量信息成功 - deviceId: {}, 剩余: {}MB, 总量: {}MB, 已用: {}MB",
-//                    device.getIccid(),
-//                    simCard.getRemaining(),
-//                    simCard.getTotal(),
-//                    simCard.getUsed());
+            logger.info("更新流量信息成功 - deviceId: {}, 剩余: {}MB, 总量: {}MB, 已用: {}MB",
+                    device.getIccid(),
+                    simCard.getRemaining(),
+                    simCard.getTotal(),
+                    simCard.getUsed());
 
         } catch (Exception e) {
             logger.error("设备{}更新SIM卡流量失败: ", device.getDeviceId(), e);