|
@@ -77,7 +77,6 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
endTime = DateUtil.parse(lt);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
PagedResponse<AlarmRecord> resp = shardingService.selectShardingPageList(AlarmRecord.class, queryWrapper,
|
|
|
jsonCriteria.getPage(), jsonCriteria.getSize(), startTime, endTime);
|
|
|
PagedResponse<AlarmRecord> resultAlarmRecordList = new PagedResponse<>();
|
|
@@ -151,7 +150,7 @@ 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.eq(AlarmRecord.PROP_ALARM_STATE,0);
|
|
|
+ queryWrappers.eq(AlarmRecord.PROP_ALARM_STATE, 0);
|
|
|
}
|
|
|
if (EnumAlarmListType.HISTORY.name().equals(listType)) {
|
|
|
queryWrappers.eq(AlarmRecord.PROP_ALARM_STATE, 1);
|
|
@@ -197,10 +196,14 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
entity.setValid(1);
|
|
|
entity.setProjectId(alarmParam.projectId);
|
|
|
entity.setGroupCode(alarmParam.groupCode);
|
|
|
- if (entity.getState() == EnumAlarmState.UN_HANDLE.getType() && (entity.getTreatState() == EnumAlarmTreatState.UN_HANDLE.getType() || entity.getTreatState() == EnumAlarmTreatState.HANDLING.getType())) {
|
|
|
+ if (EnumAlarmState.UN_HANDLE.getType().equals(entity.getState())
|
|
|
+ && (EnumAlarmTreatState.UN_HANDLE.getType().equals(entity.getTreatState())
|
|
|
+ || EnumAlarmTreatState.HANDLING.getType().equals(entity.getTreatState()))) {
|
|
|
entity.setAlarmState(0);
|
|
|
}
|
|
|
- if(entity.getState()==EnumAlarmState.END.getType() || entity.getState()==EnumAlarmState.EXPIRE.getType() || entity.getTreatState()==EnumAlarmTreatState.DONE.getType()) {
|
|
|
+ if (EnumAlarmState.END.getType().equals(entity.getState())
|
|
|
+ || EnumAlarmState.EXPIRE.getType().equals(entity.getState())
|
|
|
+ || EnumAlarmTreatState.DONE.getType().equals(entity.getTreatState())) {
|
|
|
entity.setAlarmState(1);
|
|
|
}
|
|
|
shardingService.save(entity, entity.getTriggerTime());
|
|
@@ -318,10 +321,14 @@ 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())) {
|
|
|
+ if (EnumAlarmState.UN_HANDLE.getType().equals(alarmRecord.getState())
|
|
|
+ && (EnumAlarmTreatState.UN_HANDLE.getType().equals(alarmRecord.getTreatState())
|
|
|
+ || EnumAlarmTreatState.HANDLING.getType().equals(alarmRecord.getTreatState()))) {
|
|
|
alarmRecord.setAlarmState(0);
|
|
|
}
|
|
|
- if(alarmRecord.getState()==EnumAlarmState.END.getType() || alarmRecord.getState()==EnumAlarmState.EXPIRE.getType() || alarmRecord.getTreatState()==EnumAlarmTreatState.DONE.getType()) {
|
|
|
+ if (EnumAlarmState.END.getType().equals(alarmRecord.getState())
|
|
|
+ || EnumAlarmState.EXPIRE.getType().equals(alarmRecord.getState())
|
|
|
+ || EnumAlarmTreatState.DONE.getType().equals(alarmRecord.getTreatState())) {
|
|
|
alarmRecord.setAlarmState(1);
|
|
|
}
|
|
|
shardingService.saveOrUpdate(alarmRecord, alarmRecord.getTriggerTime());
|