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

@@ -0,0 +1,54 @@
+package cn.com.qmth.examcloud.core.basic.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.core.basic.api.RolePrivilegeCloudService;
+import cn.com.qmth.examcloud.core.basic.api.request.DeleteRoleReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetPrivilegeListReq;
+import cn.com.qmth.examcloud.core.basic.api.request.SaveRoleReq;
+import cn.com.qmth.examcloud.core.basic.api.response.DeleteRoleResp;
+import cn.com.qmth.examcloud.core.basic.api.response.GetPrivilegeListResp;
+import cn.com.qmth.examcloud.core.basic.api.response.SaveRoleResp;
+
+@Service
+public class RolePrivilegeCloudServiceClient extends BasicCloudClientSupport
+		implements
+			RolePrivilegeCloudService {
+
+	private static final long serialVersionUID = 1627126406719389279L;
+
+	@Autowired
+	RestTemplate restTemplate;
+
+	@Autowired
+	private RedisClient redisClient;
+
+	@Override
+	protected RedisClient getRedisClient() {
+		return redisClient;
+	}
+
+	@Override
+	protected RestTemplate getRestTemplate() {
+		return restTemplate;
+	}
+
+	@Override
+	public SaveRoleResp saveRole(SaveRoleReq req) {
+		return post("rolePrivilege/saveRole", req, SaveRoleResp.class);
+	}
+
+	@Override
+	public DeleteRoleResp deleteRole(DeleteRoleReq req) {
+		return post("rolePrivilege/deleteRole", req, DeleteRoleResp.class);
+	}
+
+	@Override
+	public GetPrivilegeListResp getPrivilegeList(GetPrivilegeListReq req) {
+		return post("rolePrivilege/getPrivilegeList", req, GetPrivilegeListResp.class);
+	}
+
+}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/RolePrivilegeCloudService.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.DeleteRoleReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetPrivilegeListReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveRoleReq;
 import cn.com.qmth.examcloud.core.basic.api.response.DeleteRoleResp;
+import cn.com.qmth.examcloud.core.basic.api.response.GetPrivilegeListResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveRoleResp;
 
 /**
@@ -18,4 +20,6 @@ public interface RolePrivilegeCloudService extends CloudService {
 
 	DeleteRoleResp deleteRole(DeleteRoleReq req);
 
+	GetPrivilegeListResp getPrivilegeList(GetPrivilegeListReq req);
+
 }

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

@@ -0,0 +1,29 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetPrivilegeListReq extends BaseRequest {
+
+	private static final long serialVersionUID = -2241264953393891893L;
+
+	private Long rootOrgId;
+
+	private Long roleId;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Long roleId) {
+		this.roleId = roleId;
+	}
+
+}

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

@@ -0,0 +1,21 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class GetPrivilegeListResp extends BaseResponse {
+
+	private static final long serialVersionUID = -2085836838190278368L;
+
+	private List<String> privilegeCodeList;
+
+	public List<String> getPrivilegeCodeList() {
+		return privilegeCodeList;
+	}
+
+	public void setPrivilegeCodeList(List<String> privilegeCodeList) {
+		this.privilegeCodeList = privilegeCodeList;
+	}
+
+}

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

@@ -7,9 +7,11 @@ 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.GetExamStudentPageReq;
 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.GetExamStudentPageResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 
@@ -51,4 +53,9 @@ public class ExamStudentCloudServiceClient extends BasicCloudClientSupport
 		return post("examStudent/getExamStudent", req, GetExamStudentResp.class);
 	}
 
+	@Override
+	public GetExamStudentPageResp getExamStudentPage(GetExamStudentPageReq req) {
+		return post("examStudent/getExamStudentPage", req, GetExamStudentPageResp.class);
+	}
+
 }

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

@@ -2,9 +2,11 @@ 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.GetExamStudentPageReq;
 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.GetExamStudentPageResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 
@@ -43,4 +45,12 @@ public interface ExamStudentCloudService extends CloudService {
 	 */
 	GetExamStudentResp getExamStudent(GetExamStudentReq req);
 
+	/**
+	 * 分页查询考生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamStudentPageResp getExamStudentPage(GetExamStudentPageReq req);
 }

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

@@ -0,0 +1,149 @@
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetExamStudentPageReq extends BaseRequest {
+
+	private static final long serialVersionUID = -4251153367428996662L;
+
+	private Long rootOrgId;
+
+	private Integer curPage;
+
+	private Integer pageSize;
+
+	private Long orgId;
+
+	private Long examId;
+
+	private String studentName;
+
+	private String studentCode;
+
+	private String courseCode;
+
+	private String courseLevel;
+
+	private String courseName;
+
+	private String examSite;
+
+	private String identityNumber;
+
+	private String specialtyName;
+
+	private String infoCollector;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Integer getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public Integer getCurPage() {
+		return curPage;
+	}
+
+	public void setCurPage(Integer curPage) {
+		this.curPage = curPage;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public String getStudentName() {
+		return studentName;
+	}
+
+	public void setStudentName(String studentName) {
+		this.studentName = studentName;
+	}
+
+	public String getStudentCode() {
+		return studentCode;
+	}
+
+	public void setStudentCode(String studentCode) {
+		this.studentCode = studentCode;
+	}
+
+	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;
+	}
+
+	public String getCourseName() {
+		return courseName;
+	}
+
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+
+	public String getExamSite() {
+		return examSite;
+	}
+
+	public void setExamSite(String examSite) {
+		this.examSite = examSite;
+	}
+
+	public String getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+
+	public String getSpecialtyName() {
+		return specialtyName;
+	}
+
+	public void setSpecialtyName(String specialtyName) {
+		this.specialtyName = specialtyName;
+	}
+
+	public String getInfoCollector() {
+		return infoCollector;
+	}
+
+	public void setInfoCollector(String infoCollector) {
+		this.infoCollector = infoCollector;
+	}
+
+}

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/response/GetExamStudentPageResp.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.ExamStudentBean;
+
+public class GetExamStudentPageResp extends BaseResponse {
+
+	private static final long serialVersionUID = -3834785572724803553L;
+
+	List<ExamStudentBean> list;
+
+	private Long total;
+
+	public List<ExamStudentBean> getList() {
+		return list;
+	}
+
+	public void setList(List<ExamStudentBean> list) {
+		this.list = list;
+	}
+
+	public Long getTotal() {
+		return total;
+	}
+
+	public void setTotal(Long total) {
+		this.total = total;
+	}
+
+}

examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/StudentPaperCloudServiceClient.java

@@ -36,6 +36,6 @@ public class StudentPaperCloudServiceClient extends BasicCloudClientSupport impl
 
     @Override
     public GetStudentPaperResp getStudentPaper(GetStudentPaperReq req) {
-        return post("",req,GetStudentPaperResp.class);
+        return post("studentPaper/getPaper",req,GetStudentPaperResp.class);
     }
 }

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetStudentPaperReq.java

@@ -13,8 +13,16 @@ public class GetStudentPaperReq extends BaseRequest {
 
     private static final long serialVersionUID = -6892765618820908426L;
 
+    /**
+     * 阅卷任务表ID---ecs_marking_mark_task
+     */
     private long markTaskId;
 
+    /**
+     * 待阅卷的考卷信息表ID---ecs_marking_student_paper
+     */
+    private long studentPaperId;
+
     public long getMarkTaskId() {
         return markTaskId;
     }
@@ -22,4 +30,12 @@ public class GetStudentPaperReq extends BaseRequest {
     public void setMarkTaskId(long markTaskId) {
         this.markTaskId = markTaskId;
     }
+
+    public long getStudentPaperId() {
+        return studentPaperId;
+    }
+
+    public void setStudentPaperId(long studentPaperId) {
+        this.studentPaperId = studentPaperId;
+    }
 }

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/request/GetDefaultQuesionsReq.java

@@ -3,6 +3,7 @@ package cn.com.qmth.examcloud.core.questions.api.request;
 import java.util.Map;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.question.core.question.QuestionType;
 
 /**
  * @author 		weiwenhai
@@ -33,6 +34,11 @@ public class GetDefaultQuesionsReq extends BaseRequest{
 	 * 每页总数
 	 */
 	private int pageSize;
+	
+	/**
+	 * 题型
+	 */
+	private QuestionType questionType;
 
 	public Long getRootOrgId() {
 		return rootOrgId;
@@ -73,5 +79,13 @@ public class GetDefaultQuesionsReq extends BaseRequest{
 			this.pageSize = pageSize;
 		}
 	}
+
+	public QuestionType getQuestionType() {
+		return questionType;
+	}
+
+	public void setQuestionType(QuestionType questionType) {
+		this.questionType = questionType;
+	}
 	
 }