update

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/CommonController.java

@@ -67,7 +67,6 @@ public class CommonController extends ControllerSupport {
     }
 
     @PostMapping("/upyun/info")
-    @ApiOperation(value = "获取又拍云信息")
     public UpYunProperty getUpYunInfo() {
         return upYunClient.getProperty();
     }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursestatistic/CourseStatisticConvert.java

@@ -40,8 +40,7 @@ public class CourseStatisticConvert {
         if (paper != null) {
             info.setPaperId(paper.getPaperId());
             info.setPaperName(paper.getPaperName());
-            info.setPaperFileUrl(paper.getPaperFileUrl());
-            info.setAnswerFileUrl(paper.getAnswerFileUrl());
+            info.setPaperPdfUrl(paper.getPaperPdfUrl());
             info.setPaperP(paper.getPaperP());
         }
         return info;

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/coursestatistic/CourseStatisticInfo.java

@@ -58,13 +58,9 @@ public class CourseStatisticInfo implements Serializable {
      */
     private String paperName;
     /**
-     * 试卷文件URL
+     * 试卷PDF文件地址(用于预览)
      */
-    private String paperFileUrl;
-    /**
-     * 答案文件URL
-     */
-    private String answerFileUrl;
+    private String paperPdfUrl;
     /**
      * 试卷P数
      */
@@ -158,20 +154,12 @@ public class CourseStatisticInfo implements Serializable {
         this.paperName = paperName;
     }
 
-    public String getPaperFileUrl() {
-        return paperFileUrl;
-    }
-
-    public void setPaperFileUrl(String paperFileUrl) {
-        this.paperFileUrl = paperFileUrl;
-    }
-
-    public String getAnswerFileUrl() {
-        return answerFileUrl;
+    public String getPaperPdfUrl() {
+        return paperPdfUrl;
     }
 
-    public void setAnswerFileUrl(String answerFileUrl) {
-        this.answerFileUrl = answerFileUrl;
+    public void setPaperPdfUrl(String paperPdfUrl) {
+        this.paperPdfUrl = paperPdfUrl;
     }
 
     public Integer getPaperP() {

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

@@ -86,16 +86,20 @@ public class CoursePaperServiceImpl implements CoursePaperService {
         Check.isEmpty(coursePaper.getPaperId(), "试卷ID不能为空！");
         Check.isEmpty(coursePaper.getPaperName(), "试卷名称不能为空！");
         Check.isNull(coursePaper.getPaperP(), "试卷页数不能为空！");
-        Check.isBlank(coursePaper.getPaperFileUrl(), "试卷文件地址不能为空！");
-        Check.isBlank(coursePaper.getAnswerFileUrl(), "答案文件地址不能为空！");
+        Check.isBlank(coursePaper.getPaperWordUrl(), "试卷Word文件地址不能为空！");
+        Check.isBlank(coursePaper.getAnswerWordUrl(), "答案Word文件地址不能为空！");
+        Check.isBlank(coursePaper.getPaperPdfUrl(), "试卷PDF文件地址不能为空！");
+        Check.isBlank(coursePaper.getAnswerPdfUrl(), "答案PDF文件地址不能为空！");
 
         CoursePaper oldCoursePaper = coursePaperRepository.findByExamIdAndPaperId(coursePaper.getExamId(), coursePaper.getPaperId());
         if (oldCoursePaper != null) {
             //存在则修改
             oldCoursePaper.setPaperName(coursePaper.getPaperName());
             oldCoursePaper.setPaperP(coursePaper.getPaperP());
-            oldCoursePaper.setPaperFileUrl(coursePaper.getPaperFileUrl());
-            oldCoursePaper.setAnswerFileUrl(coursePaper.getAnswerFileUrl());
+            oldCoursePaper.setPaperWordUrl(coursePaper.getPaperWordUrl());
+            oldCoursePaper.setAnswerWordUrl(coursePaper.getAnswerWordUrl());
+            oldCoursePaper.setPaperPdfUrl(coursePaper.getPaperPdfUrl());
+            oldCoursePaper.setAnswerPdfUrl(coursePaper.getAnswerPdfUrl());
             coursePaperRepository.save(oldCoursePaper);
 
             //更新试卷试题结构

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

@@ -47,8 +47,10 @@ public class CoursePaperServiceTest extends BaseTest {
         coursePaper.setPaperId("abc");
         coursePaper.setPaperName("测试试卷");
         coursePaper.setPaperP(5);
-        coursePaper.setPaperFileUrl("aaa");
-        coursePaper.setAnswerFileUrl("bbb");
+        coursePaper.setPaperWordUrl("aaa");
+        coursePaper.setAnswerWordUrl("bbb");
+        coursePaper.setPaperPdfUrl("xxx");
+        coursePaper.setAnswerPdfUrl("yyy");
         coursePaperService.syncCoursePaper(coursePaper);
     }