weiwenhai hace 6 años
padre
commit
04a645c978

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

@@ -6,8 +6,10 @@ import org.springframework.web.client.RestTemplate;
 
 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.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.GetQuestionResp;
 
@@ -39,6 +41,11 @@ public class ExtractConfigCloudServiceClient extends BasicCloudClientSupport imp
 	public GetQuestionResp getQuestion(GetQuestionReq req) {
 		return post("extract_config/getQuestion", req, GetQuestionResp.class);
 	}
+	
+	@Override
+	public GetBasePaperResp getBasePaper(GetBasePaperReq req) {
+		return post("extract_config/getBasePaper", req, GetBasePaperResp.class);
+	}
 
 	@Override
 	protected RestTemplate getRestTemplate() {
@@ -50,4 +57,6 @@ public class ExtractConfigCloudServiceClient extends BasicCloudClientSupport imp
 		return redisClient;
 	}
 
+	
+
 }

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

@@ -1,8 +1,10 @@
 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.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.GetQuestionResp;
 
@@ -28,4 +30,10 @@ public interface ExtractConfigCloudService extends CloudService{
 	 */
 	GetQuestionResp getQuestion(GetQuestionReq req);
 	
+	/**
+	 * 网考  根据试卷id 抽取考试试卷
+	 * @param req
+	 * @return
+	 */
+	GetBasePaperResp getBasePaper(GetBasePaperReq req);
 }

+ 28 - 0
examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/request/GetBasePaperReq.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.8.27
+ * @company		qmth
+ * @describle	获取试卷结构请求对象
+ */
+public class GetBasePaperReq extends BaseRequest{
+
+	private static final long serialVersionUID = -2086228074459123588L;
+
+	/**
+	 * 试卷id
+	 */
+	private String paperId;
+
+	public String getPaperId() {
+		return paperId;
+	}
+
+	public void setPaperId(String paperId) {
+		this.paperId = paperId;
+	}
+	
+}

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

@@ -0,0 +1,29 @@
+package cn.com.qmth.examcloud.core.questions.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.question.core.paper.DefaultPaper;
+
+/**
+ * @author 		weiwenhai
+ * @date		2018.8.27
+ * @company		qmth
+ * @describle	试卷结构返回对象
+ */
+public class GetBasePaperResp extends BaseResponse{
+
+	private static final long serialVersionUID = 405436023397864070L;
+
+	/**
+     * 试卷结构
+     */
+	private DefaultPaper defaultPaper;
+	
+	public DefaultPaper getDefaultPaper() {
+		return defaultPaper;
+	}
+
+	public void setDefaultPaper(DefaultPaper defaultPaper) {
+		this.defaultPaper = defaultPaper;
+	}
+
+}

+ 19 - 6
examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/response/GetPaperResp.java

@@ -25,7 +25,12 @@ public class GetPaperResp extends BaseResponse{
      * ture:乱序
      * false:不乱序
      */
-    private Boolean sortQptionOrder;
+    private Boolean sortOptionOrder;
+    
+    /**
+     * 原试卷id
+     */
+    private String paperId;
     
     /**
      * 试卷结构
@@ -40,12 +45,12 @@ public class GetPaperResp extends BaseResponse{
 		this.sortQuestionOrder = sortQuestionOrder;
 	}
 
-	public Boolean getSortQptionOrder() {
-		return sortQptionOrder;
+	public Boolean getSortOptionOrder() {
+		return sortOptionOrder;
 	}
 
-	public void setSortQptionOrder(Boolean sortQptionOrder) {
-		this.sortQptionOrder = sortQptionOrder;
+	public void setSortOptionOrder(Boolean sortOptionOrder) {
+		this.sortOptionOrder = sortOptionOrder;
 	}
 
 	public DefaultPaper getDefaultPaper() {
@@ -55,5 +60,13 @@ public class GetPaperResp extends BaseResponse{
 	public void setDefaultPaper(DefaultPaper defaultPaper) {
 		this.defaultPaper = defaultPaper;
 	}
-    
+
+	public String getPaperId() {
+		return paperId;
+	}
+
+	public void setPaperId(String paperId) {
+		this.paperId = paperId;
+	}
+	
 }