cancel export pdf

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursepaper/ExportFileInfo.java

@@ -28,10 +28,6 @@ public class ExportFileInfo implements JsonSerializable {
      * 试卷PDF文件 <名称,地址>
      */
     private Pair<String, String> paperPdf;
-    /**
-     * 答案PDF文件 <名称,地址>
-     */
-    private Pair<String, String> answerPdf;
 
     public Pair<String, String> getPaperWord() {
         return paperWord;
@@ -57,12 +53,4 @@ public class ExportFileInfo implements JsonSerializable {
         this.paperPdf = paperPdf;
     }
 
-    public Pair<String, String> getAnswerPdf() {
-        return answerPdf;
-    }
-
-    public void setAnswerPdf(Pair<String, String> answerPdf) {
-        this.answerPdf = answerPdf;
-    }
-
 }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CoursePaperServiceImpl.java

@@ -92,18 +92,18 @@ public class CoursePaperServiceImpl implements CoursePaperService {
         Check.isNull(coursePaper.getPaperP(), "试卷页数不能为空！");
         Check.isBlank(coursePaper.getPaperWordUrl(), "试卷Word文件地址不能为空！");
         Check.isBlank(coursePaper.getAnswerWordUrl(), "答案Word文件地址不能为空！");
-        Check.isBlank(coursePaper.getPaperPdfUrl(), "试卷PDF文件地址不能为空！");
-        Check.isBlank(coursePaper.getAnswerPdfUrl(), "答案PDF文件地址不能为空！");
+        Check.isBlank(coursePaper.getPaperHtmlUrl(), "试卷页面地址不能为空！");
+        //Check.isBlank(coursePaper.getPaperPdfUrl(), "试卷PDF文件地址不能为空！");
 
         CoursePaper oldCoursePaper = coursePaperRepository.findByExamIdAndPaperId(coursePaper.getExamId(), coursePaper.getPaperId());
         if (oldCoursePaper != null) {
             //存在则修改
             oldCoursePaper.setPaperName(coursePaper.getPaperName());
-            oldCoursePaper.setPaperP(coursePaper.getPaperP());
+            oldCoursePaper.setPaperP(coursePaper.getPaperP());//todo
             oldCoursePaper.setPaperWordUrl(coursePaper.getPaperWordUrl());
             oldCoursePaper.setAnswerWordUrl(coursePaper.getAnswerWordUrl());
-            oldCoursePaper.setPaperPdfUrl(coursePaper.getPaperPdfUrl());
-            oldCoursePaper.setAnswerPdfUrl(coursePaper.getAnswerPdfUrl());
+            oldCoursePaper.setPaperHtmlUrl(coursePaper.getPaperHtmlUrl());
+            oldCoursePaper.setPaperPdfUrl(coursePaper.getPaperPdfUrl());//todo
             coursePaperRepository.save(oldCoursePaper);
 
             //更新试卷试题结构
@@ -311,12 +311,10 @@ public class CoursePaperServiceImpl implements CoursePaperService {
 
             if (needPaper) {
                 info.setPaperWord(new Pair<>(title + PAPER_DOC_NAME, paper.getPaperWordUrl()));
-                info.setPaperPdf(new Pair<>(title + PAPER_PDF_NAME, paper.getPaperPdfUrl()));
             }
 
             if (needAnswer) {
                 info.setAnswerWord(new Pair<>(title + ANSWER_DOC_NAME, paper.getAnswerWordUrl()));
-                info.setAnswerPdf(new Pair<>(title + ANSWER_PDF_NAME, paper.getAnswerPdfUrl()));
             }
 
             if (needStruct) {
@@ -362,9 +360,7 @@ public class CoursePaperServiceImpl implements CoursePaperService {
         //下载试卷或答案文件
         for (ExportFileInfo info : exportFiles) {
             this.loadFile(paperDir, info.getPaperWord());
-            this.loadFile(paperDir, info.getPaperPdf());
             this.loadFile(answerDir, info.getAnswerWord());
-            this.loadFile(answerDir, info.getAnswerPdf());
         }
     }
 

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/CoursePaperServiceTest.java

@@ -54,8 +54,8 @@ public class CoursePaperServiceTest extends BaseTest {
         coursePaper.setPaperP(5);
         coursePaper.setPaperWordUrl("https://ecs-test-static.qmth.com.cn/ecs-print/test/demo.docx");
         coursePaper.setAnswerWordUrl("https://ecs-test-static.qmth.com.cn/ecs-print/test/demo.docx");
+        coursePaper.setPaperHtmlUrl("https://ecs-test-static.qmth.com.cn/ecs-print/test/demo.pdf");
         coursePaper.setPaperPdfUrl("https://ecs-test-static.qmth.com.cn/ecs-print/test/demo.pdf");
-        coursePaper.setAnswerPdfUrl("https://ecs-test-static.qmth.com.cn/ecs-print/test/demo.pdf");
         coursePaperService.syncCoursePaper(coursePaper);
     }
 

pom.xml

@@ -103,6 +103,16 @@
                 <artifactId>easypoi-base</artifactId>
                 <version>3.3.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.pdfbox</groupId>
+                <artifactId>pdfbox</artifactId>
+                <version>2.0.12</version>
+            </dependency>
+            <dependency>
+                <groupId>com.itextpdf</groupId>
+                <artifactId>itextpdf</artifactId>
+                <version>5.5.13</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>