|
@@ -196,7 +196,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
alarmRecordDO.setDefinitionId(defineId);
|
|
|
alarmRecordDO.setObjId(alarmDefine.getObjId());
|
|
|
alarmRecordDO.setItemCode(alarmDefine.getItemCode());
|
|
|
- alarmRecordDO.setTargetId(alarmDefine.getTargetId());
|
|
|
+ alarmRecordDO.setItemId(alarmDefine.getItemId());
|
|
|
alarmRecordDO.setState("2");
|
|
|
alarmRecordDO.setEndTime(DateUtils.parseDate(dateTime));
|
|
|
alarmRecordDO.setEndInfo(JSONObject.toJSONString(paramMap));
|
|
@@ -359,7 +359,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
.groupCode(CommonConst.groupCode)
|
|
|
.itemCode(alarmDefine.getItemCode())
|
|
|
.objId(alarmDefine.getObjId())
|
|
|
- .targetId(alarmDefine.getTargetId())
|
|
|
+ .itemId(alarmDefine.getItemId())
|
|
|
.classCode(alarmDefine.getClassCode())
|
|
|
.createUser(CommonConst.systemId)
|
|
|
.build();
|
|
@@ -371,7 +371,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
zktAlarmRecordDO.setDefinitionId(defineId);
|
|
|
zktAlarmRecordDO.setObjId(alarmDefine.getObjId());
|
|
|
zktAlarmRecordDO.setItemCode(alarmDefine.getItemCode());
|
|
|
- zktAlarmRecordDO.setTargetId(alarmDefine.getTargetId());
|
|
|
+ zktAlarmRecordDO.setItemId(alarmDefine.getItemId());
|
|
|
zktAlarmRecordDO.setState("1");
|
|
|
zktAlarmRecordDO.setAlarmTime(alarmState.getAlarmStartTime());
|
|
|
zktAlarmRecordDO.setProjectId(alarmDefine.getProjectId());
|
|
@@ -389,7 +389,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
.itemCode(alarmDefine.getItemCode())
|
|
|
.name(alarmDefine.getName())
|
|
|
.objId(alarmDefine.getObjId())
|
|
|
- .targetId(alarmDefine.getTargetId())
|
|
|
+ .itemId(alarmDefine.getItemId())
|
|
|
.projectId(alarmDefine.getProjectId())
|
|
|
.state("3") //要变成已过期
|
|
|
.alarmId(alarmId)
|