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

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

@@ -1,109 +1,135 @@
-package cn.com.qmth.examcloud.core.basic.api.bean;
-
-import java.util.List;
-
-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 UserBean implements JsonSerializable {
-
-	private static final long serialVersionUID = -4157068941699776174L;
-
-	/**
-	 * 用户ID
-	 */
-	private Long userId;
-
-	/**
-	 * 显示名
-	 */
-	private String displayName;
-
-	/**
-	 * 顶级机构(学校)ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 顶级机构(学校)名称
-	 */
-	private String rootOrgName;
-
-	/**
-	 * 学习中心 ID
-	 */
-	private Long orgId;
-
-	/**
-	 * 学习中心名称
-	 */
-	private String orgName;
-
-	/**
-	 * 角色集合
-	 */
-	private List<RoleBean> roleList;
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	public void setDisplayName(String displayName) {
-		this.displayName = displayName;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getRootOrgName() {
-		return rootOrgName;
-	}
-
-	public void setRootOrgName(String rootOrgName) {
-		this.rootOrgName = rootOrgName;
-	}
-
-	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;
-	}
-
-	public List<RoleBean> getRoleList() {
-		return roleList;
-	}
-
-	public void setRoleList(List<RoleBean> roleList) {
-		this.roleList = roleList;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.bean;
+
+import java.util.List;
+
+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 UserBean implements JsonSerializable {
+
+	private static final long serialVersionUID = -4157068941699776174L;
+
+	/**
+	 * 用户ID
+	 */
+	private Long userId;
+
+	/**
+	 * 登陆名
+	 */
+	private String loginName;
+
+	/**
+	 * 用户名
+	 */
+	private String name;
+
+	/**
+	 * 显示名
+	 */
+	private String displayName;
+
+	/**
+	 * 顶级机构(学校)ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 顶级机构(学校)名称
+	 */
+	private String rootOrgName;
+
+	/**
+	 * 学习中心 ID
+	 */
+	private Long orgId;
+
+	/**
+	 * 学习中心名称
+	 */
+	private String orgName;
+
+	/**
+	 * 角色集合
+	 */
+	private List<RoleBean> roleList;
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public String getLoginName() {
+		return loginName;
+	}
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDisplayName() {
+		return displayName;
+	}
+
+	public void setDisplayName(String displayName) {
+		this.displayName = displayName;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getRootOrgName() {
+		return rootOrgName;
+	}
+
+	public void setRootOrgName(String rootOrgName) {
+		this.rootOrgName = rootOrgName;
+	}
+
+	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;
+	}
+
+	public List<RoleBean> getRoleList() {
+		return roleList;
+	}
+
+	public void setRoleList(List<RoleBean> roleList) {
+		this.roleList = roleList;
+	}
+
+}

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.GetExamListReq;
 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;
@@ -13,6 +14,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.GetExamListResp;
 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;
@@ -83,4 +85,9 @@ public class ExamCloudServiceClient extends BasicCloudClientSupport implements E
 		return post("exam/unlockExamStudents", req, UnlockExamStudentsResp.class);
 	}
 
+	@Override
+	public GetExamListResp getExamList(GetExamListReq req) {
+		return post("exam/getExamList", req, GetExamListResp.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.GetExamListReq;
 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;
@@ -8,6 +9,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.GetExamListResp;
 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;
@@ -85,4 +87,13 @@ public interface ExamCloudService extends CloudService {
 	 */
 	UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req);
 
+	/**
+	 * 查询考试
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamListResp getExamList(GetExamListReq req);
+
 }

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

@@ -0,0 +1,51 @@
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetExamListReq extends BaseRequest {
+
+	private static final long serialVersionUID = 3582675273552844749L;
+
+	private Long rootOrgId;
+
+	private Boolean enable;
+
+	private List<String> examTypeList;
+
+	private Long start;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Boolean getEnable() {
+		return enable;
+	}
+
+	public void setEnable(Boolean enable) {
+		this.enable = enable;
+	}
+
+	public List<String> getExamTypeList() {
+		return examTypeList;
+	}
+
+	public void setExamTypeList(List<String> examTypeList) {
+		this.examTypeList = examTypeList;
+	}
+
+	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/response/GetExamListResp.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.ExamBean;
+
+public class GetExamListResp extends BaseResponse {
+
+	private static final long serialVersionUID = -170402758973200104L;
+
+	private Long next;
+
+	List<ExamBean> examList;
+
+	public Long getNext() {
+		return next;
+	}
+
+	public void setNext(Long next) {
+		this.next = next;
+	}
+
+	public List<ExamBean> getExamList() {
+		return examList;
+	}
+
+	public void setExamList(List<ExamBean> examList) {
+		this.examList = examList;
+	}
+
+}