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 d38444cf..cc15a154 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 @@ -22,18 +22,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 1b7b0472..4903e6c3 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 @@ -160,7 +160,7 @@ 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); @@ -168,7 +168,7 @@ public class SimStatusChecker { status.getStatusCode(), status.getStatusDesc()); } catch (Exception e) { logger.error("更新设备{}的SIM卡状态失败: ", device.getDeviceId(), e); - throw e; + // throw e; } } @@ -190,7 +190,7 @@ 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); @@ -202,7 +202,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/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)'},