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

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

@@ -26,7 +26,6 @@ import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
 public class ExtractConfigCloudServiceClient extends BasicCloudClientSupport implements ExtractConfigCloudService{
 
 	private static final long serialVersionUID = 5635276170773870907L;
-
 	
 	@Autowired
 	private RestTemplate restTemplate;

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

@@ -0,0 +1,54 @@
+package cn.com.qmth.examcloud.core.questions.api.client;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.client.RestTemplate;
+
+import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
+import cn.com.qmth.examcloud.core.questions.api.QuestionCloudService;
+import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionsReq;
+import cn.com.qmth.examcloud.core.questions.api.response.GetDefaultQuesionIdResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetDefaultQuestionsResp;
+
+/**
+ * @author 		weiwenhai
+ * @date 		2018.9.10
+ * @company		qmth
+ * @describle	试题对象服务
+ */
+public class QuestionCloudServiceClient extends BasicCloudClientSupport implements QuestionCloudService{
+
+	private static final long serialVersionUID = 309315715614556772L;
+	
+	@Autowired
+	private RestTemplate restTemplate;
+
+	@Autowired
+	private RedisClient redisClient;
+
+	@Override
+	public GetDefaultQuesionIdResp saveQuestion(GetDefaultQuesionReq req) {
+		return post("default_question/save", req, GetDefaultQuesionIdResp.class);
+	}
+
+	@Override
+	protected RestTemplate getRestTemplate() {
+		return restTemplate;
+	}
+
+	@Override
+	protected RedisClient getRedisClient() {
+		return redisClient;
+	}
+
+	@Override
+	public GetDefaultQuesionIdResp updateQuestion(GetDefaultQuesionReq req) {
+		return post("default_question/update", req, GetDefaultQuesionIdResp.class);
+	}
+
+	@Override
+	public GetDefaultQuestionsResp findQuestions(GetDefaultQuesionsReq req) {
+		return post("default_question/find", req, GetDefaultQuestionsResp.class);
+	}
+
+}

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

@@ -0,0 +1,37 @@
+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.GetDefaultQuesionReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionsReq;
+import cn.com.qmth.examcloud.core.questions.api.response.GetDefaultQuesionIdResp;
+import cn.com.qmth.examcloud.core.questions.api.response.GetDefaultQuestionsResp;
+
+/**
+ * @author 		weiwenhai
+ * @date		2018.9.10
+ * @company		qmth
+ * @describle	试题对象远程调用请求接口
+ */
+public interface QuestionCloudService extends CloudService{
+
+	/**
+	 * 保存单个试题对象
+	 * @param req
+	 * @return
+	 */
+	GetDefaultQuesionIdResp saveQuestion(GetDefaultQuesionReq req);
+	
+	/**
+	 * 修改单个试题对象
+	 * @param req
+	 * @return
+	 */
+	GetDefaultQuesionIdResp updateQuestion(GetDefaultQuesionReq req);
+	
+	/**
+	 * 查询试题集合
+	 * @param req
+	 * @return
+	 */
+	GetDefaultQuestionsResp findQuestions(GetDefaultQuesionsReq req);
+}

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

@@ -0,0 +1,26 @@
+package cn.com.qmth.examcloud.core.questions.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.question.core.question.DefaultQuestion;
+
+/**
+ * @author 		weiwenhai
+ * @date		2018.9.10
+ * @company		qmth
+ * @describle	试题请求对象
+ */
+public class GetDefaultQuesionReq extends BaseRequest{
+
+	private static final long serialVersionUID = -7068180369626962601L;
+	
+	private DefaultQuestion defaultQuestion;
+
+	public DefaultQuestion getDefaultQuestion() {
+		return defaultQuestion;
+	}
+
+	public void setDefaultQuestion(DefaultQuestion defaultQuestion) {
+		this.defaultQuestion = defaultQuestion;
+	}
+	
+}

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

@@ -0,0 +1,77 @@
+package cn.com.qmth.examcloud.core.questions.api.request;
+
+import java.util.Map;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * @author 		weiwenhai
+ * @date		2018.9.11
+ * @company		qmth
+ * @describle	试题集合请求对象
+ */
+public class GetDefaultQuesionsReq extends BaseRequest{
+
+	private static final long serialVersionUID = 6672726322972965826L;
+	
+	/**
+	 * 机构id
+	 */
+	private Long rootOrgId;
+	
+	/**
+	 * 属性集合
+	 */
+	private Map<String, String> properties;
+	
+	/**
+	 * 当前页
+	 */
+	private int curPage;
+	
+	/**
+	 * 每页总数
+	 */
+	private int pageSize;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Map<String, String> getProperties() {
+		return properties;
+	}
+
+	public void setProperties(Map<String, String> properties) {
+		this.properties = properties;
+	}
+
+	public int getCurPage() {
+		return curPage;
+	}
+
+	public void setCurPage(int curPage) {
+		if(curPage<1){
+			this.curPage = 1;
+		}else {
+			this.curPage = curPage;
+		}
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		if(pageSize == 0){
+			this.pageSize = 10;
+		}else {
+			this.pageSize = pageSize;
+		}
+	}
+	
+}

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

@@ -0,0 +1,28 @@
+package cn.com.qmth.examcloud.core.questions.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * @author 		weiwenhai
+ * @date		2018.9.10
+ * @company		qmth
+ * @describle	试题id响应对象
+ */
+public class GetDefaultQuesionIdResp extends BaseResponse{
+
+	private static final long serialVersionUID = -2150215775770361725L;
+	
+	/**
+	 * 试题id
+	 */
+	private String id;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+}

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

@@ -0,0 +1,33 @@
+package cn.com.qmth.examcloud.core.questions.api.response;
+
+import java.util.List;
+
+import org.springframework.data.domain.Page;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.question.core.question.DefaultQuestion;
+
+/**
+ * @author 		weiwenhai
+ * @date		2018.9.11
+ * @company		qmth
+ * @describle	试题集合响应对象
+ */
+public class GetDefaultQuestionsResp extends BaseResponse{
+
+	private static final long serialVersionUID = 2009749603594065484L;
+	
+	/**
+	 * 试题集合
+	 */
+	private Page<DefaultQuestion> defaultQuestions;
+
+	public Page<DefaultQuestion> getDefaultQuestions() {
+		return defaultQuestions;
+	}
+
+	public void setDefaultQuestions(Page<DefaultQuestion> defaultQuestions) {
+		this.defaultQuestions = defaultQuestions;
+	}
+
+}

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

@@ -1,6 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.api.response;
 
-import java.util.List;
 import java.util.Map;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;