WANG 6 жил өмнө
parent
commit
acb02c430d

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

@@ -1,100 +1,108 @@
-package cn.com.qmth.examcloud.examwork.api.client;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-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;
-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.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;
-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
- * @date 2018年5月3日 上午9:18:19
- * @company QMTH
- * @description ExamClient.java
- */
-@Service
-public class ExamCloudServiceClient extends BasicCloudClientSupport implements ExamCloudService {
-
-	private static final long serialVersionUID = -2880611326177571371L;
-
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	public SaveExamResp saveExam(SaveExamReq req) {
-		return post("exam/saveExam", req, SaveExamResp.class);
-	}
-
-	@Override
-	public GetExamResp getExam(GetExamReq req) {
-		return post("exam/getExam", req, GetExamResp.class);
-	}
-
-	@Override
-	public SetExamPropertyResp setExamProperty(SetExamPropertyReq req) {
-		return post("exam/setExamProperty", req, SetExamPropertyResp.class);
-	}
-
-	@Override
-	public GetExamPropertyResp getExamProperty(GetExamPropertyReq req) {
-		return post("exam/getExamProperty", req, GetExamPropertyResp.class);
-	}
-
-	@Override
-	public GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req) {
-		return post("exam/getOngoingExamList", req, GetOngoingExamListResp.class);
-	}
-
-	@Override
-	public LockExamStudentsResp lockExamStudents(LockExamStudentsReq req) {
-		return post("exam/lockExamStudents", req, LockExamStudentsResp.class);
-	}
-
-	@Override
-	public UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req) {
-		return post("exam/unlockExamStudents", req, UnlockExamStudentsResp.class);
-	}
-
-	@Override
-	public GetExamListResp getExamList(GetExamListReq req) {
-		return post("exam/getExamList", req, GetExamListResp.class);
-	}
-
-	@Override
-	public GetExamCourseListResp getExamCourseList(GetExamCourseListReq req) {
-		return post("exam/getExamCourseList", req, GetExamCourseListResp.class);
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.client;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+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.GetExamCoursePaperTypeListReq;
+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;
+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.GetExamCoursePaperTypeListResp;
+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;
+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
+ * @date 2018年5月3日 上午9:18:19
+ * @company QMTH
+ * @description ExamClient.java
+ */
+@Service
+public class ExamCloudServiceClient extends BasicCloudClientSupport implements ExamCloudService {
+
+	private static final long serialVersionUID = -2880611326177571371L;
+
+	@Autowired
+	RestTemplate restTemplate;
+
+	@Autowired
+	private RedisClient redisClient;
+
+	@Override
+	protected RedisClient getRedisClient() {
+		return redisClient;
+	}
+
+	@Override
+	protected RestTemplate getRestTemplate() {
+		return restTemplate;
+	}
+
+	@Override
+	public SaveExamResp saveExam(SaveExamReq req) {
+		return post("exam/saveExam", req, SaveExamResp.class);
+	}
+
+	@Override
+	public GetExamResp getExam(GetExamReq req) {
+		return post("exam/getExam", req, GetExamResp.class);
+	}
+
+	@Override
+	public SetExamPropertyResp setExamProperty(SetExamPropertyReq req) {
+		return post("exam/setExamProperty", req, SetExamPropertyResp.class);
+	}
+
+	@Override
+	public GetExamPropertyResp getExamProperty(GetExamPropertyReq req) {
+		return post("exam/getExamProperty", req, GetExamPropertyResp.class);
+	}
+
+	@Override
+	public GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req) {
+		return post("exam/getOngoingExamList", req, GetOngoingExamListResp.class);
+	}
+
+	@Override
+	public LockExamStudentsResp lockExamStudents(LockExamStudentsReq req) {
+		return post("exam/lockExamStudents", req, LockExamStudentsResp.class);
+	}
+
+	@Override
+	public UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req) {
+		return post("exam/unlockExamStudents", req, UnlockExamStudentsResp.class);
+	}
+
+	@Override
+	public GetExamListResp getExamList(GetExamListReq req) {
+		return post("exam/getExamList", req, GetExamListResp.class);
+	}
+
+	@Override
+	public GetExamCourseListResp getExamCourseList(GetExamCourseListReq req) {
+		return post("exam/getExamCourseList", req, GetExamCourseListResp.class);
+	}
+
+	@Override
+	public GetExamCoursePaperTypeListResp getExamCoursePaperTypeList(
+			GetExamCoursePaperTypeListReq req) {
+		return post("exam/getExamCoursePaperTypeList", req, GetExamCoursePaperTypeListResp.class);
+	}
+
+}

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

@@ -1,110 +1,121 @@
-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;
-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.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;
-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 WANGWEI
- * @date 2018年8月6日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface ExamCloudService extends CloudService {
-
-	/**
-	 * 保存考试
-	 * 
-	 * @param exam
-	 */
-	SaveExamResp saveExam(SaveExamReq req);
-
-	/**
-	 * 查询考试
-	 * 
-	 * @param name
-	 * @return
-	 */
-	GetExamResp getExam(GetExamReq req);
-
-	/**
-	 * 设置考试属性配置
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SetExamPropertyResp setExamProperty(SetExamPropertyReq req);
-
-	/**
-	 * 获取考试属性配置
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetExamPropertyResp getExamProperty(GetExamPropertyReq req);
-
-	/**
-	 * 获取正在进行的考试
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req);
-
-	/**
-	 * 锁定考生
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	LockExamStudentsResp lockExamStudents(LockExamStudentsReq req);
-
-	/**
-	 * 解锁考生
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req);
-
-	/**
-	 * 查询考试
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetExamListResp getExamList(GetExamListReq req);
-
-	/**
-	 * 查询考试的课程集合
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetExamCourseListResp getExamCourseList(GetExamCourseListReq req);
-
-}
+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.GetExamCoursePaperTypeListReq;
+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;
+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.GetExamCoursePaperTypeListResp;
+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;
+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 WANGWEI
+ * @date 2018年8月6日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public interface ExamCloudService extends CloudService {
+
+	/**
+	 * 保存考试
+	 * 
+	 * @param exam
+	 */
+	SaveExamResp saveExam(SaveExamReq req);
+
+	/**
+	 * 查询考试
+	 * 
+	 * @param name
+	 * @return
+	 */
+	GetExamResp getExam(GetExamReq req);
+
+	/**
+	 * 设置考试属性配置
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	SetExamPropertyResp setExamProperty(SetExamPropertyReq req);
+
+	/**
+	 * 获取考试属性配置
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamPropertyResp getExamProperty(GetExamPropertyReq req);
+
+	/**
+	 * 获取正在进行的考试
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req);
+
+	/**
+	 * 锁定考生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	LockExamStudentsResp lockExamStudents(LockExamStudentsReq req);
+
+	/**
+	 * 解锁考生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req);
+
+	/**
+	 * 查询考试
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamListResp getExamList(GetExamListReq req);
+
+	/**
+	 * 查询考试的课程集合
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamCourseListResp getExamCourseList(GetExamCourseListReq req);
+
+	/**
+	 * 查询考试课程的试卷类型集
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamCoursePaperTypeListResp getExamCoursePaperTypeList(GetExamCoursePaperTypeListReq req);
+
+}

+ 46 - 0
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamPaperTypeRelation.java

@@ -0,0 +1,46 @@
+package cn.com.qmth.examcloud.examwork.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年11月23日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class ExamPaperTypeRelation implements JsonSerializable {
+
+	private static final long serialVersionUID = 949820967079339911L;
+
+	private Long examId;
+
+	private Long courseId;
+
+	private String paperType;
+
+	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 getPaperType() {
+		return paperType;
+	}
+
+	public void setPaperType(String paperType) {
+		this.paperType = paperType;
+	}
+
+}

+ 46 - 0
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/GetExamCoursePaperTypeListReq.java

@@ -0,0 +1,46 @@
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年11月23日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class GetExamCoursePaperTypeListReq extends BaseRequest {
+
+	private static final long serialVersionUID = -3332877825734394366L;
+
+	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;
+	}
+
+}

+ 39 - 0
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/response/GetExamCoursePaperTypeListResp.java

@@ -0,0 +1,39 @@
+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.ExamPaperTypeRelation;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年11月23日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class GetExamCoursePaperTypeListResp extends BaseResponse {
+
+	private static final long serialVersionUID = 5302118993768804495L;
+
+	private long next;
+
+	private List<ExamPaperTypeRelation> relationList;
+
+	public long getNext() {
+		return next;
+	}
+
+	public void setNext(long next) {
+		this.next = next;
+	}
+
+	public List<ExamPaperTypeRelation> getRelationList() {
+		return relationList;
+	}
+
+	public void setRelationList(List<ExamPaperTypeRelation> relationList) {
+		this.relationList = relationList;
+	}
+
+}