PSSR主清单导出（多表）

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

@@ -228,6 +228,12 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private TPssrFrameController frameController;
 
+    @Autowired
+    private TPssrPipeController pipeController;
+
+    @Autowired
+    private TPssrVesselController vesselController;
+
     @Autowired
     private TPssrCircuitController circuitController;
 
@@ -255,12 +261,25 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private TPssrMaterialController materialController;
 
+    @Autowired
+    private TPssrPumpCleaningController pumpCleaningController;
+
+    @Autowired
+    private TPssrPumpFillController pumpFillController;
+
+    @Autowired
+    private TPssrPumpOverhaulController pumpOverhaulController;
+
+
     @Autowired
     private TPssrMocController mocController;
 
     @Autowired
     private TPssrMotorController motorController;
 
+    @Autowired
+    private TPssrLightingController lightingController;
+
     @Autowired
     private TPssrNitrogenController nitrogenController;
 
@@ -273,6 +292,42 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private TPssrPublicController publicController;
 
+    @Autowired
+    private TPssrOverhaulExchangerController exchangerController;
+
+    @Autowired
+    private TPssrOverhaulFilterController filterController;
+
+    @Autowired
+    private TPssrOverhaulTowerController towerController;
+
+    @Autowired
+    private TPssrOverhaulValveController valveController;
+
+    @Autowired
+    private TPssrProtectionController protectionController;
+
+    @Autowired
+    private TPssrMeasureController measureController;
+
+    @Autowired
+    private TPssrSafetyBleedController bleedController;
+
+    @Autowired
+    private TPssrSafetyBreathController breathController;
+
+    @Autowired
+    private TPssrSafetyBrustController brustController;
+
+    @Autowired
+    private TPssrSafetyFlamearresterController flamearresterController;
+
+    @Autowired
+    private TPssrSafetyValveController safetyValveController;
+
+    @Autowired
+    private TPssrTorchvocController torchvocController;
+
     /**
      * 子项内容确认
      */
@@ -693,7 +748,58 @@ public class TPssrApproveController extends BaseController {
         for (TPssrSubcontent tPssrSubcontent : tPssrSubcontents) {
             switch (tPssrSubcontent.getForShort()) {
                 case "jxxm"://检修项目
+                    TPssrOverhaulFilter filter = new TPssrOverhaulFilter();//过滤器
+                    filter.setSubId(tPssrSubcontent.getId());//子表id
+                    result = filterController.export(filter);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
+
+                    TPssrOverhaulTower tower = new TPssrOverhaulTower();//塔罐
+                    tower.setSubId(tPssrSubcontent.getId());//子表id
+                    result = towerController.export(tower);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
+
+                    TPssrOverhaulValve valve = new TPssrOverhaulValve();//阀门
+                    valve.setSubId(tPssrSubcontent.getId());//子表id
+                    result = valveController.export(valve);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
+
+                    TPssrOverhaulExchanger exchanger = new TPssrOverhaulExchanger();//换热器
+                    exchanger.setSubId(tPssrSubcontent.getId());//子表id
+                    exchanger.setDevType(1L);
+                    result = exchangerController.export(exchanger);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
+
+                    exchanger.setDevType(2L);
+                    result = exchangerController.export(exchanger);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
+
+                    exchanger.setDevType(3L);
+                    result = exchangerController.export(exchanger);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
 
+                    exchanger.setDevType(4L);
+                    result = exchangerController.export(exchanger);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
+
+                    exchanger.setDevType(5L);
+                    result = exchangerController.export(exchanger);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
                 case "kgfa"://开工方案
                     TPssrProgramme programme = new TPssrProgramme();
@@ -728,7 +834,19 @@ public class TPssrApproveController extends BaseController {
                     files.add(new File(path));
                     break;
                 case "rsfh"://人身防护
+                    TPssrProtection protection = new TPssrProtection();
+                    protection.setSubId(tPssrSubcontent.getId());//子表id
+                    result = protectionController.export(protection);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
 
+                    TPssrMeasure measure = new TPssrMeasure();
+                    measure.setSubId(tPssrSubcontent.getId());//子表id
+                    result = measureController.export(measure);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
                 case "sbqjd"://设备清洁度
                     TPssrCleaning cleaning = new TPssrCleaning();
@@ -782,7 +900,40 @@ public class TPssrApproveController extends BaseController {
 
                     break;
                 case "aqss"://安全设施
+                    TPssrSafetyBleed bleed = new TPssrSafetyBleed();
+                    bleed.setSubId(tPssrSubcontent.getId());//子表id
+                    result = bleedController.export(bleed);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
+
+                    TPssrSafetyBreath breath = new TPssrSafetyBreath();
+                    breath.setSubId(tPssrSubcontent.getId());//子表id
+                    result = breathController.export(breath);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
 
+                    TPssrSafetyBrust brust = new TPssrSafetyBrust();
+                    brust.setSubId(tPssrSubcontent.getId());//子表id
+                    result = brustController.export(brust);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
+
+                    TPssrSafetyFlamearrester flamearrester = new TPssrSafetyFlamearrester();
+                    flamearrester.setSubId(tPssrSubcontent.getId());//子表id
+                    result = flamearresterController.export(flamearrester);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
+
+                    TPssrSafetyValve safetyValve = new TPssrSafetyValve();
+                    safetyValve.setSubId(tPssrSubcontent.getId());//子表id
+                    result = safetyValveController.export(safetyValve);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
                 case "txjk"://通讯监控
 
@@ -799,7 +950,19 @@ public class TPssrApproveController extends BaseController {
                     files.add(new File(path));
                     break;
                 case "hbss"://环保设施
+                    TPssrTorchvoc torchvoc = new TPssrTorchvoc();
+                    torchvoc.setSubId(tPssrSubcontent.getId());//子表id
+                    torchvoc.setTorchvocType("1");
+                    result = torchvocController.export(torchvoc);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
 
+                    torchvoc.setTorchvocType("2");
+                    result = torchvocController.export(torchvoc);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
                 case "yfl"://原辅料
                     TPssrMaterial material = new TPssrMaterial();
@@ -810,7 +973,26 @@ public class TPssrApproveController extends BaseController {
                     files.add(new File(path));
                     break;
                 case "jb"://机泵
+                    TPssrPumpCleaning pumpCleaning = new TPssrPumpCleaning();
+                    pumpCleaning.setSubId(tPssrSubcontent.getId());//子表id
+                    result = pumpCleaningController.export(pumpCleaning);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
 
+                    TPssrPumpFill pumpFill = new TPssrPumpFill();
+                    pumpFill.setSubId(tPssrSubcontent.getId());//子表id
+                    result = pumpFillController.export(pumpFill);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
+
+                    TPssrPumpOverhaul pumpOverhaul = new TPssrPumpOverhaul();
+                    pumpOverhaul.setSubId(tPssrSubcontent.getId());//子表id
+                    result = pumpOverhaulController.export(pumpOverhaul);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
                 case "zdj"://支（吊）架
                     TPssrFrame frame = new TPssrFrame();
@@ -821,7 +1003,19 @@ public class TPssrApproveController extends BaseController {
                     files.add(new File(path));
                     break;
                 case "tzsb"://压力管道/压力容器
+                    TPssrPipe pipe = new TPssrPipe();
+                    pipe.setSubId(tPssrSubcontent.getId());//子表id
+                    result = pipeController.export(pipe);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
 
+                    TPssrVessel vessel = new TPssrVessel();
+                    vessel.setSubId(tPssrSubcontent.getId());//子表id
+                    result = vesselController.export(vessel);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
                 case "ybjy"://仪表校验
                     TPssrInstrumentCalibration calibration = new TPssrInstrumentCalibration();
@@ -854,7 +1048,19 @@ public class TPssrApproveController extends BaseController {
                     files.add(new File(path));
                     break;
                 case "zmdbr"://照明、电伴热
+                    TPssrLighting lighting = new TPssrLighting();
+                    lighting.setSubId(tPssrSubcontent.getId());//子表id
+                    lighting.setLightingType("1");
+                    result = lightingController.export(lighting);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
 
+                    lighting.setLightingType("2");
+                    result = lightingController.export(lighting);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
                 case "jdjdkj"://静电接地/跨接
                     TPssrFranklinism franklinism = new TPssrFranklinism();

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

@@ -145,7 +145,11 @@ public class TPssrLightingController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Lighting");
+            if ("1".equals(LightingType)) {
+                filename =  "PSSR_28_照明_" + UUID.randomUUID().toString() + ".xlsx";
+            } else {
+                filename =  "PSSR_28_电伴热_" + UUID.randomUUID().toString() + ".xlsx";
+            }
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -240,7 +240,7 @@ public class TPssrMeasureController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Measure");
+            filename =  "PSSR_06_人身防护_现场转动设备防护措施检查表_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -160,19 +160,19 @@ public class TPssrOverhaulExchangerController extends BaseController {
             }
             switch (devType.toString()) {
                 case "1":
-                    filename = ExcelUtil.encodingFilename("OverhaulExchanger");
+                    filename =  "PSSR_01_检修项目_换热器_" + UUID.randomUUID().toString() + ".xlsx";
                     break;
                 case "2":
-                    filename = ExcelUtil.encodingFilename("OverhaulExchanger2");
+                    filename =  "PSSR_01_检修项目_电仪_" + UUID.randomUUID().toString() + ".xlsx";
                     break;
                 case "3":
-                    filename = ExcelUtil.encodingFilename("OverhaulExchanger3");
+                    filename =  "PSSR_01_检修项目_反应器_" + UUID.randomUUID().toString() + ".xlsx";
                     break;
                 case "4":
-                    filename = ExcelUtil.encodingFilename("OverhaulExchanger4");
+                    filename =  "PSSR_01_检修项目_裂解炉_" + UUID.randomUUID().toString() + ".xlsx";
                     break;
                 case "5":
-                    filename = ExcelUtil.encodingFilename("OverhaulExchanger5");
+                    filename =  "PSSR_01_检修项目_其他_" + UUID.randomUUID().toString() + ".xlsx";
                     break;
             }
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));

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

@@ -322,7 +322,7 @@ public class TPssrOverhaulFilterController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("OverhaulFilter");
+            filename =  "PSSR_01_检修项目_过滤器_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -312,7 +312,7 @@ public class TPssrOverhaulTowerController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("OverhaulTower");
+            filename =  "PSSR_01_检修项目_塔罐_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -325,7 +325,7 @@ public class TPssrOverhaulValveController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("OverhaulValve");
+            filename =  "PSSR_01_检修项目_阀门_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -196,7 +196,7 @@ public class TPssrPipeController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Pipe");
+            filename =  "PSSR_22_压力管道_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -230,7 +230,7 @@ public class TPssrProtectionController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Protection");
+            filename =  "PSSR_06_人身防护_现场管道和设备保温防护检查表_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -240,7 +240,7 @@ public class TPssrPumpCleaningController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("PumpCleaning");
+            filename =  "PSSR_20_机泵_机泵过滤器清理工作清单_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -243,7 +243,7 @@ public class TPssrPumpFillController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("PumpFill");
+            filename =  "PSSR_20_机泵_机泵润滑油加注确认清单_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -237,7 +237,7 @@ public class TPssrPumpOverhaulController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("PumpOverhaul");
+            filename =  "PSSR_20_机泵_机泵检修完成确认清单_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -34,6 +34,7 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 安全设施-紧急泄放阀Controller
@@ -236,7 +237,7 @@ public class TPssrSafetyBleedController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("SafetyBleed");
+            filename =  "PSSR_14_安全设施_泄放阀_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -34,6 +34,7 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 安全设施-呼吸阀Controller
@@ -236,7 +237,7 @@ public class TPssrSafetyBreathController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("SafetyBreath");
+            filename =  "PSSR_14_安全设施_呼吸阀_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -34,6 +34,7 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 安全设施-爆破片Controller
@@ -236,7 +237,7 @@ public class TPssrSafetyBrustController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("SafetyBrust");
+            filename =  "PSSR_14_安全设施_爆破片_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -34,6 +34,7 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 安全设施-阻火器Controller
@@ -224,7 +225,7 @@ public class TPssrSafetyFlamearresterController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("SafetyFlamearrester");
+            filename =  "PSSR_14_安全设施_阻火器_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 安全设施-安全阀Controller
@@ -138,7 +139,7 @@ public class TPssrSafetyValveController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("SafetyValve");
+            filename =  "PSSR_14_安全设施_安全阀_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -147,7 +147,11 @@ public class TPssrTorchvocController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Torchvoc");
+            if ("1".equals(torchvocType)) {
+                filename =  "PSSR_18_环保设施_火炬_" + UUID.randomUUID().toString() + ".xlsx";
+            } else {
+                filename =  "PSSR_18_环保设施_VOC_" + UUID.randomUUID().toString() + ".xlsx";
+            }
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -157,7 +157,7 @@ public class TPssrVesselController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Vessel");
+            filename =  "PSSR_22_压力容器_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();