巡检修改导出功能呢

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseBicycleController.java

@@ -177,10 +177,11 @@ public class TCommonuseBicycleController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseDownspoutController.java

@@ -145,10 +145,11 @@ public class TCommonuseDownspoutController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseEarplugController.java

@@ -149,10 +149,11 @@ public class TCommonuseEarplugController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseManholeCoverController.java

@@ -181,10 +181,11 @@ public class TCommonuseManholeCoverController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = m;
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseMovementController.java

@@ -182,10 +182,11 @@ public class TCommonuseMovementController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseSafetyBeltController.java

@@ -151,10 +151,11 @@ public class TCommonuseSafetyBeltController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseTesterController.java

@@ -171,10 +171,11 @@ public class TCommonuseTesterController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseWalkieTalkieController.java

@@ -151,10 +151,11 @@ public class TCommonuseWalkieTalkieController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseWaterPumpController.java

@@ -149,10 +149,11 @@ public class TCommonuseWaterPumpController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCabinetController.java

@@ -258,8 +258,10 @@ public class TEmergencyCabinetController extends BaseController {
         TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
         if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
             SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
-            confirmed = sysUser.getSignUrl();
-            confirmedDate = tPatrolPlan.getConfirmDate();
+            if (sysUser!=null) {
+                confirmed = sysUser.getSignUrl();
+                confirmedDate = tPatrolPlan.getConfirmDate();
+            }
         }
         // 循环后下一行
         int nextRowNum = 5 + list.size();
@@ -374,9 +376,10 @@ public class TEmergencyCabinetController extends BaseController {
         Date confirmedDate = null;
         TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
         if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-            SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
-            confirmed = sysUser.getSignUrl();
-            confirmedDate = tPatrolPlan.getConfirmDate();
+            SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
+                confirmed = sysUser.getSignUrl();
+                confirmedDate = tPatrolPlan.getConfirmDate();
+            }
         }
         // 循环后下一行
         int nextRowNum = 5 + list.size();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCctvController.java

@@ -27,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -149,8 +148,10 @@ public class TEmergencyCctvController extends BaseController {
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
                 SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
-                confirmed = sysUser.getSignUrl();
-                confirmedDate = tPatrolPlan.getConfirmDate();
+                if (sysUser != null) {
+                    confirmed = sysUser.getSignUrl();
+                    confirmedDate = tPatrolPlan.getConfirmDate();
+                }
             }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
@@ -200,7 +201,7 @@ public class TEmergencyCctvController extends BaseController {
                 }
                 if (row.getRowNum() == 2) {
                     for (Cell cell : row) {
-                        if (cell.getColumnIndex() == 0 || cell.getColumnIndex() == 1 )
+                        if (cell.getColumnIndex() == 0 || cell.getColumnIndex() == 1)
                             cell.setCellStyle(style2);
                         else
                             cell.setCellStyle(style);
@@ -297,7 +298,7 @@ public class TEmergencyCctvController extends BaseController {
         tEmergencyCctv.setCheckDate(new Date());
         TEmergencyCctv item = tEmergencyCctvService.selectTEmergencyCctvById(tEmergencyCctv.getId());
         TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(tEmergencyCctv.getPlanId());
-        if (tPatrolPlan.getStatus()==1){
+        if (tPatrolPlan.getStatus() == 1) {
             return AjaxResult.error("当前选择的计划已确认！");
         }
         if (!"1".equals(item.getCheckStatus())) {

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCofferdamController.java

@@ -148,10 +148,11 @@ public class TEmergencyCofferdamController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyEyewashController.java

@@ -185,8 +185,10 @@ public class TEmergencyEyewashController extends BaseController {
         TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
         if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
             SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
-            confirmed = sysUser.getSignUrl();
-            confirmedDate = tPatrolPlan.getConfirmDate();
+            if (sysUser!=null) {
+                confirmed = sysUser.getSignUrl();
+                confirmedDate = tPatrolPlan.getConfirmDate();
+            }
         }
         // 28行
         int nextRowNum = 5 + list.size();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyPagaController.java

@@ -153,10 +153,11 @@ public class TEmergencyPagaController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAlarmController.java

@@ -173,10 +173,11 @@ public class TFireAlarmController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAnnihilatorController.java

@@ -188,9 +188,10 @@ public class TFireAnnihilatorController extends BaseController {
         Date confirmedDate = null;
         TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
         if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-            SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
-            confirmed = sysUser.getSignUrl();
-            confirmedDate = tPatrolPlan.getConfirmDate();
+            SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
+                confirmed = sysUser.getSignUrl();
+                confirmedDate = tPatrolPlan.getConfirmDate();
+            }
         }
         // 循环后下一行
         int nextRowNum = 5 + list.size();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireDoorController.java

@@ -232,9 +232,10 @@ public class TFireDoorController extends BaseController {
         Date confirmedDate = null;
         TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
         if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-            SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
-            confirmed = sysUser.getSignUrl();
-            confirmedDate = tPatrolPlan.getConfirmDate();
+            SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
+                confirmed = sysUser.getSignUrl();
+                confirmedDate = tPatrolPlan.getConfirmDate();
+            }
         }
         // 循环后下一行
         int nextRowNum = 5 + list.size();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireGasShieldController.java

@@ -159,10 +159,11 @@ public class TFireGasShieldController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireHoseBoxController.java

@@ -155,10 +155,11 @@ public class TFireHoseBoxController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFirePostFireController.java

@@ -155,10 +155,11 @@ public class TFirePostFireController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSandboxController.java

@@ -148,10 +148,11 @@ public class TFireSandboxController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSprinklerController.java

@@ -160,10 +160,11 @@ public class TFireSprinklerController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireStandpipeController.java

@@ -151,10 +151,11 @@ public class TFireStandpipeController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSteamCurtainController.java

@@ -147,10 +147,11 @@ public class TFireSteamCurtainController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireWaterCannonController.java

@@ -155,10 +155,11 @@ public class TFireWaterCannonController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireWeathervaneController.java

@@ -179,10 +179,11 @@ public class TFireWeathervaneController extends BaseController {
             Date confirmedDate = null;
             TPatrolPlan tPatrolPlan = tPatrolPlanService.selectTPatrolPlanById(planId);
             if (Objects.nonNull(tPatrolPlan) && Objects.nonNull(tPatrolPlan.getConfirmed())) {
-                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));
+                SysUser sysUser = sysUserService.selectUserById(Long.valueOf(tPatrolPlan.getConfirmed()));            if (sysUser!=null) {
                 confirmed = sysUser.getSignUrl();
                 confirmedDate = tPatrolPlan.getConfirmDate();
             }
+            }
             // 循环后下一行
             int nextRowNum = 5 + list.size();
             XSSFRow row28 = sheet.createRow(nextRowNum);

ui/src/main.js

@@ -47,6 +47,7 @@ import DictData from '@/components/DictData'
 
 // 函数节流
 import throttle from "@/utils/throttle";
+import {download2} from "@/utils/request";
 Vue.prototype.$throttle = throttle;
 
 
@@ -62,6 +63,7 @@ Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
+Vue.prototype.download2 = download2
 Vue.prototype.handleTree = handleTree
 Vue.prototype.echarts = echarts
 Vue.prototype.officeConvert = officeConvert

ui/src/utils/request.js

@@ -1,9 +1,12 @@
 import axios from 'axios'
-import { Notification, MessageBox, Message } from 'element-ui'
+import {Notification, MessageBox, Message, Loading} from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
+import {blobValidate, download, tansParams} from "@/utils/ruoyi";
+import { saveAs } from 'file-saver'
 
+let downloadLoadingInstance;
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
@@ -79,4 +82,31 @@ service.interceptors.response.use(res => {
   }
 )
 
+
+// 通用下载方法
+export function download2(url, params, filename, config) {
+  downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+  return service.post(url, params, {
+    transformRequest: [(params) => { return tansParams(params) }],
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    responseType: 'blob',
+    ...config
+  }).then(async (data) => {
+    const isBlob = blobValidate(data);
+    if (isBlob) {
+      const blob = new Blob([data])
+      saveAs(blob, filename)
+    } else {
+      const resText = await data.text();
+      const rspObj = JSON.parse(resText);
+      download(rspObj.msg);
+    }
+    downloadLoadingInstance.close();
+  }).catch((r) => {
+    console.error(r)
+    Message.error('下载文件出现错误，请联系管理员！')
+    downloadLoadingInstance.close();
+  })
+}
+
 export default service

ui/src/utils/ruoyi.js

@@ -100,6 +100,39 @@ export function download(fileName) {
 	window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
 }
 
+
+/**
+ * 参数处理
+ * @param {*} params  参数
+ */
+export function tansParams(params) {
+  let result = ''
+  for (const propName of Object.keys(params)) {
+    const value = params[propName];
+    var part = encodeURIComponent(propName) + "=";
+    if (value !== null && value !== "" && typeof (value) !== "undefined") {
+      if (typeof value === 'object') {
+        for (const key of Object.keys(value)) {
+          if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
+            let params = propName + '[' + key + ']';
+            var subPart = encodeURIComponent(params) + "=";
+            result += subPart + encodeURIComponent(value[key]) + "&";
+          }
+        }
+      } else {
+        result += part + encodeURIComponent(value) + "&";
+      }
+    }
+  }
+  return result
+}
+
+// 验证是否为blob格式
+export function blobValidate(data) {
+  return data.type !== 'application/json'
+}
+
+
 // 字符串格式化(%s )
 export function sprintf(str) {
 	var args = arguments, flag = true, i = 1;

ui/src/views/patrol/commonuse/bicycle/index.vue

@@ -445,7 +445,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('commonuse/bicycle/export', {
+      this.download2('commonuse/bicycle/export', {
         ...this.queryParams
       }, `bicycle_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/commonuse/cover/index.vue

@@ -360,7 +360,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('commonuse/cover/export', {
+      this.download2('commonuse/cover/export', {
         ...this.queryParams
       }, `cover_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/commonuse/downspout/index.vue

@@ -355,7 +355,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('commonuse/downspout/export', {
+      this.download2('commonuse/downspout/export', {
         ...this.queryParams
       }, `downspout_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/commonuse/earplug/index.vue

@@ -362,7 +362,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('commonuse/earplug/export', {
+      this.download2('commonuse/earplug/export', {
         ...this.queryParams
       }, `earplug_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/commonuse/movement/index.vue

@@ -376,7 +376,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('commonuse/movement/export', {
+      this.download2('commonuse/movement/export', {
         ...this.queryParams
       }, `movement_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/commonuse/pump/index.vue

@@ -366,7 +366,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('commonuse/pump/export', {
+      this.download2('commonuse/pump/export', {
         ...this.queryParams
       }, `pump_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/commonuse/safetyBelt/index.vue

@@ -373,7 +373,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('commonuse/safetyBelt/export', {
+      this.download2('commonuse/safetyBelt/export', {
         ...this.queryParams
       }, `safetyBelt_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/commonuse/tester/index.vue

@@ -466,7 +466,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('commonuse/tester/export', {
+      this.download2('commonuse/tester/export', {
         ...this.queryParams
       }, `tester_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/commonuse/walkitTalkie/index.vue

@@ -369,7 +369,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('commonuse/walkitTalkie/export', {
+      this.download2('commonuse/walkitTalkie/export', {
         ...this.queryParams
       }, `walkitTalkie_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/dev/alarm/index.vue

@@ -323,13 +323,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/alarm/export', {
+      this.download2('dev/alarm/export', {
         ...this.queryParams
       }, `alarm_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/alarm/exportQRCode', {
+      this.download2('dev/alarm/exportQRCode', {
         ...this.queryParams
       }, `alarmQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/annihilator/index.vue

@@ -373,13 +373,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/annihilator/export', {
+      this.download2('dev/annihilator/export', {
         ...this.queryParams
       }, `annihilator_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/annihilator/exportQRCode', {
+      this.download2('dev/annihilator/exportQRCode', {
         ...this.queryParams
       }, `annihilatorQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/bicycle/index.vue

@@ -301,13 +301,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/bicycle/export', {
+      this.download2('dev/bicycle/export', {
         ...this.queryParams
       }, `bicycle_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/bicycle/exportQRCode', {
+      this.download2('dev/bicycle/exportQRCode', {
         ...this.queryParams
       }, `bicycleQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/cabinet/index.vue

@@ -422,13 +422,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/cabinet/export', {
+      this.download2('dev/cabinet/export', {
         ...this.queryParams
       }, `cabinet_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/cabinet/exportQRCode', {
+      this.download2('dev/cabinet/exportQRCode', {
         ...this.queryParams
       }, `cabinetQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/cannon/index.vue

@@ -316,13 +316,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/cannon/exportQRCode', {
+      this.download2('dev/cannon/exportQRCode', {
         ...this.queryParams
       }, `消防水炮QRCode_${new Date().getTime()}.docx`)
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/cannon/export', {
+      this.download2('dev/cannon/export', {
         ...this.queryParams
       }, `消防水炮_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/dev/cctv/index.vue

@@ -304,13 +304,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/cctv/export', {
+      this.download2('dev/cctv/export', {
         ...this.queryParams
       }, `cctv_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/cctv/exportQRCode', {
+      this.download2('dev/cctv/exportQRCode', {
         ...this.queryParams
       }, `cctvQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/cofferdam/index.vue

@@ -313,13 +313,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/cofferdam/export', {
+      this.download2('dev/cofferdam/export', {
         ...this.queryParams
       }, `cofferdam_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/cofferdam/exportQRCode', {
+      this.download2('dev/cofferdam/exportQRCode', {
         ...this.queryParams
       }, `cofferdamQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/cover/index.vue

@@ -318,13 +318,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/cover/export', {
+      this.download2('dev/cover/export', {
         ...this.queryParams
       }, `cover_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/cover/exportQRCode', {
+      this.download2('dev/cover/exportQRCode', {
         ...this.queryParams
       }, `coverQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/curtain/index.vue

@@ -304,13 +304,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/curtain/export', {
+      this.download2('dev/curtain/export', {
         ...this.queryParams
       }, `curtain_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/curtain/exportQRCode', {
+      this.download2('dev/curtain/exportQRCode', {
         ...this.queryParams
       }, `curtainQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/door/index.vue

@@ -357,13 +357,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/door/export', {
+      this.download2('dev/door/export', {
         ...this.queryParams
       }, `door_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/door/exportQRCode', {
+      this.download2('dev/door/exportQRCode', {
         ...this.queryParams
       }, `doorQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/downspout/index.vue

@@ -304,13 +304,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/downspout/export', {
+      this.download2('dev/downspout/export', {
         ...this.queryParams
       }, `downspout_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/downspout/exportQRCode', {
+      this.download2('dev/downspout/exportQRCode', {
         ...this.queryParams
       }, `downspoutQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/earplug/index.vue

@@ -318,13 +318,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/earplug/export', {
+      this.download2('dev/earplug/export', {
         ...this.queryParams
       }, `earplug_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/earplug/exportQRCode', {
+      this.download2('dev/earplug/exportQRCode', {
         ...this.queryParams
       }, `earplugQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/eyewash/index.vue

@@ -317,13 +317,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/eyewash/export', {
+      this.download2('dev/eyewash/export', {
         ...this.queryParams
       }, `eyewash_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/eyewash/exportQRCode', {
+      this.download2('dev/eyewash/exportQRCode', {
         ...this.queryParams
       }, `eyewashQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/hoseBox/index.vue

@@ -326,13 +326,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/hoseBox/export', {
+      this.download2('dev/hoseBox/export', {
         ...this.queryParams
       }, `hoseBox_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/hoseBox/exportQRCode', {
+      this.download2('dev/hoseBox/exportQRCode', {
         ...this.queryParams
       }, `消防水带箱QRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/movement/index.vue

@@ -345,13 +345,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/movement/export', {
+      this.download2('dev/movement/export', {
         ...this.queryParams
       }, `movement_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/movement/exportQRCode', {
+      this.download2('dev/movement/exportQRCode', {
         ...this.queryParams
       }, `movementQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/paga/index.vue

@@ -318,13 +318,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/paga/export', {
+      this.download2('dev/paga/export', {
         ...this.queryParams
       }, `paga_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/paga/exportQRCode', {
+      this.download2('dev/paga/exportQRCode', {
         ...this.queryParams
       }, `pagaQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/postFire/index.vue

@@ -318,13 +318,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/postFire/export', {
+      this.download2('dev/postFire/export', {
         ...this.queryParams
       }, `postFire_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/postFire/exportQRCode', {
+      this.download2('dev/postFire/exportQRCode', {
         ...this.queryParams
       }, `地上消火栓QRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/pump/index.vue

@@ -321,13 +321,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/pump/export', {
+      this.download2('dev/pump/export', {
         ...this.queryParams
       }, `pump_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/pump/exportQRCode', {
+      this.download2('dev/pump/exportQRCode', {
         ...this.queryParams
       }, `pumpQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/safetyBelt/index.vue

@@ -330,13 +330,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/safetyBelt/export', {
+      this.download2('dev/safetyBelt/export', {
         ...this.queryParams
       }, `safetyBelt_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/safetyBelt/exportQRCode', {
+      this.download2('dev/safetyBelt/exportQRCode', {
         ...this.queryParams
       }, `safetyBeltQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/sandbox/index.vue

@@ -318,13 +318,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/sandbox/export', {
+      this.download2('dev/sandbox/export', {
         ...this.queryParams
       }, `sandbox_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/sandbox/exportQRCode', {
+      this.download2('dev/sandbox/exportQRCode', {
         ...this.queryParams
       }, `应急沙箱QRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/shield/index.vue

@@ -306,13 +306,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/shield/export', {
+      this.download2('dev/shield/export', {
         ...this.queryParams
       }, `shield_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/shield/exportQRCode', {
+      this.download2('dev/shield/exportQRCode', {
         ...this.queryParams
       }, `shieldQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/sprinkler/index.vue

@@ -318,13 +318,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/sprinkler/export', {
+      this.download2('dev/sprinkler/export', {
         ...this.queryParams
       }, `sprinkler_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/sprinkler/exportQRCode', {
+      this.download2('dev/sprinkler/exportQRCode', {
         ...this.queryParams
       }, `sprinklerQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/standpipe/index.vue

@@ -318,13 +318,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/standpipe/export', {
+      this.download2('dev/standpipe/export', {
         ...this.queryParams
       }, `standpipe_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/standpipe/exportQRCode', {
+      this.download2('dev/standpipe/exportQRCode', {
         ...this.queryParams
       }, `消防竖管QRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/tester/index.vue

@@ -335,13 +335,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/tester/export', {
+      this.download2('dev/tester/export', {
         ...this.queryParams
       }, `tester_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/tester/exportQRCode', {
+      this.download2('dev/tester/exportQRCode', {
         ...this.queryParams
       }, `检测仪QRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/walkieTalkie/index.vue

@@ -304,13 +304,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/walkieTalkie/export', {
+      this.download2('dev/walkieTalkie/export', {
         ...this.queryParams
       }, `walkieTalkie_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/walkieTalkie/exportQRCode', {
+      this.download2('dev/walkieTalkie/exportQRCode', {
         ...this.queryParams
       }, `walkieTalkieQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/dev/weathervane/index.vue

@@ -335,13 +335,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dev/weathervane/export', {
+      this.download2('dev/weathervane/export', {
         ...this.queryParams
       }, `weathervane_${new Date().getTime()}.xlsx`)
     },
     /** 导出按钮操作 */
     handleExportQRCode() {
-      this.download('dev/weathervane/exportQRCode', {
+      this.download2('dev/weathervane/exportQRCode', {
         ...this.queryParams
       }, `weathervaneQRCode_${new Date().getTime()}.docx`)
     }

ui/src/views/patrol/emergency/cabinet/index.vue

@@ -462,7 +462,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('emergency/cabinet/export', {
+      this.download2('emergency/cabinet/export', {
         ...this.queryParams
       }, `cabinet_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/emergency/cctv/index.vue

@@ -368,7 +368,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('emergency/cctv/export', {
+      this.download2('emergency/cctv/export', {
         ...this.queryParams
       }, `cctv_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/emergency/cofferdam/index.vue

@@ -366,7 +366,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('emergency/cofferdam/export', {
+      this.download2('emergency/cofferdam/export', {
         ...this.queryParams
       }, `cofferdam_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/emergency/eyewash/index.vue

@@ -550,7 +550,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('emergency/eyewash/export', {
+      this.download2('emergency/eyewash/export', {
         ...this.queryParams
       }, `eyewash_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/emergency/paga/index.vue

@@ -497,7 +497,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('emergency/paga/export', {
+      this.download2('emergency/paga/export', {
         ...this.queryParams
       }, `paga_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/alarm/index.vue

@@ -470,7 +470,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/alarm/export', {
+      this.download2('fire/alarm/export', {
         ...this.queryParams
       }, `alarm_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/annihilator/index.vue

@@ -587,7 +587,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/annihilator/export', {
+      this.download2('fire/annihilator/export', {
         ...this.queryParams
       }, `annihilator_${new Date().getTime()}.xlsx`)
     },

ui/src/views/patrol/fire/cannon/index.vue

@@ -441,7 +441,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/cannon/export', {
+      this.download2('fire/cannon/export', {
         ...this.queryParams
       }, `cannon_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/curtain/index.vue

@@ -363,7 +363,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/curtain/export', {
+      this.download2('fire/curtain/export', {
         ...this.queryParams
       }, `curtain_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/door/index.vue

@@ -439,7 +439,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/door/export', {
+      this.download2('fire/door/export', {
         ...this.queryParams
       }, `door_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/hoseBox/index.vue

@@ -513,7 +513,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/hoseBox/export', {
+      this.download2('fire/hoseBox/export', {
         ...this.queryParams
       }, `hoseBox_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/postFire/index.vue

@@ -507,7 +507,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/postFire/export', {
+      this.download2('fire/postFire/export', {
         ...this.queryParams
       }, `postFire_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/sandbox/index.vue

@@ -487,7 +487,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/sandbox/export', {
+      this.download2('fire/sandbox/export', {
         ...this.queryParams
       }, `sandbox_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/shield/index.vue

@@ -540,7 +540,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/shield/export', {
+      this.download2('fire/shield/export', {
         ...this.queryParams
       }, `shield_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/sprinkler/index.vue

@@ -494,7 +494,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/sprinkler/export', {
+      this.download2('fire/sprinkler/export', {
         ...this.queryParams
       }, `sprinkler_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/standpipe/index.vue

@@ -497,7 +497,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/standpipe/export', {
+      this.download2('fire/standpipe/export', {
         ...this.queryParams
       }, `standpipe_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/fire/weathervane/index.vue

@@ -381,7 +381,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('fire/weathervane/export', {
+      this.download2('fire/weathervane/export', {
         ...this.queryParams
       }, `weathervane_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/patrol/file/index.vue

@@ -401,7 +401,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('patrol/file/export', {
+      this.download2('patrol/file/export', {
         ...this.queryParams
       }, `file_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/patrol/issues/index.vue

@@ -324,7 +324,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('/patrol/issues/export', {
+      this.download2('/patrol/issues/export', {
         ...this.queryParams
       }, `issues_${new Date().getTime()}.xlsx`)
     }

ui/src/views/patrol/patrol/main/index.vue

@@ -579,7 +579,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('patrol/main/export', {
+      this.download2('patrol/main/export', {
         ...this.queryParams
       }, `main_${new Date().getTime()}.xlsx`)
     },

ui/src/views/patrol/patrol/plan/index.vue

@@ -598,7 +598,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('patrol/plan/export', {
+      this.download2('patrol/plan/export', {
         ...this.queryParams
       }, `plan_${new Date().getTime()}.xlsx`)
     }