From 2fecf821e96219a0c371fc20af74096a10b18375 Mon Sep 17 00:00:00 2001 From: weitang Date: Tue, 6 May 2025 09:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeviceAlarmRecordServiceImpl.java | 2 +- .../controller/WeatherLogController.java | 2 +- .../controller/AlarmLogController.java | 5 +++-- .../patroltask/mapper/AlarmLogMapper.java | 14 ++++++++++--- .../patroltask/service/IAlarmLogService.java | 8 +++++++ .../service/impl/AlarmLogServiceImpl.java | 10 +++++++++ .../mapper/patroltask/AlarmLogMapper.xml | 21 +++++++++++++++++++ 7 files changed, 55 insertions(+), 7 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmRecordServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmRecordServiceImpl.java index fb420ea..725a0cf 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmRecordServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmRecordServiceImpl.java @@ -181,7 +181,7 @@ public class DeviceAlarmRecordServiceImpl extends ServiceImpl idList = Arrays.asList(stationId.split(",")); + //TODO 整合辅控告警 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(AlarmLog::getStationId, idList).eq(AlarmLog::getDatastatus, "1").eq(AlarmLog::getCheckFlag, 0).select(AlarmLog::getId, + queryWrapper.eq(AlarmLog::getStationId, stationId).eq(AlarmLog::getDatastatus, "1").eq(AlarmLog::getCheckFlag + , 0).select(AlarmLog::getId, AlarmLog::getContent, AlarmLog::getAlarmLevel, AlarmLog::getAlarmDate, AlarmLog::getStationName).orderByDesc(AlarmLog::getAlarmDate); List> maps = alarmLogService.listMaps(queryWrapper); return ResponseResult.successData(maps); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/AlarmLogMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/AlarmLogMapper.java index a891de0..7854a65 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/AlarmLogMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/mapper/AlarmLogMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.patroltask.domain.AlarmLog; +import java.util.List; import java.util.Map; /** @@ -34,10 +35,11 @@ public interface AlarmLogMapper extends BaseMapper { * 参数说明 monitorType * 参数说明 startDate * 参数说明 endDate - * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page> + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page> ***********************************/ - Page> getAlarmListPage(Page> page, String patrolDeviceCode, String monitorType, String startDate, String endDate); - + Page> getAlarmListPage(Page> page, String patrolDeviceCode, + String monitorType, String startDate, String endDate); /********************************** * 用途说明: 告警准确率统计 @@ -46,4 +48,10 @@ public interface AlarmLogMapper extends BaseMapper { ***********************************/ Map getConfirmationRate(String stationId); + /********************************** + * 用途说明: 查询报警信息 + * 参数说明 stationId + * 返回值说明: java.util.List> + ***********************************/ + List> getAlarmLogList(String stationId); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/IAlarmLogService.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/IAlarmLogService.java index 9eb0c2d..f668db7 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/IAlarmLogService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/IAlarmLogService.java @@ -7,6 +7,7 @@ import com.yfd.platform.modules.patroltask.domain.AlarmLog; import com.yfd.platform.modules.patroltask.domain.TaskResult; import java.io.UnsupportedEncodingException; +import java.util.List; import java.util.Map; /** @@ -69,4 +70,11 @@ public interface IAlarmLogService extends IService { ***********************************/ Map getConfirmationRate(String stationId); + /********************************** + * 用途说明: 查询报警信息 + * 参数说明 stationId + * 返回值说明: java.util.List> + ***********************************/ + List> getAlarmLogList(String stationId); + } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/AlarmLogServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/AlarmLogServiceImpl.java index e33c7b9..c4505d0 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/AlarmLogServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/AlarmLogServiceImpl.java @@ -403,6 +403,16 @@ public class AlarmLogServiceImpl extends ServiceImpl i return alarmLogMapper.getConfirmationRate(stationId); } + /********************************** + * 用途说明: 查询报警信息 + * 参数说明 stationId + * 返回值说明: java.util.List> + ***********************************/ + @Override + public List> getAlarmLogList(String stationId) { + return alarmLogMapper.getAlarmLogList(stationId); + } + /********************************** * 用途说明: 设置任务结果数据 * 参数说明 taskResult diff --git a/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml b/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml index 922d998..045f7d8 100644 --- a/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml +++ b/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml @@ -74,4 +74,25 @@ AND station_id = #{stationId} +