1.防火监督联调

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/ExcelUtil.java

@@ -257,7 +257,7 @@ public class ExcelUtil {
         //创建本地文件
         String filePath = fileName + excelTypeEnum.getValue();
         try {
-            fileName = new String(filePath.getBytes(),"UTF-8");
+            fileName = new String(filePath.getBytes(), StandardCharsets.UTF_8);
             response.setCharacterEncoding(StandardCharsets.UTF_8.name());
             response.setContentType("application/vnd.ms-excel");
             response.addHeader("Content-Disposition", "filename=" + fileName);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/DangerFeignClient.java

@@ -51,7 +51,7 @@ public interface DangerFeignClient {
      * @return FeignClientResult
      */
     @GetMapping(value = "/page/list")
-    FeignClientResult<IPage<DangerDto>> pageList(Page page, @RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState);
+    FeignClientResult<Page<DangerDto>> pageList(Page page, @RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState);
 
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -113,8 +113,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         List<HiddenDangerDto> dangers = hiddenDangerMapper.listByCondition(planId, pointId);
         List<Long> dangerIds = Lists.transform(dangers, HiddenDangerDto::getLatentDangerId);
         String dangerIdsStr = Joiner.on(",").join(dangerIds);
-        FeignClientResult<IPage<DangerDto>> feignClientResult = feignClient.pageList(page, dangerIdsStr, level, status);
-        IPage<DangerDto> dangerDtoIPage = feignClientResult.getResult();
+        FeignClientResult<Page<DangerDto>> feignClientResult = feignClient.pageList(page, dangerIdsStr, level, status);
+        Page<DangerDto> dangerDtoIPage = feignClientResult.getResult();
         Map<Long, HiddenDangerDto> keyMap = dangers.stream().collect(Collectors.toMap(HiddenDangerDto::getLatentDangerId, Function.identity()));
         dangerDtoIPage.getRecords().forEach(r -> {
             HiddenDangerDto hiddenDangerDto = keyMap.get(r.getId());
@@ -172,7 +172,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
 
     @Override
     public void exportDangerData(String planId, Long pointId, String level, String status, HttpServletResponse response) {
+        String fileName = "隐患问题清单_" + System.currentTimeMillis();
         List<HiddenDangerExportDataDto> dtoList = this.listAll(planId, pointId, level, status);
-        ExcelUtil.createTemplate(response, "隐患问题清单", "隐患问题清单", dtoList, HiddenDangerExportDataDto.class, dataSources, false);
+        ExcelUtil.createTemplate(response, fileName, "隐患问题清单", dtoList, HiddenDangerExportDataDto.class, dataSources, false);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IHiddenDangerService.java

@@ -72,5 +72,13 @@ public interface IHiddenDangerService {
      * @param dtoList数据
      * @param response 响应
      */
+    /**
+     * 隐患数据导出
+     * @param planId 计划id
+     * @param pointId 点id
+     * @param level   隐患级别
+     * @param status  状态
+     * @param response 响应
+     */
     void exportDangerData(String planId, Long pointId, String level, String status, HttpServletResponse response);
 }