PSSR文档转PDF及代码优化

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

@@ -6,12 +6,12 @@ import com.ruoyi.common.utils.document.ZipUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.approve.damain.DevTask;
 import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
+import com.ruoyi.project.officeConvert.OfficeConvertController;
 import com.ruoyi.project.patrol.commonuse.controller.TCommonuseTesterController;
 import com.ruoyi.project.patrol.commonuse.domain.TCommonuseTester;
 import com.ruoyi.project.patrol.emergency.controller.TEmergencyCabinetController;
@@ -37,15 +37,14 @@ import org.activiti.engine.impl.util.CollectionUtil;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.*;
@@ -61,7 +60,9 @@ import static com.ruoyi.framework.config.RuoYiConfig.getProfile;
 @RestController
 @RequestMapping("/pssr/approve")
 public class TPssrApproveController extends BaseController {
-
+    // region 引用
+    @Resource
+    private OfficeConvertController officeConvertController;
     @Resource
     private SysUserMapper userMapper;
 
@@ -391,6 +392,7 @@ public class TPssrApproveController extends BaseController {
 
     @Autowired
     private TPssrSubcontentController subcontentController;
+    //endregion
 
     @PutMapping("/handleConfirm")
     public AjaxResult handleConfirm(@RequestBody TPssrApproveDto dto) {
@@ -1413,12 +1415,12 @@ public class TPssrApproveController extends BaseController {
             forShorts.add("ssy");
             forShorts.add("gygc");
             forShorts.add("yfl");
-        }else if ("djsb".contains(sub.getForShort())) {
+        } else if ("djsb".contains(sub.getForShort())) {
             forShorts.add("qm");
             forShorts.add("dqzh");
-        }else if ("yblscs".contains(sub.getForShort())) {
+        } else if ("yblscs".contains(sub.getForShort())) {
             forShorts.add("djsb");
-        }else if ("bjlszqr,lsdy,zmdbr,jdjdkj,qtjcy,zxfxy".contains(sub.getForShort())) {
+        } else if ("bjlszqr,lsdy,zmdbr,jdjdkj,qtjcy,zxfxy".contains(sub.getForShort())) {
             forShorts.add("yblscs");
         }
         if (CollectionUtils.isNotEmpty(forShorts)) {
@@ -1640,16 +1642,9 @@ public class TPssrApproveController extends BaseController {
 //        files.add(new File(rootPath + subTitle + msg));
 
         // word转pdf
-        FileInputStream fis = new FileInputStream(path);
-        XWPFDocument document = new XWPFDocument(fis);
-        OutputStream out = new FileOutputStream(path.replace(".docx", ".pdf"));
-        document.write(out);
-        out.close();
-        fis.close();
-        this.copyFileIgnoreException(path.replace(".docx", ".pdf"),
-                rootPath + subTitle + msg.replace("/profile/pssr/", "").replace(".docx", ".pdf"),
-                files,
-                rootPath + subTitle + msg.replace(".docx", ".pdf"));
+        String fdfFile = officeConvertController.wordTransPdf(msg);
+        fdfFile = fdfFile.replace(File.separator,"/");
+        this.copyFileIgnoreException(getProfile()+fdfFile.replace("/profile", ""), rootPath + subTitle + fdfFile.replace("/profile/temp/", ""), files, rootPath + subTitle + fdfFile);
 
         for (TPssrSubcontent tPssrSubcontent : tPssrSubcontents) {
             TPssrPatrol patrol = new TPssrPatrol();
@@ -2414,7 +2409,7 @@ public class TPssrApproveController extends BaseController {
         Set<String> confirm2 = new HashSet<>();
         List<TPssrNitrogen> tPssrNitrogens = tPssrNitrogenService.selectTPssrNitrogenList(tPssrNitrogen);
         for (TPssrNitrogen item : tPssrNitrogens) {
-            if(!"是".equals(item.getStandard())){
+            if (!"是".equals(item.getStandard())) {
                 throw new Exception("氮气置换检查结果不符合要求，请重新填写！");
             }
         }
@@ -2972,7 +2967,7 @@ public class TPssrApproveController extends BaseController {
         Set<String> remover = new HashSet<>();
         List<TPssrAirtight> tPssrAirtights = tPssrAirtightService.selectTPssrAirtightList(tPssrAirtight);
         for (TPssrAirtight item : tPssrAirtights) {
-            if(!"是".equals(item.getStandard())){
+            if (!"是".equals(item.getStandard())) {
                 throw new Exception("气密性测试标准为否，请重新检查！");
             }
         }
@@ -3147,7 +3142,7 @@ public class TPssrApproveController extends BaseController {
         Set<String> remover = new HashSet<>();
         List<TPssrPublic> tPssrPublics = tPssrPublicService.selectTPssrPublicList(tPssrPublic);
         for (TPssrPublic item : tPssrPublics) {
-            if("✔".equals(item.getCheckResult())){
+            if ("✔".equals(item.getCheckResult())) {
                 throw new Exception("公用工程检查结果不合规！请重新检查！");
             }
         }