update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicAttachmentServiceImpl.java

@@ -116,7 +116,7 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
             JSONObject jsonObject = new JSONObject();
             stringJoiner.add(File.separator).add(SystemConstant.getUuid()).add(SystemConstant.HTML_PREFIX);
             String fileMd5 = null;
-            if (oss) {//上传至oss\
+            if (oss) {//上传至oss
                 String dirName = stringJoiner.toString().replaceAll("\\\\", "/");
                 ossUtil.ossUpload(dirName, htmlContent);
                 byte[] data = ossUtil.ossDownload(dirName);
@@ -144,7 +144,7 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
                 jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
                 jsonObject.put(SystemConstant.PATH, stringJoiner.toString());
                 String destUrl = finalFile.getPath().replaceAll(SystemConstant.HTML_PREFIX, SystemConstant.PDF_PREFIX).replaceAll(UploadFileEnum.HTML.name().toLowerCase(), UploadFileEnum.PDF.name().toLowerCase());
-                HtmlToPdfUtil.convert(finalFile.getPath(), destUrl, PageSizeEnum.A4);
+                HtmlToPdfUtil.convert(finalFile.getPath(), destUrl, PageSizeEnum.A3);
                 jsonObject.put(SystemConstant.PDF_PATH, destUrl);
             }
             jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.HTML);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncCreatePdfTempleteService.java

@@ -66,8 +66,8 @@ public class AsyncCreatePdfTempleteService extends AsyncCreateTaskTemplete {
                 ResultUtil.error(e.getMessage());
             }
         } finally {//生成txt文件
-//            tbTask.setSummary(stringJoinerSummary.toString());
-//            super.createTxt(tbTask);
+            tbTask.setSummary(stringJoinerSummary.toString());
+            super.createTxt(tbTask);
         }
         return ResultUtil.ok(map);
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -33,7 +33,6 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -321,6 +320,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     jsonPdf.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.PDF);
                     BasicAttachment basicAttachment = new BasicAttachment(jsonPdf.toJSONString(), localPdfFile.getName(), SystemConstant.PDF_PREFIX, new BigDecimal(localPdfFile.length()), DigestUtils.md5Hex(new FileInputStream(localPdfFile)), sysUser.getId());
                     basicAttachmentService.save(basicAttachment);
+                    tbTask.setImportFileName(basicAttachment.getName());
+                    tbTask.setImportFilePath(basicAttachment.getPath());
                     examDetail.setAttachmentId(basicAttachment.getId());
                     detailService.saveOrUpdate(examDetail);
                     basicAttachmentList.add(basicAttachment);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/HtmlToPdfUtil.java

@@ -42,7 +42,11 @@ public class HtmlToPdfUtil {
         cmd.append(dictionaryConfig.sysDomain().getHtmlToPdfUrl());
         cmd.append(" ");
         cmd.append(" --page-size ").append(pageSizeEnum.name()).append(" ");
-//        cmd.append(" --page-width 1200px");
+        cmd.append(" --disable-smart-shrinking ");
+        cmd.append(" --orientation Landscape ");
+//        cmd.append(" --page-width 1200px ");
+//        cmd.append(" --page-width 1200px ");
+//        cmd.append(" --dpi 1191*842 ");
         cmd.append("  --margin-top 0 ");
         cmd.append("  --margin-bottom 0 ");
         cmd.append("  --margin-left 0 ");