Commit 1da8e099 authored by tangwei's avatar tangwei

修改告警历史记录

parent a5df55c3
...@@ -240,15 +240,14 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea ...@@ -240,15 +240,14 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
//增建告警记录表 //增建告警记录表
//告警记录 //告警记录
List<Alarm> curAlarmList = alarmService.findByQueryColumn(eqpId+metricKey); List<Alarm> curAlarmList = alarmService.findByQueryColumn(eqpId+"");
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (curAlarmList != null && curAlarmList.size() > 0) { if (curAlarmList != null && curAlarmList.size() > 0) {
if("异常".equals(curAlarmList.get(0).getCurrentState())){ // if("异常".equals(curAlarmList.get(0).getCurrentState())){
Alarm alarm = curAlarmList.get(0); Alarm alarm = curAlarmList.get(0);
alarm.setUpdateDate(df.format(new Date())); alarm.setUpdateDate(df.format(new Date()));
alarm.setAlarmSourceType(metricKey);
iAlarmDao.save(alarm); iAlarmDao.save(alarm);
} // }
} else { } else {
Alarm alarm = new Alarm(); Alarm alarm = new Alarm();
alarm.setSourceId(eqpId+""); alarm.setSourceId(eqpId+"");
...@@ -270,7 +269,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea ...@@ -270,7 +269,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
alarm.setEnsurePerson(""); alarm.setEnsurePerson("");
alarm.setOrgCode(orgCode1); alarm.setOrgCode(orgCode1);
alarm.setUpdateDate(df.format(new Date())); alarm.setUpdateDate(df.format(new Date()));
alarm.setQueryColumn(eqpId+metricKey); alarm.setQueryColumn(eqpId+"");
iAlarmDao.save(alarm); iAlarmDao.save(alarm);
} }
} catch (Exception e) { } catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment