报警导出修改

sms_water/src/main/java/com/huaxu/controller/AlarmDetailsController.java

@@ -193,13 +193,13 @@ public class AlarmDetailsController {
             @ApiParam(value = "报警类型") @RequestParam(required = false) String alarmType,
             @ApiParam(value = "处理状态") @RequestParam(required = false) Integer opState,
             @ApiParam(value = "所属场景id") @RequestParam(required = false)  Integer sceneId,
-            @ApiParam(value = "报警信息id") @RequestParam(required = false)  Integer[] ids,
+            @ApiParam(value = "报警信息id") @RequestParam(required = false)  List<Integer> ids,
             @ApiParam(value = "查询：开始时间yyyy-MM-dd") @RequestParam(required = false) String startTime,
             @ApiParam(value = "查询：结束时间yyyy-MM-dd") @RequestParam(required = false) String endTime
 
     ){
-        if(ids != null && ids.length>0){
-            String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警记录",alarmDetailsService.selectHistoryByIds(Arrays.asList(ids)) );
+        if(ids != null && ids.size()>0){
+            String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警记录",alarmDetailsService.selectHistoryByIds(ids) );
             return new AjaxMessage<>(ResultStatus.OK, filePath);
         }
         AlarmDetailsDto alarmDetailsDto = new AlarmDetailsDto();
@@ -222,11 +222,11 @@ public class AlarmDetailsController {
         if(sceneId != null) {
             alarmDetailsDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
             if(alarmDetailsDto.getSceneIds() == null || alarmDetailsDto.getSceneIds().size() == 0){
-                String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警", new ArrayList<>());
+                String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警记录", new ArrayList<>());
                 return new AjaxMessage<>(ResultStatus.OK, filePath);
             }
         }
-        String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警", alarmDetailsService.selectHistoryList(alarmDetailsDto));
+        String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警记录", alarmDetailsService.selectHistoryList(alarmDetailsDto));
         return new AjaxMessage<>(ResultStatus.OK, filePath);
     }
 
@@ -289,13 +289,13 @@ public class AlarmDetailsController {
             @ApiParam(value = "报警类型") @RequestParam(required = false) String alarmType,
             @ApiParam(value = "处理状态") @RequestParam(required = false) Integer opState,
             @ApiParam(value = "所属场景id") @RequestParam(required = false)  Integer sceneId,
-            @ApiParam(value = "报警信息id") @RequestParam(required = false)  Integer[] ids,
+            @ApiParam(value = "报警信息id") @RequestParam(required = false)  List<Integer>  ids,
             @ApiParam(value = "查询：开始时间yyyy-MM-dd") @RequestParam(required = false) String startTime,
             @ApiParam(value = "查询：结束时间yyyy-MM-dd") @RequestParam(required = false) String endTime
     ){
 
-        if(ids != null && ids.length >0){
-            String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsRealTimeDto.class, "实时报警记录",alarmDetailsService.selectRealTimeByIds(Arrays.asList(ids)));
+        if(ids != null && ids.size() >0){
+            String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsRealTimeDto.class, "实时报警记录",alarmDetailsService.selectRealTimeByIds(ids));
             return new AjaxMessage<>(ResultStatus.OK, filePath);
         }
         AlarmDetailsDto alarmDetailsDto = new AlarmDetailsDto();
@@ -318,11 +318,11 @@ public class AlarmDetailsController {
         if(sceneId != null) {
             alarmDetailsDto.setSceneIds(sceneService.findByParentIdsLike(sceneId.longValue()));
             if(alarmDetailsDto.getSceneIds() == null || alarmDetailsDto.getSceneIds().size() == 0){
-                String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警", new ArrayList<>());
+                String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警记录", new ArrayList<>());
                 return new AjaxMessage<>(ResultStatus.OK, filePath);
             }
         }
-        String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsRealTimeDto.class, "实时报警",alarmDetailsService.selectRealTimeList(alarmDetailsDto) );
+        String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsRealTimeDto.class, "实时报警记录",alarmDetailsService.selectRealTimeList(alarmDetailsDto) );
         return new AjaxMessage<>(ResultStatus.OK, filePath);
     }
     @RequestMapping(value="batchDelete" , method = RequestMethod.DELETE)

sms_water/src/main/java/com/huaxu/dto/AlarmDetailsHistoryDto.java

@@ -22,6 +22,9 @@ public class AlarmDetailsHistoryDto implements Serializable {
 
     private static final long serialVersionUID = 6107433946964301057L;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "主键id")
+    private Integer id;
     @ApiModelProperty("所属场景")
     @ExcelProperty(value = "所属场景",index = 0)
     private String sceneName;