Merge remote-tracking branch 'origin/master'

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

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

examcloud-core-oe-student-face-api/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/api/ExamCaptureQueueCloudService.java

@@ -22,5 +22,5 @@ public interface ExamCaptureQueueCloudService extends CloudService{
 	 * @param examCaptureQueueReq
 	 * @return
 	 */
-	public String disposeExamCapturePhoto(ExamCaptureQueueReq examCaptureQueueReq);
+	public void disposeExamCapturePhoto(ExamCaptureQueueReq examCaptureQueueReq);
 }

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

@@ -21,8 +21,7 @@ import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
  * @author 		weiwenhai
  * @date 		2018.8.15
  * @company		qmth
- * @describle	调卷远程调用服务
- *
+ * @description	调卷远程调用服务
  */
 @Service
 public class ExtractConfigCloudServiceClient extends BasicCloudClientSupport implements ExtractConfigCloudService{
@@ -71,4 +70,9 @@ public class ExtractConfigCloudServiceClient extends BasicCloudClientSupport imp
 		return post("extract_config/getQuestionAnswerList", req, GetQuestionAnswerResp.class);
 	}
 
+	@Override
+	public GetQuestionResp getBaseQuestion(GetQuestionReq req) {
+		return post("extract_config/getBaseQuestion", req, GetQuestionResp.class);
+	}
+
 }

examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/PaperCloudServiceClient.java

@@ -0,0 +1,44 @@
+package cn.com.qmth.examcloud.core.questions.api.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.questions.api.PaperCloudService;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
+import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
+
+/**
+ * @author 		weiwenhai
+ * @date		2018.10.8
+ * @company		qmth
+ * @description	试卷对象远程调用
+ */
+@Service
+public class PaperCloudServiceClient extends BasicCloudClientSupport implements PaperCloudService{
+
+	private static final long serialVersionUID = 1657323811328647049L;
+
+	@Autowired
+	private RestTemplate restTemplate;
+
+	@Autowired
+	private RedisClient redisClient;
+	
+	@Override
+	public GetPaperResp genPaper(GetQuestionListReq req) {
+		return post("default_paper/save", req, GetPaperResp.class);
+	}
+
+	@Override
+	protected RestTemplate getRestTemplate() {
+		return restTemplate;
+	}
+
+	@Override
+	protected RedisClient getRedisClient() {
+		return redisClient;
+	}
+
+}

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

@@ -54,4 +54,11 @@ public interface ExtractConfigCloudService extends CloudService{
 	 * @return
 	 */
 	GetQuestionAnswerResp getQuestionAnswer(GetQuestionAnswerReq req);
+	
+	/**
+	 * 根据试题id查询单个题目
+	 * @param req
+	 * @return
+	 */
+	GetQuestionResp getBaseQuestion(GetQuestionReq req);
 }

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/PaperCloudService.java

@@ -0,0 +1,22 @@
+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.GetQuestionListReq;
+import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
+
+/**
+ * @author 		weiwenhai
+ * @date 		2018.10.8
+ * @company		qmth
+ * @description	试卷对象远程调用请求接口
+ */
+public interface PaperCloudService extends CloudService{
+
+	/**
+	 * 根据试题id集合，进行组卷
+	 * @param req
+	 * @return
+	 */
+	GetPaperResp genPaper(GetQuestionListReq req);
+	
+}

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/QuestionCloudService.java

@@ -12,7 +12,7 @@ import cn.com.qmth.examcloud.core.questions.api.response.GetDefaultQuestionsResp
  * @author 		weiwenhai
  * @date		2018.9.10
  * @company		qmth
- * @describle	试题对象远程调用请求接口
+ * @description	试题对象远程调用请求接口
  */
 public interface QuestionCloudService extends CloudService{
 

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/bean/PaperBean.java

@@ -6,7 +6,7 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
  * @author 		weiwenhai
  * @date 		2018.8.15
  * @company		qmth
- * @describle	调卷规则远程调用试卷结构包装类
+ * @description	调卷规则远程调用试卷结构包装类
  */
 public class PaperBean implements JsonSerializable{
 

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/bean/PaperK12Bean.java

@@ -0,0 +1,41 @@
+package cn.com.qmth.examcloud.core.questions.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * @author 		weiwenhai
+ * @date		2018.10.8
+ * @company		qmth
+ * @description	K12请求对包含对象
+ */
+public class PaperK12Bean implements JsonSerializable{
+
+	private static final long serialVersionUID = -3224832466574427121L;
+	
+	/**
+	 * 分数
+	 */
+	private Double score;
+	
+	/**
+	 * 作答限时
+	 */
+	private Long timeLimit;
+
+	public Double getScore() {
+		return score;
+	}
+
+	public void setScore(Double score) {
+		this.score = score;
+	}
+
+	public Long getTimeLimit() {
+		return timeLimit;
+	}
+
+	public void setTimeLimit(Long timeLimit) {
+		this.timeLimit = timeLimit;
+	}
+	
+}

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/request/GetQuestionListReq.java

@@ -1,8 +1,10 @@
 package cn.com.qmth.examcloud.core.questions.api.request;
 
+import java.util.Map;
 import java.util.Set;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.core.questions.api.bean.PaperK12Bean;
 
 /**
  * @author 		weiwenhai
@@ -18,6 +20,16 @@ public class GetQuestionListReq extends BaseRequest{
 	 * 试题id集合
 	 */
 	private Set<String> questionIds;
+	
+	/**
+	 * K12需要对象
+	 */
+	private Map<String, PaperK12Bean> map;
+	
+	/**
+	 * 试卷名称
+	 */
+	private String name;
 
 	public Set<String> getQuestionIds() {
 		return questionIds;
@@ -26,7 +38,21 @@ public class GetQuestionListReq extends BaseRequest{
 	public void setQuestionIds(Set<String> questionIds) {
 		this.questionIds = questionIds;
 	}
-	
-	
 
+	public Map<String, PaperK12Bean> getMap() {
+		return map;
+	}
+
+	public void setMap(Map<String, PaperK12Bean> map) {
+		this.map = map;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
 }