Ver código fonte

Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-2/examcloud-rmi.git

wangwei 6 anos atrás
pai
commit
ff9ad654db
27 arquivos alterados com 514 adições e 15 exclusões
  1. 1 1
      examcloud-core-oe-admin-api-client/pom.xml
  2. 1 1
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/AdminCloudClientSupport.java
  3. 0 0
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordCloudServiceClient.java
  4. 7 0
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordForMarkingCloudServiceClient.java
  5. 42 0
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordQuestionsCloudServiceClient.java
  6. 0 0
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/OeExamStudentCloudServiceClient.java
  7. 13 0
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/ExamRecordForMarkingCloudService.java
  8. 21 0
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/ExamRecordQuestionsCloudService.java
  9. 56 5
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamRecordForMarkingBean.java
  10. 72 0
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/QuerySubjectiveAnswerBean.java
  11. 66 0
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/SaveSubjectiveQuestionScoreBean.java
  12. 6 1
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/ExamStudentSyncAllDataReq.java
  13. 6 1
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/ExamStudentSyncPartDataReq.java
  14. 5 0
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/FindExamRecordForMarkingInfoReq.java
  15. 22 0
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/QuerySubjectiveAnswerListReq.java
  16. 32 0
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/QueryValidExamRecordInfoReq.java
  17. 39 0
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/SaveSubjectiveQuestionScoreReq.java
  18. 25 0
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/response/QuerySubjectiveAnswerListResp.java
  19. 20 0
      examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/response/QueryValidExamRecordInfoResp.java
  20. 1 1
      examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/BasicCloudClientSupport.java
  21. 1 1
      examcloud-core-oe-student-face-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/client/BasicCloudClientSupport.java
  22. 3 3
      examcloud-core-oe-student-face-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/client/ExamCaptureQueueCloudServiceClient.java
  23. 7 0
      examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/ExtractConfigCloudServiceClient.java
  24. 9 0
      examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExtractConfigCloudService.java
  25. 28 0
      examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/request/GetQuestionAnswerReq.java
  26. 30 0
      examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/response/GetQuestionAnswerResp.java
  27. 1 1
      pom.xml

+ 1 - 1
examcloud-core-oe-admin-client/pom.xml → examcloud-core-oe-admin-api-client/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>examcloud-core-oe-admin-client</artifactId>
+    <artifactId>examcloud-core-oe-admin-api-client</artifactId>
     <packaging>jar</packaging>
 
     <parent>

+ 1 - 1
examcloud-core-oe-admin-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/AdminCloudClientSupport.java → examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/AdminCloudClientSupport.java

@@ -17,7 +17,7 @@ public abstract class AdminCloudClientSupport extends CloudClientSupport {
 
     @Override
     public String getUrlPrefix() {
-        return "http://EXAMCLOUD-SERVICE-OE-ADMIN/api/core/oe/admin/";
+        return "http://EC-CORE-OE-ADMIN/api/core/oe/admin/";
     }
 
 }

+ 0 - 0
examcloud-core-oe-admin-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordCloudServiceClient.java → examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordCloudServiceClient.java


+ 7 - 0
examcloud-core-oe-admin-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordForMarkingCloudServiceClient.java → examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordForMarkingCloudServiceClient.java

@@ -7,7 +7,9 @@ import org.springframework.web.client.RestTemplate;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordForMarkingCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamRecordForMarkingInfoReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryValidExamRecordInfoReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamRecordForMarkingInfoResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoResp;
 
 @Service
 public class ExamRecordForMarkingCloudServiceClient extends AdminCloudClientSupport implements ExamRecordForMarkingCloudService{
@@ -33,6 +35,11 @@ public class ExamRecordForMarkingCloudServiceClient extends AdminCloudClientSupp
 		return redisClient;
 	}
 
+	@Override
+	public QueryValidExamRecordInfoResp queryValidExamRecordInfo(QueryValidExamRecordInfoReq req) {
+		return post("examRecordForMarking/queryValidExamRecordInfo", req, QueryValidExamRecordInfoResp.class);
+	}
+
 	
 	
 }

+ 42 - 0
examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordQuestionsCloudServiceClient.java

@@ -0,0 +1,42 @@
+package cn.com.qmth.examcloud.core.oe.admin.client;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
+import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordQuestionsCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QuerySubjectiveAnswerListReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveSubjectiveQuestionScoreReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QuerySubjectiveAnswerListResp;
+
+@Service
+public class ExamRecordQuestionsCloudServiceClient extends AdminCloudClientSupport implements ExamRecordQuestionsCloudService{
+	
+	@Autowired
+    private RestTemplate restTemplate;
+	
+    @Autowired
+    private RedisClient redisClient;
+
+	@Override
+	protected RestTemplate getRestTemplate() {
+		return restTemplate;
+	}
+
+	@Override
+	protected RedisClient getRedisClient() {
+		return redisClient;
+	}
+
+	@Override
+	public QuerySubjectiveAnswerListResp querySubjectiveAnswerList(QuerySubjectiveAnswerListReq req) {
+		return post("examRecordQuestions/querySubjectiveAnswerList", req, QuerySubjectiveAnswerListResp.class);
+	}
+
+	@Override
+	public void saveSubjectiveQuestionScore(SaveSubjectiveQuestionScoreReq req) {
+		post("examRecordQuestions/saveSubjectiveQuestionScore", req, null);
+	}
+
+}

+ 0 - 0
examcloud-core-oe-admin-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/OeExamStudentCloudServiceClient.java → examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/OeExamStudentCloudServiceClient.java


+ 13 - 0
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/ExamRecordForMarkingCloudService.java

@@ -2,10 +2,23 @@ package cn.com.qmth.examcloud.core.oe.admin.api;
 
 
 import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamRecordForMarkingInfoReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryValidExamRecordInfoReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamRecordForMarkingInfoResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoResp;
 
 public interface ExamRecordForMarkingCloudService {
 
+	/**
+	 * 获取试卷信息
+	 * @param findExamRecordForMarkingInfoReq
+	 * @return
+	 */
 	public FindExamRecordForMarkingInfoResp findExamRecordForMarkingInfo(FindExamRecordForMarkingInfoReq findExamRecordForMarkingInfoReq);
 	
+	/**
+	 * 获取学生有效考试记录
+	 * @param req
+	 * @return
+	 */
+	public QueryValidExamRecordInfoResp queryValidExamRecordInfo(QueryValidExamRecordInfoReq req);
 }

+ 21 - 0
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/ExamRecordQuestionsCloudService.java

@@ -0,0 +1,21 @@
+package cn.com.qmth.examcloud.core.oe.admin.api;
+
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QuerySubjectiveAnswerListReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveSubjectiveQuestionScoreReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QuerySubjectiveAnswerListResp;
+
+public interface ExamRecordQuestionsCloudService {
+
+	/**
+	 * 根据考试记录ID获取主观题答案集合
+	 * @param req
+	 * @return
+	 */
+	public QuerySubjectiveAnswerListResp querySubjectiveAnswerList(QuerySubjectiveAnswerListReq req);
+	
+	/**
+	 * 阅卷回传主观题分数
+	 * @param req
+	 */
+	public void saveSubjectiveQuestionScore(SaveSubjectiveQuestionScoreReq req);
+}

+ 56 - 5
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamRecordForMarkingBean.java

@@ -1,18 +1,45 @@
 package cn.com.qmth.examcloud.core.oe.admin.api.bean;
 
-public class ExamRecordForMarkingBean {
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+public class ExamRecordForMarkingBean implements JsonSerializable{
 
 	private Long id;
 	
+	/**
+	 * 考试ID
+	 */
+	private Long examId;
+	/**
+	 * 考试记录ID
+	 */
+	private Long examRecordDataId;
+	
+	/**
+	 * 原始试卷ID
+	 */
 	private String basePaperId;
 	
+	/**
+	 * 原始试卷名称
+	 */
 	private String basePaperName;
-	
-	private String paperType;
-	
+	/**
+	 * 课程code
+	 */
 	private String courseCode;
-	
+	/**
+	 * 课程名称
+	 */
 	private String courseName;
+	/**
+	 * 试卷类型 A、B、O
+	 */
+	private String paperType;
+	/**
+	 * 考生ID
+	 */
+	private Long examStudentId;
 
 	public Long getId() {
 		return id;
@@ -61,5 +88,29 @@ public class ExamRecordForMarkingBean {
 	public void setCourseName(String courseName) {
 		this.courseName = courseName;
 	}
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+
+	public Long getExamStudentId() {
+		return examStudentId;
+	}
+
+	public void setExamStudentId(Long examStudentId) {
+		this.examStudentId = examStudentId;
+	}
 	
 }

+ 72 - 0
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/QuerySubjectiveAnswerBean.java

@@ -0,0 +1,72 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+public class QuerySubjectiveAnswerBean implements JsonSerializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7905287270240057925L;
+	/**
+	 * 考试记录Data Id
+	 */
+    private Long examRecordDataId;
+    /**
+     * 大题号
+     */
+    private Integer mainNumber;
+    /**
+     * 原题ID
+     */
+    private String questionId;
+    /**
+     * 在整个试卷中的序号
+     */
+    private Integer order;
+    /**
+     * 考生作答
+     */
+    private String studentAnswer;
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+
+	public Integer getMainNumber() {
+		return mainNumber;
+	}
+
+	public void setMainNumber(Integer mainNumber) {
+		this.mainNumber = mainNumber;
+	}
+
+	public String getQuestionId() {
+		return questionId;
+	}
+
+	public void setQuestionId(String questionId) {
+		this.questionId = questionId;
+	}
+
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
+	public String getStudentAnswer() {
+		return studentAnswer;
+	}
+
+	public void setStudentAnswer(String studentAnswer) {
+		this.studentAnswer = studentAnswer;
+	}
+    
+}

+ 66 - 0
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/SaveSubjectiveQuestionScoreBean.java

@@ -0,0 +1,66 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年9月21日 下午4:36:00
+ * @company 	QMTH
+ * @description 阅卷回传主观题分数
+ */
+public class SaveSubjectiveQuestionScoreBean implements JsonSerializable{
+
+	/**
+	 * 考试记录ID
+	 */
+	private Long examRecordDataId;
+	
+	/**
+	 * 
+	 */
+	private String questionId;
+	
+	/**
+	 * 小题序号
+	 */
+	private Integer order;
+	
+	/**
+	 * 得分
+	 */
+	private Double score;
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+
+	public String getQuestionId() {
+		return questionId;
+	}
+
+	public void setQuestionId(String questionId) {
+		this.questionId = questionId;
+	}
+
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
+	public Double getScore() {
+		return score;
+	}
+
+	public void setScore(Double score) {
+		this.score = score;
+	}
+	
+}

+ 6 - 1
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/ExamStudentSyncAllDataReq.java

@@ -17,7 +17,12 @@ import java.util.List;
  * @since: 2018/8/15
  */
 public class ExamStudentSyncAllDataReq extends BaseRequest {
-    private List<ExamStudentSyncAllDataBean> examStudents;
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 3175391899811481624L;
+	
+	private List<ExamStudentSyncAllDataBean> examStudents;
 
     public List<ExamStudentSyncAllDataBean> getExamStudents() {
         return examStudents;

+ 6 - 1
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/ExamStudentSyncPartDataReq.java

@@ -17,7 +17,12 @@ import java.util.List;
  * @since: 2018/8/21
  */
 public class ExamStudentSyncPartDataReq extends BaseRequest {
-    private List<ExamStudentSyncPartDataBean> examStudents;
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1132518052371768047L;
+	
+	private List<ExamStudentSyncPartDataBean> examStudents;
 
     public List<ExamStudentSyncPartDataBean> getExamStudents() {
         return examStudents;

+ 5 - 0
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/FindExamRecordForMarkingInfoReq.java

@@ -4,6 +4,11 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
 public class FindExamRecordForMarkingInfoReq extends BaseRequest{
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5225188075968101471L;
+
 	private Long id;
 	
 	private Long examId;

+ 22 - 0
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/QuerySubjectiveAnswerListReq.java

@@ -0,0 +1,22 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class QuerySubjectiveAnswerListReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -9070813233144824120L;
+	
+	private Long examRecordDataId;
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+	
+}

+ 32 - 0
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/QueryValidExamRecordInfoReq.java

@@ -0,0 +1,32 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class QueryValidExamRecordInfoReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6980222009119791592L;
+
+	private Long examId;
+	
+	private String courseCode;
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public String getCourseCode() {
+		return courseCode;
+	}
+
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+	
+}

+ 39 - 0
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/SaveSubjectiveQuestionScoreReq.java

@@ -0,0 +1,39 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.SaveSubjectiveQuestionScoreBean;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年9月21日 下午4:38:10
+ * @company 	QMTH
+ * @description 阅卷回传主观题分数
+ */
+public class SaveSubjectiveQuestionScoreReq extends BaseRequest {
+
+	private Long examRecordDataId;
+	
+	private List<SaveSubjectiveQuestionScoreBean> saveSubjectiveQuestionScoreList;
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+
+	public List<SaveSubjectiveQuestionScoreBean> getSaveSubjectiveQuestionScoreList() {
+		return saveSubjectiveQuestionScoreList;
+	}
+
+	public void setSaveSubjectiveQuestionScoreList(
+			List<SaveSubjectiveQuestionScoreBean> saveSubjectiveQuestionScoreList) {
+		this.saveSubjectiveQuestionScoreList = saveSubjectiveQuestionScoreList;
+	}
+	
+	
+}

+ 25 - 0
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/response/QuerySubjectiveAnswerListResp.java

@@ -0,0 +1,25 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.QuerySubjectiveAnswerBean;
+
+public class QuerySubjectiveAnswerListResp extends BaseResponse {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4706376951430478336L;
+	private List<QuerySubjectiveAnswerBean> querySubjectiveAnswerBeanList;
+
+	public List<QuerySubjectiveAnswerBean> getQuerySubjectiveAnswerBeanList() {
+		return querySubjectiveAnswerBeanList;
+	}
+
+	public void setQuerySubjectiveAnswerBeanList(
+			List<QuerySubjectiveAnswerBean> querySubjectiveAnswerBeanList) {
+		this.querySubjectiveAnswerBeanList = querySubjectiveAnswerBeanList;
+	}
+	
+}

+ 20 - 0
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/response/QueryValidExamRecordInfoResp.java

@@ -0,0 +1,20 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamRecordForMarkingBean;
+
+public class QueryValidExamRecordInfoResp extends BaseResponse{
+	private static final long serialVersionUID = 3280021281705457587L;
+	private List<ExamRecordForMarkingBean> examRecordForMarkingBeanList;
+
+	public List<ExamRecordForMarkingBean> getExamRecordForMarkingBeanList() {
+		return examRecordForMarkingBeanList;
+	}
+
+	public void setExamRecordForMarkingBeanList(
+			List<ExamRecordForMarkingBean> examRecordForMarkingBeanList) {
+		this.examRecordForMarkingBeanList = examRecordForMarkingBeanList;
+	}
+}

+ 1 - 1
examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/BasicCloudClientSupport.java

@@ -10,7 +10,7 @@ import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
 public abstract class BasicCloudClientSupport extends CloudClientSupport {
 	@Override
 	public String getUrlPrefix() {
-		return "http://EXAMCLOUD-SERVICE-OE-STUDENT/api/core/oe/student/";
+		return "http://EC-CORE-OE-STUDENT/api/core/oe/student/";
 	}
 
 }

+ 1 - 1
examcloud-core-oe-student-face-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/client/BasicCloudClientSupport.java

@@ -10,7 +10,7 @@ public abstract class BasicCloudClientSupport extends CloudClientSupport {
 
 	@Override
 	public String getUrlPrefix() {
-		return "http://EC-CORE-OE-STUDENT-FACE/api/core/oe/student/face";
+		return "http://EC-CORE-OE-STUDENT-FACE/api/core/oe/student/face/";
 	}
 
 }

+ 3 - 3
examcloud-core-oe-student-face-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/client/ExamCaptureQueueCloudServiceClient.java

@@ -34,17 +34,17 @@ public class ExamCaptureQueueCloudServiceClient extends BasicCloudClientSupport
 
 	@Override
 	public void processingExamCaptureQueue() {
-		 post("/processingExamCaptureQueue", null, null);
+		 post("examCaptureQueue/processingExamCaptureQueue", null, null);
 	}
 
 	@Override
 	public String disposeExamCapturePhoto(ExamCaptureQueueReq examCaptureQueueReq) {
-		return post("/disposeExamCapturePhoto", examCaptureQueueReq, String.class);
+		return post("examCaptureQueue/disposeExamCapturePhoto", examCaptureQueueReq, String.class);
 	}
 
 	@Override
 	public void changeExamCaptureQueueStatus() {
-		post("/changeExamCaptureQueueStatus", null, null);
+		post("examCaptureQueue/changeExamCaptureQueueStatus", null, null);
 	}
 
 }

+ 7 - 0
examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/ExtractConfigCloudServiceClient.java

@@ -8,10 +8,12 @@ import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.questions.api.ExtractConfigCloudService;
 import cn.com.qmth.examcloud.core.questions.api.request.GetBasePaperReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionAnswerReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
 import cn.com.qmth.examcloud.core.questions.api.response.GetBasePaperResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionAnswerResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionListResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
 
@@ -64,4 +66,9 @@ public class ExtractConfigCloudServiceClient extends BasicCloudClientSupport imp
 		return redisClient;
 	}
 
+	@Override
+	public GetQuestionAnswerResp getQuestionAnswer(GetQuestionAnswerReq req) {
+		return post("extract_config/getQuestionAnswerList", req, GetQuestionAnswerResp.class);
+	}
+
 }

+ 9 - 0
examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExtractConfigCloudService.java

@@ -3,10 +3,12 @@ package cn.com.qmth.examcloud.core.questions.api;
 import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.core.questions.api.request.GetBasePaperReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionAnswerReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
 import cn.com.qmth.examcloud.core.questions.api.response.GetBasePaperResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionAnswerResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionListResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
 
@@ -45,4 +47,11 @@ public interface ExtractConfigCloudService extends CloudService{
 	 * @return
 	 */
 	GetQuestionListResp getQuestionList(GetQuestionListReq req);
+	
+	/**
+	 * 根据试题id获取试题答案
+	 * @param req
+	 * @return
+	 */
+	GetQuestionAnswerResp getQuestionAnswer(GetQuestionAnswerReq req);
 }

+ 28 - 0
examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/request/GetQuestionAnswerReq.java

@@ -0,0 +1,28 @@
+package cn.com.qmth.examcloud.core.questions.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * @author 		weiwenhai
+ * @date 		2018.9.22
+ * @company		qmth
+ * @describle	调卷规则远程调用请求单个试题答案
+ */
+public class GetQuestionAnswerReq extends BaseRequest{
+
+	private static final long serialVersionUID = -6186837094658202592L;
+	
+	/**
+	 * 试题id
+	 */
+	private String questionId;
+
+	public String getQuestionId() {
+		return questionId;
+	}
+
+	public void setQuestionId(String questionId) {
+		this.questionId = questionId;
+	}
+
+}

+ 30 - 0
examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/response/GetQuestionAnswerResp.java

@@ -0,0 +1,30 @@
+package cn.com.qmth.examcloud.core.questions.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * @author 		weiwenhai
+ * @date 		2018.9.22
+ * @company		qmth
+ * @describle	调卷规则远程调用响应单个试题答案
+ */
+public class GetQuestionAnswerResp extends BaseResponse{
+
+	private static final long serialVersionUID = 8028849673872181468L;
+	
+	/**
+	 * 试题答案
+	 */
+	private List<String> answerList;
+
+	public List<String> getAnswerList() {
+		return answerList;
+	}
+
+	public void setAnswerList(List<String> answerList) {
+		this.answerList = answerList;
+	}
+	
+}

+ 1 - 1
pom.xml

@@ -24,7 +24,7 @@
 		<module>examcloud-task-api-client</module>
 
 		<module>examcloud-core-oe-admin-api</module>
-		<module>examcloud-core-oe-admin-client</module>
+		<module>examcloud-core-oe-admin-api-client</module>
 
 		<module>examcloud-core-questions-api</module>
 		<module>examcloud-core-questions-api-client</module>