diff --git a/riis-monitor/src/main/resources/application-dev.yml b/riis-monitor/src/main/resources/application-dev.yml index 9b4cc90..60395f0 100644 --- a/riis-monitor/src/main/resources/application-dev.yml +++ b/riis-monitor/src/main/resources/application-dev.yml @@ -144,6 +144,7 @@ user-settings: - http://192.168.1.245:3001 - http://192.168.1.112:3002 - http://192.168.1.211:3001 + - http://192.168.1.211:3000 - http://192.168.1.20:3000 - http://192.168.1.112:18080 - http://192.168.1.38:3000 diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmRecord.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmRecord.java index 92fe765..8ea7fab 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmRecord.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmRecord.java @@ -220,4 +220,19 @@ public class DeviceAlarmRecord implements Serializable { */ @TableField(exist = false) private String noticeTypeName; + + /** + * 0:未核查；1:已审核；2.已修正 + */ + private String checkFlag; + + /** + * 核查反馈意见 + */ + private String checkComment; + + /** + * 是否属实 + */ + private String checkResult; } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceAlarmRecordMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceAlarmRecordMapper.java index 05b75fb..db7a759 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceAlarmRecordMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceAlarmRecordMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.auxcontrol.domain.DeviceAlarmRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.Map; + /** *

* 变电站-辅控设备-告警记录 Mapper 接口 @@ -16,4 +18,5 @@ public interface DeviceAlarmRecordMapper extends BaseMapper { Page getDeviceAlarmRecordPage(Page page, String systemcode, String deviceName, String signalName, String startDate, String endDate, String alarmLevel, String status); + Map getAlarmLogById(String id); } 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 725a0cf..0ed79d3 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 @@ -199,9 +199,8 @@ public class DeviceAlarmRecordServiceImpl extends ServiceImpl singalData, String value) { DeviceAlarmRecord deviceAlarmRecord = new DeviceAlarmRecord(); MeterDevice device = meterDeviceMapper.selectById(singalData.get("meterDeviceId").toString()); - + deviceAlarmRecord.setCheckFlag("0"); // 创建 SimpleDateFormat 对象，指定日期格式 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if ("yx".equals(type)) { deviceAlarmRecord.setRecordId(IdUtil.fastSimpleUUID()); deviceAlarmRecord.setStationId(singalData.get("stationId").toString()); 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 9cb071f..ae70576 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 @@ -60,11 +60,14 @@ public class AlarmLogController { return ResponseResult.error("未传变电站信息"); } //TODO 整合辅控告警 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - 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); + // LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 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); + List> maps = alarmLogService.getAlarmLogList(stationId); return ResponseResult.successData(maps); } @@ -284,9 +287,8 @@ public class AlarmLogController { @GetMapping("/getAlarmLogById") @ApiOperation("根据告警信息ID查询详情") - public ResponseResult getAlarmLogById(String id) { - Map alarmLog = alarmLogService.getAlarmLogById(id); - + public ResponseResult getAlarmLogById(String id,String systemType) { + Map alarmLog = alarmLogService.getAlarmLogById(id,systemType); return ResponseResult.successData(alarmLog); } 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 7854a65..8173a92 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 @@ -54,4 +54,6 @@ public interface AlarmLogMapper extends BaseMapper { * 返回值说明: java.util.List> ***********************************/ List> getAlarmLogList(String stationId); + + Map getAlarmLogById(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 f668db7..05fd947 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 @@ -59,7 +59,7 @@ public interface IAlarmLogService extends IService { * 参数说明 id 告警id * 返回值说明: java.util.Map ***********************************/ - Map getAlarmLogById(String id); + Map getAlarmLogById(String id,String systemType); boolean updateDeviceResult(JSONObject jsonObject) throws Exception; 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 c4505d0..9b02cac 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 @@ -23,6 +23,7 @@ import com.yfd.platform.config.AlarmTemplateConfig; import com.yfd.platform.config.HttpServerConfig; import com.yfd.platform.config.ParentConfig; import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.modules.auxcontrol.mapper.DeviceAlarmRecordMapper; import com.yfd.platform.modules.basedata.domain.LinkageSignal; import com.yfd.platform.modules.basedata.domain.Substation; import com.yfd.platform.modules.basedata.domain.SubstationDevice; @@ -119,7 +120,8 @@ public class AlarmLogServiceImpl extends ServiceImpl i @Resource private ISysDictionaryItemsService sysDictionaryItemsService; - + @Resource + private DeviceAlarmRecordMapper deviceAlarmRecordMapper; @Resource private MqttGateway mqttGateway; @@ -1177,19 +1179,16 @@ public class AlarmLogServiceImpl extends ServiceImpl i * 返回值说明: java.util.Map ***********************************/ @Override - public Map getAlarmLogById(String id) { - Map map = this.getMap(new LambdaQueryWrapper().eq(AlarmLog::getId, id)); - if (map == null) { - return ResponseResult.successData(null); + public Map getAlarmLogById(String id, String systemType) { + + if ("01".equals(systemType)) { + Map map = deviceAlarmRecordMapper.getAlarmLogById(id); } - String taskResultId = map.get("taskResultId").toString(); - TaskResult taskResult = taskResultMapper.selectById(taskResultId); - if (taskResult != null) { - map.put("deviceId", taskResult.getPatroldeviceCode()); - map.put("channelId", taskResult.getPatroldeviceChannelcode()); - map.put("patroldevicePos", taskResult.getPatroldevicePos()); + if ("02".equals(systemType)) { + Map map = alarmLogMapper.getAlarmLogById(id); + return ResponseResult.successData(map); } - return map; + return ResponseResult.successData(null); } private String getSlienceType(String type) { diff --git a/riis-system/src/main/java/com/yfd/platform/utils/TestFileDir.java b/riis-system/src/main/java/com/yfd/platform/utils/TestFileDir.java index f96b362..069bee0 100644 --- a/riis-system/src/main/java/com/yfd/platform/utils/TestFileDir.java +++ b/riis-system/src/main/java/com/yfd/platform/utils/TestFileDir.java @@ -5,6 +5,7 @@ import java.util.regex.Pattern; public class TestFileDir { public static void main(String[] args) throws Exception { + System.out.println("user.home = " + System.getProperty("user.home")); // //获取告警触发条件 String str = "20<=value<50"; // 定义正则表达式 diff --git a/riis-system/src/main/resources/mapper/auxcontrol/DeviceAlarmRecordMapper.xml b/riis-system/src/main/resources/mapper/auxcontrol/DeviceAlarmRecordMapper.xml index be1421f..47230af 100644 --- a/riis-system/src/main/resources/mapper/auxcontrol/DeviceAlarmRecordMapper.xml +++ b/riis-system/src/main/resources/mapper/auxcontrol/DeviceAlarmRecordMapper.xml @@ -53,4 +53,22 @@ and dar.alarm_time <= #{endDate} + + diff --git a/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml b/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml index 045f7d8..2bfef70 100644 --- a/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml +++ b/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml @@ -75,24 +75,46 @@ +