提交rmi

examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/ExtractConfigCloudClientSupport.java → examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/BasicCloudClientSupport.java

@@ -8,7 +8,7 @@ import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
  * @company		qmth
  * @describle	调卷规则路径
  */
-public abstract class ExtractConfigCloudClientSupport extends CloudClientSupport {
+public abstract class BasicCloudClientSupport extends CloudClientSupport {
 
 	@Override
 	protected String getUrlPrefix() {

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

@@ -1,12 +1,15 @@
 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.ExtractConfigCloudService;
 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.GetPaperResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
 
 /**
  * @author 		weiwenhai
@@ -15,7 +18,8 @@ import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
  * @describle	调卷远程调用服务
  *
  */
-public class ExtractConfigCloudServiceClient extends ExtractConfigCloudClientSupport implements ExtractConfigCloudService{
+@Service
+public class ExtractConfigCloudServiceClient extends BasicCloudClientSupport implements ExtractConfigCloudService{
 
 	private static final long serialVersionUID = 5635276170773870907L;
 
@@ -28,7 +32,12 @@ public class ExtractConfigCloudServiceClient extends ExtractConfigCloudClientSup
 	
 	@Override
 	public GetPaperResp getPaper(GetPaperReq req) {
-		return post("extract_paper/getPaper", req, GetPaperResp.class);
+		return post("extract_config/getPaper", req, GetPaperResp.class);
+	}
+	
+	@Override
+	public GetQuestionResp getQuestion(GetQuestionReq req) {
+		return post("extract_config/getQuestion", req, GetQuestionResp.class);
 	}
 
 	@Override
@@ -40,5 +49,5 @@ public class ExtractConfigCloudServiceClient extends ExtractConfigCloudClientSup
 	protected RedisClient getRedisClient() {
 		return redisClient;
 	}
-	
+
 }

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

@@ -2,7 +2,9 @@ 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.GetPaperReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
 import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
 
 /**
  * @author 		weiwenhai
@@ -19,4 +21,11 @@ public interface ExtractConfigCloudService extends CloudService{
 	 */
 	GetPaperResp getPaper(GetPaperReq req);
 	
+	/**
+	 * 网考  根据调卷规则  抽取单个试题
+	 * @param req
+	 * @return
+	 */
+	GetQuestionResp getQuestion(GetQuestionReq req);
+	
 }

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

@@ -6,7 +6,7 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
  * @author 		weiwenhai
  * @date 		2018.8.15
  * @company		qmth
- * @describle	调卷规则远程调用请求对象
+ * @describle	调卷规则远程调用请求试卷结构对象
  */
 public class GetPaperReq extends BaseRequest{
 

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

@@ -0,0 +1,68 @@
+package cn.com.qmth.examcloud.core.questions.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * @author 		weiwenhai
+ * @date 		2018.8.15
+ * @company		qmth
+ * @describle	调卷规则远程调用请求单个试题对象
+ *
+ */
+public class GetQuestionReq extends BaseRequest{
+
+	private static final long serialVersionUID = 3795913755024582770L;
+
+	/**
+	 * 考试id
+	 */
+	private Long examId;
+	
+	/**
+	 * 课程code
+	 */
+	private String courseCode;
+	
+	/**
+	 * 考试类型：O,A...
+	 */
+	private String groupCode;
+	
+	/**
+	 * 试题id
+	 */
+	private String questionId;
+
+	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;
+	}
+
+	public String getGroupCode() {
+		return groupCode;
+	}
+
+	public void setGroupCode(String groupCode) {
+		this.groupCode = groupCode;
+	}
+
+	public String getQuestionId() {
+		return questionId;
+	}
+
+	public void setQuestionId(String questionId) {
+		this.questionId = questionId;
+	}
+	
+}

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

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.api.response;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-import cn.com.qmth.examcloud.core.questions.api.bean.PaperBean;
+import cn.com.qmth.examcloud.question.core.paper.DefaultPaper;
 
 /**
  * @author 		weiwenhai
@@ -13,14 +13,47 @@ public class GetPaperResp extends BaseResponse{
 
 	private static final long serialVersionUID = -8320558698331419566L;
 	
-	private PaperBean paperBean;
+	/**
+     * 小题乱序
+     * true:乱序
+     * false：不乱序
+     */
+    private Boolean sortQuestionOrder;
+    
+    /**
+     * 选项乱序
+     * ture:乱序
+     * false：不乱序
+     */
+    private Boolean sortQptionOrder;
+    
+    /**
+     * 试卷结构
+     */
+    private DefaultPaper defaultPaper;
+    
+	public Boolean getSortQuestionOrder() {
+		return sortQuestionOrder;
+	}
 
-	public PaperBean getPaperBean() {
-		return paperBean;
+	public void setSortQuestionOrder(Boolean sortQuestionOrder) {
+		this.sortQuestionOrder = sortQuestionOrder;
 	}
 
-	public void setPaperBean(PaperBean paperBean) {
-		this.paperBean = paperBean;
+	public Boolean getSortQptionOrder() {
+		return sortQptionOrder;
 	}
-	
+
+	public void setSortQptionOrder(Boolean sortQptionOrder) {
+		this.sortQptionOrder = sortQptionOrder;
+	}
+
+	public DefaultPaper getDefaultPaper() {
+		return defaultPaper;
+	}
+
+	public void setDefaultPaper(DefaultPaper defaultPaper) {
+		this.defaultPaper = defaultPaper;
+	}
+    
 }

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

@@ -0,0 +1,23 @@
+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.question.DefaultQuestion;
+
+public class GetQuestionResp extends BaseResponse{
+
+	private static final long serialVersionUID = 4686294816077136293L;
+
+	/**
+	 * 单个试题对象
+	 */
+	private DefaultQuestion defaultQuestion;
+
+	public DefaultQuestion getDefaultQuestion() {
+		return defaultQuestion;
+	}
+
+	public void setDefaultQuestion(DefaultQuestion defaultQuestion) {
+		this.defaultQuestion = defaultQuestion;
+	}
+	
+}