From 62ad3ae8a9940781b23a5ecc74a79f54acf6d058 Mon Sep 17 00:00:00 2001 From: fengyarnom Date: Thu, 21 Nov 2024 18:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E7=94=A8=E8=AD=A6=E5=91=8A=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=94=9F=E6=88=90=20-=20=E5=88=A0=E9=99=A4=E5=9C=A8?= =?UTF-8?q?=20DeviceStatusChecker=20=E5=92=8C=20WarningServiceImpl=20?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sideslope/service/WarningServiceImpl.java | 13 ------------- .../imdroid/beidou/task/DeviceStatusChecker.java | 8 -------- 2 files changed, 21 deletions(-) diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java index 5c4b706e..a41b2522 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java @@ -2,7 +2,6 @@ package com.imdroid.sideslope.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.imdroid.common.util.NumberUtils; -import com.imdroid.common.util.WarningLogExecutor; import com.imdroid.secapi.dto.*; import com.imdroid.sideslope.sal.Device; import org.springframework.beans.factory.annotation.Autowired; @@ -24,8 +23,6 @@ public class WarningServiceImpl implements WarningService { @Autowired GnssStatusMapper gnssStatusMapper; - @Value("${warning.log.directory}") - private String logDirectory; // warning type <-> level & value Map cfgMap = new ConcurrentHashMap<>(); @@ -179,9 +176,6 @@ public class WarningServiceImpl implements WarningService { warningMsgMapper.insert(warningMsg); //告警级别 curStatus.setWarningcode(curStatus.getWarningcode() | warningType); - - // 新告警出现后，生成对应设备的 warning 日志文件 - generate_warning_logs(curStatus.getDeviceid(),warningType,auxInfo); } isUpdated = true; } @@ -228,11 +222,4 @@ public class WarningServiceImpl implements WarningService { } } - public void generate_warning_logs(String device_id,int warning_type,String warning_type_name){ - if (warning_type == WarningCfg.TYPE_LOW_VOLTAGE) { - WarningLogExecutor warningLogExecutor = new WarningLogExecutor(logDirectory); - warningLogExecutor.generateWarningLogs(device_id, warning_type_name); - } - - } } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java b/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java index eec06a93..d87b215a 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java @@ -3,7 +3,6 @@ package com.imdroid.beidou.task; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.yulichang.query.MPJQueryWrapper; import com.imdroid.beidou.service.NotificationService; -import com.imdroid.common.util.WarningLogExecutor; import com.imdroid.secapi.dto.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -47,8 +46,6 @@ public class DeviceStatusChecker { @Autowired GnssDeviceMapper deviceMapper; - @Value("${warning.log.directory}") - private String logDirectory; static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -160,11 +157,6 @@ public class DeviceStatusChecker { status.setWarning(WarningCfg.LEVEL_2); deviceIds.add(status.getDeviceid()); - // 生成 Warning 日志 - WarningLogExecutor warningLogExecutor = new WarningLogExecutor(logDirectory); - warningLogExecutor.generateWarningLogs(status.getDeviceid(),WarningCfg.TYPE_NAME_NO_FIXED_RESULT); - - } gnssStatusMapper.updateById(status); }