Merge remote-tracking branch 'origin/master'

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

@@ -6,9 +6,13 @@ 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.GetAllOrgPropertiesReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetOrgPropertyReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgsReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveOrgReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetAllOrgPropertiesResp;
+import cn.com.qmth.examcloud.core.basic.api.response.GetOrgPropertyResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveOrgResp;
@@ -57,4 +61,14 @@ public class OrgCloudServiceClient extends BasicCloudClientSupport implements Or
 		return post("org/getOrgs", req, GetOrgsResp.class);
 	}
 
+	@Override
+	public GetAllOrgPropertiesResp getAllOrgProperties(GetAllOrgPropertiesReq req) {
+		return post("org/getAllOrgProperties", req, GetAllOrgPropertiesResp.class);
+	}
+
+	@Override
+	public GetOrgPropertyResp getOrgProperty(GetOrgPropertyReq req) {
+		return post("org/getOrgProperty", req, GetOrgPropertyResp.class);
+	}
+
 }

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

@@ -1,9 +1,13 @@
 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.GetAllOrgPropertiesReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetOrgPropertyReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgsReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveOrgReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetAllOrgPropertiesResp;
+import cn.com.qmth.examcloud.core.basic.api.response.GetOrgPropertyResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveOrgResp;
@@ -24,4 +28,8 @@ public interface OrgCloudService extends CloudService {
 
 	GetOrgsResp getOrgs(GetOrgsReq req);
 
+	GetAllOrgPropertiesResp getAllOrgProperties(GetAllOrgPropertiesReq req);
+
+	GetOrgPropertyResp getOrgProperty(GetOrgPropertyReq req);
+
 }

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

@@ -0,0 +1,19 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetAllOrgPropertiesReq extends BaseRequest {
+
+	private static final long serialVersionUID = -2480857346739167675L;
+
+	private Long orgId;
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+}

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

@@ -0,0 +1,31 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import org.springframework.web.bind.annotation.PathVariable;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetOrgPropertyReq extends BaseRequest {
+
+	private static final long serialVersionUID = 8445489864946182160L;
+
+	private Long orgId;
+
+	private String key;
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+}

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

@@ -0,0 +1,21 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import java.util.Map;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class GetAllOrgPropertiesResp extends BaseResponse {
+
+	private static final long serialVersionUID = -3389812285108955277L;
+
+	private Map<String, String> props;
+
+	public Map<String, String> getProps() {
+		return props;
+	}
+
+	public void setProps(Map<String, String> props) {
+		this.props = props;
+	}
+
+}

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

@@ -0,0 +1,19 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class GetOrgPropertyResp extends BaseResponse {
+
+	private static final long serialVersionUID = -2283981755144391579L;
+
+	private String value;
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}

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

@@ -7,7 +7,9 @@ import org.springframework.web.client.RestTemplate;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.CheckExamIsStartedReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryExamRecordForSelectScoreReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.CheckExamIsStartedResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamRecordForSelectScoreResp;
 
 
 @Service("examRecordCloudService")
@@ -36,7 +38,12 @@ public class ExamRecordCloudServiceClient extends AdminCloudClientSupport implem
 
 	@Override
 	public CheckExamIsStartedResp checkExamIsStarted(CheckExamIsStartedReq examRecordReq) {
-		return post("exam/examRecord/checkExamIsStarted", examRecordReq,CheckExamIsStartedResp.class);
+		return post("examRecord/checkExamIsStarted", examRecordReq,CheckExamIsStartedResp.class);
+	}
+
+	@Override
+	public QueryExamRecordForSelectScoreResp queryExamRecordForSelectScore(QueryExamRecordForSelectScoreReq req) {
+		return post("examRecord/queryExamRecordForSelectScore", req, QueryExamRecordForSelectScoreResp.class);
 	}
 
 }

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

@@ -0,0 +1,36 @@
+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.ExamScoreCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryExamScoreReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamScoreResp;
+
+@Service
+public class ExamScoreCloudServiceClient extends AdminCloudClientSupport implements ExamScoreCloudService{
+
+	@Autowired
+    private RestTemplate restTemplate;
+	
+    @Autowired
+    private RedisClient redisClient;
+	
+	@Override
+	public QueryExamScoreResp queryExamScore(QueryExamScoreReq req) {
+		return post("examScore/queryExamScore", req, QueryExamScoreResp.class);
+	}
+
+	@Override
+	protected RestTemplate getRestTemplate() {
+		return restTemplate;
+	}
+
+	@Override
+	protected RedisClient getRedisClient() {
+		return redisClient;
+	}
+
+}

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

@@ -0,0 +1,41 @@
+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.ExamScoreDataCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamScoreDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamScoreDataResp;
+
+@Service
+public class ExamScoreDataCloudServiceClient extends AdminCloudClientSupport implements ExamScoreDataCloudService{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 702370114207337204L;
+
+	@Autowired
+    private RestTemplate restTemplate;
+	
+    @Autowired
+    private RedisClient redisClient;
+	
+	@Override
+	public FindExamScoreDataResp findExamScoreData(FindExamScoreDataReq findExamScoreDataReq) {
+		return post("examScoreData/findExamScoreData", findExamScoreDataReq, FindExamScoreDataResp.class);
+	}
+
+	@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/ExamRecordCloudService.java

@@ -2,7 +2,9 @@ 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.CheckExamIsStartedReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryExamRecordForSelectScoreReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.CheckExamIsStartedResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamRecordForSelectScoreResp;
 
 /**
  * 
@@ -19,5 +21,10 @@ public interface ExamRecordCloudService extends CloudService{
 	 * @return
 	 */
 	public CheckExamIsStartedResp checkExamIsStarted(CheckExamIsStartedReq examRecordReq);
-	
+	/**
+	 * 查询考试记录-供exchange使用
+	 * @param req
+	 * @return
+	 */
+	public QueryExamRecordForSelectScoreResp queryExamRecordForSelectScore(QueryExamRecordForSelectScoreReq req);
 }

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

@@ -0,0 +1,18 @@
+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.QueryExamScoreReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamScoreResp;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年10月15日 下午4:59:34
+ * @company 	QMTH
+ * @description 分数查询接口
+ */
+public interface ExamScoreCloudService extends CloudService {
+
+	public QueryExamScoreResp queryExamScore(QueryExamScoreReq req);
+	
+}

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

@@ -0,0 +1,24 @@
+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.response.FindExamScoreDataResp;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年10月15日 下午4:16:08
+ * @company 	QMTH
+ * @description 考试记录，学生信息，分数信息等数据查询接口
+ */
+public interface ExamScoreDataCloudService  extends CloudService{
+
+	/**
+	 * 考试记录，学生信息，分数信息等数据查询
+	 * @param findExamScoreDataReq
+	 * @return
+	 */
+	public FindExamScoreDataResp findExamScoreData(FindExamScoreDataReq findExamScoreDataReq);
+	
+	
+}

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

@@ -0,0 +1,115 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import java.util.Date;
+
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * @author  	chenken
+ * @date    	2018年10月15日 下午5:25:08
+ * @company 	QMTH
+ * @description 供exchange使用
+ */
+public class ExamRecordForSelectScore implements JsonSerializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3412182254208531252L;
+
+	private Long examRecordDataId;
+	
+	private Long rootOrgId;
+	
+	private Long examStudentId;
+	
+	  /**
+     * 考试开始时间
+     */
+    private Date startTime;
+    /**
+     * 考试结束时间
+     */
+    private Date endTime;
+    /**
+     * 考试被清理时间
+     */
+    private Date cleanTime;
+    /**
+     * 是否异常数据
+     */
+    private Boolean isWarn;
+    /**
+     * 是否被审核过
+     */
+    private Boolean isAudit;
+    /**
+     * 是否违纪
+     */
+    private Boolean isIllegality;
+    
+    private String status;
+    
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+	public Long getExamStudentId() {
+		return examStudentId;
+	}
+	public void setExamStudentId(Long examStudentId) {
+		this.examStudentId = examStudentId;
+	}
+	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 Date getCleanTime() {
+		return cleanTime;
+	}
+	public void setCleanTime(Date cleanTime) {
+		this.cleanTime = cleanTime;
+	}
+	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;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	
+}

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

@@ -0,0 +1,108 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年10月15日 下午4:54:16
+ * @company 	QMTH
+ * @description 考试分数
+ */
+public class ExamScoreBean implements JsonSerializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4888665934064569010L;
+
+	private Long id;
+
+    /**
+     * 考试记录
+     */
+    private Long examRecordDataId;
+
+    /**
+     * 总分
+     */
+    private Double totalScore;
+
+    /**
+     * 客观题得分总分
+     */
+    private Double objectiveScore;
+
+    /**
+     * 客观题答对的比率
+     * (客观题答对的题数/客观题总题数)*100  取2位小数
+     */
+    private Double objectiveAccuracy;
+
+    /**
+     * 主观题得分总分
+     */
+    private Double subjectiveScore;
+
+    /**
+     * 答题正确率
+     */
+    private Double succPercent;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+
+	public Double getTotalScore() {
+		return totalScore;
+	}
+
+	public void setTotalScore(Double totalScore) {
+		this.totalScore = totalScore;
+	}
+
+	public Double getObjectiveScore() {
+		return objectiveScore;
+	}
+
+	public void setObjectiveScore(Double objectiveScore) {
+		this.objectiveScore = objectiveScore;
+	}
+
+	public Double getObjectiveAccuracy() {
+		return objectiveAccuracy;
+	}
+
+	public void setObjectiveAccuracy(Double objectiveAccuracy) {
+		this.objectiveAccuracy = objectiveAccuracy;
+	}
+
+	public Double getSubjectiveScore() {
+		return subjectiveScore;
+	}
+
+	public void setSubjectiveScore(Double subjectiveScore) {
+		this.subjectiveScore = subjectiveScore;
+	}
+
+	public Double getSuccPercent() {
+		return succPercent;
+	}
+
+	public void setSuccPercent(Double succPercent) {
+		this.succPercent = succPercent;
+	}
+    
+}

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

@@ -0,0 +1,164 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import java.util.Date;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年10月15日 下午4:05:20
+ * @company 	QMTH
+ * @description 考试记录，学生信息，分数信息等数据
+ */
+public class ExamScoreDataBean  implements JsonSerializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5176922468872092382L;
+
+	private Long examId;
+	
+	private String studentName;
+	
+	private String studentCode;
+	
+	private String identityNumber;
+	
+	private String courseName;
+	
+	private String courseCode;
+	
+	private Date startTime;
+	
+	private Date endTime;
+	
+	/**
+	 * 人脸检测通过率
+	 */
+	private Double succPercent;
+	
+	private Long scoreId;
+	
+	private Double totalScore;
+	
+	private Double objectiveScore;
+	
+	private Double subjectiveScore;
+	
+	private Boolean isIllegality;
+
+	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 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 getSuccPercent() {
+		return succPercent;
+	}
+
+	public void setSuccPercent(Double succPercent) {
+		this.succPercent = succPercent;
+	}
+
+	public Long getScoreId() {
+		return scoreId;
+	}
+
+	public void setScoreId(Long scoreId) {
+		this.scoreId = scoreId;
+	}
+
+	public Double getTotalScore() {
+		return totalScore;
+	}
+
+	public void setTotalScore(Double totalScore) {
+		this.totalScore = totalScore;
+	}
+
+	public Double getObjectiveScore() {
+		return objectiveScore;
+	}
+
+	public void setObjectiveScore(Double objectiveScore) {
+		this.objectiveScore = objectiveScore;
+	}
+
+	public Double getSubjectiveScore() {
+		return subjectiveScore;
+	}
+
+	public void setSubjectiveScore(Double subjectiveScore) {
+		this.subjectiveScore = subjectiveScore;
+	}
+
+	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/request/FindExamScoreDataReq.java

@@ -0,0 +1,94 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class FindExamScoreDataReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2305148404791040820L;
+
+	private Long scoreId;
+	
+	private Long examId;
+	
+	private String examName;
+	
+	private Long rootOrgId;
+	
+	private String studentCode;
+	
+	private String courseCode;
+	
+	private List<String> identityNumbers;
+	
+	private List<String> studentCodes;
+
+	public Long getScoreId() {
+		return scoreId;
+	}
+
+	public void setScoreId(Long scoreId) {
+		this.scoreId = scoreId;
+	}
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public String getExamName() {
+		return examName;
+	}
+
+	public void setExamName(String examName) {
+		this.examName = examName;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	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 List<String> getIdentityNumbers() {
+		return identityNumbers;
+	}
+
+	public void setIdentityNumbers(List<String> identityNumbers) {
+		this.identityNumbers = identityNumbers;
+	}
+
+	public List<String> getStudentCodes() {
+		return studentCodes;
+	}
+
+	public void setStudentCodes(List<String> studentCodes) {
+		this.studentCodes = studentCodes;
+	}
+	
+}

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

@@ -0,0 +1,32 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class QueryExamRecordForSelectScoreReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4937742188159738117L;
+
+	private Long examScoreId;
+	
+	private Long examStudentId;
+
+	public Long getExamScoreId() {
+		return examScoreId;
+	}
+
+	public void setExamScoreId(Long examScoreId) {
+		this.examScoreId = examScoreId;
+	}
+
+	public Long getExamStudentId() {
+		return examStudentId;
+	}
+
+	public void setExamStudentId(Long examStudentId) {
+		this.examStudentId = examStudentId;
+	}
+	
+}

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

@@ -0,0 +1,23 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class QueryExamScoreReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7809480099872276294L;
+	private List<Long> examRecordDataIds;
+
+	public List<Long> getExamRecordDataIds() {
+		return examRecordDataIds;
+	}
+
+	public void setExamRecordDataIds(List<Long> examRecordDataIds) {
+		this.examRecordDataIds = examRecordDataIds;
+	}
+	
+}

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

@@ -0,0 +1,7 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+public class FindExamRecordResp {
+
+	
+	
+}

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

@@ -0,0 +1,20 @@
+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.ExamScoreDataBean;
+
+public class FindExamScoreDataResp extends BaseResponse {
+
+	private List<ExamScoreDataBean> examScoreDatas;
+
+	public List<ExamScoreDataBean> getExamScoreDatas() {
+		return examScoreDatas;
+	}
+
+	public void setExamScoreDatas(List<ExamScoreDataBean> examScoreDatas) {
+		this.examScoreDatas = examScoreDatas;
+	}
+	
+}

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

@@ -0,0 +1,25 @@
+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.ExamRecordForSelectScore;
+
+public class QueryExamRecordForSelectScoreResp extends BaseResponse{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5169712056493103693L;
+	public List<ExamRecordForSelectScore> examRecordForSelectScoreList;
+
+	public List<ExamRecordForSelectScore> getExamRecordForSelectScoreList() {
+		return examRecordForSelectScoreList;
+	}
+
+	public void setExamRecordForSelectScoreList(
+			List<ExamRecordForSelectScore> examRecordForSelectScoreList) {
+		this.examRecordForSelectScoreList = examRecordForSelectScoreList;
+	}
+	
+}

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

@@ -0,0 +1,20 @@
+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.ExamScoreBean;
+
+public class QueryExamScoreResp extends BaseResponse{
+
+	private List<ExamScoreBean> examScoreBeans;
+
+	public List<ExamScoreBean> getExamScoreBeans() {
+		return examScoreBeans;
+	}
+
+	public void setExamScoreBeans(List<ExamScoreBean> examScoreBeans) {
+		this.examScoreBeans = examScoreBeans;
+	}
+	
+}

examcloud-core-oe-student-face-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/client/ExamCaptureQueueCloudServiceClient.java

@@ -47,4 +47,9 @@ public class ExamCaptureQueueCloudServiceClient extends BasicCloudClientSupport
 		post("examCaptureQueue/changeExamCaptureQueueStatus", null, null);
 	}
 
+	@Override
+	public void examCaptureQueueMonitor() {
+		post("examCaptureQueue/examCaptureQueueMonitor", null, null);
+	}
+
 }

examcloud-core-oe-student-face-api/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/api/ExamCaptureQueueCloudService.java

@@ -23,4 +23,9 @@ public interface ExamCaptureQueueCloudService extends CloudService{
 	 * @return
 	 */
 	public void disposeExamCapturePhoto(ExamCaptureQueueReq examCaptureQueueReq);
+	
+	/**
+	 * 队列监测
+	 */
+	public void examCaptureQueueMonitor();
 }

examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/PaperCloudServiceClient.java

@@ -6,7 +6,9 @@ import org.springframework.web.client.RestTemplate;
 
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.questions.api.PaperCloudService;
+import cn.com.qmth.examcloud.core.questions.api.request.GetExtractConfigReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
+import cn.com.qmth.examcloud.core.questions.api.response.GetCommonResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
 
 /**
@@ -28,9 +30,14 @@ public class PaperCloudServiceClient extends BasicCloudClientSupport implements
 	
 	@Override
 	public GetPaperResp genPaper(GetQuestionListReq req) {
-		return post("default_paper/save", req, GetPaperResp.class);
+		return post("default_paper/genPaper", req, GetPaperResp.class);
 	}
 
+	@Override
+	public GetCommonResp examPaper(GetExtractConfigReq req) {
+		return post("default_paper/examPaper", req, GetCommonResp.class);
+	}
+	
 	@Override
 	protected RestTemplate getRestTemplate() {
 		return restTemplate;

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

@@ -1,7 +1,9 @@
 package cn.com.qmth.examcloud.core.questions.api;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
+import cn.com.qmth.examcloud.core.questions.api.request.GetExtractConfigReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
+import cn.com.qmth.examcloud.core.questions.api.response.GetCommonResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
 
 /**
@@ -19,4 +21,11 @@ public interface PaperCloudService extends CloudService{
 	 */
 	GetPaperResp genPaper(GetQuestionListReq req);
 	
+	/**
+	 * 制定考试试卷
+	 * @param req
+	 * @return
+	 */
+	GetCommonResp examPaper(GetExtractConfigReq req);
+	
 }

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

@@ -0,0 +1,67 @@
+package cn.com.qmth.examcloud.core.questions.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * @author 		weiwenhai
+ * @date 		2018.10.11
+ * @company		qmth
+ * @description	试卷制定调卷规则请求对象
+ */
+public class GetExtractConfigReq extends BaseRequest{
+
+	private static final long serialVersionUID = 2745038307789837441L;
+
+	/**
+	 * 用户机构id
+	 */
+	private String rootOrgId;
+	
+	/**
+	 * 考试id
+	 */
+	private Long examId;
+	
+	/**
+	 * 试卷id
+	 */
+	private String paperId;
+	
+	/**
+	 * 考卷对象id
+	 */
+	private String extractConfigId;
+
+	public String getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(String rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public String getPaperId() {
+		return paperId;
+	}
+
+	public void setPaperId(String paperId) {
+		this.paperId = paperId;
+	}
+
+	public String getExtractConfigId() {
+		return extractConfigId;
+	}
+
+	public void setExtractConfigId(String extractConfigId) {
+		this.extractConfigId = extractConfigId;
+	}
+	
+}

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

@@ -26,6 +26,11 @@ public class GetPaperReq extends BaseRequest{
 	 * 考试类型：O,A...
 	 */
 	private String groupCode;
+	
+	/**
+	 * 试卷id
+	 */
+	private String paperId;
 
 	public Long getExamId() {
 		return examId;
@@ -50,5 +55,13 @@ public class GetPaperReq extends BaseRequest{
 	public void setGroupCode(String groupCode) {
 		this.groupCode = groupCode;
 	}
+
+	public String getPaperId() {
+		return paperId;
+	}
+
+	public void setPaperId(String paperId) {
+		this.paperId = paperId;
+	}
 	
 }

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

@@ -30,6 +30,10 @@ public class GetQuestionListReq extends BaseRequest{
 	 * 试卷名称
 	 */
 	private String name;
+	
+	private String orgId;
+	
+	private String userName;
 
 	public Set<String> getQuestionIds() {
 		return questionIds;
@@ -54,5 +58,21 @@ public class GetQuestionListReq extends BaseRequest{
 	public void setName(String name) {
 		this.name = name;
 	}
+
+	public String getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(String orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
 	
 }

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/response/GetDefaultQuestionsResp.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.api.response;
 
-import java.util.List;
-
 import org.springframework.data.domain.Page;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;