阅卷中间件调用阅卷后端工程的调用方式更改

examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkResultCloudServiceClient.java

@@ -3,6 +3,7 @@ package cn.com.qmth.examcloud.marking.api.client;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.marking.api.MarkResultCloudService;
 import cn.com.qmth.examcloud.marking.api.request.GetMarkResultReq;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkResultPageResp;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkResultResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,4 +38,9 @@ public class MarkResultCloudServiceClient extends BasicCloudClientSupport implem
     public GetMarkResultResp getMarkResult(GetMarkResultReq req) {
         return post("markResult/getMarkResult",req,GetMarkResultResp.class);
     }
+
+    @Override
+    public GetMarkResultPageResp getMarkResultPage(GetMarkResultReq req) {
+        return post("markResult/getMarkResultPage",req,GetMarkResultPageResp.class);
+    }
 }

examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkTaskCloudServiceClient.java

@@ -9,6 +9,7 @@ import cn.com.qmth.examcloud.marking.api.response.GetMarkTaskResp;
 import cn.com.qmth.examcloud.marking.api.response.SaveMarkTaskResp;
 import cn.com.qmth.examcloud.marking.api.response.UpdateMarkTaskResp;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -18,6 +19,7 @@ import org.springframework.web.client.RestTemplate;
  * @Date 2018/11/27 17:21
  * @Version 3.0
  */
+@Service
 public class MarkTaskCloudServiceClient extends BasicCloudClientSupport implements MarkTaskCloudService {
     @Autowired
     private RestTemplate restTemplate;

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/MarkResultCloudService.java

@@ -2,6 +2,7 @@ package cn.com.qmth.examcloud.marking.api;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.marking.api.request.GetMarkResultReq;
+import cn.com.qmth.examcloud.marking.api.response.GetMarkResultPageResp;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkResultResp;
 
 /**
@@ -18,4 +19,9 @@ public interface MarkResultCloudService extends CloudService {
      * @return
      */
     GetMarkResultResp getMarkResult(GetMarkResultReq req);
+
+    /**
+     * 分页查询
+     */
+    GetMarkResultPageResp getMarkResultPage(GetMarkResultReq req);
 }

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/MarkResultBean.java

@@ -11,6 +11,55 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
  */
 public class MarkResultBean implements JsonSerializable {
     private static final long serialVersionUID = 5272188907376217931L;
+
+    //评卷结果表主键Id
+    private Long id;
+
+    private Long userId;
+
+    private Long markRangeId;
+
+    private Long studentPaperId;
+
+    private Double score;
+
+    private String studentId;
+
+    private String tag;
+
+    private String studentName;
+
+    private String studentCode;
+
+    private String courseCode;
+
+    private String orgCode;
+
+    private String paperType;
+
+    private String paperId;
+
+    private String courseName;
+
+    private String orgName;
+
+    private String userName;
+
+    private Long workId;
+
+    private String specialtyName;
+
+    private String specialtyCode;
+
+    /**
+     * 学生答卷的主观题HTML
+     */
+    private String studentSubjectiveHtml;
+
+    private String examType;
+
+    private Long rootOrgId;
+
     //客观分
     private Double objectiveScore;
     //主观分
@@ -18,7 +67,9 @@ public class MarkResultBean implements JsonSerializable {
     //总分
     private Double totalScore;
     //阅卷结果备注信息
-    private String remark;
+    private String markRemark;
+
+    private StudentPaperBean studentPaper;
 
     public MarkResultBean() {
     }
@@ -47,11 +98,195 @@ public class MarkResultBean implements JsonSerializable {
         this.totalScore = totalScore;
     }
 
-    public String getRemark() {
-        return remark;
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getMarkRangeId() {
+        return markRangeId;
+    }
+
+    public void setMarkRangeId(Long markRangeId) {
+        this.markRangeId = markRangeId;
+    }
+
+    public Long getStudentPaperId() {
+        return studentPaperId;
+    }
+
+    public void setStudentPaperId(Long studentPaperId) {
+        this.studentPaperId = studentPaperId;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public String getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(String studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
+    public String getPaperId() {
+        return paperId;
+    }
+
+    public void setPaperId(String paperId) {
+        this.paperId = paperId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Long getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(Long workId) {
+        this.workId = workId;
+    }
+
+    public String getSpecialtyName() {
+        return specialtyName;
+    }
+
+    public void setSpecialtyName(String specialtyName) {
+        this.specialtyName = specialtyName;
+    }
+
+    public String getSpecialtyCode() {
+        return specialtyCode;
+    }
+
+    public void setSpecialtyCode(String specialtyCode) {
+        this.specialtyCode = specialtyCode;
+    }
+
+    public String getStudentSubjectiveHtml() {
+        return studentSubjectiveHtml;
+    }
+
+    public void setStudentSubjectiveHtml(String studentSubjectiveHtml) {
+        this.studentSubjectiveHtml = studentSubjectiveHtml;
+    }
+
+    public String getExamType() {
+        return examType;
+    }
+
+    public void setExamType(String examType) {
+        this.examType = examType;
+    }
+
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
+
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
+
+    public String getMarkRemark() {
+        return markRemark;
+    }
+
+    public void setMarkRemark(String markRemark) {
+        this.markRemark = markRemark;
+    }
+
+    public StudentPaperBean getStudentPaper() {
+        return studentPaper;
     }
 
-    public void setRemark(String remark) {
-        this.remark = remark;
+    public void setStudentPaper(StudentPaperBean studentPaper) {
+        this.studentPaper = studentPaper;
     }
 }

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetMarkResultReq.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.marking.api.request;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.marking.api.bean.MarkResultBean;
 
 /**
  * @ClassName GetMarkResultReq
@@ -11,22 +12,8 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
  */
 public class GetMarkResultReq extends BaseRequest {
     private static final long serialVersionUID = -3296359799978577391L;
-    //考生Id
-    private Long examStudentId;
 
-    private Long workId;
-
-    private String orgCode;
-
-    private String courseCode;
-
-    private String tag;
-
-    private String studentCode;
-
-    private String studentName;
-
-    private Long userId;
+    private MarkResultBean markResultBean;
 
     private Integer curPage;
 
@@ -36,68 +23,12 @@ public class GetMarkResultReq extends BaseRequest {
     public GetMarkResultReq() {
     }
 
-    public Long getExamStudentId() {
-        return examStudentId;
-    }
-
-    public void setExamStudentId(Long examStudentId) {
-        this.examStudentId = examStudentId;
-    }
-
-    public Long getWorkId() {
-        return workId;
-    }
-
-    public void setWorkId(Long workId) {
-        this.workId = workId;
-    }
-
-    public String getOrgCode() {
-        return orgCode;
-    }
-
-    public void setOrgCode(String orgCode) {
-        this.orgCode = orgCode;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getTag() {
-        return tag;
-    }
-
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public Long getUserId() {
-        return userId;
+    public MarkResultBean getMarkResultBean() {
+        return markResultBean;
     }
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
+    public void setMarkResultBean(MarkResultBean markResultBean) {
+        this.markResultBean = markResultBean;
     }
 
     public Integer getCurPage() {

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/GetMarkResultPageResp.java

@@ -0,0 +1,97 @@
+package cn.com.qmth.examcloud.marking.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.commons.web.helpers.page.PageInfo;
+import cn.com.qmth.examcloud.marking.api.bean.MarkResultBean;
+
+import java.util.List;
+
+/**
+ * @ClassName GetMarkResultPageResp
+ * @Description TODO
+ * @Author nikang
+ * @Date 2018/11/28 10:09
+ * @Version 3.0
+ */
+public class GetMarkResultPageResp extends BaseResponse {
+
+    private static final long serialVersionUID = -4434412357231463358L;
+
+    /**
+     * 当前页码
+     */
+    private long index = 1;
+
+    /**
+     * 每页的数量
+     */
+    private long limit = 10;
+
+    /**
+     * 当前页的数量
+     */
+    private long size;
+
+    /**
+     * 总记录数
+     */
+    private long total;
+
+    /**
+     * 总页数
+     */
+    private long pages;
+
+    /**
+     * 结果集
+     */
+    private List<MarkResultBean> list;
+
+    public long getIndex() {
+        return index;
+    }
+
+    public void setIndex(long index) {
+        this.index = index;
+    }
+
+    public long getLimit() {
+        return limit;
+    }
+
+    public void setLimit(long limit) {
+        this.limit = limit;
+    }
+
+    public long getSize() {
+        return size;
+    }
+
+    public void setSize(long size) {
+        this.size = size;
+    }
+
+    public long getTotal() {
+        return total;
+    }
+
+    public void setTotal(long total) {
+        this.total = total;
+    }
+
+    public long getPages() {
+        return pages;
+    }
+
+    public void setPages(long pages) {
+        this.pages = pages;
+    }
+
+    public List<MarkResultBean> getList() {
+        return list;
+    }
+
+    public void setList(List<MarkResultBean> list) {
+        this.list = list;
+    }
+}

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/GetMarkResultResp.java

@@ -10,7 +10,7 @@ import cn.com.qmth.examcloud.marking.api.bean.MarkResultBean;
  * @Date 2018/9/27 9:09
  * @Version 3.0
  */
-public class GetMarkResultResp extends PageInfo {
+public class GetMarkResultResp extends BaseResponse {
 
     private static final long serialVersionUID = 4892486776787678144L;
 

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/response/PageInfo.java

@@ -1,59 +0,0 @@
-package cn.com.qmth.examcloud.marking.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-/**
- * @ClassName PageInfo
- * @Description TODO
- * @Author nikang
- * @Date 2018/11/27 9:36
- * @Version 3.0
- */
-public class PageInfo extends BaseResponse {
-    private long size;
-    private long totalElements;
-    private long totalPages;
-    private long page;
-
-    public PageInfo() {
-    }
-
-    public PageInfo(long size, long totalElements, long totalPages, long page) {
-        this.size = size;
-        this.totalElements = totalElements;
-        this.totalPages = totalPages;
-        this.page = page;
-    }
-
-    public long getSize() {
-        return size;
-    }
-
-    public void setSize(long size) {
-        this.size = size;
-    }
-
-    public long getTotalElements() {
-        return totalElements;
-    }
-
-    public void setTotalElements(long totalElements) {
-        this.totalElements = totalElements;
-    }
-
-    public long getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(long totalPages) {
-        this.totalPages = totalPages;
-    }
-
-    public long getPage() {
-        return page;
-    }
-
-    public void setPage(long page) {
-        this.page = page;
-    }
-}