bug fix

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

@@ -5,6 +5,7 @@ import com.itextpdf.text.DocumentException;
 import com.qmth.distributed.print.business.bean.dto.PdfDto;
 import com.qmth.distributed.print.business.entity.BasicAttachment;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
+import com.qmth.distributed.print.business.enums.ClassifyEnum;
 import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -78,7 +79,7 @@ public interface BasicAttachmentService extends IService<BasicAttachment> {
     /**
      * 保存附件
      *
-     * @param printType
+     * @param classifyEnum
      * @param examDetailCourse
      * @param basicAttachment
      * @param pdfList
@@ -87,7 +88,7 @@ public interface BasicAttachmentService extends IService<BasicAttachment> {
      * @return
      * @throws IOException
      */
-    public BasicAttachment saveAttachmentPdf(String printType, ExamDetailCourse examDetailCourse, BasicAttachment basicAttachment, List<PdfDto> pdfList, Integer printCount, Integer sequence) throws IOException, DocumentException;
+    public BasicAttachment saveAttachmentPdf(ClassifyEnum classifyEnum, ExamDetailCourse examDetailCourse, BasicAttachment basicAttachment, List<PdfDto> pdfList, Integer printCount, Integer sequence) throws IOException, DocumentException;
 
     /**
      * 删除附件

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

@@ -12,6 +12,7 @@ import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.BasicAttachment;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.distributed.print.business.entity.SysUser;
+import com.qmth.distributed.print.business.enums.ClassifyEnum;
 import com.qmth.distributed.print.business.enums.PageSizeEnum;
 import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.mapper.BasicAttachmentMapper;
@@ -240,7 +241,7 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
     /**
      * 保存附件
      *
-     * @param printType
+     * @param classifyEnum
      * @param examDetailCourse
      * @param basicAttachment
      * @param pdfList
@@ -251,7 +252,7 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
      */
     @Override
     @Transactional
-    public BasicAttachment saveAttachmentPdf(String printType, ExamDetailCourse examDetailCourse, BasicAttachment basicAttachment, List<PdfDto> pdfList, Integer printCount, Integer sequence) throws IOException, DocumentException {
+    public BasicAttachment saveAttachmentPdf(ClassifyEnum classifyEnum, ExamDetailCourse examDetailCourse, BasicAttachment basicAttachment, List<PdfDto> pdfList, Integer printCount, Integer sequence) throws IOException, DocumentException {
         try {
             boolean oss = dictionaryConfig.sysDomain().isOss();
             JSONObject jsonObject = JSONObject.parseObject(basicAttachment.getPath());
@@ -300,7 +301,7 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
             JSONArray jsonArray = (JSONArray) attachmentPath.get(SystemConstant.PATH);
             jsonArray = Objects.isNull(jsonArray) ? new JSONArray() : jsonArray;
             JSONObject object = new JSONObject();
-            object.put("printType", printType);
+            object.put("printType", classifyEnum.name());
             object.put(SystemConstant.HTML_PATH, filePath);
             object.put(SystemConstant.PDF_PATH, pdfDirName);
             object.put(SystemConstant.TYPE, SystemConstant.OSS);

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

@@ -9,10 +9,7 @@ import com.itextpdf.text.DocumentException;
 import com.qmth.distributed.print.business.bean.dto.ExamStudentDto;
 import com.qmth.distributed.print.business.bean.dto.PdfDto;
 import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.enums.DrawRuleEnum;
-import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
-import com.qmth.distributed.print.business.enums.PageSizeEnum;
-import com.qmth.distributed.print.business.enums.PrintMethodEnum;
+import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.business.service.BasicAttachmentService;
 import com.qmth.distributed.print.business.service.CommonService;
 import com.qmth.distributed.print.business.service.ExamDetailService;
@@ -81,7 +78,7 @@ public class CreatePdfUtil {
                 ordinaryPdfList.add(new PdfDto(localFile.getPath(), PageSizeEnum.A4, pdfDto.getPageCount()));
             }
         } else {
-            basicAttachmentService.saveAttachmentPdf("checkIn", examDetailCourse, basicAttachment, ordinaryPdfList, printCount, 0);
+            basicAttachmentService.saveAttachmentPdf(ClassifyEnum.CHECK_IN, examDetailCourse, basicAttachment, ordinaryPdfList, printCount, 0);
         }
     }
 
@@ -158,7 +155,7 @@ public class CreatePdfUtil {
         htmlMap.computeIfAbsent("printCount", v -> printCount);
         htmlMap.computeIfAbsent("sequence", v -> 1);
         htmlMap.computeIfAbsent("examDetailCourse", v -> examDetailCourse);
-        htmlMap.computeIfAbsent("printType", v -> "paperPackage");
+        htmlMap.computeIfAbsent("printType", v -> ClassifyEnum.PACKAGE);
         freemarkerUtil.createPaperPackage(htmlMap);
     }
 
@@ -256,7 +253,7 @@ public class CreatePdfUtil {
         htmlMap.computeIfAbsent("printCount", v -> printCount);
         htmlMap.computeIfAbsent("sequence", v -> 2);
         htmlMap.computeIfAbsent("examDetailCourse", v -> examDetailCourse);
-        htmlMap.computeIfAbsent("printType", v -> "signBook");
+        htmlMap.computeIfAbsent("printType", v -> ClassifyEnum.SIGN);
         freemarkerUtil.createSignBook(htmlMap);
     }
 

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

@@ -5,6 +5,7 @@ import com.qmth.distributed.print.business.bean.dto.PdfDto;
 import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.BasicAttachment;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
+import com.qmth.distributed.print.business.enums.ClassifyEnum;
 import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.service.BasicAttachmentService;
 import com.qmth.distributed.print.common.contant.SystemConstant;
@@ -81,7 +82,7 @@ public class FreemarkerUtil {
         try {
             BasicAttachment basicAttachment = (BasicAttachment) dataMap.get("basicAttachment");
             ExamDetailCourse examDetailCourse = (ExamDetailCourse) dataMap.get("examDetailCourse");
-            String printType = (String) dataMap.get("printType");
+            ClassifyEnum classifyEnum = (ClassifyEnum) dataMap.get("printType");
             JSONObject jsonObject = JSONObject.parseObject(basicAttachment.getPath());
             String path = (String) jsonObject.get(SystemConstant.PATH);
             String ftlPath = path.substring(0, path.lastIndexOf("/"));
@@ -119,7 +120,7 @@ public class FreemarkerUtil {
                         UploadFileEnum.HTML
                 });
                 basicAttachment.setPath(jsonObject.toJSONString());
-                basicAttachmentService.saveAttachmentPdf(printType, examDetailCourse, basicAttachment, (List<PdfDto>) dataMap.get("variablePdfList"), (Integer) dataMap.get("printCount"), (Integer) dataMap.get("sequence"));
+                basicAttachmentService.saveAttachmentPdf(classifyEnum, examDetailCourse, basicAttachment, (List<PdfDto>) dataMap.get("variablePdfList"), (Integer) dataMap.get("printCount"), (Integer) dataMap.get("sequence"));
             }
             htmlFile.delete();
         } catch (Exception e) {