|
@@ -1660,27 +1660,33 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrOverhaulFilter filter = new TPssrOverhaulFilter();//过滤器
|
|
|
filter.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = filterController.export(filter);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
TPssrOverhaulTower tower = new TPssrOverhaulTower();//塔罐
|
|
|
tower.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = towerController.export(tower);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
TPssrOverhaulValve valve = new TPssrOverhaulValve();//阀门
|
|
|
valve.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = valveController.export(valve);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
@@ -1688,41 +1694,51 @@ public class TPssrApproveController extends BaseController {
|
|
|
exchanger.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
exchanger.setDevType(1L);
|
|
|
result = exchangerController.export(exchanger);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
exchanger.setDevType(2L);
|
|
|
result = exchangerController.export(exchanger);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
exchanger.setDevType(3L);
|
|
|
result = exchangerController.export(exchanger);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
exchanger.setDevType(4L);
|
|
|
result = exchangerController.export(exchanger);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
exchanger.setDevType(5L);
|
|
|
result = exchangerController.export(exchanger);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1731,9 +1747,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrProgramme programme = new TPssrProgramme();
|
|
|
programme.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = programmeController.export(programme);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
//附件
|
|
@@ -1750,10 +1768,12 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrMoc moc = new TPssrMoc();
|
|
|
moc.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = mocController.export(moc);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- files.add(new File(path));
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ files.add(new File(path));
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1762,9 +1782,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrBlind blind = new TPssrBlind();
|
|
|
blind.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = blindController.export(blind);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1773,9 +1795,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrHygiene hygiene = new TPssrHygiene();
|
|
|
hygiene.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = hygieneController.export(hygiene);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1784,17 +1808,21 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrProtection protection = new TPssrProtection();
|
|
|
protection.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = protectionController.export(protection);
|
|
|
- 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));
|
|
|
+ if (result != null) {
|
|
|
+ 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));
|
|
|
+ }
|
|
|
|
|
|
TPssrMeasure measure = new TPssrMeasure();
|
|
|
measure.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = measureController.export(measure);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1803,9 +1831,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrCleaning cleaning = new TPssrCleaning();
|
|
|
cleaning.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = cleaningController.export(cleaning);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1814,9 +1844,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrAirtight airtight = new TPssrAirtight();
|
|
|
airtight.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = airtightController.export(airtight);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1825,9 +1857,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrLock lock = new TPssrLock();
|
|
|
lock.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = lockController.export(lock);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1836,9 +1870,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrLaboratory laboratory = new TPssrLaboratory();
|
|
|
laboratory.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = laboratoryController.export(laboratory);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1847,9 +1883,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrCircuit circuit = new TPssrCircuit();
|
|
|
circuit.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = circuitController.export(circuit);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1858,9 +1896,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrNitrogen nitrogen = new TPssrNitrogen();
|
|
|
nitrogen.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = nitrogenController.export(nitrogen);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1874,9 +1914,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireAnnihilator annihilator = new TFireAnnihilator();
|
|
|
annihilator.setPlanId(planId);
|
|
|
result = annihilatorController.export(annihilator);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1884,9 +1926,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireWaterCannon waterCannon = new TFireWaterCannon();
|
|
|
waterCannon.setPlanId(planId);
|
|
|
result = waterCannonController.export(waterCannon);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1894,9 +1938,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFirePostFire postFire = new TFirePostFire();
|
|
|
postFire.setPlanId(planId);
|
|
|
result = postFireController.export(postFire);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1904,9 +1950,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireHoseBox hoseBox = new TFireHoseBox();
|
|
|
hoseBox.setPlanId(planId);
|
|
|
result = hoseBoxController.export(hoseBox);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1914,9 +1962,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireStandpipePatrol standpipe = new TFireStandpipePatrol();
|
|
|
standpipe.setPlanId(planId);
|
|
|
result = standpipeController.export(standpipe);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1924,9 +1974,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireSprinkler sprinkler = new TFireSprinkler();
|
|
|
sprinkler.setPlanId(planId);
|
|
|
result = sprinklerController.export(sprinkler);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1934,9 +1986,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TEmergencyCabinet cabinet = new TEmergencyCabinet();
|
|
|
cabinet.setPlanId(planId);
|
|
|
result = cabinetController.export(cabinet);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1944,9 +1998,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireAlarm alarm = new TFireAlarm();
|
|
|
alarm.setPlanId(planId);
|
|
|
result = alarmController.export(alarm);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1954,9 +2010,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireGasShield gasShield = new TFireGasShield();
|
|
|
gasShield.setPlanId(planId);
|
|
|
result = gasShieldController.export(gasShield);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1964,9 +2022,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TEmergencyEyewash eyewash = new TEmergencyEyewash();
|
|
|
eyewash.setPlanId(planId);
|
|
|
result = eyewashController.export(eyewash);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1974,9 +2034,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireSandbox sandbox = new TFireSandbox();
|
|
|
sandbox.setPlanId(planId);
|
|
|
result = sandboxController.export(sandbox);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1984,9 +2046,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireDoor door = new TFireDoor();
|
|
|
door.setPlanId(planId);
|
|
|
result = doorController.export(door);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -1994,9 +2058,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireWeathervane weathervane = new TFireWeathervane();
|
|
|
weathervane.setPlanId(planId);
|
|
|
result = weathervaneController.export(weathervane);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2004,9 +2070,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireSteamCurtain steamCurtain = new TFireSteamCurtain();
|
|
|
steamCurtain.setPlanId(planId);
|
|
|
result = steamCurtainController.export(steamCurtain);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2014,9 +2082,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TFireAidkit aidkit = new TFireAidkit();
|
|
|
aidkit.setPlanId(planId);
|
|
|
result = aidkitController.export(aidkit);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2028,45 +2098,55 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrSafetyBleed bleed = new TPssrSafetyBleed();
|
|
|
bleed.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = bleedController.export(bleed);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
TPssrSafetyBreath breath = new TPssrSafetyBreath();
|
|
|
breath.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = breathController.export(breath);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
TPssrSafetyBrust brust = new TPssrSafetyBrust();
|
|
|
brust.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = brustController.export(brust);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
TPssrSafetyFlamearrester flamearrester = new TPssrSafetyFlamearrester();
|
|
|
flamearrester.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = flamearresterController.export(flamearrester);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
TPssrSafetyValve safetyValve = new TPssrSafetyValve();
|
|
|
safetyValve.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = safetyValveController.export(safetyValve);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2080,9 +2160,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TEmergencyPaga paga = new TEmergencyPaga();
|
|
|
paga.setPlanId(planId);
|
|
|
result = pagaController.export(paga);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2090,9 +2172,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TEmergencyCctv cctv = new TEmergencyCctv();
|
|
|
cctv.setPlanId(planId);
|
|
|
result = cctvController.export(cctv);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2109,9 +2193,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TCommonuseTester tester = new TCommonuseTester();
|
|
|
tester.setPlanId(planId);
|
|
|
result = testerController.export(tester);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2123,9 +2209,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrPublic tPssrPublic = new TPssrPublic();
|
|
|
tPssrPublic.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = publicController.export(tPssrPublic);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2135,17 +2223,21 @@ public class TPssrApproveController extends BaseController {
|
|
|
torchvoc.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
torchvoc.setTorchvocType("1");
|
|
|
result = torchvocController.export(torchvoc);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
torchvoc.setTorchvocType("2");
|
|
|
result = torchvocController.export(torchvoc);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2154,9 +2246,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrMaterial material = new TPssrMaterial();
|
|
|
material.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = materialController.export(material);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
@@ -2174,27 +2268,33 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrPumpCleaning pumpCleaning = new TPssrPumpCleaning();
|
|
|
pumpCleaning.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = pumpCleaningController.export(pumpCleaning);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
TPssrPumpFill pumpFill = new TPssrPumpFill();
|
|
|
pumpFill.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = pumpFillController.export(pumpFill);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
TPssrPumpOverhaul pumpOverhaul = new TPssrPumpOverhaul();
|
|
|
pumpOverhaul.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = pumpOverhaulController.export(pumpOverhaul);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2203,9 +2303,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrFrame frame = new TPssrFrame();
|
|
|
frame.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = frameController.export(frame);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2214,18 +2316,22 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrPipe pipe = new TPssrPipe();
|
|
|
pipe.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = pipeController.export(pipe);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
TPssrVessel vessel = new TPssrVessel();
|
|
|
vessel.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = vesselController.export(vessel);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2236,21 +2342,27 @@ public class TPssrApproveController extends BaseController {
|
|
|
//调节阀
|
|
|
calibration.setDevType("1");
|
|
|
result = instrumentCalibrationController.export(calibration);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
//液位计
|
|
|
calibration.setDevType("2");
|
|
|
result = instrumentCalibrationController.export(calibration);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
//流量计
|
|
|
calibration.setDevType("3");
|
|
|
result = instrumentCalibrationController.export(calibration);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// try {
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// } catch (IOException e) {
|
|
@@ -2297,9 +2409,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrPower power = new TPssrPower();
|
|
|
power.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = powerController.export(power);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2308,9 +2422,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrMotor motor = new TPssrMotor();
|
|
|
motor.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = motorController.export(motor);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2320,17 +2436,21 @@ public class TPssrApproveController extends BaseController {
|
|
|
lighting.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
lighting.setLightingType("1");
|
|
|
result = lightingController.export(lighting);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
|
|
|
lighting.setLightingType("2");
|
|
|
result = lightingController.export(lighting);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2339,9 +2459,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrFranklinism franklinism = new TPssrFranklinism();
|
|
|
franklinism.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = franklinismController.export(franklinism);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2350,9 +2472,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrGasdetector gasdetector = new TPssrGasdetector();
|
|
|
gasdetector.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = gasdetectorController.export(gasdetector);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|
|
@@ -2361,9 +2485,11 @@ public class TPssrApproveController extends BaseController {
|
|
|
TPssrAnalyzer analyzer = new TPssrAnalyzer();
|
|
|
analyzer.setSubId(tPssrSubcontent.getId());//子表id
|
|
|
result = analyzerController.export(analyzer);
|
|
|
- msg = (String) result.get("msg");
|
|
|
- path = downloadPath + msg;
|
|
|
- this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ if (result != null) {
|
|
|
+ msg = (String) result.get("msg");
|
|
|
+ path = downloadPath + msg;
|
|
|
+ this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
|
|
|
+ }
|
|
|
// Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
|
|
|
// files.add(new File(rootPath + subTitle + msg));
|
|
|
break;
|