|
@@ -185,17 +185,6 @@ public class AlarmRecordController {
|
|
|
return queryAlarmRecord(pageQueryAlarmRecordDTO);
|
|
|
}
|
|
|
|
|
|
- @ApiOperation(value = "已忽略报警列表")
|
|
|
- @PostMapping("/ignored_list")
|
|
|
- public CommonResult<PageList<AlarmRecordListItem>> queryIgnoredAlarmRecord(
|
|
|
- @Valid @RequestBody PageQueryAlarmRecordDTO pageQueryAlarmRecordDTO) throws Exception {
|
|
|
- // 历史报警的默认查询条件为:报警处理状态为已忽略
|
|
|
- pageQueryAlarmRecordDTO.setAlarmTreatState(Lists.newArrayList(
|
|
|
- EnumAlarmTreatState.IGNORE.getType()
|
|
|
- ));
|
|
|
- return queryAlarmRecord(pageQueryAlarmRecordDTO);
|
|
|
- }
|
|
|
-
|
|
|
@ApiOperation(value = "关闭报警")
|
|
|
@PostMapping("/close")
|
|
|
public CommonResult<AlarmRecordIdsItem> closeAlarmRecord(
|
|
@@ -267,7 +256,7 @@ public class AlarmRecordController {
|
|
|
@Valid @RequestBody IgnoreAlarmRecordDTO ignoreAlarmRecordDTO) throws Exception {
|
|
|
// 报警处理方式更新为忽略,报警状态更新为已忽略
|
|
|
String treatMode = EnumAlarmTreatMode.IGNORE.getType();
|
|
|
- String treatState = EnumAlarmTreatState.IGNORE.getType();
|
|
|
+ String treatState = EnumAlarmTreatState.DONE.getType();
|
|
|
List<String> recordIds = ignoreAlarmRecordDTO.getIds();
|
|
|
|
|
|
return updateAlarmRecordTreatState(treatMode, treatState,null,null, recordIds);
|
|
@@ -299,9 +288,6 @@ public class AlarmRecordController {
|
|
|
if (listType.equals(EnumDownloadAlarmListType.HISTORY.getType())) {
|
|
|
result = queryHistoryAlarmRecord(pageQueryAlarmRecordDTO);
|
|
|
}
|
|
|
- if (listType.equals(EnumDownloadAlarmListType.IGNORE.getType())) {
|
|
|
- result = queryIgnoredAlarmRecord(pageQueryAlarmRecordDTO);
|
|
|
- }
|
|
|
|
|
|
List<AlarmRecordListItem> alarmRecordItemList = new ArrayList<>();
|
|
|
if (result != null) {
|