|
@@ -151,16 +151,10 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
private <T> void addAlarmQueryCondition(JSONObject criteria, QueryWrapper<T> queryWrappers) {
|
|
|
String listType = criteria.getString("listType");
|
|
|
if (EnumAlarmListType.CURRENT.name().equals(listType)) {
|
|
|
- queryWrappers.and(andWrapper -> andWrapper.eq(AlarmRecord.PROP_STATE, EnumAlarmState.UN_HANDLE.getType())
|
|
|
- .or(orw -> orw.eq(AlarmRecord.PROP_TREAT_STATE, EnumAlarmState.UN_HANDLE.getType())
|
|
|
- .eq(AlarmRecord.PROP_TREAT_STATE, EnumAlarmTreatState.HANDLING.getType())));
|
|
|
+ queryWrappers.eq(AlarmRecord.PROP_ALARM_STATE,0);
|
|
|
}
|
|
|
-
|
|
|
if (EnumAlarmListType.HISTORY.name().equals(listType)) {
|
|
|
- queryWrappers.and(andWrapper -> andWrapper.eq(AlarmRecord.PROP_STATE, EnumAlarmState.END.getType())
|
|
|
- .or(orw -> orw.eq(AlarmRecord.PROP_STATE, EnumAlarmState.EXPIRE.getType())
|
|
|
- .eq(AlarmRecord.PROP_TREAT_STATE, EnumAlarmTreatState.DONE.getType())));
|
|
|
-
|
|
|
+ queryWrappers.eq(AlarmRecord.PROP_ALARM_STATE, 1);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -203,9 +197,10 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
entity.setValid(1);
|
|
|
entity.setProjectId(alarmParam.projectId);
|
|
|
entity.setGroupCode(alarmParam.groupCode);
|
|
|
- if (entity.getState() == 1 || (entity.getTreatState() == 1 && entity.getTreatState() == 2)) {
|
|
|
+ if (entity.getState() == EnumAlarmState.UN_HANDLE.getType() && (entity.getTreatState() == EnumAlarmTreatState.UN_HANDLE.getType() || entity.getTreatState() == EnumAlarmTreatState.HANDLING.getType())) {
|
|
|
entity.setAlarmState(0);
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ if(entity.getState()==EnumAlarmState.END.getType() || entity.getState()==EnumAlarmState.EXPIRE.getType() || entity.getTreatState()==EnumAlarmTreatState.DONE.getType()) {
|
|
|
entity.setAlarmState(1);
|
|
|
}
|
|
|
shardingService.save(entity, entity.getTriggerTime());
|
|
@@ -323,6 +318,12 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
}
|
|
|
alarmRecord.setUpdateUser(alarmParam.userId);
|
|
|
alarmRecord.setUpdateTime(new Date());
|
|
|
+ if (alarmRecord.getState() == EnumAlarmState.UN_HANDLE.getType() && (alarmRecord.getTreatState() == EnumAlarmTreatState.UN_HANDLE.getType() || alarmRecord.getTreatState() == EnumAlarmTreatState.HANDLING.getType())) {
|
|
|
+ alarmRecord.setAlarmState(0);
|
|
|
+ }
|
|
|
+ if(alarmRecord.getState()==EnumAlarmState.END.getType() || alarmRecord.getState()==EnumAlarmState.EXPIRE.getType() || alarmRecord.getTreatState()==EnumAlarmTreatState.DONE.getType()) {
|
|
|
+ alarmRecord.setAlarmState(1);
|
|
|
+ }
|
|
|
shardingService.saveOrUpdate(alarmRecord, alarmRecord.getTriggerTime());
|
|
|
response.add("id", alarmRecord.getId());
|
|
|
// 推送消息至mq
|