险情管理导出

wangqian
1 parent 02dfba2e
Showing 3 changed files with 22 additions and 12 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ExportBusiCodeEnum.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/filedownload/FileDownloadServiceImpl.java
@@ -124,7 +124,7 @@ public class EmergencyTaskController {
                 emergencyExportHandler
         );
         // 直接返回成功通知
-        return CommonResult.success("导出任务已提交，数据正在后台生成，请稍后下载");
+        return CommonResult.success("数据生成中，请稍后下载");
     }
     @GetMapping("/export-excel-new")
@@ -135,7 +135,7 @@ public class EmergencyTaskController {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<EmergencyTaskRespVO> list = emergencyTaskService.getEmergencyTaskPage(pageReqVO).getList();
         if (CollectionUtil.isEmpty(list)) {
-            return null;
+            return CommonResult.error(1 ,"暂无数据，无法导出");
         }
         // 创建异步任务
         // 2. 调用调度服务创建任务
@@ -145,6 +145,6 @@ public class EmergencyTaskController {
                 emergencyExportNewHandler
         );
          // 返回成功提示
-        return success("导出任务已提交，数据正在后台生成，请稍后下载");
+        return success("数据生成中，请稍后下载");
     }
 }
@@ -12,9 +12,9 @@ import java.time.format.DateTimeFormatter;
 public enum ExportBusiCodeEnum {
     /** 旧版抢险案件导出 */
-    EMERGENCY_TASK_OLD("EmergencyTaskExcle", "险情管理", "抢险案件表", "险情案件", ".xlsx"),
+    EMERGENCY_TASK_OLD("EmergencyTaskExcle", "险情管理", "应急抢险列表", "抢险案件表", ".xlsx"),
     /** 新版抢险案件导出 */
-    EMERGENCY_TASK_NEW("EmergencyTaskExcleNew", "险情管理", "抢险案件表", "险情案件", ".xlsx");
+    EMERGENCY_TASK_NEW("EmergencyTaskExcleNew", "险情管理", "应急抢险", "抢险案件表", ".xlsx");
     /** 业务编码 */
     private final String busiCode;
@@ -97,15 +97,17 @@ public class FileDownloadServiceImpl implements FileDownloadService {
         // 1. 查询下载任务记录
         FileDownloadDO fileDownload = fileDownloadMapper.selectById(id);
         if (fileDownload == null) {
-            try {
-                response.setContentType("text/plain;charset=UTF-8");
-                response.getWriter().write("下载任务不存在");
-            } catch (IOException e) {
-                throw exception0( 400, e.getMessage());
-            }
+            writeMsg(response, "下载任务不存在");
+            return;
+        }
+        if (fileDownload.getStatus() == 1 || fileDownload.getStatus() == 0) {
+            writeMsg(response, "任务正在下载中，请稍后重试");
+            return;
+        }
+        if (fileDownload.getStatus() == 3) {
+            writeMsg(response, "导出文件异常,请重新导出");
             return;
         }
-
         // 2. 组装文件对象（替换为你DO中实际的文件路径/文件名字段）
         String filePath = fileDownload.getFilePath();
         String fileName = fileDownload.getFileName();
@@ -163,4 +165,12 @@ public class FileDownloadServiceImpl implements FileDownloadService {
         }
     }
+    private void writeMsg(HttpServletResponse response, String msg) {
+        try {
+            response.setContentType("text/plain;charset=UTF-8");
+            response.getWriter().write(msg);
+        } catch (IOException e) {
+            throw exception0(400, e.getMessage());
+        }
+    }
 }