危险作业导出

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/RiskJobServiceImpl.java

@@ -245,44 +245,44 @@ public class RiskJobServiceImpl implements RiskJobService {
                 throw new RuntimeException("未找到该动火作业信息！");
             }
             processAspDhzyDo(dhzyDo, wordMap, sysDictDoList);
-        }  if ("受限空间作业".equals(jobtype)) {
+        } else if ("受限空间作业".equals(jobtype)) {
             AspSxkjzyDo sxkjzyDo = sxkjzyService.getById(id);
 
             if (sxkjzyDo == null) {
                 throw new RuntimeException("未找到该受限空间作业信息！");
             }
             processAspSxkjzyDo(sxkjzyDo, wordMap, sysDictDoList);
-        }if ("高处作业".equals(jobtype)) {
+        }else if ("高处作业".equals(jobtype)) {
             AspGczyDo aspGczyDo = aspGczyService.getById(id);
             if(aspGczyDo == null){
                 throw new RuntimeException("未找到该高处作业信息！");
             }
             processAspGczyDo(aspGczyDo, wordMap, sysDictDoList);
-        }if ("吊装作业".equals(jobtype)) {
+        }else if ("吊装作业".equals(jobtype)) {
             AspDzzyDo aspDzzyDo = aspDzzyService.getById(id);
             if(aspDzzyDo == null){
                 throw new RuntimeException("未找到该吊装作业信息！");
             }
             processAspDzzyDo(aspDzzyDo, wordMap, sysDictDoList);
-        }if ("临时用电作业".equals(jobtype)) {
+        }else if ("临时用电作业".equals(jobtype)) {
             AspLsydzyDo aspLsydzyDo = aspLsydzyService.getById(id);
             if(aspLsydzyDo == null){
                 throw new RuntimeException("未找到该临时用电作业信息！");
             }
             processAspLsydzyDo(aspLsydzyDo,wordMap,sysDictDoList);
-        }if ("动土作业".equals(jobtype)) {
+        }else if ("动土作业".equals(jobtype)) {
             AspDtzyDo aspdtzyDo = aspDtzyService.getById(id);
             if(aspdtzyDo == null){
                 throw new RuntimeException("未找到该动土作业信息！");
             }
             processAspDtzyDo(aspdtzyDo,wordMap,sysDictDoList);
-        }if ("断路作业".equals(jobtype)) {
+        }else if ("断路作业".equals(jobtype)) {
             AspDlzzDo aspdlzzDo = aspDlzzService.getById(id);
             if(aspdlzzDo == null){
                 throw new RuntimeException("未找到该断路作业信息！");
             }
             processAspDlzzDo(aspdlzzDo,wordMap,sysDictDoList);
-        }if ("盲板抽堵".equals(jobtype)) {
+        }else if ("盲板抽堵".equals(jobtype)) {
             AspMbcdzyDo aspmbcdzyDo = aspMbcdzyService.getById(id);
             if(aspmbcdzyDo == null){
                 throw new RuntimeException("未找到该盲板抽堵作业信息！");

js-security/security-server/src/main/java/com/rongwei/savecheck/controller/RiskJobController.java

@@ -22,10 +22,16 @@ public class RiskJobController {
 
     @PostMapping("/formExcelExport")
     public void formExcelExport(@RequestBody Map<String, String> params, HttpServletResponse response) throws Exception {
+        log.info("开始导出");
         String id = params.get("id");
         String jobtype = params.get("jobtype");
         String  tenantid = params.get("tenantid");
-        riskJobService.riskJobExport2(id, jobtype,tenantid, response);
+        try{
+            riskJobService.riskJobExport2(id, jobtype,tenantid, response);
+        } catch (Exception e) {
+            log.error("导出失败", e);
+        }
+
     }