Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

停用警告日志生成

Browse Source 
- 删除在 DeviceStatusChecker 和 WarningServiceImpl 的相关代码
This commit is contained in:
fengyarnom 2024-11-21 18:03:22 +08:00
parent 09c05e4d17
commit 62ad3ae8a9
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java
View File

@ -2,7 +2,6 @@ package com.imdroid.sideslope.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.imdroid.common.util.NumberUtils; import com.imdroid.common.util.NumberUtils;
import com.imdroid.common.util.WarningLogExecutor;
import com.imdroid.secapi.dto.*; import com.imdroid.secapi.dto.*;
import com.imdroid.sideslope.sal.Device; import com.imdroid.sideslope.sal.Device;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -24,8 +23,6 @@ public class WarningServiceImpl implements WarningService {
@Autowired @Autowired
GnssStatusMapper gnssStatusMapper; GnssStatusMapper gnssStatusMapper;
@Value("${warning.log.directory}")
private String logDirectory;
// warning type <-> level & value // warning type <-> level & value
Map<Integer, int[]> cfgMap = new ConcurrentHashMap<>(); Map<Integer, int[]> cfgMap = new ConcurrentHashMap<>();
@ -179,9 +176,6 @@ public class WarningServiceImpl implements WarningService {
warningMsgMapper.insert(warningMsg); warningMsgMapper.insert(warningMsg);
//告警级别 //告警级别
curStatus.setWarningcode(curStatus.getWarningcode() | warningType); curStatus.setWarningcode(curStatus.getWarningcode() | warningType);
// 新告警出现后，生成对应设备的 warning 日志文件
generate_warning_logs(curStatus.getDeviceid(),warningType,auxInfo);
} }
isUpdated = true; 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);
}
}
} }

8
sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java
View File

@ -3,7 +3,6 @@ package com.imdroid.beidou.task;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.query.MPJQueryWrapper; import com.github.yulichang.query.MPJQueryWrapper;
import com.imdroid.beidou.service.NotificationService; import com.imdroid.beidou.service.NotificationService;
import com.imdroid.common.util.WarningLogExecutor;
import com.imdroid.secapi.dto.*; import com.imdroid.secapi.dto.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -47,8 +46,6 @@ public class DeviceStatusChecker {
@Autowired @Autowired
GnssDeviceMapper deviceMapper; GnssDeviceMapper deviceMapper;
@Value("${warning.log.directory}")
private String logDirectory;
static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@ -160,11 +157,6 @@ public class DeviceStatusChecker {
status.setWarning(WarningCfg.LEVEL_2); status.setWarning(WarningCfg.LEVEL_2);
deviceIds.add(status.getDeviceid()); deviceIds.add(status.getDeviceid());
// 生成 Warning 日志
WarningLogExecutor warningLogExecutor = new WarningLogExecutor(logDirectory);
warningLogExecutor.generateWarningLogs(status.getDeviceid(),WarningCfg.TYPE_NAME_NO_FIXED_RESULT);
} }
gnssStatusMapper.updateById(status); gnssStatusMapper.updateById(status);
} }