暂时简单修复获取用户做过的试卷的接口

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

@@ -26,7 +26,7 @@ import java.util.Map;
  * @DATE: Create in 2018/7/6 17:55
  * @DESCRIPTION:
  */
-@Api(tags = "答案提交 马上废弃")
+@Api(tags = "试卷提交 马上废弃")
 @RestController
 @RequestMapping("/commit")
 public class CommitController {

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

@@ -1,6 +1,7 @@
 package edu.math.diagnosis.controller;
 
 import edu.math.diagnosis.entity.PaperCommit;
+import edu.math.diagnosis.model.Constants;
 import edu.math.diagnosis.model.Result;
 import edu.math.diagnosis.service.CommitService;
 import io.swagger.annotations.Api;
@@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;
 
-@Api(tags = "试卷提交")
+@Api(tags = "试卷提交管理")
 @RestController
 @RequestMapping("paper")
 public class PaperCommitController {
@@ -30,15 +31,17 @@ public class PaperCommitController {
             @ApiImplicitParam(name = "name", value = "用户姓名，可无", paramType = "query"),
             @ApiImplicitParam(name = "pid", value = "试卷Id，可无", paramType = "query"),
     })
-    @RequestMapping(value = "/listPaperCommit", method = RequestMethod.GET)
-    public List<PaperCommit> listPaperCommit(@RequestParam(required = false) String name,
-                                             @RequestParam(required = false) Long pid,
+    @GetMapping("/listPaperCommit")
+    public List<PaperCommit> listPaperCommit(@RequestParam(required = false) Long pid,
+                                             @RequestParam(required = false) String name,
                                              @RequestParam(defaultValue = "0") Long startTime,
-                                             @RequestParam(required = false) Long endTime) {
+                                             @RequestParam(required = false) Long endTime,
+                                             @RequestParam(defaultValue = Constants.PAGENO) Integer pageNo,
+                                             @RequestParam(defaultValue = Constants.PAGESIZE) Integer pageSize) {
         if (endTime == null) {
             endTime = System.currentTimeMillis();
         }
-        return commitService.listPaperCommit(name, pid, startTime, endTime);
+        return commitService.listPaperCommit(pid, name, startTime, endTime);
     }
 
 }

src/main/java/edu/math/diagnosis/controller/TempController.java → src/main/java/edu/math/diagnosis/controller/ReportController.java

@@ -13,11 +13,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-@Api(tags = "获取报告信息")
+@Api(tags = "获取报告信息 马上废弃")
 @RestController
 @RequestMapping("/getTempPapers")
 //@PreAuthorize("hasRole('ROLE_ADMIN')")
-public class TempController {
+public class ReportController {
 
     @Resource
     private ExcelUtils excelUtils;

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

@@ -13,4 +13,8 @@ import java.util.List;
 public interface PaperCommitRepo extends JpaRepository<PaperCommit, Long> {
 
     List<PaperCommit> findByPidOrNameContaining(Long pid,String name);
+
+    List<PaperCommit> findByNameContaining(String name);
+
+    List<PaperCommit> findByPid(Long pid);
 }

src/main/java/edu/math/diagnosis/entity/AbilityScore.java

@@ -21,12 +21,12 @@ public class AbilityScore {
     private String ability;
 
     @Column(nullable = false)
-    @ApiModelProperty("关联类型 commit paper question")
-    private String relatedType;
+    @ApiModelProperty("试卷Id")
+    private Long pid;
 
     @Column(nullable = false)
-    @ApiModelProperty("关联")
-    private Long relatedId;
+    @ApiModelProperty("问题Id")
+    private Long qid;
 
     @Column(nullable = false, columnDefinition = "double(10,2) default 0")
     @ApiModelProperty("能力分数")
@@ -60,20 +60,20 @@ public class AbilityScore {
         this.ability = ability;
     }
 
-    public String getRelatedType() {
-        return relatedType;
+    public Long getPid() {
+        return pid;
     }
 
-    public void setRelatedType(String relatedType) {
-        this.relatedType = relatedType;
+    public void setPid(Long pid) {
+        this.pid = pid;
     }
 
-    public Long getRelatedId() {
-        return relatedId;
+    public Long getQid() {
+        return qid;
     }
 
-    public void setRelatedId(Long relatedId) {
-        this.relatedId = relatedId;
+    public void setQid(Long qid) {
+        this.qid = qid;
     }
 
     public Double getScore() {

src/main/java/edu/math/diagnosis/entity/SubjectKnowledge.java

@@ -1,4 +1,85 @@
 package edu.math.diagnosis.entity;
 
+import io.swagger.annotations.ApiModel;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+@ApiModel("科目知识点")
 public class SubjectKnowledge {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String subjectId;
+
+    private String grade;
+
+    private String chapter;
+
+    private String code;
+
+    private String content;
+
+    private String abilityCodes;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public String getChapter() {
+        return chapter;
+    }
+
+    public void setChapter(String chapter) {
+        this.chapter = chapter;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getAbilityCodes() {
+        return abilityCodes;
+    }
+
+    public void setAbilityCodes(String abilityCodes) {
+        this.abilityCodes = abilityCodes;
+    }
 }

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

@@ -75,4 +75,7 @@ public class Constants {
     public static final SimpleGrantedAuthority USER_STUDENT = new SimpleGrantedAuthority(USER_TYPE_STUDENT);
     public static final SimpleGrantedAuthority USER_GUEST = new SimpleGrantedAuthority(USER_TYPE_GUEST);
 
+    public static final String PAGENO = "1";
+    public static final String PAGESIZE = "10";
+
 }

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

@@ -127,7 +127,17 @@ public class CommitService {
         return paperResultService.parseResult(paperCommit, paper);
     }
 
-    public List<PaperCommit> listPaperCommit(String name, Long pid, Long startTime, Long endTime) {
+    public List<PaperCommit> listPaperCommit(Long pid, String name, Long startTime, Long endTime) {
+        //TODO 增加时间区间查询,待优化查询
+        if (pid == null && StringUtils.isBlank(name)) {
+            return paperCommitRepo.findAll();
+        }
+        if (pid == null && StringUtils.isNotBlank(name)) {
+            return paperCommitRepo.findByNameContaining(name);
+        }
+        if (pid != null && StringUtils.isBlank(name)) {
+            return paperCommitRepo.findByPid(pid);
+        }
         return paperCommitRepo.findByPidOrNameContaining(pid, name);
     }
 }