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/BasicCloudClientSupport.java

@@ -1,16 +1,16 @@
-package cn.com.qmth.examcloud.core.basic.api.client;
-
-import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
-
-/**
- * @author WANGWEI
- *
- */
-public abstract class BasicCloudClientSupport extends CloudClientSupport {
-
-	@Override
-	public String getUrlPrefix() {
-		return "http://EC_CORE_BASIC/api/core/basic/";
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.client;
+
+import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
+
+/**
+ * @author WANGWEI
+ *
+ */
+public abstract class BasicCloudClientSupport extends CloudClientSupport {
+
+	@Override
+	public String getUrlPrefix() {
+		return "http://EC-CORE-BASIC/api/core/basic/";
+	}
+
+}

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

@@ -6,10 +6,8 @@ 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.GetOrgListByNameLikeReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveOrgReq;
-import cn.com.qmth.examcloud.core.basic.api.response.GetOrgListByNameLikeResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveOrgResp;
 
@@ -47,11 +45,6 @@ public class OrgCloudServiceClient extends BasicCloudClientSupport implements Or
 		return post("org/saveOrg", orgReq, SaveOrgResp.class);
 	}
 
-	@Override
-	public GetOrgListByNameLikeResp getOrgListByNameLike(GetOrgListByNameLikeReq req) {
-		return post("org/getOrgListByNameLike", req, GetOrgListByNameLikeResp.class);
-	}
-
 	@Override
 	public GetOrgResp getOrg(GetOrgReq req) {
 		return post("org/getOrg", req, GetOrgResp.class);

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

@@ -7,9 +7,9 @@ import org.springframework.web.client.RestTemplate;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetStudentReq;
-import cn.com.qmth.examcloud.core.basic.api.request.InsertOrUpdateStudentReq;
+import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetStudentResp;
-import cn.com.qmth.examcloud.core.basic.api.response.InsertOrUpdateStudentResp;
+import cn.com.qmth.examcloud.core.basic.api.response.SaveStudentResp;
 
 @Service
 public class StudentCloudServiceClient extends BasicCloudClientSupport
@@ -35,8 +35,8 @@ public class StudentCloudServiceClient extends BasicCloudClientSupport
 	}
 
 	@Override
-	public InsertOrUpdateStudentResp insertOrUpdateStudent(InsertOrUpdateStudentReq studentReq) {
-		return post("student/insertOrUpdateStudent", studentReq, InsertOrUpdateStudentResp.class);
+	public SaveStudentResp saveStudent(SaveStudentReq studentReq) {
+		return post("student/insertOrUpdateStudent", studentReq, SaveStudentResp.class);
 	}
 
 	@Override

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

@@ -1,10 +1,8 @@
 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.GetOrgListByNameLikeReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveOrgReq;
-import cn.com.qmth.examcloud.core.basic.api.response.GetOrgListByNameLikeResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveOrgResp;
 
@@ -22,6 +20,4 @@ public interface OrgCloudService extends CloudService {
 
 	SaveOrgResp saveOrg(SaveOrgReq orgReq);
 
-	GetOrgListByNameLikeResp getOrgListByNameLike(GetOrgListByNameLikeReq req);
-
 }

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

@@ -2,9 +2,9 @@ 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.GetStudentReq;
-import cn.com.qmth.examcloud.core.basic.api.request.InsertOrUpdateStudentReq;
+import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetStudentResp;
-import cn.com.qmth.examcloud.core.basic.api.response.InsertOrUpdateStudentResp;
+import cn.com.qmth.examcloud.core.basic.api.response.SaveStudentResp;
 
 /**
  * 学生接口服务
@@ -22,7 +22,7 @@ public interface StudentCloudService extends CloudService {
 	 * @author WANGWEI
 	 * @param req
 	 */
-	InsertOrUpdateStudentResp insertOrUpdateStudent(InsertOrUpdateStudentReq req);
+	SaveStudentResp saveStudent(SaveStudentReq req);
 
 	GetStudentResp getStudent(GetStudentReq req);
 

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

@@ -23,6 +23,8 @@ public class OrgBean implements Serializable {
 
 	private Boolean enable;
 
+	private String code;
+
 	public Long getId() {
 		return id;
 	}
@@ -71,4 +73,12 @@ public class OrgBean implements Serializable {
 		this.enable = enable;
 	}
 
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
 }

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

@@ -2,40 +2,115 @@ package cn.com.qmth.examcloud.core.basic.api.request;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
-public class SaveOrgReq  extends BaseRequest {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -7946303617489697283L;
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
-	/**
-	 * 机构code
-	 */
-	private String orgCode;
-	/**
-	 * 机构名称
-	 */
-	private String orgName;
-	
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-	public String getOrgCode() {
-		return orgCode;
-	}
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
-	}
-	public String getOrgName() {
-		return orgName;
-	}
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年8月23日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class SaveOrgReq extends BaseRequest {
+
+	private static final long serialVersionUID = -542122454712136439L;
+
+	private Long id;
+
+	private Long rootId;
+
+	private Long parentId;
+
+	private String code;
+
+	private String name;
+
+	private Boolean enable;
+
+	private String telephone;
+
+	private String contacts;
+
+	private String remark;
+
+	private String domainName;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getRootId() {
+		return rootId;
+	}
+
+	public void setRootId(Long rootId) {
+		this.rootId = rootId;
+	}
+
+	public Long getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(Long parentId) {
+		this.parentId = parentId;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
 	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Boolean getEnable() {
+		return enable;
+	}
+
+	public void setEnable(Boolean enable) {
+		this.enable = enable;
+	}
+
+	public String getTelephone() {
+		return telephone;
+	}
+
+	public void setTelephone(String telephone) {
+		this.telephone = telephone;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getDomainName() {
+		return domainName;
+	}
+
+	public void setDomainName(String domainName) {
+		this.domainName = domainName;
+	}
+
 }

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/InsertOrUpdateStudentReq.java → examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveStudentReq.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.core.basic.api.request;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
-public class InsertOrUpdateStudentReq extends BaseRequest {
+public class SaveStudentReq extends BaseRequest {
 
 	private static final long serialVersionUID = 9066273303019460160L;
 

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/InsertOrUpdateStudentResp.java → examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SaveStudentResp.java

@@ -1,59 +1,59 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年6月29日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class InsertOrUpdateStudentResp extends BaseResponse {
-
-	/**
-	 * 属性注释
-	 */
-	private static final long serialVersionUID = 2263704597882102664L;
-
-	private Long studentId;
-
-	private Long rootOrgId;
-
-	private Long orgId;
-
-	private String orgName;
-
-	public Long getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年6月29日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class SaveStudentResp extends BaseResponse {
+
+	/**
+	 * 属性注释
+	 */
+	private static final long serialVersionUID = 2263704597882102664L;
+
+	private Long studentId;
+
+	private Long rootOrgId;
+
+	private Long orgId;
+
+	private String orgName;
+
+	public Long getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+}

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

@@ -10,7 +10,7 @@ public abstract class BasicCloudClientSupport extends CloudClientSupport {
 
 	@Override
 	public String getUrlPrefix() {
-		return "http://EC_CORE_EXAMWORK/api/core/examwork/";
+		return "http://EC-CORE-EXAMWORK/api/core/examwork/";
 	}
 
 }

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

@@ -8,10 +8,12 @@ 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.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.SaveExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SetExamPropertyReq;
 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.SaveExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.SetExamPropertyResp;
 
@@ -62,4 +64,9 @@ public class ExamCloudServiceClient extends BasicCloudClientSupport implements E
 		return post("exam/getExamProperty", req, GetExamPropertyResp.class);
 	}
 
+	@Override
+	public GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req) {
+		return post("exam/getOngoingExamList", req, GetOngoingExamListResp.class);
+	}
+
 }

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

@@ -3,10 +3,12 @@ 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.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.SaveExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SetExamPropertyReq;
 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.SaveExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.SetExamPropertyResp;
 
@@ -52,4 +54,13 @@ public interface ExamCloudService extends CloudService {
 	 */
 	GetExamPropertyResp getExamProperty(GetExamPropertyReq req);
 
+	/**
+	 * 获取正在进行的考试
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req);
+
 }

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

@@ -1,39 +1,59 @@
-package cn.com.qmth.examcloud.examwork.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetExamPropertyReq extends BaseRequest {
-
-	private static final long serialVersionUID = -3957501133504335385L;
-
-	private Long examId;
-
-	private Long rootOrgId;
-
-	private String key;
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年8月21日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class GetExamPropertyReq extends BaseRequest {
+
+	private static final long serialVersionUID = -3957501133504335385L;
+
+	private Long examId;
+
+	private Long rootOrgId;
+
+	private String key;
+
+	/**
+	 * 机构ID(机构属性不为空时覆盖考试属性)
+	 */
+	private Long orgId;
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+}

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

@@ -12,6 +12,11 @@ public class GetExamReq extends BaseRequest {
 
 	private static final long serialVersionUID = -5832266903859887508L;
 
+	/**
+	 * 考试ID
+	 */
+	private Long id;
+
 	/**
 	 * 机构ID
 	 */
@@ -23,9 +28,9 @@ public class GetExamReq extends BaseRequest {
 	private String name;
 
 	/**
-	 * 考试ID
+	 * 机构ID(机构特殊配置不为空时覆盖考试信息)
 	 */
-	private Long id;
+	private Long orgId;
 
 	public Long getRootOrgId() {
 		return rootOrgId;
@@ -51,4 +56,12 @@ public class GetExamReq extends BaseRequest {
 		this.id = id;
 	}
 
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
 }

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

@@ -0,0 +1,26 @@
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年8月21日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class GetOngoingExamListReq extends BaseRequest {
+
+	private static final long serialVersionUID = 8861900598975341544L;
+
+	private Long rootOrgId;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+}

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

@@ -1,48 +1,75 @@
 package cn.com.qmth.examcloud.examwork.api.request;
 
 import java.util.Date;
+import java.util.Map;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
 /**
- * @author  	chenken
- * @date    	2018年5月2日 下午3:44:54
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年5月2日 下午3:44:54
+ * @company QMTH
  * @description ExamReq.java
  */
 public class SaveExamReq extends BaseRequest {
 
 	private static final long serialVersionUID = -5832266903859887508L;
+
+	/**
+	 * ID
+	 */
+	private Long id;
+
 	/**
 	 * 机构ID
 	 */
 	private Long rootOrgId;
+
 	/**
 	 * 考试名称
 	 */
 	private String name;
+
 	/**
 	 * 考试类型
 	 */
 	private String examType;
+
 	/**
 	 * 考试开始时间
 	 */
 	private Date beginTime;
+
 	/**
 	 * 考试结束时间
 	 */
 	private Date endTime;
+
 	/**
 	 * 考试时长(分钟)
 	 */
 	private Integer duration;
+
 	/**
 	 * 备注
 	 */
 	private String remark;
 
-	
+	/**
+	 * 考试次数
+	 */
+	private Long examTimes;
+
+	private Map<String, String> properties;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}
@@ -98,6 +125,21 @@ public class SaveExamReq extends BaseRequest {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
-	
-}
 
+	public Long getExamTimes() {
+		return examTimes;
+	}
+
+	public void setExamTimes(Long examTimes) {
+		this.examTimes = examTimes;
+	}
+
+	public Map<String, String> getProperties() {
+		return properties;
+	}
+
+	public void setProperties(Map<String, String> properties) {
+		this.properties = properties;
+	}
+
+}

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

@@ -1,49 +1,26 @@
-package cn.com.qmth.examcloud.examwork.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class GetExamPropertyResp extends BaseResponse {
-
-	private static final long serialVersionUID = 606999493938772517L;
-
-	private Boolean existing;
-
-	private Long propertyId;
-
-	private String key;
-
-	private String value;
-
-	public Boolean getExisting() {
-		return existing;
-	}
-
-	public void setExisting(Boolean existing) {
-		this.existing = existing;
-	}
-
-	public Long getPropertyId() {
-		return propertyId;
-	}
-
-	public void setPropertyId(Long propertyId) {
-		this.propertyId = propertyId;
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年8月21日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class GetExamPropertyResp extends BaseResponse {
+
+	private static final long serialVersionUID = 606999493938772517L;
+
+	private String value;
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}

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

@@ -0,0 +1,29 @@
+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.ExamBean;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年8月21日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class GetOngoingExamListResp extends BaseResponse {
+
+	private static final long serialVersionUID = -1482780210224441938L;
+
+	private List<ExamBean> examList;
+
+	public List<ExamBean> getExamList() {
+		return examList;
+	}
+
+	public void setExamList(List<ExamBean> examList) {
+		this.examList = examList;
+	}
+
+}

examcloud-core-oe-admin-api/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>cn.com.qmth.examcloud</groupId>
+    <artifactId>examcloud-core-oe-admin-api</artifactId>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>cn.com.qmth.examcloud.rmi</groupId>
+        <artifactId>examcloud-rmi</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.commons</groupId>
+            <artifactId>examcloud-commons-web</artifactId>
+            <version>${examcloud.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,34 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-15 14:15:53.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.api;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncAllDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncPartDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.ExamStudentSyncAllDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.ExamStudentSyncPartDataResp;
+
+/**
+ * 考生信息接口
+ *
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public interface ExamStudentCloudService extends CloudService {
+
+    /**
+     * 同步考生(全部)数据
+     */
+    ExamStudentSyncAllDataResp syncExamStudentAllData(ExamStudentSyncAllDataReq req);
+
+    /**
+     * 同步考生(部分)数据
+     */
+    ExamStudentSyncPartDataResp syncExamStudentPartData(ExamStudentSyncPartDataReq req);
+
+}

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamStudentSyncAllDataBean.java

@@ -0,0 +1,282 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-16 15:58:23.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public class ExamStudentSyncAllDataBean implements JsonSerializable {
+    /**
+     * 考生ID(与考务的考生ID一致)
+     */
+    private Long examStudentId;
+    /**
+     * 考试ID
+     */
+    private Long examId;
+    /**
+     * 学生ID
+     */
+    private Long studentId;
+    /**
+     * 学号
+     */
+    private String studentCode;
+    /**
+     * 学生姓名
+     */
+    private String studentName;
+    /**
+     * 身份证号
+     */
+    private String identityNumber;
+    /**
+     * 课程ID
+     */
+    private Long courseId;
+    /**
+     * 课程Code
+     */
+    private String courseCode;
+    /**
+     * 课程名称
+     */
+    private String courseName;
+    /**
+     * 课程层次
+     */
+    private String courseLevel;
+    /**
+     * 学习中心ID
+     */
+    private Long orgId;
+    /**
+     * 学习中心代码
+     */
+    private String orgCode;
+    /**
+     * 学习中心名称
+     */
+    private String orgName;
+    /**
+     * 顶级机构ID
+     */
+    private Long rootOrgId;
+    /**
+     * 专业code
+     */
+    private String specialtyCode;
+    /**
+     * 专业名称
+     */
+    private String specialtyName;
+    /**
+     * 试卷类型
+     */
+    private String paperType;
+    /**
+     * 采集人
+     */
+    private String infoCollector;
+    /**
+     * 是否完成考试
+     */
+    private Boolean finished;
+    /**
+     * 正常考试次数
+     */
+    private Integer normalExamTimes;
+    /**
+     * 是否重考
+     */
+    private Boolean isReExamine;
+    /**
+     * 重考是否已完成
+     */
+    private Boolean reExamineCompleted;
+
+    public Long getExamStudentId() {
+        return examStudentId;
+    }
+
+    public void setExamStudentId(Long examStudentId) {
+        this.examStudentId = examStudentId;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getIdentityNumber() {
+        return identityNumber;
+    }
+
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getCourseLevel() {
+        return courseLevel;
+    }
+
+    public void setCourseLevel(String courseLevel) {
+        this.courseLevel = courseLevel;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
+
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
+
+    public String getSpecialtyCode() {
+        return specialtyCode;
+    }
+
+    public void setSpecialtyCode(String specialtyCode) {
+        this.specialtyCode = specialtyCode;
+    }
+
+    public String getSpecialtyName() {
+        return specialtyName;
+    }
+
+    public void setSpecialtyName(String specialtyName) {
+        this.specialtyName = specialtyName;
+    }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
+    public String getInfoCollector() {
+        return infoCollector;
+    }
+
+    public void setInfoCollector(String infoCollector) {
+        this.infoCollector = infoCollector;
+    }
+
+    public Boolean getFinished() {
+        return finished;
+    }
+
+    public void setFinished(Boolean finished) {
+        this.finished = finished;
+    }
+
+    public Integer getNormalExamTimes() {
+        return normalExamTimes;
+    }
+
+    public void setNormalExamTimes(Integer normalExamTimes) {
+        this.normalExamTimes = normalExamTimes;
+    }
+
+    public Boolean getReExamine() {
+        return isReExamine;
+    }
+
+    public void setReExamine(Boolean reExamine) {
+        isReExamine = reExamine;
+    }
+
+    public Boolean getReExamineCompleted() {
+        return reExamineCompleted;
+    }
+
+    public void setReExamineCompleted(Boolean reExamineCompleted) {
+        this.reExamineCompleted = reExamineCompleted;
+    }
+
+}

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamStudentSyncPartDataBean.java

@@ -0,0 +1,66 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-21 16:44:30.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public class ExamStudentSyncPartDataBean implements JsonSerializable {
+    /**
+     * 学生ID
+     */
+    private Long studentId;
+    /**
+     * 学号
+     */
+    private String studentCode;
+    /**
+     * 学生姓名
+     */
+    private String studentName;
+    /**
+     * 身份证号
+     */
+    private String identityNumber;
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getIdentityNumber() {
+        return identityNumber;
+    }
+
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
+    }
+
+}

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/ExamStudentSyncAllDataReq.java

@@ -0,0 +1,30 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-16 15:58:12.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamStudentSyncAllDataBean;
+
+import java.util.List;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public class ExamStudentSyncAllDataReq extends BaseRequest {
+    private List<ExamStudentSyncAllDataBean> examStudents;
+
+    public List<ExamStudentSyncAllDataBean> getExamStudents() {
+        return examStudents;
+    }
+
+    public void setExamStudents(List<ExamStudentSyncAllDataBean> examStudents) {
+        this.examStudents = examStudents;
+    }
+
+}

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/ExamStudentSyncPartDataReq.java

@@ -0,0 +1,30 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-21 16:36:01.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamStudentSyncPartDataBean;
+
+import java.util.List;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/21
+ */
+public class ExamStudentSyncPartDataReq extends BaseRequest {
+    private List<ExamStudentSyncPartDataBean> examStudents;
+
+    public List<ExamStudentSyncPartDataBean> getExamStudents() {
+        return examStudents;
+    }
+
+    public void setExamStudents(List<ExamStudentSyncPartDataBean> examStudents) {
+        this.examStudents = examStudents;
+    }
+
+}

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/response/ExamStudentSyncAllDataResp.java

@@ -0,0 +1,35 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-16 16:17:06.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public class ExamStudentSyncAllDataResp<T> extends BaseResponse {
+    private T data;
+
+    public ExamStudentSyncAllDataResp(T data) {
+        this.data = data;
+    }
+
+    public ExamStudentSyncAllDataResp() {
+
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+}

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/response/ExamStudentSyncPartDataResp.java

@@ -0,0 +1,35 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-21 16:37:07.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public class ExamStudentSyncPartDataResp<T> extends BaseResponse {
+    private T data;
+
+    public ExamStudentSyncPartDataResp(T data) {
+        this.data = data;
+    }
+
+    public ExamStudentSyncPartDataResp() {
+
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+}

examcloud-core-oe-admin-client/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>cn.com.qmth.examcloud</groupId>
+    <artifactId>examcloud-core-oe-admin-client</artifactId>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>cn.com.qmth.examcloud.rmi</groupId>
+        <artifactId>examcloud-rmi</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud</groupId>
+            <artifactId>examcloud-core-oe-admin-api</artifactId>
+            <version>${examcloud.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

examcloud-core-oe-admin-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/AdminCloudClientSupport.java

@@ -0,0 +1,23 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-16 16:20:56.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.client;
+
+import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public abstract class AdminCloudClientSupport extends CloudClientSupport {
+
+    @Override
+    public String getUrlPrefix() {
+        return "http://EXAMCLOUD-SERVICE-OE-ADMIN/api/core/oe/admin/";
+    }
+
+}

examcloud-core-oe-admin-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamStudentCloudServiceClient.java

@@ -0,0 +1,54 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-16 16:19:24.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.client;
+
+import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
+import cn.com.qmth.examcloud.core.oe.admin.api.ExamStudentCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncAllDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncPartDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.ExamStudentSyncAllDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.ExamStudentSyncPartDataResp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * 考生信息接口
+ *
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+@Service
+public class ExamStudentCloudServiceClient extends AdminCloudClientSupport implements ExamStudentCloudService {
+    private static final long serialVersionUID = -8874453764538303046L;
+    @Autowired
+    private RestTemplate restTemplate;
+    @Autowired
+    private RedisClient redisClient;
+
+    @Override
+    public ExamStudentSyncAllDataResp syncExamStudentAllData(ExamStudentSyncAllDataReq req) {
+        return post("exam/student/sync/all/data", req, ExamStudentSyncAllDataResp.class);
+    }
+
+    @Override
+    public ExamStudentSyncPartDataResp syncExamStudentPartData(ExamStudentSyncPartDataReq req) {
+        return post("exam/student/sync/part/data", req, ExamStudentSyncPartDataResp.class);
+    }
+
+    @Override
+    protected RedisClient getRedisClient() {
+        return redisClient;
+    }
+
+    @Override
+    protected RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+}

examcloud-exchange-inner-api-client/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/client/ExchangeCloudClientSupport.java

@@ -10,7 +10,7 @@ public abstract class ExchangeCloudClientSupport extends CloudClientSupport {
 
 	@Override
 	public String getUrlPrefix() {
-		return "http://EXAMCLOUD-SERVICE-OUTLET/api/exchange/inner";
+		return "http://EC-EXCHANGE/api/exchange/inner";
 	}
 
 }

examcloud-task-api-client/src/main/java/cn/com/qmth/examcloud/task/api/client/TaskCloudClientSupport.java

@@ -10,7 +10,7 @@ public abstract class TaskCloudClientSupport extends CloudClientSupport {
 
 	@Override
 	public String getUrlPrefix() {
-		return "http://EXAMCLOUD-TASK/api/cloud/task";
+		return "http://EC-TASK/api/cloud/task";
 	}
 
 }

pom.xml

@@ -1,31 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.com.qmth.examcloud</groupId>
-		<artifactId>examcloud-parent</artifactId>
-		<version>2.0-SNAPSHOT</version>
-	</parent>
-	<groupId>cn.com.qmth.examcloud.rmi</groupId>
-	<artifactId>examcloud-rmi</artifactId>
-	<packaging>pom</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.com.qmth.examcloud</groupId>
+        <artifactId>examcloud-parent</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>cn.com.qmth.examcloud.rmi</groupId>
+    <artifactId>examcloud-rmi</artifactId>
+    <packaging>pom</packaging>
 
-	<modules>
-		<module>examcloud-core-basic-api</module>
-		<module>examcloud-core-basic-api-client</module>
+    <modules>
+        <module>examcloud-core-basic-api</module>
+        <module>examcloud-core-basic-api-client</module>
 
-		<module>examcloud-core-examwork-api</module>
-		<module>examcloud-core-examwork-api-client</module>
+        <module>examcloud-core-examwork-api</module>
+        <module>examcloud-core-examwork-api-client</module>
 
-		<module>examcloud-exchange-inner-api</module>
-		<module>examcloud-exchange-inner-api-client</module>
+        <module>examcloud-exchange-inner-api</module>
+        <module>examcloud-exchange-inner-api-client</module>
 
-		<module>examcloud-task-api</module>
-		<module>examcloud-task-api-client</module>
-		
-		<module>examcloud-core-questions-api</module>
-		<module>examcloud-core-questions-api-client</module>
+        <module>examcloud-task-api</module>
+        <module>examcloud-task-api-client</module>
 
-	</modules>
+        <module>examcloud-core-oe-admin-api</module>
+        <module>examcloud-core-oe-admin-client</module>
+
+        <module>examcloud-core-questions-api</module>
+        <module>examcloud-core-questions-api-client</module>
+    </modules>
 
 </project>