辅控告警优化
This commit is contained in:
parent
9b02f59135
commit
02585710b1
@ -302,5 +302,13 @@ public class AlarmLogController {
|
||||
return ResponseResult.success();
|
||||
}
|
||||
|
||||
@GetMapping("/createAlarmData")
|
||||
@ApiOperation("生成报警")
|
||||
public ResponseResult createAlarmData(String from,String type,String slaveIp,String address,String value) {
|
||||
alarmLogService.doAlaramRecord(from, type, slaveIp, address, value);
|
||||
// alarmLogService.doAlaramRecord("IEC61850", "yx", "192.168.1.1", "10", "2");
|
||||
|
||||
return ResponseResult.success();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -2049,11 +2049,15 @@ public class AlarmLogServiceImpl extends ServiceImpl<AlarmLogMapper, AlarmLog> i
|
||||
AlarmLog alarmLog = new AlarmLog();
|
||||
MeterDevice meterDevice = meterDeviceMapper.selectById(signalDate.get("meterDeviceId").toString());
|
||||
alarmLog.setCheckFlag("0");
|
||||
alarmLog.setDatastatus("1");
|
||||
// alarmLog.setLastmodifier(SecurityUtils.getCurrentUsername());
|
||||
alarmLog.setLastmodifier("admin");
|
||||
alarmLog.setLastmodifydate(new Timestamp(System.currentTimeMillis()));
|
||||
alarmLog.setAlarmSourceType("2");
|
||||
alarmLog.setId(IdUtil.fastSimpleUUID());
|
||||
// 创建 SimpleDateFormat 对象,指定日期格式
|
||||
if ("yx".equals(type)) {
|
||||
alarmLog.setId(IdUtil.fastSimpleUUID());
|
||||
|
||||
alarmLog.setNormalRange(signalDate.get("normalRange").toString());
|
||||
alarmLog.setStationId(signalDate.get("stationId").toString());
|
||||
alarmLog.setStationName(signalDate.get("stationName").toString());
|
||||
alarmLog.setStationCode(signalDate.get("stationCode").toString());
|
||||
@ -2062,6 +2066,8 @@ public class AlarmLogServiceImpl extends ServiceImpl<AlarmLogMapper, AlarmLog> i
|
||||
alarmLog.setBayId(signalDate.get("bayId").toString());
|
||||
alarmLog.setBayName(signalDate.get("bayName").toString());
|
||||
alarmLog.setMainDeviceName(signalDate.get("mainDeviceName").toString());
|
||||
alarmLog.setMainDeviceId(signalDate.get("mainDeviceId").toString());
|
||||
alarmLog.setComponentId(signalDate.get("mainComponentId").toString());
|
||||
alarmLog.setComponentName(signalDate.get("componentName").toString());
|
||||
|
||||
//所属系统
|
||||
@ -2071,7 +2077,7 @@ public class AlarmLogServiceImpl extends ServiceImpl<AlarmLogMapper, AlarmLog> i
|
||||
//告警设备ID
|
||||
alarmLog.setPatroldeviceId(meterDevice.getDeviceId());
|
||||
alarmLog.setPatroldeviceName(meterDevice.getDeviceName());
|
||||
|
||||
alarmLog.setPatroldeviceCode(signalDate.get("deviceCode").toString());
|
||||
//告警设名称
|
||||
alarmLog.setDeviceId(signalDate.get("signalId").toString());
|
||||
//告警信号id
|
||||
@ -2092,7 +2098,6 @@ public class AlarmLogServiceImpl extends ServiceImpl<AlarmLogMapper, AlarmLog> i
|
||||
//区域标识
|
||||
}
|
||||
if ("yc".equals(type)) {
|
||||
alarmLog.setId(IdUtil.fastSimpleUUID());
|
||||
//变电站id
|
||||
alarmLog.setStationId(signalDate.get("stationId").toString());
|
||||
alarmLog.setStationName(signalDate.get("stationName").toString());
|
||||
@ -2101,6 +2106,8 @@ public class AlarmLogServiceImpl extends ServiceImpl<AlarmLogMapper, AlarmLog> i
|
||||
alarmLog.setAreaName(signalDate.get("areaName").toString());
|
||||
alarmLog.setBayId(signalDate.get("bayId").toString());
|
||||
alarmLog.setBayName(signalDate.get("bayName").toString());
|
||||
alarmLog.setMainDeviceId(signalDate.get("mainDeviceId").toString());
|
||||
alarmLog.setComponentId(signalDate.get("mainComponentId").toString());
|
||||
alarmLog.setMainDeviceName(signalDate.get("mainDeviceName").toString());
|
||||
alarmLog.setComponentName(signalDate.get("componentName").toString());
|
||||
//所属系统
|
||||
@ -2111,12 +2118,14 @@ public class AlarmLogServiceImpl extends ServiceImpl<AlarmLogMapper, AlarmLog> i
|
||||
alarmLog.setPatroldeviceId(meterDevice.getDeviceId());
|
||||
//告警设备名称
|
||||
alarmLog.setPatroldeviceName(meterDevice.getDeviceName());
|
||||
//告警设备ID
|
||||
alarmLog.setPatroldeviceCode(signalDate.get("deviceCode").toString());
|
||||
//告警信号id
|
||||
alarmLog.setDeviceId(signalDate.get("signalId").toString());
|
||||
//告警信号名称
|
||||
alarmLog.setDeviceName(signalDate.get("signalName").toString());
|
||||
//告警类型
|
||||
alarmLog.setAlarmType(deviceAlarmParameter.getAlarmType());
|
||||
alarmLog.setFkAlarmType(deviceAlarmParameter.getAlarmType());
|
||||
//告警等级
|
||||
alarmLog.setAlarmLevel(deviceAlarmParameter.getAlarmLevel());
|
||||
//告警值
|
||||
@ -2130,7 +2139,7 @@ public class AlarmLogServiceImpl extends ServiceImpl<AlarmLogMapper, AlarmLog> i
|
||||
|
||||
String alarmLevelname = getDictName(deviceAlarmParameter.getAlarmLevel(), "alarmLevel");
|
||||
String alarmMessage = String.format("信号[%s]监测值为[%s]%s,达到了设置的报警阈值范围[%s],发生告警,告警级别为[%s]!",
|
||||
signalDate.get("signal_name").toString(), value, sinalUnit,
|
||||
signalDate.get("signalName").toString(), value, sinalUnit,
|
||||
deviceAlarmParameter.getAlarmCondition(), alarmLevelname
|
||||
);
|
||||
//告警信息
|
||||
|
@ -17,6 +17,7 @@
|
||||
a.station_id,
|
||||
a.systemcode,
|
||||
a.device_name,
|
||||
a.device_code,
|
||||
b.*
|
||||
FROM
|
||||
fk_meter_device a
|
||||
|
Loading…
Reference in New Issue
Block a user