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

examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/UserCloudServiceClient.java

@@ -7,8 +7,10 @@ import org.springframework.web.client.RestTemplate;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.AddUserReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetUserListReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserReq;
 import cn.com.qmth.examcloud.core.basic.api.response.AddUserResp;
+import cn.com.qmth.examcloud.core.basic.api.response.GetUserListResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUserResp;
 
 /**
@@ -49,4 +51,9 @@ public class UserCloudServiceClient extends BasicCloudClientSupport implements U
 		return post("user/getUser", req, GetUserResp.class);
 	}
 
+	@Override
+	public GetUserListResp getUserList(GetUserListReq req) {
+		return post("user/getUserList", req, GetUserListResp.class);
+	}
+
 }

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/UserCloudService.java

@@ -2,8 +2,10 @@ package cn.com.qmth.examcloud.core.basic.api;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.AddUserReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetUserListReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserReq;
 import cn.com.qmth.examcloud.core.basic.api.response.AddUserResp;
+import cn.com.qmth.examcloud.core.basic.api.response.GetUserListResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUserResp;
 
 /**
@@ -34,4 +36,13 @@ public interface UserCloudService extends CloudService {
 	 */
 	GetUserResp getUser(GetUserReq req);
 
+	/**
+	 * 方法注释
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetUserListResp getUserList(GetUserListReq req);
+
 }

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/ThirdPartyAccessBean.java

@@ -1,68 +1,68 @@
-package cn.com.qmth.examcloud.core.basic.api.bean;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-
-/**
- * 第三方接入信息
- *
- * @author WANGWEI
- * @date 2018年7月5日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class ThirdPartyAccessBean implements JsonSerializable {
-
-	private static final long serialVersionUID = 9212710623859419481L;
-
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 应用ID
-	 */
-	private String appId;
-
-	/**
-	 * 密钥
-	 */
-	private String secretKey;
-
-	/**
-	 * 时间差范围
-	 */
-	private long timeRange;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getAppId() {
-		return appId;
-	}
-
-	public void setAppId(String appId) {
-		this.appId = appId;
-	}
-
-	public String getSecretKey() {
-		return secretKey;
-	}
-
-	public void setSecretKey(String secretKey) {
-		this.secretKey = secretKey;
-	}
-
-	public long getTimeRange() {
-		return timeRange;
-	}
-
-	public void setTimeRange(long timeRange) {
-		this.timeRange = timeRange;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * 第三方接入信息
+ *
+ * @author WANGWEI
+ * @date 2018年7月5日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class ThirdPartyAccessBean implements JsonSerializable {
+
+	private static final long serialVersionUID = 9212710623859419481L;
+
+	/**
+	 * 顶级机构ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 应用ID
+	 */
+	private String appId;
+
+	/**
+	 * 密钥
+	 */
+	private String secretKey;
+
+	/**
+	 * 时间差范围
+	 */
+	private Long timeRange;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getAppId() {
+		return appId;
+	}
+
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+
+	public String getSecretKey() {
+		return secretKey;
+	}
+
+	public void setSecretKey(String secretKey) {
+		this.secretKey = secretKey;
+	}
+
+	public Long getTimeRange() {
+		return timeRange;
+	}
+
+	public void setTimeRange(Long timeRange) {
+		this.timeRange = timeRange;
+	}
+
+}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetUserListReq.java

@@ -0,0 +1,49 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetUserListReq extends BaseRequest {
+
+	private static final long serialVersionUID = -5423361956786896423L;
+
+	private Long rootOrgId;
+
+	private Long start;
+
+	private Long roleId;
+
+	private String roleCode;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getStart() {
+		return start;
+	}
+
+	public void setStart(Long start) {
+		this.start = start;
+	}
+
+	public Long getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Long roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleCode() {
+		return roleCode;
+	}
+
+	public void setRoleCode(String roleCode) {
+		this.roleCode = roleCode;
+	}
+
+}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetUserListResp.java

@@ -0,0 +1,32 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.core.basic.api.bean.UserBean;
+
+public class GetUserListResp extends BaseResponse {
+
+	private static final long serialVersionUID = -2236372532342357905L;
+
+	private long next;
+
+	private List<UserBean> userBeanList;
+
+	public long getNext() {
+		return next;
+	}
+
+	public void setNext(long next) {
+		this.next = next;
+	}
+
+	public List<UserBean> getUserBeanList() {
+		return userBeanList;
+	}
+
+	public void setUserBeanList(List<UserBean> userBeanList) {
+		this.userBeanList = userBeanList;
+	}
+
+}

examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamCloudServiceClient.java

@@ -6,6 +6,7 @@ import org.springframework.web.client.RestTemplate;
 
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseListReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamListReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
@@ -14,6 +15,7 @@ import cn.com.qmth.examcloud.examwork.api.request.LockExamStudentsReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.UnlockExamStudentsReq;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseListResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamListResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
@@ -90,4 +92,9 @@ public class ExamCloudServiceClient extends BasicCloudClientSupport implements E
 		return post("exam/getExamList", req, GetExamListResp.class);
 	}
 
+	@Override
+	public GetExamCourseListResp getExamCourseList(GetExamCourseListReq req) {
+		return post("exam/getExamCourseList", req, GetExamCourseListResp.class);
+	}
+
 }

examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamStudentCloudServiceClient.java

@@ -7,8 +7,10 @@ import org.springframework.web.client.RestTemplate;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.CopyExamStudentsReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.response.CopyExamStudentsResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 
 @Service
@@ -44,4 +46,9 @@ public class ExamStudentCloudServiceClient extends BasicCloudClientSupport
 		return post("examStudent/copyExamStudents", req, CopyExamStudentsResp.class);
 	}
 
+	@Override
+	public GetExamStudentResp getExamStudent(GetExamStudentReq req) {
+		return post("examStudent/getExamStudent", req, GetExamStudentResp.class);
+	}
+
 }

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/ExamCloudService.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.examwork.api;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseListReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamListReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
@@ -9,6 +10,7 @@ import cn.com.qmth.examcloud.examwork.api.request.LockExamStudentsReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.UnlockExamStudentsReq;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseListResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamListResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
@@ -96,4 +98,13 @@ public interface ExamCloudService extends CloudService {
 	 */
 	GetExamListResp getExamList(GetExamListReq req);
 
+	/**
+	 * 查询考试的课程集合
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamCourseListResp getExamCourseList(GetExamCourseListReq req);
+
 }

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/ExamStudentCloudService.java

@@ -2,8 +2,10 @@ package cn.com.qmth.examcloud.examwork.api;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.examwork.api.request.CopyExamStudentsReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.response.CopyExamStudentsResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 
 /**
@@ -32,4 +34,13 @@ public interface ExamStudentCloudService extends CloudService {
 	 */
 	CopyExamStudentsResp copyExamStudents(CopyExamStudentsReq req);
 
+	/**
+	 * 查询单个考生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamStudentResp getExamStudent(GetExamStudentReq req);
+
 }

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamCourseRelationBean.java

@@ -0,0 +1,59 @@
+package cn.com.qmth.examcloud.examwork.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+public class ExamCourseRelationBean implements JsonSerializable {
+
+	private static final long serialVersionUID = 757531976286006550L;
+
+	private Long examId;
+
+	private Long courseId;
+
+	private String courseName;
+
+	private String courseCode;
+
+	private String courseLevel;
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getCourseId() {
+		return courseId;
+	}
+
+	public void setCourseId(Long courseId) {
+		this.courseId = courseId;
+	}
+
+	public String getCourseName() {
+		return courseName;
+	}
+
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+
+	public String getCourseCode() {
+		return courseCode;
+	}
+
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+
+	public String getCourseLevel() {
+		return courseLevel;
+	}
+
+	public void setCourseLevel(String courseLevel) {
+		this.courseLevel = courseLevel;
+	}
+
+}

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/GetExamCourseListReq.java

@@ -0,0 +1,39 @@
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetExamCourseListReq extends BaseRequest {
+
+	private static final long serialVersionUID = 3931835759483816611L;
+
+	private Long rootOrgId;
+
+	private Long examId;
+
+	private Long start;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getStart() {
+		return start;
+	}
+
+	public void setStart(Long start) {
+		this.start = start;
+	}
+
+}

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/GetExamStudentReq.java

@@ -0,0 +1,29 @@
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetExamStudentReq extends BaseRequest {
+
+	private static final long serialVersionUID = 6021720401106774756L;
+
+	private Long rootOrgId;
+
+	private Long examStudentId;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getExamStudentId() {
+		return examStudentId;
+	}
+
+	public void setExamStudentId(Long examStudentId) {
+		this.examStudentId = examStudentId;
+	}
+
+}

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/response/GetExamCourseListResp.java

@@ -0,0 +1,32 @@
+package cn.com.qmth.examcloud.examwork.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamCourseRelationBean;
+
+public class GetExamCourseListResp extends BaseResponse {
+
+	private static final long serialVersionUID = 3698992696031626041L;
+
+	private long next;
+
+	private List<ExamCourseRelationBean> relationList;
+
+	public long getNext() {
+		return next;
+	}
+
+	public void setNext(long next) {
+		this.next = next;
+	}
+
+	public List<ExamCourseRelationBean> getRelationList() {
+		return relationList;
+	}
+
+	public void setRelationList(List<ExamCourseRelationBean> relationList) {
+		this.relationList = relationList;
+	}
+
+}

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/response/GetExamStudentResp.java

@@ -0,0 +1,20 @@
+package cn.com.qmth.examcloud.examwork.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
+
+public class GetExamStudentResp extends BaseResponse {
+
+	private static final long serialVersionUID = 551172845649241433L;
+
+	private ExamStudentBean examStudentBean;
+
+	public ExamStudentBean getExamStudentBean() {
+		return examStudentBean;
+	}
+
+	public void setExamStudentBean(ExamStudentBean examStudentBean) {
+		this.examStudentBean = examStudentBean;
+	}
+
+}