|
@@ -20,8 +20,8 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.persagy.apm.dmpalarm.config.DmpParameterStorage;
|
|
|
import com.persagy.apm.dmpalarm.criteria.JsonCriteria;
|
|
|
+import com.persagy.apm.dmpalarm.enumeration.AlarmLogType;
|
|
|
import com.persagy.apm.dmpalarm.enumeration.EnumAlarmListType;
|
|
|
-import com.persagy.apm.dmpalarm.enumeration.EnumAlarmLogType;
|
|
|
import com.persagy.apm.dmpalarm.enumeration.EnumAlarmMessageType;
|
|
|
import com.persagy.apm.dmpalarm.enumeration.EnumAlarmRecordWithColumns;
|
|
|
import com.persagy.apm.dmpalarm.enumeration.EnumAlarmState;
|
|
@@ -119,11 +119,11 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
alarmLogList = alarmLogListMap.get(entity.getId());
|
|
|
}
|
|
|
if (withColumns.contains(EnumAlarmRecordWithColumns.ignoreTime.name())) {
|
|
|
- Date ignoreAlarmTime = getCreateTime(alarmLogList, EnumAlarmLogType.TREATMODE, 1);
|
|
|
+ Date ignoreAlarmTime = getCreateTime(alarmLogList, AlarmLogType.TREATMODE, 1);
|
|
|
entity.setIgnoreTime(ignoreAlarmTime);
|
|
|
}
|
|
|
if (withColumns.contains(EnumAlarmRecordWithColumns.treatEndTime.name())) {
|
|
|
- Date treatEndTime = getCreateTime(alarmLogList, EnumAlarmLogType.TREATSTATE, 3);
|
|
|
+ Date treatEndTime = getCreateTime(alarmLogList, AlarmLogType.TREATSTATE, 3);
|
|
|
entity.setTreatEndTime(treatEndTime);
|
|
|
}
|
|
|
}
|
|
@@ -135,7 +135,7 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
return new PagedResponse<>();
|
|
|
}
|
|
|
|
|
|
- public Date getCreateTime(List<AlarmLog> alarmLogList, EnumAlarmLogType type, int after) {
|
|
|
+ public Date getCreateTime(List<AlarmLog> alarmLogList, String type, int after) {
|
|
|
Date createTime = null;
|
|
|
if (!CollectionUtils.isEmpty(alarmLogList)) {
|
|
|
for (AlarmLog alarmLog : alarmLogList) {
|
|
@@ -266,7 +266,7 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
if (param.getState() != null) {
|
|
|
if (!param.getState().equals(alarmRecord.getState())) {
|
|
|
AlarmLog alarmLog = initAlarmLogModel(param);
|
|
|
- alarmLog.setType(EnumAlarmLogType.ALARMSTATE);
|
|
|
+ alarmLog.setType(AlarmLogType.ALARMSTATE);
|
|
|
alarmLog.setNature(alarmRecord.getNature());
|
|
|
alarmLog.setBefore(alarmRecord.getState());
|
|
|
alarmLog.setAfter(param.getState());
|
|
@@ -281,7 +281,7 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
if (param.getTreatMode() != null) {
|
|
|
if (!param.getTreatMode().equals(alarmRecord.getTreatMode())) {
|
|
|
AlarmLog alarmLogModel = initAlarmLogModel(param);
|
|
|
- alarmLogModel.setType(EnumAlarmLogType.TREATMODE);
|
|
|
+ alarmLogModel.setType(AlarmLogType.TREATMODE);
|
|
|
alarmLogModel.setNature(alarmRecord.getNature());
|
|
|
alarmLogModel.setBefore(alarmRecord.getTreatMode());
|
|
|
alarmLogModel.setAfter(param.getTreatMode());
|
|
@@ -293,7 +293,7 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
if (param.getTreatState() != null) {
|
|
|
if (!param.getTreatState().equals(alarmRecord.getTreatState())) {
|
|
|
AlarmLog alarmLogModel = initAlarmLogModel(param);
|
|
|
- alarmLogModel.setType(EnumAlarmLogType.TREATSTATE);
|
|
|
+ alarmLogModel.setType(AlarmLogType.TREATSTATE);
|
|
|
alarmLogModel.setNature(alarmRecord.getNature());
|
|
|
alarmLogModel.setBefore(alarmRecord.getTreatState());
|
|
|
alarmLogModel.setAfter(param.getTreatState());
|