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/OrgCloudServiceClient.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.OrgCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetOrgsReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveOrgReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
+import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveOrgResp;
 
 /**
@@ -50,4 +52,9 @@ public class OrgCloudServiceClient extends BasicCloudClientSupport implements Or
 		return post("org/getOrg", req, GetOrgResp.class);
 	}
 
+	@Override
+	public GetOrgsResp getOrgs(GetOrgsReq req) {
+		return post("org/getOrgs", req, GetOrgsResp.class);
+	}
+
 }

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/OrgCloudService.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.GetOrgReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetOrgsReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveOrgReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
+import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveOrgResp;
 
 /**
@@ -20,4 +22,6 @@ public interface OrgCloudService extends CloudService {
 
 	SaveOrgResp saveOrg(SaveOrgReq orgReq);
 
+	GetOrgsResp getOrgs(GetOrgsReq req);
+
 }

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

@@ -1,60 +1,79 @@
-package cn.com.qmth.examcloud.core.basic.api.bean;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年5月25日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class RoleBean implements JsonSerializable {
-
-	private static final long serialVersionUID = -916123953402843015L;
-
-	private Long roleId;
-
-	private String roleCode;
-
-	private String roleName;
-
-	public RoleBean() {
-	}
-
-	public RoleBean(Long roleId, String roleCode, String roleName) {
-		super();
-		this.roleId = roleId;
-		this.roleCode = roleCode;
-		this.roleName = roleName;
-	}
-
-	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;
-	}
-
-	public String getRoleName() {
-		return roleName;
-	}
-
-	public void setRoleName(String roleName) {
-		this.roleName = roleName;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年5月25日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class RoleBean implements JsonSerializable {
+
+	private static final long serialVersionUID = -916123953402843015L;
+
+	private Long roleId;
+
+	private String roleCode;
+
+	private String roleName;
+
+	private Long rootOrgId;
+
+	/**
+	 * 构造函数
+	 *
+	 */
+	public RoleBean() {
+	}
+
+	/**
+	 * 构造函数
+	 *
+	 * @param rootOrgId
+	 * @param roleId
+	 * @param roleCode
+	 * @param roleName
+	 */
+	public RoleBean(Long rootOrgId, Long roleId, String roleCode, String roleName) {
+		super();
+		this.rootOrgId = rootOrgId;
+		this.roleId = roleId;
+		this.roleCode = roleCode;
+		this.roleName = roleName;
+	}
+
+	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;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+}

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

@@ -0,0 +1,39 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetOrgsReq extends BaseRequest {
+
+	private static final long serialVersionUID = -4094995334429058987L;
+
+	private Long rootOrgId;
+
+	private Long parentId;
+
+	private Long start;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(Long parentId) {
+		this.parentId = parentId;
+	}
+
+	public Long getStart() {
+		return start;
+	}
+
+	public void setStart(Long start) {
+		this.start = start;
+	}
+
+}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetOrgsResp.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.OrgBean;
+
+public class GetOrgsResp extends BaseResponse {
+
+	private static final long serialVersionUID = -8786805029980636744L;
+
+	private long next;
+
+	private List<OrgBean> orgBeanList;
+
+	public long getNext() {
+		return next;
+	}
+
+	public void setNext(long next) {
+		this.next = next;
+	}
+
+	public List<OrgBean> getOrgBeanList() {
+		return orgBeanList;
+	}
+
+	public void setOrgBeanList(List<OrgBean> orgBeanList) {
+		this.orgBeanList = orgBeanList;
+	}
+
+}

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

@@ -9,13 +9,17 @@ import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetOngoingExamListReq;
+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.GetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetOngoingExamListResp;
+import cn.com.qmth.examcloud.examwork.api.response.LockExamStudentsResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.SetExamPropertyResp;
+import cn.com.qmth.examcloud.examwork.api.response.UnlockExamStudentsResp;
 
 /**
  * @author chenken
@@ -69,4 +73,14 @@ public class ExamCloudServiceClient extends BasicCloudClientSupport implements E
 		return post("exam/getOngoingExamList", req, GetOngoingExamListResp.class);
 	}
 
+	@Override
+	public LockExamStudentsResp lockExamStudents(LockExamStudentsReq req) {
+		return post("exam/getOngoingExamList", req, LockExamStudentsResp.class);
+	}
+
+	@Override
+	public UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req) {
+		return post("exam/getOngoingExamList", req, UnlockExamStudentsResp.class);
+	}
+
 }

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

@@ -6,7 +6,9 @@ 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.SaveExamStudentReq;
+import cn.com.qmth.examcloud.examwork.api.response.CopyExamStudentsResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 
 @Service
@@ -28,13 +30,18 @@ public class ExamStudentCloudServiceClient extends BasicCloudClientSupport
 	}
 
 	@Override
-	public SaveExamStudentResp saveExamStudent(SaveExamStudentReq examStudentReq) {
-		return post("examStudent/saveExamStudent", examStudentReq, SaveExamStudentResp.class);
+	protected RestTemplate getRestTemplate() {
+		return restTemplate;
 	}
 
 	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
+	public SaveExamStudentResp saveExamStudent(SaveExamStudentReq req) {
+		return post("examStudent/saveExamStudent", req, SaveExamStudentResp.class);
+	}
+
+	@Override
+	public CopyExamStudentsResp copyExamStudents(CopyExamStudentsReq req) {
+		return post("examStudent/copyExamStudents", req, CopyExamStudentsResp.class);
 	}
 
 }

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

@@ -4,13 +4,17 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetOngoingExamListReq;
+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.GetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetOngoingExamListResp;
+import cn.com.qmth.examcloud.examwork.api.response.LockExamStudentsResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.SetExamPropertyResp;
+import cn.com.qmth.examcloud.examwork.api.response.UnlockExamStudentsResp;
 
 /**
  * 类注释
@@ -63,4 +67,22 @@ public interface ExamCloudService extends CloudService {
 	 */
 	GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req);
 
+	/**
+	 * 锁定考生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	LockExamStudentsResp lockExamStudents(LockExamStudentsReq req);
+
+	/**
+	 * 解锁考生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req);
+
 }

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

@@ -1,7 +1,9 @@
 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.SaveExamStudentReq;
+import cn.com.qmth.examcloud.examwork.api.response.CopyExamStudentsResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 
 /**
@@ -21,4 +23,13 @@ public interface ExamStudentCloudService extends CloudService {
 	 */
 	SaveExamStudentResp saveExamStudent(SaveExamStudentReq req);
 
+	/**
+	 * 拷贝
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	CopyExamStudentsResp copyExamStudents(CopyExamStudentsReq req);
+
 }

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

@@ -0,0 +1,51 @@
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class CopyExamStudentsReq extends BaseRequest {
+
+	/**
+	 * 属性注释
+	 */
+	private static final long serialVersionUID = -3889415294884515605L;
+
+	/**
+	 * copy from
+	 */
+	private Long examId1;
+
+	/**
+	 * copy to
+	 */
+	private Long examId2;
+
+	/**
+	 * 考试ID开始值
+	 */
+	private Long start;
+
+	public Long getExamId1() {
+		return examId1;
+	}
+
+	public void setExamId1(Long examId1) {
+		this.examId1 = examId1;
+	}
+
+	public Long getExamId2() {
+		return examId2;
+	}
+
+	public void setExamId2(Long examId2) {
+		this.examId2 = examId2;
+	}
+
+	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/LockExamStudentsReq.java

@@ -0,0 +1,21 @@
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class LockExamStudentsReq extends BaseRequest {
+
+	private static final long serialVersionUID = -5866745872512198999L;
+
+	private List<Long> examIdList;
+
+	public List<Long> getExamIdList() {
+		return examIdList;
+	}
+
+	public void setExamIdList(List<Long> examIdList) {
+		this.examIdList = examIdList;
+	}
+
+}

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

@@ -0,0 +1,20 @@
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class UnlockExamStudentsReq extends BaseRequest {
+	private static final long serialVersionUID = -4190561579691204704L;
+
+	private List<Long> examIdList;
+
+	public List<Long> getExamIdList() {
+		return examIdList;
+	}
+
+	public void setExamIdList(List<Long> examIdList) {
+		this.examIdList = examIdList;
+	}
+
+}

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

@@ -0,0 +1,31 @@
+package cn.com.qmth.examcloud.examwork.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class CopyExamStudentsResp extends BaseResponse {
+
+	private static final long serialVersionUID = 7302954606845265326L;
+
+	private List<Long> examStudentIds;
+
+	private Long next;
+
+	public List<Long> getExamStudentIds() {
+		return examStudentIds;
+	}
+
+	public void setExamStudentIds(List<Long> examStudentIds) {
+		this.examStudentIds = examStudentIds;
+	}
+
+	public Long getNext() {
+		return next;
+	}
+
+	public void setNext(Long next) {
+		this.next = next;
+	}
+
+}

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

@@ -0,0 +1,9 @@
+package cn.com.qmth.examcloud.examwork.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class LockExamStudentsResp extends BaseResponse {
+
+	private static final long serialVersionUID = 2575690350837797384L;
+
+}

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

@@ -0,0 +1,9 @@
+package cn.com.qmth.examcloud.examwork.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class UnlockExamStudentsResp extends BaseResponse {
+
+	private static final long serialVersionUID = -3808667043727866238L;
+
+}