PSSR主清单导出（巡检）

master/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -496,6 +496,12 @@ public class ExcelUtil<T>
         return exportExcel();
     }
 
+    public AjaxResult exportExcelNoEncoding(List<T> list, String sheetName)
+    {
+        this.init(list, sheetName, Type.EXPORT);
+        return exportExcelNoEncoding();
+    }
+
     public AjaxResult exportExcel(List<T> list, String sheetName , String title)
     {
         this.init(list, sheetName, Type.EXPORT ,title);
@@ -605,6 +611,91 @@ public class ExcelUtil<T>
         }
     }
 
+    public AjaxResult exportExcelNoEncoding()
+    {
+        OutputStream out = null;
+        try
+        {
+            // 取出一共有多少个sheet.
+            double sheetNo = Math.ceil(list.size() / sheetSize);
+            for (int index = 0; index <= sheetNo; index++)
+            {
+                createSheet(sheetNo, index);
+
+                if (StringUtils.isNotEmpty(this.title)){
+                    Row row1 = sheet.createRow(0);
+                    row1.setHeight((short) 800);
+                    // 创建列
+                    Cell cell = row1.createCell(0);
+                    // 写入列信息
+                    cell.setCellValue(this.title);
+                    CellStyle style = wb.createCellStyle();
+                    style.cloneStyleFrom(styles.get("data"));
+                    style.setAlignment(HorizontalAlignment.LEFT);
+                    style.setVerticalAlignment(VerticalAlignment.CENTER);
+                    style.setFillForegroundColor(IndexedColors.YELLOW.getIndex());
+                    style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+                    Font headerFont = wb.createFont();
+                    headerFont.setFontName("Arial");
+                    headerFont.setFontHeightInPoints((short) 20);
+                    headerFont.setBold(false);
+                    headerFont.setColor(IndexedColors.BLACK.getIndex());
+                    style.setFont(headerFont);
+                    cell.setCellStyle(style);
+                    CellRangeAddress region = new CellRangeAddress(0, 0, 0, fields.size()-1);
+                    sheet.addMergedRegion(region);
+                }
+                // 产生一行
+                Row row = sheet.createRow(1);
+                int column = 0;
+                // 写入各个字段的列头名称
+                for (Object[] os : fields)
+                {
+                    Excel excel = (Excel) os[1];
+                    this.createCell(excel, row, column++);
+                }
+                if (Type.EXPORT.equals(type))
+                {
+                    fillExcelData(index, row);
+                    addStatisticsRow();
+                }
+            }
+            out = new FileOutputStream(getAbsoluteFile(sheetName));
+            wb.write(out);
+            return AjaxResult.success(sheetName);
+        }
+        catch (Exception e)
+        {
+            log.error("导出Excel异常{}", e.getMessage());
+            throw new CustomException("导出Excel失败，请联系网站管理员！");
+        }
+        finally
+        {
+            if (wb != null)
+            {
+                try
+                {
+                    wb.close();
+                }
+                catch (IOException e1)
+                {
+                    e1.printStackTrace();
+                }
+            }
+            if (out != null)
+            {
+                try
+                {
+                    out.close();
+                }
+                catch (IOException e1)
+                {
+                    e1.printStackTrace();
+                }
+            }
+        }
+    }
+
     /**
      * 填充excel数据
      *

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

@@ -38,6 +38,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 检测仪检查记录Controller
@@ -267,7 +268,7 @@ public class TCommonuseTesterController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_16_便携式检测仪_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -38,6 +38,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 应急事故柜Controller
@@ -159,7 +160,7 @@ public class TEmergencyCabinetController extends BaseController {
             }
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_应急事故柜检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * CCTV系统Controller
@@ -238,7 +239,7 @@ public class TEmergencyCctvController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 6));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_15_通讯监控_CCTV系统检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -33,10 +33,7 @@ import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 洗眼器检查记录Controller
@@ -284,7 +281,7 @@ public class TEmergencyEyewashController extends BaseController {
         sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 15));
 
         //返回
-        String fileName = ExcelUtil.encodingFilename("main");
+        String fileName =  "PSSR_13_消气防设施_淋浴洗眼器检查记录_" + UUID.randomUUID().toString() + ".xlsx";
         OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
         workbook.write(os);
         workbook.close();

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

@@ -37,6 +37,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * PAGA系统Controller
@@ -243,7 +244,7 @@ public class TEmergencyPagaController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 7));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_15_通讯监控_PAGA系统检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -113,7 +113,7 @@ public class TFireAidkitController extends BaseController {
             if (confirmedDate!=null){
                 sheet.getRow(5).getCell(3).setCellValue(DateUtils.dateTime(confirmedDate));
             }
-            filename =  "Aidkit" + UUID.randomUUID().toString() + ".xlsx";
+            filename =  "PSSR_13_消气防设施_急救箱检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -38,6 +38,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 现场可燃气体检测器/火灾报警系统Controller
@@ -263,7 +264,7 @@ public class TFireAlarmController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 7));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_现场可燃气体检测器、火灾报警系统检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -277,7 +277,7 @@ public class TFireAnnihilatorController extends BaseController {
         sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 10));
 
         //返回
-        String fileName = ExcelUtil.encodingFilename("main");
+        String fileName =  "PSSR_13_消气防设施_手提式、小推车式灭火器、灭火器材箱检查记录_" + UUID.randomUUID().toString() + ".xlsx";
         OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
         workbook.write(os);
         workbook.close();

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 常闭式防爆门/防火门Controller
@@ -149,7 +150,7 @@ public class TFireDoorController extends BaseController {
                 sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
             }
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_常闭式防爆门、防火门检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * CO2气体保护系统Controller
@@ -253,7 +254,7 @@ public class TFireGasShieldController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 10));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_气体保护系统检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 消防水带箱检查记录Controller
@@ -245,7 +246,7 @@ public class TFireHoseBoxController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_消防水带箱检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 地上消火栓检查记录检查记录Controller
@@ -245,7 +246,7 @@ public class TFirePostFireController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_地上消火栓检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 应急沙箱Controller
@@ -238,7 +239,7 @@ public class TFireSandboxController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 6));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_应急沙箱检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 自动喷淋灭火系统检查记录Controller
@@ -250,7 +251,7 @@ public class TFireSprinklerController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 10));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_自动喷淋灭火系统检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 消防竖管Controller
@@ -241,7 +242,7 @@ public class TFireStandpipeController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 7));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_消防竖管检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 蒸汽幕检查记录Controller
@@ -241,7 +242,7 @@ public class TFireSteamCurtainController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 6));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_蒸汽幕检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -36,6 +36,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 消防水炮检查记录Controller
@@ -245,7 +246,7 @@ public class TFireWaterCannonController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_消防水炮检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

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

@@ -38,6 +38,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 /**
  * 风向标/风向袋/新风系统正压计Controller
@@ -268,7 +269,7 @@ public class TFireWeathervaneController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
 
             //返回
-            String fileName = ExcelUtil.encodingFilename("main");
+            String fileName =  "PSSR_13_消气防设施_获取风向标、风向袋、新风系统正压计检查记录_" + UUID.randomUUID().toString() + ".xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -16,6 +16,22 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.approve.damain.DevTask;
 import com.ruoyi.project.listener.invoiceApprove.YhzgTaskCreateListener;
 import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
+import com.ruoyi.project.patrol.commonuse.controller.TCommonuseTesterController;
+import com.ruoyi.project.patrol.commonuse.domain.TCommonuseTester;
+import com.ruoyi.project.patrol.dev.controller.TDevCctvController;
+import com.ruoyi.project.patrol.dev.controller.TDevPagaController;
+import com.ruoyi.project.patrol.dev.domain.TDevCctv;
+import com.ruoyi.project.patrol.dev.domain.TDevPaga;
+import com.ruoyi.project.patrol.emergency.controller.TEmergencyCabinetController;
+import com.ruoyi.project.patrol.emergency.controller.TEmergencyCctvController;
+import com.ruoyi.project.patrol.emergency.controller.TEmergencyEyewashController;
+import com.ruoyi.project.patrol.emergency.controller.TEmergencyPagaController;
+import com.ruoyi.project.patrol.emergency.domain.TEmergencyCabinet;
+import com.ruoyi.project.patrol.emergency.domain.TEmergencyCctv;
+import com.ruoyi.project.patrol.emergency.domain.TEmergencyEyewash;
+import com.ruoyi.project.patrol.emergency.domain.TEmergencyPaga;
+import com.ruoyi.project.patrol.fire.controller.*;
+import com.ruoyi.project.patrol.fire.domain.*;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
@@ -294,6 +310,15 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private TPssrPublicController publicController;
 
+    @Autowired
+    private TCommonuseTesterController testerController;
+
+    @Autowired
+    private TEmergencyPagaController pagaController;
+
+    @Autowired
+    private TEmergencyCctvController cctvController;
+
     @Autowired
     private TPssrOverhaulExchangerController exchangerController;
 
@@ -315,6 +340,51 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private TPssrSafetyBleedController bleedController;
 
+    @Autowired
+    private TFireAidkitController aidkitController;
+
+    @Autowired
+    private TFireAlarmController alarmController;
+
+    @Autowired
+    private TFireAnnihilatorController annihilatorController;
+
+    @Autowired
+    private TFireDoorController doorController;
+
+    @Autowired
+    private TFireGasShieldController gasShieldController;
+
+    @Autowired
+    private TEmergencyEyewashController eyewashController;
+
+    @Autowired
+    private TFireHoseBoxController hoseBoxController;
+
+    @Autowired
+    private TFirePostFireController postFireController;
+
+    @Autowired
+    private TFireSandboxController sandboxController;
+
+    @Autowired
+    private TFireSprinklerController sprinklerController;
+
+    @Autowired
+    private TEmergencyCabinetController cabinetController;
+
+    @Autowired
+    private TFireStandpipeController standpipeController;
+
+    @Autowired
+    private TFireSteamCurtainController steamCurtainController;
+
+    @Autowired
+    private TFireWaterCannonController waterCannonController;
+
+    @Autowired
+    private TFireWeathervaneController weathervaneController;
+
     @Autowired
     private TPssrSafetyBreathController breathController;
 
@@ -691,7 +761,7 @@ public class TPssrApproveController extends BaseController {
     }
 
     @PutMapping("/handleMgrApprove")
-    public AjaxResult handleMgrApprove(@RequestBody DevTask devTask) throws IOException {
+    public AjaxResult handleMgrApprove(@RequestBody DevTask devTask) throws Exception {
         TPssrApprove approve = devTask.gettPssrApprove();
         //使用任务服务完成任务(提交任务)
         String taskId = devTask.getTaskId();
@@ -741,7 +811,7 @@ public class TPssrApproveController extends BaseController {
      * 生成子项文件压缩包
      */
     @GetMapping("/genZip")
-    public void genZip(TPssrAboveall aboveall) throws IOException {
+    public void genZip(TPssrAboveall aboveall) throws Exception {
         Long id = aboveall.getId();//主表id
         AjaxResult result = null;
         String msg = "";//导出方法文件名
@@ -945,8 +1015,113 @@ public class TPssrApproveController extends BaseController {
                     Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
                     files.add(new File(rootPath + subTitle + msg));
                     break;
-                case "xqf"://消气防设施
-                    //todo:巡检
+                case "xqf"://todo:消气防设施（巡检）
+                    subTitle = "13消气防设施/";
+                    //手提式/小推车式灭火器/灭火器材箱检查记录
+                    TFireAnnihilator annihilator = new TFireAnnihilator();
+                    result = annihilatorController.export(annihilator);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //消防水炮检查记录
+                    TFireWaterCannon waterCannon = new TFireWaterCannon();
+                    result = waterCannonController.export(waterCannon);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //地上消火栓检查记录
+                    TFirePostFire postFire = new TFirePostFire();
+                    result = postFireController.export(postFire);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //消防水带箱检查记录
+                    TFireHoseBox hoseBox = new TFireHoseBox();
+                    result = hoseBoxController.export(hoseBox);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //消防竖管检查记录
+                    TFireStandpipePatrol standpipe = new TFireStandpipePatrol();
+                    result = standpipeController.export(standpipe);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //自动喷淋灭火系统检查记录
+                    TFireSprinkler sprinkler = new TFireSprinkler();
+                    result = sprinklerController.export(sprinkler);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //应急事故柜检查记录
+                    TEmergencyCabinet cabinet = new TEmergencyCabinet();
+                    result = cabinetController.export(cabinet);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //现场可燃气体检测器/火灾报警系统检查记录
+                    TFireAlarm alarm = new TFireAlarm();
+                    result = alarmController.export(alarm);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //CO2气体保护系统检查记录
+                    TFireGasShield gasShield = new TFireGasShield();
+                    result = gasShieldController.export(gasShield);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //淋浴洗眼器检查记录
+                    TEmergencyEyewash eyewash = new TEmergencyEyewash();
+                    result = eyewashController.export(eyewash);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //应急沙箱检查记录
+                    TFireSandbox sandbox = new TFireSandbox();
+                    result = sandboxController.export(sandbox);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //常闭式防爆门/防火门检查记录
+                    TFireDoor door = new TFireDoor();
+                    result = doorController.export(door);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //风向标/风向袋/新风系统正压计检查记录
+                    TFireWeathervane weathervane = new TFireWeathervane();
+                    result = weathervaneController.export(weathervane);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //蒸汽幕检查记录
+                    TFireSteamCurtain steamCurtain = new TFireSteamCurtain();
+                    result = steamCurtainController.export(steamCurtain);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //急救箱检查记录
+                    TFireAidkit aidkit = new TFireAidkit();
+                    result = aidkitController.export(aidkit);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
                     break;
                 case "aqss"://安全设施
                     subTitle = "14安全设施/";
@@ -990,11 +1165,32 @@ public class TPssrApproveController extends BaseController {
                     Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
                     files.add(new File(rootPath + subTitle + msg));
                     break;
-                case "txjk"://通讯监控
-                    //todo:巡检
+                case "txjk"://todo:通讯监控（巡检）
+                    subTitle = "15通讯监控/";
+                    //PAGA系统检查记录
+                    TEmergencyPaga paga = new TEmergencyPaga();
+                    result = pagaController.export(paga);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
+                    //CCTV系统检查记录
+                    TEmergencyCctv cctv = new TEmergencyCctv();
+                    result = cctvController.export(cctv);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
                     break;
-                case "bxsjcy"://便携式检测仪
-                    //todo:巡检
+                case "bxsjcy"://todo:便携式检测仪（巡检）
+                    subTitle = "16便携式检测仪/";
+                    //四合一/苯系物/硫化氢/二氧化碳/射线一氧化碳检测仪检查记录
+                    TCommonuseTester tester = new TCommonuseTester();
+                    result = testerController.export(tester);
+                    msg = (String) result.get("msg");
+                    path = downloadPath + msg;
+                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    files.add(new File(rootPath + subTitle + msg));
                     break;
                 case "gygc"://公用工程
                     subTitle = "17公用工程/";
@@ -1112,10 +1308,10 @@ public class TPssrApproveController extends BaseController {
                     break;
                 case "bjlszqr"://报警/联锁值确认
                     subTitle = "25报警、联锁值确认/";
-                    TPssrAlarm alarm = new TPssrAlarm();
-                    alarm.setSubId(tPssrSubcontent.getId());//子表id
+                    TPssrAlarm pssrAlarm = new TPssrAlarm();
+                    pssrAlarm.setSubId(tPssrSubcontent.getId());//子表id
                     //附件
-                    List<TPssrAlarm> alarms = tPssrAlarmService.selectTPssrAlarmList(alarm);
+                    List<TPssrAlarm> alarms = tPssrAlarmService.selectTPssrAlarmList(pssrAlarm);
                     for (TPssrAlarm a : alarms) {
                         String fileUrl = a.getFileUrl();
                         String newFileUrl = getProfile() + fileUrl.replace("/profile","");