|
@@ -2,7 +2,7 @@ package com.persagy.apm.alarmservice.group.alarmrecord.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
-import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumAlarmListType;
|
|
|
|
|
|
+import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumDownloadAlarmListType;
|
|
import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumAlarmTreatMode;
|
|
import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumAlarmTreatMode;
|
|
import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumAlarmTreatState;
|
|
import com.persagy.apm.alarmservice.group.alarmrecord.enums.EnumAlarmTreatState;
|
|
import com.persagy.apm.alarmservice.group.alarmrecord.model.ConvertAlarmRecordTool;
|
|
import com.persagy.apm.alarmservice.group.alarmrecord.model.ConvertAlarmRecordTool;
|
|
@@ -20,6 +20,7 @@ import com.persagy.apm.common.model.dto.Sort;
|
|
import com.persagy.apm.common.response.CommonResult;
|
|
import com.persagy.apm.common.response.CommonResult;
|
|
import com.persagy.apm.common.response.PageList;
|
|
import com.persagy.apm.common.response.PageList;
|
|
import com.persagy.apm.common.utils.ResultHelper;
|
|
import com.persagy.apm.common.utils.ResultHelper;
|
|
|
|
+import com.persagy.apm.energyalarmstarter.alarmdata.enums.EnumAlarmListType;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.AddAlarmRecordDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.AddAlarmRecordDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.BatchUpdateAlarmRecordDTO;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmrecord.BatchUpdateAlarmRecordDTO;
|
|
@@ -81,14 +82,7 @@ public class AlarmRecordController {
|
|
@PostMapping("/current_list")
|
|
@PostMapping("/current_list")
|
|
public CommonResult<PageList<AlarmRecordListItem>> queryCurrentAlarmRecord(
|
|
public CommonResult<PageList<AlarmRecordListItem>> queryCurrentAlarmRecord(
|
|
@Valid @RequestBody PageQueryAlarmRecordDTO pageQueryAlarmRecordDTO) throws Exception {
|
|
@Valid @RequestBody PageQueryAlarmRecordDTO pageQueryAlarmRecordDTO) throws Exception {
|
|
- if (pageQueryAlarmRecordDTO.getAlarmTreatState() == null) {
|
|
|
|
- // 当前报警的默认查询条件为:报警处理状态为未处理和处理中
|
|
|
|
- pageQueryAlarmRecordDTO.setAlarmTreatState(Lists.newArrayList(
|
|
|
|
- EnumAlarmTreatState.UN_HANDLE.getType(),
|
|
|
|
- EnumAlarmTreatState.HANDLING.getType()
|
|
|
|
- ));
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ pageQueryAlarmRecordDTO.setListType(EnumAlarmListType.CURRENT);
|
|
return queryAlarmRecord(pageQueryAlarmRecordDTO);
|
|
return queryAlarmRecord(pageQueryAlarmRecordDTO);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -187,10 +181,7 @@ public class AlarmRecordController {
|
|
@PostMapping("/history_list")
|
|
@PostMapping("/history_list")
|
|
public CommonResult<PageList<AlarmRecordListItem>> queryHistoryAlarmRecord(
|
|
public CommonResult<PageList<AlarmRecordListItem>> queryHistoryAlarmRecord(
|
|
@Valid @RequestBody PageQueryAlarmRecordDTO pageQueryAlarmRecordDTO) throws Exception {
|
|
@Valid @RequestBody PageQueryAlarmRecordDTO pageQueryAlarmRecordDTO) throws Exception {
|
|
- // 历史报警的默认查询条件为:报警处理状态为处理完成
|
|
|
|
- pageQueryAlarmRecordDTO.setAlarmTreatState(Lists.newArrayList(
|
|
|
|
- EnumAlarmTreatState.DONE.getType()
|
|
|
|
- ));
|
|
|
|
|
|
+ pageQueryAlarmRecordDTO.setListType(EnumAlarmListType.HISTORY);
|
|
return queryAlarmRecord(pageQueryAlarmRecordDTO);
|
|
return queryAlarmRecord(pageQueryAlarmRecordDTO);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -302,13 +293,13 @@ public class AlarmRecordController {
|
|
// 去掉分页条件
|
|
// 去掉分页条件
|
|
pageQueryAlarmRecordDTO.setSize(Integer.MAX_VALUE);
|
|
pageQueryAlarmRecordDTO.setSize(Integer.MAX_VALUE);
|
|
CommonResult<PageList<AlarmRecordListItem>> result = null;
|
|
CommonResult<PageList<AlarmRecordListItem>> result = null;
|
|
- if (listType.equals(EnumAlarmListType.CURRENT.getType())) {
|
|
|
|
|
|
+ if (listType.equals(EnumDownloadAlarmListType.CURRENT.getType())) {
|
|
result = queryCurrentAlarmRecord(pageQueryAlarmRecordDTO);
|
|
result = queryCurrentAlarmRecord(pageQueryAlarmRecordDTO);
|
|
}
|
|
}
|
|
- if (listType.equals(EnumAlarmListType.HISTORY.getType())) {
|
|
|
|
|
|
+ if (listType.equals(EnumDownloadAlarmListType.HISTORY.getType())) {
|
|
result = queryHistoryAlarmRecord(pageQueryAlarmRecordDTO);
|
|
result = queryHistoryAlarmRecord(pageQueryAlarmRecordDTO);
|
|
}
|
|
}
|
|
- if (listType.equals(EnumAlarmListType.IGNORE.getType())) {
|
|
|
|
|
|
+ if (listType.equals(EnumDownloadAlarmListType.IGNORE.getType())) {
|
|
result = queryIgnoredAlarmRecord(pageQueryAlarmRecordDTO);
|
|
result = queryIgnoredAlarmRecord(pageQueryAlarmRecordDTO);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -319,11 +310,11 @@ public class AlarmRecordController {
|
|
|
|
|
|
List<AlarmRecordItemVO> alarmRecordItemVOList = ConvertAlarmRecordTool.INSTANCE.
|
|
List<AlarmRecordItemVO> alarmRecordItemVOList = ConvertAlarmRecordTool.INSTANCE.
|
|
convert2AlarmRecordItemVOList(alarmRecordItemList);
|
|
convert2AlarmRecordItemVOList(alarmRecordItemList);
|
|
- EnumAlarmListType enumAlarmListType = EnumAlarmListType.getByType(listType);
|
|
|
|
- if (enumAlarmListType == null) {
|
|
|
|
|
|
+ EnumDownloadAlarmListType enumDownloadAlarmListType = EnumDownloadAlarmListType.getByType(listType);
|
|
|
|
+ if (enumDownloadAlarmListType == null) {
|
|
throw new IllegalArgumentException("列表类型传值错误");
|
|
throw new IllegalArgumentException("列表类型传值错误");
|
|
}
|
|
}
|
|
- downloadRecordList(response, enumAlarmListType, alarmRecordItemVOList);
|
|
|
|
|
|
+ downloadRecordList(response, enumDownloadAlarmListType, alarmRecordItemVOList);
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "下载")
|
|
@ApiOperation(value = "下载")
|
|
@@ -335,8 +326,8 @@ public class AlarmRecordController {
|
|
List<String> recordIdList = downloadAlarmRecordDTO.getIds();
|
|
List<String> recordIdList = downloadAlarmRecordDTO.getIds();
|
|
//列表类型
|
|
//列表类型
|
|
String listType = downloadAlarmRecordDTO.getListType();
|
|
String listType = downloadAlarmRecordDTO.getListType();
|
|
- EnumAlarmListType enumAlarmListType = EnumAlarmListType.getByType(listType);
|
|
|
|
- if (enumAlarmListType == null) {
|
|
|
|
|
|
+ EnumDownloadAlarmListType enumDownloadAlarmListType = EnumDownloadAlarmListType.getByType(listType);
|
|
|
|
+ if (enumDownloadAlarmListType == null) {
|
|
throw new IllegalArgumentException("列表类型传值错误");
|
|
throw new IllegalArgumentException("列表类型传值错误");
|
|
}
|
|
}
|
|
// 获取报警详情列表
|
|
// 获取报警详情列表
|
|
@@ -347,35 +338,35 @@ public class AlarmRecordController {
|
|
alarmRecordItemVOList.add(alarmRecordWrapper.convert2AlarmRecordItemVO(alarmRecord));
|
|
alarmRecordItemVOList.add(alarmRecordWrapper.convert2AlarmRecordItemVO(alarmRecord));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- downloadRecordList(response, enumAlarmListType, alarmRecordItemVOList);
|
|
|
|
|
|
+ downloadRecordList(response, enumDownloadAlarmListType, alarmRecordItemVOList);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* 下载报警记录列表
|
|
* 下载报警记录列表
|
|
*
|
|
*
|
|
* @param response response对象
|
|
* @param response response对象
|
|
- * @param enumAlarmListType 列表类型
|
|
|
|
|
|
+ * @param enumDownloadAlarmListType 列表类型
|
|
* @param alarmRecordItemVOList 要下载的列表
|
|
* @param alarmRecordItemVOList 要下载的列表
|
|
* @author lixing
|
|
* @author lixing
|
|
* @version V1.0 2021/10/19 7:22 下午
|
|
* @version V1.0 2021/10/19 7:22 下午
|
|
*/
|
|
*/
|
|
private void downloadRecordList(
|
|
private void downloadRecordList(
|
|
- HttpServletResponse response, EnumAlarmListType enumAlarmListType,
|
|
|
|
|
|
+ HttpServletResponse response, EnumDownloadAlarmListType enumDownloadAlarmListType,
|
|
List<AlarmRecordItemVO> alarmRecordItemVOList) throws Exception {
|
|
List<AlarmRecordItemVO> alarmRecordItemVOList) throws Exception {
|
|
// 创建Workbook
|
|
// 创建Workbook
|
|
XSSFWorkbook wb = new XSSFWorkbook();
|
|
XSSFWorkbook wb = new XSSFWorkbook();
|
|
XSSFSheet overViewSheet = wb.createSheet();
|
|
XSSFSheet overViewSheet = wb.createSheet();
|
|
// 设置sheet页标题
|
|
// 设置sheet页标题
|
|
- wb.setSheetName(0, enumAlarmListType.getDesc());
|
|
|
|
|
|
+ wb.setSheetName(0, enumDownloadAlarmListType.getDesc());
|
|
// 处理表头
|
|
// 处理表头
|
|
- alarmRecordWrapper.handleExcelTitle(enumAlarmListType, overViewSheet, wb);
|
|
|
|
|
|
+ alarmRecordWrapper.handleExcelTitle(enumDownloadAlarmListType, overViewSheet, wb);
|
|
|
|
|
|
if (!CollectionUtils.isEmpty(alarmRecordItemVOList)) {
|
|
if (!CollectionUtils.isEmpty(alarmRecordItemVOList)) {
|
|
// 能耗概览Sheet数据填充
|
|
// 能耗概览Sheet数据填充
|
|
- alarmRecordWrapper.fillDataTable(enumAlarmListType, overViewSheet, alarmRecordItemVOList);
|
|
|
|
|
|
+ alarmRecordWrapper.fillDataTable(enumDownloadAlarmListType, overViewSheet, alarmRecordItemVOList);
|
|
}
|
|
}
|
|
String time = DateUtils.date2Str(new Date(), DateUtils.SDFSECOND);
|
|
String time = DateUtils.date2Str(new Date(), DateUtils.SDFSECOND);
|
|
- String excelName = enumAlarmListType.getDesc() + "-" + time + ".xlsx";
|
|
|
|
|
|
+ String excelName = enumDownloadAlarmListType.getDesc() + "-" + time + ".xlsx";
|
|
|
|
|
|
response.reset();
|
|
response.reset();
|
|
response.setContentType("application/msexcel;charset=UTF-8");
|
|
response.setContentType("application/msexcel;charset=UTF-8");
|