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

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

@@ -12,6 +12,11 @@ import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamScoreResp;
 @Service
 public class ExamScoreCloudServiceClient extends AdminCloudClientSupport implements ExamScoreCloudService{
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5079612325935269180L;
+
 	@Autowired
     private RestTemplate restTemplate;
 	

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

@@ -7,7 +7,13 @@ import org.springframework.web.client.RestTemplate;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreDataCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamScoreDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetAuditDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetScoreDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryCapturePhotoReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamScoreDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetAuditDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetScoreDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryCapturePhotoResp;
 
 @Service
 public class ExamScoreDataCloudServiceClient extends AdminCloudClientSupport implements ExamScoreDataCloudService{
@@ -42,4 +48,19 @@ public class ExamScoreDataCloudServiceClient extends AdminCloudClientSupport imp
 	public FindExamScoreDataResp findExamScoreDataByExamIdAndStudentCode(FindExamScoreDataReq findExamScoreDataReq) {
 		return post("examScoreData/findExamScoreDataByExamIdAndStudentCode", findExamScoreDataReq, FindExamScoreDataResp.class);
 	}
+
+	@Override
+	public GetScoreDataResp getScoreData(GetScoreDataReq req) {
+		return post("examScoreData/getScoreData",req,GetScoreDataResp.class);
+	}
+
+	@Override
+	public GetAuditDataResp getAuditData(GetAuditDataReq req) {
+		return post("examScoreData/getAuditData",req,GetAuditDataResp.class);
+	}
+
+	@Override
+	public QueryCapturePhotoResp queryCapturePhoto(QueryCapturePhotoReq req) {
+		return post("examScoreData/queryCapturePhoto",req,QueryCapturePhotoResp.class);
+	}
 }

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

@@ -0,0 +1,47 @@
+package cn.com.qmth.examcloud.core.oe.admin.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.oe.admin.api.ExamScoreObtainQueueCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.DeleteExamScoreQueueReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetTopExamScoreQueueReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetTopExamScoreQueueResp;
+
+@Service
+public class ExamScoreObtainQueueCloudServiceClient extends AdminCloudClientSupport implements ExamScoreObtainQueueCloudService{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7442463539981662202L;
+
+	@Autowired
+    private RestTemplate restTemplate;
+	
+    @Autowired
+    private RedisClient redisClient;
+	
+	@Override
+	public GetTopExamScoreQueueResp getTopExamScoreQueue(GetTopExamScoreQueueReq req) {
+		return post("examScoreObtainQueue/getTopExamScoreQueue", req, GetTopExamScoreQueueResp.class);
+	}
+
+	@Override
+	public void deleteExamScoreQueue(DeleteExamScoreQueueReq req) {
+		post("examScoreObtainQueue/deleteExamScoreQueue", req);
+	}
+
+	@Override
+	protected RestTemplate getRestTemplate() {
+		return restTemplate;
+	}
+
+	@Override
+	protected RedisClient getRedisClient() {
+		return redisClient;
+	}
+
+}

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

@@ -2,14 +2,20 @@ 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.FindExamScoreDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetAuditDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetScoreDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryCapturePhotoReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamScoreDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetAuditDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetScoreDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryCapturePhotoResp;
 
 /**
  * 
  * @author  	chenken
  * @date    	2018年10月15日 下午4:16:08
  * @company 	QMTH
- * @description 考试记录，学生信息，分数信息等数据查询接口
+ * @description 供exchange查询：考试记录，学生信息，分数信息等数据查询接口
  */
 public interface ExamScoreDataCloudService  extends CloudService{
 
@@ -28,4 +34,25 @@ public interface ExamScoreDataCloudService  extends CloudService{
 	 * @return
 	 */
 	public FindExamScoreDataResp findExamScoreDataByExamIdAndStudentCode(FindExamScoreDataReq findExamScoreDataReq);
+	
+	/**
+	 * 查询分数信息
+	 * @param req
+	 * @return
+	 */
+	public GetScoreDataResp getScoreData(GetScoreDataReq req);
+	
+	/**
+	 * 查询审核信息
+	 * @param req
+	 * @return
+	 */
+	public GetAuditDataResp getAuditData(GetAuditDataReq req);
+	
+	/**
+	 * 查询抓拍照片信息
+	 * @param req
+	 * @return
+	 */
+	public QueryCapturePhotoResp queryCapturePhoto(QueryCapturePhotoReq req);
 }

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

@@ -0,0 +1,22 @@
+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.DeleteExamScoreQueueReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetTopExamScoreQueueReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetTopExamScoreQueueResp;
+
+public interface ExamScoreObtainQueueCloudService extends CloudService{
+
+	/**
+	 * 取队列最顶层记录
+	 * @param req
+	 * @return
+	 */
+	public GetTopExamScoreQueueResp getTopExamScoreQueue(GetTopExamScoreQueueReq req);
+	/**
+	 * 删除队列记录
+	 * @param req
+	 */
+	public void deleteExamScoreQueue(DeleteExamScoreQueueReq req);
+	
+}

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

@@ -0,0 +1,53 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+public class QueryCapturePhotoBean implements JsonSerializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 291850328247014762L;
+
+	private Long examRecordDataId;
+   
+    private String fileUrl;
+    
+    private Boolean isPass;
+    
+    private Boolean isStranger;
+    
+    private Boolean isLivenessPass;
+	
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+	public String getFileUrl() {
+		return fileUrl;
+	}
+	public void setFileUrl(String fileUrl) {
+		this.fileUrl = fileUrl;
+	}
+	public Boolean getIsPass() {
+		return isPass;
+	}
+	public void setIsPass(Boolean isPass) {
+		this.isPass = isPass;
+	}
+	public Boolean getIsStranger() {
+		return isStranger;
+	}
+	public void setIsStranger(Boolean isStranger) {
+		this.isStranger = isStranger;
+	}
+	public Boolean getIsLivenessPass() {
+		return isLivenessPass;
+	}
+	public void setIsLivenessPass(Boolean isLivenessPass) {
+		this.isLivenessPass = isLivenessPass;
+	}
+	
+}

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

@@ -0,0 +1,22 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class DeleteExamScoreQueueReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3963300713882349016L;
+
+	private Long queueId;
+
+	public Long getQueueId() {
+		return queueId;
+	}
+
+	public void setQueueId(Long queueId) {
+		this.queueId = queueId;
+	}
+	
+}

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

@@ -0,0 +1,21 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetAuditDataReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8011559735932023034L;
+	private Long examRecordDataId;
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+	
+}

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

@@ -0,0 +1,21 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetScoreDataReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8011559735932023034L;
+	private Long examRecordDataId;
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+	
+}

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

@@ -0,0 +1,22 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetTopExamScoreQueueReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 9145536950613866116L;
+
+	private Long rootOrgId;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+	
+}

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

@@ -0,0 +1,21 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class QueryCapturePhotoReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 483728821472149537L;
+	
+	private Long examRecordDataId;
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+}

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

@@ -0,0 +1,64 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import java.util.Date;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class GetAuditDataResp extends BaseResponse{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6654101758814409007L;
+
+	private Long examRecordDataId;
+	
+	private String disciplineType;
+	
+	private String disciplineDetail;
+
+	private String auditUserName;
+	
+	private Date creationTime;
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+
+	public String getDisciplineType() {
+		return disciplineType;
+	}
+
+	public void setDisciplineType(String disciplineType) {
+		this.disciplineType = disciplineType;
+	}
+
+	public String getDisciplineDetail() {
+		return disciplineDetail;
+	}
+
+	public void setDisciplineDetail(String disciplineDetail) {
+		this.disciplineDetail = disciplineDetail;
+	}
+
+	public String getAuditUserName() {
+		return auditUserName;
+	}
+
+	public void setAuditUserName(String auditUserName) {
+		this.auditUserName = auditUserName;
+	}
+
+	public Date getCreationTime() {
+		return creationTime;
+	}
+
+	public void setCreationTime(Date creationTime) {
+		this.creationTime = creationTime;
+	}
+	
+}

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

@@ -0,0 +1,109 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import java.util.Date;
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class GetScoreDataResp extends BaseResponse{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -892667150000208723L;
+
+	private Long examRecordDataId;
+	
+	private String studentName;
+	
+	private String studentCode;
+	
+	private String identityNumber;
+	
+	private String courseName;
+	
+	private String courseCode;
+	
+	private Date startTime;
+	
+	private Date endTime;
+	
+	private Double totalScore;
+	
+	private Boolean isWarn;
+	
+	private Boolean isAudit;
+	
+	private Boolean isIllegality;
+	
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+	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 getIdentityNumber() {
+		return identityNumber;
+	}
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+	public String getCourseName() {
+		return courseName;
+	}
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+	public String getCourseCode() {
+		return courseCode;
+	}
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+	public Date getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+	public Date getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+	public Double getTotalScore() {
+		return totalScore;
+	}
+	public void setTotalScore(Double totalScore) {
+		this.totalScore = totalScore;
+	}
+	public Boolean getIsWarn() {
+		return isWarn;
+	}
+	public void setIsWarn(Boolean isWarn) {
+		this.isWarn = isWarn;
+	}
+	public Boolean getIsAudit() {
+		return isAudit;
+	}
+	public void setIsAudit(Boolean isAudit) {
+		this.isAudit = isAudit;
+	}
+	public Boolean getIsIllegality() {
+		return isIllegality;
+	}
+	public void setIsIllegality(Boolean isIllegality) {
+		this.isIllegality = isIllegality;
+	}
+}

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

@@ -0,0 +1,37 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class GetTopExamScoreQueueResp extends BaseResponse{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3972638145165513830L;
+
+	/**
+	 * 队列ID
+	 */
+	private Long queueId;
+	/**
+	 * 考试记录ID
+	 */
+	private Long examRecordDataId;
+
+	public Long getQueueId() {
+		return queueId;
+	}
+
+	public void setQueueId(Long queueId) {
+		this.queueId = queueId;
+	}
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+	
+}

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

@@ -0,0 +1,38 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.QueryCapturePhotoBean;
+
+
+public class QueryCapturePhotoResp extends BaseResponse{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2939688655739194839L;
+
+	private Long examRecordDataId;
+	
+	private List<QueryCapturePhotoBean> capturePhotoList;
+	
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+
+	public List<QueryCapturePhotoBean> getCapturePhotoList() {
+		return capturePhotoList;
+	}
+
+	public void setCapturePhotoList(List<QueryCapturePhotoBean> capturePhotoList) {
+		this.capturePhotoList = capturePhotoList;
+	}
+
+
+	
+}

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

@@ -7,6 +7,10 @@ import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamScoreBean;
 
 public class QueryExamScoreResp extends BaseResponse{
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 290144392290193583L;
 	private List<ExamScoreBean> examScoreBeans;
 
 	public List<ExamScoreBean> getExamScoreBeans() {