From d8aeeb260b068b73e4daa8a3411b8a4630b18319 Mon Sep 17 00:00:00 2001 From: weitang Date: Wed, 11 Jun 2025 09:47:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=92=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=80=BB=E8=BE=91=20=E4=BC=98=E5=8C=96=E4=BA=86?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9C=89=E9=97=AE=E9=A2=98=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=B9=B6=E6=96=B0=E5=A2=9E=E4=BA=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SubstationController.java | 4 ++-- .../basedata/service/ISubstationService.java | 2 +- .../service/impl/SubstationServiceImpl.java | 4 ++-- .../controller/AlarmLogController.java | 7 +++++++ .../patroltask/mapper/AlarmLogMapper.java | 1 + .../patroltask/service/IAlarmLogService.java | 2 ++ .../service/impl/AlarmLogServiceImpl.java | 5 +++++ .../mapper/auxcontrol/DeviceSignalMapper.xml | 6 +++--- .../mapper/patroltask/AlarmLogMapper.xml | 17 +++++++++++++++++ 9 files changed, 40 insertions(+), 8 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationController.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationController.java index 7cd347e..b52c892 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/SubstationController.java @@ -132,8 +132,8 @@ public class SubstationController { @ApiOperation("获取变电站区域导航树") @GetMapping("/getSubstationAreaTree") - public ResponseResult getSubstationAreaTree(String stationId) { - List> substationTree = substationService.getSubstationAreaTree(stationId); + public ResponseResult getSubstationAreaTree(String stationId,String areaName) { + List> substationTree = substationService.getSubstationAreaTree(stationId,areaName); return ResponseResult.successData(substationTree); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/ISubstationService.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/ISubstationService.java index a39b202..34ff69e 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/ISubstationService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/ISubstationService.java @@ -109,7 +109,7 @@ public interface ISubstationService extends IService { * 参数说明 * 返回值说明: java.util.List> ***********************************/ - List> getSubstationAreaTree(String stationId); + List> getSubstationAreaTree(String stationId,String areaName); /********************************** * 用途说明: 获取区域下所有间隔 diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationServiceImpl.java index 3ba2627..50fdc41 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/SubstationServiceImpl.java @@ -157,10 +157,10 @@ public class SubstationServiceImpl extends ServiceImpl> ***********************************/ @Override - public List> getSubstationAreaTree(String stationId) { + public List> getSubstationAreaTree(String stationId,String areaName) { Substation substation = this.substationMapper.selectById(stationId); List list = - substationAreaMapper.selectList(new LambdaQueryWrapper().eq(SubstationArea::getDatastatus, "1").eq(SubstationArea::getStationCode, substation.getStationCode()).orderByAsc(SubstationArea::getCustom1)); + substationAreaMapper.selectList(new LambdaQueryWrapper().eq(SubstationArea::getDatastatus, "1").like(StrUtil.isNotBlank(areaName),SubstationArea::getAreaName,areaName).eq(SubstationArea::getStationCode, substation.getStationCode()).orderByAsc(SubstationArea::getCustom1)); return buildTreeArea(list); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java index cfb39b3..0dda21f 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java @@ -89,6 +89,13 @@ public class AlarmLogController { return ResponseResult.successData(maps); } + @GetMapping("/getAlarmDetail") + @ApiOperation("查询故障诊断详情信息") + public ResponseResult getAlarmDetail(String id) { + Map map=alarmLogService.getAlarmDetail(id); + return ResponseResult.successData(map); + } + @GetMapping("/getNotCheckAlarmCount") @ApiOperation("查询未审核告警和数量") public ResponseResult getNotCheckAlarmCount(String stationId) { 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 fefeff8..3d1489a 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 @@ -61,4 +61,5 @@ public interface AlarmLogMapper extends BaseMapper { Page> getAlarmLogPage(Page> page, String stationCode, String taskAlarmType, String alarmLevel, String checkFlag, String alarmSourceType, String startDate, String endDate); + Map getAlarmDetail(String id); } 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 d83a273..f09e353 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 @@ -92,4 +92,6 @@ public interface IAlarmLogService extends IService { ***********************************/ void doAlaramRecord(String from,String type,String slaveIp,String address,String value); + Map getAlarmDetail(String id); + } 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 e1400fa..f2671e3 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 @@ -2272,6 +2272,11 @@ public class AlarmLogServiceImpl extends ServiceImpl i } + @Override + public Map getAlarmDetail(String id) { + return alarmLogMapper.getAlarmDetail(id); + } + /** * 填充告警记录表 * diff --git a/riis-system/src/main/resources/mapper/auxcontrol/DeviceSignalMapper.xml b/riis-system/src/main/resources/mapper/auxcontrol/DeviceSignalMapper.xml index 6949996..eddda22 100644 --- a/riis-system/src/main/resources/mapper/auxcontrol/DeviceSignalMapper.xml +++ b/riis-system/src/main/resources/mapper/auxcontrol/DeviceSignalMapper.xml @@ -158,7 +158,7 @@ diff --git a/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml b/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml index 53a5d02..04dd379 100644 --- a/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml +++ b/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml @@ -247,6 +247,23 @@ ORDER BY al.alarm_date DESC +