Sfoglia il codice sorgente

PSSR打包/下载加日志

wangggziwen 1 mese fa
parent
commit
f5d85bc609

+ 97 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -1643,6 +1643,8 @@ public class TPssrApproveController extends BaseController {
         TPssrSubcontent subcontent = new TPssrSubcontent();
         subcontent.setAboveallId(aboveall.getId());
         result = subcontentController.export(subcontent);
+        logger.info("====================00主清单");
+        logger.info("====================result:{}", result);
         msg = (String) result.get("msg");
         msg = msg.replace(File.separator,"/");
         path = getProfile() + msg.replace("/profile", "");
@@ -1665,6 +1667,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrOverhaulFilter filter = new TPssrOverhaulFilter();//过滤器
                     filter.setSubId(tPssrSubcontent.getId());//子表id
                     result = filterController.export(filter);
+                    logger.info("====================01检修项目");
+                    logger.info("====================filterController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1676,6 +1680,7 @@ public class TPssrApproveController extends BaseController {
                     TPssrOverhaulTower tower = new TPssrOverhaulTower();//塔罐
                     tower.setSubId(tPssrSubcontent.getId());//子表id
                     result = towerController.export(tower);
+                    logger.info("====================towerController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1687,6 +1692,7 @@ public class TPssrApproveController extends BaseController {
                     TPssrOverhaulValve valve = new TPssrOverhaulValve();//阀门
                     valve.setSubId(tPssrSubcontent.getId());//子表id
                     result = valveController.export(valve);
+                    logger.info("====================valveController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1699,6 +1705,7 @@ public class TPssrApproveController extends BaseController {
                     exchanger.setSubId(tPssrSubcontent.getId());//子表id
                     exchanger.setDevType(1L);
                     result = exchangerController.export(exchanger);
+                    logger.info("====================exchangerController1 result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1709,6 +1716,7 @@ public class TPssrApproveController extends BaseController {
 
                     exchanger.setDevType(2L);
                     result = exchangerController.export(exchanger);
+                    logger.info("====================exchangerController2 result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1719,6 +1727,7 @@ public class TPssrApproveController extends BaseController {
 
                     exchanger.setDevType(3L);
                     result = exchangerController.export(exchanger);
+                    logger.info("====================exchangerController3 result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1729,6 +1738,7 @@ public class TPssrApproveController extends BaseController {
 
                     exchanger.setDevType(4L);
                     result = exchangerController.export(exchanger);
+                    logger.info("====================exchangerController4 result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1739,6 +1749,7 @@ public class TPssrApproveController extends BaseController {
 
                     exchanger.setDevType(5L);
                     result = exchangerController.export(exchanger);
+                    logger.info("====================exchangerController5 result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1752,6 +1763,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrProgramme programme = new TPssrProgramme();
                     programme.setSubId(tPssrSubcontent.getId());//子表id
                     result = programmeController.export(programme);
+                    logger.info("====================02开工方案");
+                    logger.info("====================programmeController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1773,6 +1786,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrMoc moc = new TPssrMoc();
                     moc.setSubId(tPssrSubcontent.getId());//子表id
                     result = mocController.export(moc);
+                    logger.info("====================03设计变更");
+                    logger.info("====================mocController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1787,6 +1802,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrBlind blind = new TPssrBlind();
                     blind.setSubId(tPssrSubcontent.getId());//子表id
                     result = blindController.export(blind);
+                    logger.info("====================04盲板");
+                    logger.info("====================blindController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1800,6 +1817,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrHygiene hygiene = new TPssrHygiene();
                     hygiene.setSubId(tPssrSubcontent.getId());//子表id
                     result = hygieneController.export(hygiene);
+                    logger.info("====================05现场卫生");
+                    logger.info("====================hygieneController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1813,6 +1832,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrProtection protection = new TPssrProtection();
                     protection.setSubId(tPssrSubcontent.getId());//子表id
                     result = protectionController.export(protection);
+                    logger.info("====================06人身防护");
+                    logger.info("====================protectionController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1823,6 +1844,7 @@ public class TPssrApproveController extends BaseController {
                     TPssrMeasure measure = new TPssrMeasure();
                     measure.setSubId(tPssrSubcontent.getId());//子表id
                     result = measureController.export(measure);
+                    logger.info("====================measureController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1836,6 +1858,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrCleaning cleaning = new TPssrCleaning();
                     cleaning.setSubId(tPssrSubcontent.getId());//子表id
                     result = cleaningController.export(cleaning);
+                    logger.info("====================07设备清洁度");
+                    logger.info("====================cleaningController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1849,6 +1873,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrAirtight airtight = new TPssrAirtight();
                     airtight.setSubId(tPssrSubcontent.getId());//子表id
                     result = airtightController.export(airtight);
+                    logger.info("====================08气密");
+                    logger.info("====================airtightController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1862,6 +1888,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrLock lock = new TPssrLock();
                     lock.setSubId(tPssrSubcontent.getId());//子表id
                     result = lockController.export(lock);
+                    logger.info("====================09锁开锁关阀门状态");
+                    logger.info("====================lockController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1875,6 +1903,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrLaboratory laboratory = new TPssrLaboratory();
                     laboratory.setSubId(tPssrSubcontent.getId());//子表id
                     result = laboratoryController.export(laboratory);
+                    logger.info("====================10实验室");
+                    logger.info("====================laboratoryController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1888,6 +1918,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrCircuit circuit = new TPssrCircuit();
                     circuit.setSubId(tPssrSubcontent.getId());//子表id
                     result = circuitController.export(circuit);
+                    logger.info("====================11短接");
+                    logger.info("====================circuitController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1901,6 +1933,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrNitrogen nitrogen = new TPssrNitrogen();
                     nitrogen.setSubId(tPssrSubcontent.getId());//子表id
                     result = nitrogenController.export(nitrogen);
+                    logger.info("====================12氮气置换");
+                    logger.info("====================nitrogenController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -1915,12 +1949,15 @@ public class TPssrApproveController extends BaseController {
                         String planType = tPssrPatrol.getPlanType().toString();
                         Long planId = tPssrPatrol.getPlanId();
                         TPatrolPlan plan = tPatrolPlanMapper.selectTPatrolPlanById(planId);
+                        logger.info("====================13消气防设施");
+                        logger.info("====================tPatrolPlanMapper result:{}", result);
                         switch (planType) {
                             case "1"://手提式/小推车式灭火器/灭火器材箱检查记录
                                 TFireAnnihilator annihilator = new TFireAnnihilator();
                                 annihilator.setPlanId(planId);
                                 annihilator.setYear(plan.getPlanYear());
                                 result = annihilatorController.export(annihilator);
+                                logger.info("====================annihilatorController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -1934,6 +1971,7 @@ public class TPssrApproveController extends BaseController {
                                 waterCannon.setPlanId(planId);
                                 waterCannon.setYear(plan.getPlanYear());
                                 result = waterCannonController.export(waterCannon);
+                                logger.info("====================waterCannonController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -1947,6 +1985,7 @@ public class TPssrApproveController extends BaseController {
                                 postFire.setPlanId(planId);
                                 postFire.setYear(plan.getPlanYear());
                                 result = postFireController.export(postFire);
+                                logger.info("====================postFireController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -1960,6 +1999,7 @@ public class TPssrApproveController extends BaseController {
                                 hoseBox.setPlanId(planId);
                                 hoseBox.setYear(plan.getPlanYear());
                                 result = hoseBoxController.export(hoseBox);
+                                logger.info("====================hoseBoxController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -1973,6 +2013,7 @@ public class TPssrApproveController extends BaseController {
                                 standpipe.setPlanId(planId);
                                 standpipe.setYear(plan.getPlanYear());
                                 result = standpipeController.export(standpipe);
+                                logger.info("====================standpipeController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -1986,6 +2027,7 @@ public class TPssrApproveController extends BaseController {
                                 sprinkler.setPlanId(planId);
                                 sprinkler.setYear(plan.getPlanYear());
                                 result = sprinklerController.export(sprinkler);
+                                logger.info("====================sprinklerController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -1999,6 +2041,7 @@ public class TPssrApproveController extends BaseController {
                                 cabinet.setPlanId(planId);
                                 cabinet.setYear(plan.getPlanYear());
                                 result = cabinetController.export(cabinet);
+                                logger.info("====================cabinetController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2012,6 +2055,7 @@ public class TPssrApproveController extends BaseController {
                                 alarm.setPlanId(planId);
                                 alarm.setYear(plan.getPlanYear());
                                 result = alarmController.export(alarm);
+                                logger.info("====================alarmController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2024,6 +2068,7 @@ public class TPssrApproveController extends BaseController {
                                 TFireGasShield gasShield = new TFireGasShield();
                                 gasShield.setPlanId(planId);
                                 result = gasShieldController.export(gasShield);
+                                logger.info("====================gasShieldController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2037,6 +2082,7 @@ public class TPssrApproveController extends BaseController {
                                 eyewash.setPlanId(planId);
                                 eyewash.setYear(plan.getPlanYear());
                                 result = eyewashController.export(eyewash);
+                                logger.info("====================eyewashController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2050,6 +2096,7 @@ public class TPssrApproveController extends BaseController {
                                 sandbox.setPlanId(planId);
                                 sandbox.setYear(plan.getPlanYear());
                                 result = sandboxController.export(sandbox);
+                                logger.info("====================sandboxController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2063,6 +2110,7 @@ public class TPssrApproveController extends BaseController {
                                 door.setPlanId(planId);
                                 door.setYear(plan.getPlanYear());
                                 result = doorController.export(door);
+                                logger.info("====================doorController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2076,6 +2124,7 @@ public class TPssrApproveController extends BaseController {
                                 weathervane.setPlanId(planId);
                                 weathervane.setYear(plan.getPlanYear());
                                 result = weathervaneController.export(weathervane);
+                                logger.info("====================weathervaneController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2089,6 +2138,7 @@ public class TPssrApproveController extends BaseController {
                                 steamCurtain.setPlanId(planId);
                                 steamCurtain.setYear(plan.getPlanYear());
                                 result = steamCurtainController.export(steamCurtain);
+                                logger.info("====================steamCurtainController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2102,6 +2152,7 @@ public class TPssrApproveController extends BaseController {
                                 aidkit.setPlanId(planId);
                                 aidkit.setYear(plan.getPlanYear());
                                 result = aidkitController.export(aidkit);
+                                logger.info("====================aidkitController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2118,6 +2169,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrSafetyBleed bleed = new TPssrSafetyBleed();
                     bleed.setSubId(tPssrSubcontent.getId());//子表id
                     result = bleedController.export(bleed);
+                    logger.info("====================14安全设施");
+                    logger.info("====================bleedController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2129,6 +2182,7 @@ public class TPssrApproveController extends BaseController {
                     TPssrSafetyBreath breath = new TPssrSafetyBreath();
                     breath.setSubId(tPssrSubcontent.getId());//子表id
                     result = breathController.export(breath);
+                    logger.info("====================breathController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2140,6 +2194,7 @@ public class TPssrApproveController extends BaseController {
                     TPssrSafetyBrust brust = new TPssrSafetyBrust();
                     brust.setSubId(tPssrSubcontent.getId());//子表id
                     result = brustController.export(brust);
+                    logger.info("====================brustController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2151,6 +2206,7 @@ public class TPssrApproveController extends BaseController {
                     TPssrSafetyFlamearrester flamearrester = new TPssrSafetyFlamearrester();
                     flamearrester.setSubId(tPssrSubcontent.getId());//子表id
                     result = flamearresterController.export(flamearrester);
+                    logger.info("====================flamearresterController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2162,6 +2218,7 @@ public class TPssrApproveController extends BaseController {
                     TPssrSafetyValve safetyValve = new TPssrSafetyValve();
                     safetyValve.setSubId(tPssrSubcontent.getId());//子表id
                     result = safetyValveController.export(safetyValve);
+                    logger.info("====================safetyValveController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2176,12 +2233,14 @@ public class TPssrApproveController extends BaseController {
                         String planType = tPssrPatrol.getPlanType().toString();
                         Long planId = tPssrPatrol.getPlanId();
                         TPatrolPlan plan = tPatrolPlanMapper.selectTPatrolPlanById(planId);
+                        logger.info("====================15通讯监控");
                         switch (planType) {
                             case "10"://PAGA系统检查记录
                                 TEmergencyPaga paga = new TEmergencyPaga();
                                 paga.setPlanId(planId);
                                 paga.setYear(plan.getPlanYear());
                                 result = pagaController.export(paga);
+                                logger.info("====================pagaController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2195,6 +2254,7 @@ public class TPssrApproveController extends BaseController {
                                 cctv.setPlanId(planId);
                                 cctv.setYear(plan.getPlanYear());
                                 result = cctvController.export(cctv);
+                                logger.info("====================cctvController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2212,12 +2272,14 @@ public class TPssrApproveController extends BaseController {
                         String planType = tPssrPatrol.getPlanType().toString();
                         Long planId = tPssrPatrol.getPlanId();
                         TPatrolPlan plan = tPatrolPlanMapper.selectTPatrolPlanById(planId);
+                        logger.info("====================16便携式检测仪");
                         switch (planType) {
                             case "18"://四合一/苯系物/硫化氢/二氧化碳/射线一氧化碳检测仪检查记录
                                 TCommonuseTester tester = new TCommonuseTester();
                                 tester.setPlanId(planId);
                                 tester.setYear(plan.getPlanYear());
                                 result = testerController.export(tester);
+                                logger.info("====================testerController result:{}", result);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
                                     path = downloadPath + msg;
@@ -2234,6 +2296,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrPublic tPssrPublic = new TPssrPublic();
                     tPssrPublic.setSubId(tPssrSubcontent.getId());//子表id
                     result = publicController.export(tPssrPublic);
+                    logger.info("====================17公用工程");
+                    logger.info("====================publicController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2248,6 +2312,8 @@ public class TPssrApproveController extends BaseController {
                     torchvoc.setSubId(tPssrSubcontent.getId());//子表id
                     torchvoc.setTorchvocType("1");
                     result = torchvocController.export(torchvoc);
+                    logger.info("====================18环保设施");
+                    logger.info("====================torchvocController1 result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2258,6 +2324,7 @@ public class TPssrApproveController extends BaseController {
 
                     torchvoc.setTorchvocType("2");
                     result = torchvocController.export(torchvoc);
+                    logger.info("====================torchvocController2 result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2271,6 +2338,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrMaterial material = new TPssrMaterial();
                     material.setSubId(tPssrSubcontent.getId());//子表id
                     result = materialController.export(material);
+                    logger.info("====================19原辅料");
+                    logger.info("====================materialController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2293,6 +2362,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrPumpCleaning pumpCleaning = new TPssrPumpCleaning();
                     pumpCleaning.setSubId(tPssrSubcontent.getId());//子表id
                     result = pumpCleaningController.export(pumpCleaning);
+                    logger.info("====================20机泵");
+                    logger.info("====================pumpCleaningController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2304,6 +2375,7 @@ public class TPssrApproveController extends BaseController {
                     TPssrPumpFill pumpFill = new TPssrPumpFill();
                     pumpFill.setSubId(tPssrSubcontent.getId());//子表id
                     result = pumpFillController.export(pumpFill);
+                    logger.info("====================pumpFillController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2315,6 +2387,7 @@ public class TPssrApproveController extends BaseController {
                     TPssrPumpOverhaul pumpOverhaul = new TPssrPumpOverhaul();
                     pumpOverhaul.setSubId(tPssrSubcontent.getId());//子表id
                     result = pumpOverhaulController.export(pumpOverhaul);
+                    logger.info("====================pumpOverhaulController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2328,6 +2401,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrFrame frame = new TPssrFrame();
                     frame.setSubId(tPssrSubcontent.getId());//子表id
                     result = frameController.export(frame);
+                    logger.info("====================21支吊架");
+                    logger.info("====================frameController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2341,6 +2416,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrPipe pipe = new TPssrPipe();
                     pipe.setSubId(tPssrSubcontent.getId());//子表id
                     result = pipeController.export(pipe);
+                    logger.info("====================22压力管道、压力容器");
+                    logger.info("====================pipeController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2352,6 +2429,7 @@ public class TPssrApproveController extends BaseController {
                     TPssrVessel vessel = new TPssrVessel();
                     vessel.setSubId(tPssrSubcontent.getId());//子表id
                     result = vesselController.export(vessel);
+                    logger.info("====================vesselController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2367,6 +2445,8 @@ public class TPssrApproveController extends BaseController {
                     //调节阀
                     calibration.setDevType("1");
                     result = instrumentCalibrationController.export(calibration);
+                    logger.info("====================23仪表校验");
+                    logger.info("====================instrumentCalibrationController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2375,6 +2455,7 @@ public class TPssrApproveController extends BaseController {
                     //液位计
                     calibration.setDevType("2");
                     result = instrumentCalibrationController.export(calibration);
+                    logger.info("====================instrumentCalibrationController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2383,6 +2464,7 @@ public class TPssrApproveController extends BaseController {
                     //流量计
                     calibration.setDevType("3");
                     result = instrumentCalibrationController.export(calibration);
+                    logger.info("====================instrumentCalibrationController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2434,6 +2516,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrPower power = new TPssrPower();
                     power.setSubId(tPssrSubcontent.getId());//子表id
                     result = powerController.export(power);
+                    logger.info("====================26临时电源");
+                    logger.info("====================powerController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2447,6 +2531,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrMotor motor = new TPssrMotor();
                     motor.setSubId(tPssrSubcontent.getId());//子表id
                     result = motorController.export(motor);
+                    logger.info("====================27电机设备");
+                    logger.info("====================motorController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2461,6 +2547,8 @@ public class TPssrApproveController extends BaseController {
                     lighting.setSubId(tPssrSubcontent.getId());//子表id
                     lighting.setLightingType("1");
                     result = lightingController.export(lighting);
+                    logger.info("====================28照明、电伴热");
+                    logger.info("====================lightingController1 result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2471,6 +2559,7 @@ public class TPssrApproveController extends BaseController {
 
                     lighting.setLightingType("2");
                     result = lightingController.export(lighting);
+                    logger.info("====================lightingController2 result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2484,6 +2573,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrFranklinism franklinism = new TPssrFranklinism();
                     franklinism.setSubId(tPssrSubcontent.getId());//子表id
                     result = franklinismController.export(franklinism);
+                    logger.info("====================29静电接地、跨接");
+                    logger.info("====================franklinismController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2497,6 +2588,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrGasdetector gasdetector = new TPssrGasdetector();
                     gasdetector.setSubId(tPssrSubcontent.getId());//子表id
                     result = gasdetectorController.export(gasdetector);
+                    logger.info("====================30气体检测仪");
+                    logger.info("====================gasdetectorController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2510,6 +2603,8 @@ public class TPssrApproveController extends BaseController {
                     TPssrAnalyzer analyzer = new TPssrAnalyzer();
                     analyzer.setSubId(tPssrSubcontent.getId());//子表id
                     result = analyzerController.export(analyzer);
+                    logger.info("====================31在线分析仪");
+                    logger.info("====================analyzerController result:{}", result);
                     if (result != null) {
                         msg = (String) result.get("msg");
                         path = downloadPath + msg;
@@ -2526,7 +2621,7 @@ public class TPssrApproveController extends BaseController {
             aboveall.setZipUrl(zipName);
             tPssrAboveallService.updateTPssrAboveall(aboveall);
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.error(e.getMessage());
         }
     }
 
@@ -2535,7 +2630,7 @@ public class TPssrApproveController extends BaseController {
             Files.copy(Paths.get(source), Paths.get(target), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
             files.add(new File(fileName));
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error(e.getMessage());
         }
 
     }