修改Paper#grade字段为String类型，增加RemarkTemplate接口

src/main/java/edu/math/diagnosis/controller/PaperCommitController.java

@@ -1,15 +1,17 @@
 package edu.math.diagnosis.controller;
 
+import edu.math.diagnosis.entity.Paper;
 import edu.math.diagnosis.entity.PaperCommit;
 import edu.math.diagnosis.model.Result;
 import edu.math.diagnosis.service.CommitService;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Api(tags = "试卷提交")
 @RestController
@@ -24,4 +26,19 @@ public class PaperCommitController {
         return commitService.commit(paperCommit);
     }
 
+    @ApiOperation(value = "获取所有做过的试卷")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "status", value = "已完成：aleady  未完成：notaleady;  不填则代表全部", paramType = "query"),
+    })
+    @RequestMapping(value = "/listPaperCommit", method = RequestMethod.GET)
+    public List<PaperCommit> listPaperCommit(@RequestParam(required = false) String name,
+                                             @RequestParam(required = false) Long pid,
+                                             @RequestParam(defaultValue = "0") Long startTime,
+                                             @RequestParam(required = false) Long endTime) {
+        if(endTime == null){
+            endTime = System.currentTimeMillis();
+        }
+        return commitService.listPaperCommit(name,pid,startTime,endTime);
+    }
+
 }

src/main/java/edu/math/diagnosis/controller/PaperController.java

@@ -75,11 +75,11 @@ public class PaperController {
         paperService.delete(id);
     }
 
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
+//    @PreAuthorize("hasRole('ROLE_ADMIN')")
     @ApiOperation(value = "上传试卷")
     @PostMapping("uploadPaper")
     @ApiImplicitParam(name = "templateId", value = "试卷模板Id 默认1")
-    public Result uploadPaper(PaperVo paperVo, @RequestParam(defaultValue = "1") Long templateId,
+    public Result uploadPaper(PaperVo paperVo, @RequestParam(defaultValue = "1") Long paperTemplateId,
                               @RequestBody MultipartFile file) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         FileCopyUtils.copy(file.getInputStream(), baos);
@@ -93,6 +93,6 @@ public class PaperController {
         if (StringUtils.isEmpty(url)) {
             return Result.fail("文件上传失败，请重试");
         }
-        return paperService.uploadPaper(paperVo, templateId, url, data);
+        return paperService.uploadPaper(paperVo, paperTemplateId, url, data);
     }
 }

src/main/java/edu/math/diagnosis/controller/RemarkTemplateController.java

@@ -0,0 +1,26 @@
+package edu.math.diagnosis.controller;
+
+
+import edu.math.diagnosis.dao.RemarkTemplateRepo;
+import edu.math.diagnosis.entity.RemarkTemplate;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = "试卷说明模板")
+@RestController
+@RequestMapping("/remarkTemplate")
+public class RemarkTemplateController {
+
+    @Resource
+    private RemarkTemplateRepo remarkTemplateRepo;
+
+    @GetMapping("/list")
+    public List<RemarkTemplate> list() {
+        return remarkTemplateRepo.findAll();
+    }
+}

src/main/java/edu/math/diagnosis/dao/RemarkTemplateRepo.java

@@ -0,0 +1,8 @@
+package edu.math.diagnosis.dao;
+
+import edu.math.diagnosis.entity.RemarkTemplate;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface RemarkTemplateRepo extends JpaRepository<RemarkTemplate, Long> {
+
+}

src/main/java/edu/math/diagnosis/model/PaperVo.java

@@ -6,11 +6,11 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel
 public class PaperVo {
     private String name;
-    @ApiModelProperty("年级 1-12")
-    private Integer grade;
-    @ApiModelProperty("各模块题目数量,以','隔开,单位为分钟 20,20,20")
+    @ApiModelProperty("年级 1-12 X-Y 1X表示1年级上")
+    private String grade;
+    @ApiModelProperty("各模块题目数量,以','隔开,单位为分钟 50,10,9")
     private String sectionNums;
-    @ApiModelProperty("各模块完成时间,以','隔开,单位为分钟 20,20,20")
+    @ApiModelProperty("各模块完成时间,以','隔开,单位为分钟 40,40,40")
     private String sectionDurations;
     @ApiModelProperty("各模块休息时间，以','隔开，单位为分钟 2,2,2")
     private String sectionRests;
@@ -28,11 +28,11 @@ public class PaperVo {
         this.name = name;
     }
 
-    public Integer getGrade() {
+    public String getGrade() {
         return grade;
     }
 
-    public void setGrade(Integer grade) {
+    public void setGrade(String grade) {
         this.grade = grade;
     }
 

src/main/java/edu/math/diagnosis/service/CommitService.java

@@ -123,8 +123,12 @@ public class CommitService {
         paperCommitRepo.saveAndFlush(paperCommit);
         logger.info("uid={},name={},pid={} commit paper success", paperCommit.getUid(), paperCommit.getName(), paperCommit.getPid());
 
-        return  paperResultService.parseResult(paperCommit);
+        return  paperResultService.parseResult(paperCommit,paper);
     }
 
 
+    public List<PaperCommit> listPaperCommit(String name, Long pid, Long startTime, Long endTime) {
+        return null;
+
+    }
 }

src/main/java/edu/math/diagnosis/service/PaperResultService.java

@@ -1,6 +1,7 @@
 package edu.math.diagnosis.service;
 
 import edu.math.diagnosis.dao.PaperResultRepo;
+import edu.math.diagnosis.entity.Paper;
 import edu.math.diagnosis.entity.PaperCommit;
 import edu.math.diagnosis.model.Result;
 import org.springframework.stereotype.Service;
@@ -12,8 +13,13 @@ public class PaperResultService {
 
     @Resource
     private PaperResultRepo paperResultRepo;
+    @Resource
+    private PaperService paperService;
+
+    public Result parseResult(PaperCommit paperCommit, Paper paper){
 
-    public Result parseResult(PaperCommit paperCommit){
         return Result.ok();
     }
+
+
 }

src/main/java/edu/math/diagnosis/service/PaperService.java

@@ -147,6 +147,7 @@ public class PaperService {
             section.setPid(save.getId());
             sectionService.add(section);
         }
+        logger.info("试卷增加成功");
         return Result.ok(paper);
     }
 
@@ -196,9 +197,9 @@ public class PaperService {
         paper.setQuestionNum(paper.getQuestions().size());
         paper.setDuration(paper.getQuestionNum() * 2);
         //TODO 这里要根据实际情况改
-        paper.setSectionDurations("100,20,20");
-        paper.setSectionRests("2,2,2");
-        paper.setSectionNums("50,10,10");
+//        paper.setSectionDurations("100,20,20");
+//        paper.setSectionRests("2,2,2");
+//        paper.setSectionNums("50,10,10");
         WordUtil.close(document);
         //TODO due ability score
         //TODO convert parse exception to reason

src/main/java/edu/math/diagnosis/word/WordService.java

@@ -249,7 +249,7 @@ public class WordService {
             List<XWPFPicture> pictures = run.getEmbeddedPictures();
             logger.debug("run pos " + (i++) + " embed picture size " + pictures.size());
 //            String img = "<img src=\"%s\" style=\"width: %spt;height: %spt\" />";
-            String img = "<img src=\"%s\" style=\"width: %spx\" />";
+            String img = "<img src=\"%s\" style=\"max-width: %spx\" />";
             if (CommonUtil.notEmpty(pictures)) {
                 XWPFPicture pp = pictures.get(0);
                 String pName = pp.getPictureData().getFileName();