From cbbf17b2476f76059e79abaed64d06ad61609965 Mon Sep 17 00:00:00 2001 From: fengyarnom Date: Sun, 2 Mar 2025 09:55:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20SIM=20=E5=8D=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=92=8C=E6=B5=81=E9=87=8F=E6=9F=A5=E8=AF=A2=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=20BUG=201.=20=E4=BF=AE=E6=AD=A3=20schema.sql=20?= =?UTF-8?q?=E4=B8=AD=20simcards=20=E5=85=B3=E4=BA=8E=20msisdn=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=9A=84=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=202.=20?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E7=9A=84=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E9=94=99=E8=AF=AF=203.=20=E4=BF=AE=E6=AD=A3=20SimCard?= =?UTF-8?q?sMapper=20=E4=B8=80=E4=BA=9B=E5=87=BD=E6=95=B0=204.=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=97=A5=E5=BF=97=E4=B8=BA=20Debug=20=E7=AD=89?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imdroid/secapi/dto/SimCardsMapper.java | 15 +++++++------ .../sideslope/task/SimStatusChecker.java | 22 +++++++++---------- sec-beidou/src/main/resources/db/schema.sql | 2 +- .../resources/templates/page/sim_status.html | 2 +- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/SimCardsMapper.java b/sec-api/src/main/java/com/imdroid/secapi/dto/SimCardsMapper.java index 6a8d5e35..d4ad9c6d 100644 --- a/sec-api/src/main/java/com/imdroid/secapi/dto/SimCardsMapper.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/SimCardsMapper.java @@ -23,18 +23,19 @@ public interface SimCardsMapper extends MPJBaseMapper{ "WHERE deviceid = #{deviceid}") int updateSimCardInfo(SimCard simCard); + @Update("UPDATE simcards SET " + + "updatetime = #{updatetime}, " + + "msisdn = #{msisdn}, " + + "status = #{status} " + + "WHERE deviceid = #{deviceid}") + int updateCardStatusInfo(SimCard simCard); + @Update("UPDATE simcards SET " + "updatetime = #{updatetime}, " + "remaining = #{remaining}, " + "total = #{total}, " + "used = #{used} " + "WHERE deviceid = #{deviceid}") - int updateFlowInfo(SimCard simCard); - - @Update("UPDATE simcards SET " + - "updatetime = #{updatetime}, " + - "status = #{status} " + - "WHERE deviceid = #{deviceid}") - int updateStatus(SimCard simCard); + int updateCardTrafficInfo(SimCard simCard); } 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 0400b19a..7b262bdd 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 @@ -54,11 +54,11 @@ public class SimStatusChecker { //@Scheduled(cron = "0 */10 * * * ?") private void scheduleSimCardStatusCheck() { List onlineDevices = gnssStatusMapper.queryOnline(); - logger.info("当前在线设备数量: {}", onlineDevices.size()); + logger.debug("当前在线设备数量: {}", onlineDevices.size()); for (GnssStatusJoin onlineDevice : onlineDevices) { int delay = Math.abs(onlineDevice.getDeviceid().hashCode() % 3600 ); - logger.info("- 设备: {}, SIM状态查询，延迟执行: {}秒", onlineDevice.getDeviceid(), delay); + //logger.debug("- 设备: {}, SIM状态查询，延迟执行: {}秒", onlineDevice.getDeviceid(), delay); ThreadManager.getScheduledThreadPool().schedule( () -> checkDeviceSimCardStatus(onlineDevice.getDeviceid()), @@ -72,11 +72,11 @@ public class SimStatusChecker { @Scheduled(cron = "0 0 0/2 * * ?") private void scheduleSimCardTrafficCheck() { List onlineDevices = gnssStatusMapper.queryOnline(); - logger.info("当前在线设备数量: {}", onlineDevices.size()); + logger.debug("当前在线设备数量: {}", onlineDevices.size()); for (GnssStatusJoin onlineDevice : onlineDevices) { int delay = Math.abs(onlineDevice.getDeviceid().hashCode() % 7200); - logger.debug("- 设备: {}, SIM流量查询，延迟执行: {}秒", onlineDevice.getDeviceid(), delay); + //logger.debug("- 设备: {}, SIM流量查询，延迟执行: {}秒", onlineDevice.getDeviceid(), delay); ThreadManager.getScheduledThreadPool().schedule( () -> checkDeviceSimCardTraffic(onlineDevice.getDeviceid()), @@ -142,7 +142,7 @@ public class SimStatusChecker { simCard.setMsisdn(info.getMsisdn()); simCardsMapper.updateSimCardInfo(simCard); - logger.info("更新SIM卡基本信息 - imsi: {}, msisdn: {}, iccid: {}", + logger.debug("更新SIM卡基本信息 - imsi: {}, msisdn: {}, iccid: {}", info.getImsi(), info.getMsisdn(), info.getIccid()); } catch (Exception e) { logger.error("更新设备{}的SIM卡基本信息失败: ", device.getDeviceId(), e); @@ -158,15 +158,15 @@ public class SimStatusChecker { CardStatusData status = response.getData(); simCard.setUpdatetime(new Date()); simCard.setStatus(status.getStatusCode()); - simCardsMapper.updateSimCardInfo(simCard); + simCardsMapper.updateCardStatusInfo(simCard); warningService.checkSimCardStatus(device, simCard); - logger.info("更新SIM卡状态 - Code: {}, 描述: {}", + logger.debug("更新SIM卡状态 - Code: {}, 描述: {}", status.getStatusCode(), status.getStatusDesc()); } catch (Exception e) { logger.error("更新设备{}的SIM卡状态失败: ", device.getDeviceId(), e); - throw e; + // throw e; } } @@ -188,11 +188,11 @@ public class SimStatusChecker { simCard.setRemaining(BigDecimal.valueOf(usage.getLeft())); simCard.setUsed(BigDecimal.valueOf(usage.getUsed())); simCard.setTotal(BigDecimal.valueOf(usage.getTotal())); - simCardsMapper.updateSimCardInfo(simCard); + simCardsMapper.updateCardTrafficInfo(simCard); warningService.checkSimCardTraffic(device, simCard); - logger.info("更新流量信息成功 - deviceId: {}, 剩余: {}MB, 总量: {}MB, 已用: {}MB", + logger.debug("更新流量信息成功 - deviceId: {}, 剩余: {}MB, 总量: {}MB, 已用: {}MB", device.getIccid(), simCard.getRemaining(), simCard.getTotal(), @@ -200,7 +200,7 @@ public class SimStatusChecker { } catch (Exception e) { logger.error("设备{}更新SIM卡流量失败: ", device.getDeviceId(), e); - throw e; + //throw e; } } diff --git a/sec-beidou/src/main/resources/db/schema.sql b/sec-beidou/src/main/resources/db/schema.sql index 0be53fe4..39558046 100644 --- a/sec-beidou/src/main/resources/db/schema.sql +++ b/sec-beidou/src/main/resources/db/schema.sql @@ -353,7 +353,7 @@ CREATE TABLE IF NOT EXISTS `simcards` ( `id` INT NOT NULL AUTO_INCREMENT COMMENT '主键，自增，唯一', `updatetime` DATETIME DEFAULT NULL COMMENT '最新一次查询接口记录的时间', `iccid` VARCHAR(36) NOT NULL COMMENT 'ICCID号，唯一', - `msisd` VARCHAR(20) NOT NULL COMMENT '物联卡号码，SIM号，唯一', + `msisdn` VARCHAR(20) NOT NULL COMMENT '物联卡号码，SIM号，唯一', `deviceid` VARCHAR(20) DEFAULT NULL COMMENT '设备ID号', `status` TINYINT DEFAULT -1 COMMENT 'SIM卡状态（-1:未知, 1:待激活, 2:已激活, 3:停机, 4:注销, 5:库存, 6:可测试, 7:失效, 99:号码不存在）', `remaining` DECIMAL(10,2) DEFAULT 0.00 COMMENT '剩余流量，单位为MB，保留两位小数', diff --git a/sec-beidou/src/main/resources/templates/page/sim_status.html b/sec-beidou/src/main/resources/templates/page/sim_status.html index e220984b..7e1950fe 100644 --- a/sec-beidou/src/main/resources/templates/page/sim_status.html +++ b/sec-beidou/src/main/resources/templates/page/sim_status.html @@ -191,7 +191,7 @@ {field: 'deviceid', title: '设备号'}, {field: 'iccid', title: 'ICCID'}, {field: 'msisdn', title: 'SIM 卡号'}, - {field: 'updatetime', title: '更新时间'}, + {field: 'updatetime', title: '更新时间',templet: "
{{layui.util.toDateString(d.updatetime, 'yyyy-MM-dd HH:mm:ss')}}
"}, {field: 'status', title: '状态',templet: '#statusTpl'}, {field: 'remaining', title: '剩余流量(MB)'}, {field: 'used', title: '已使用流量(MB)'},