将exchange中的数据库操作移除

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

@@ -22,12 +22,7 @@ public class ExamScoreDataCloudServiceClient extends AdminCloudClientSupport imp
 	
     @Autowired
     private RedisClient redisClient;
-	
-	@Override
-	public FindExamScoreDataResp findExamScoreData(FindExamScoreDataReq findExamScoreDataReq) {
-		return post("examScoreData/findExamScoreData", findExamScoreDataReq, FindExamScoreDataResp.class);
-	}
-
+    
 	@Override
 	protected RestTemplate getRestTemplate() {
 		return restTemplate;
@@ -37,5 +32,14 @@ public class ExamScoreDataCloudServiceClient extends AdminCloudClientSupport imp
 	protected RedisClient getRedisClient() {
 		return redisClient;
 	}
+	
+	@Override
+	public FindExamScoreDataResp findExamScoreDataByScoreId(FindExamScoreDataReq findExamScoreDataReq) {
+		return post("examScoreData/findExamScoreDataByScoreId", findExamScoreDataReq, FindExamScoreDataResp.class);
+	}
 
+	@Override
+	public FindExamScoreDataResp findExamScoreDataByExamIdAndStudentCode(FindExamScoreDataReq findExamScoreDataReq) {
+		return post("examScoreData/findExamScoreDataByExamIdAndStudentCode", findExamScoreDataReq, FindExamScoreDataResp.class);
+	}
 }

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

@@ -11,8 +11,11 @@ import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.oe.admin.api.OeExamStudentCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncAllDataReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncPartDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamStudentInfoReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.ExamStudentSyncAllDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.ExamStudentSyncPartDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamStudentInfoResp;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -26,29 +29,36 @@ import org.springframework.web.client.RestTemplate;
 @Service("oeExamStudentCloudService")
 public class OeExamStudentCloudServiceClient extends AdminCloudClientSupport implements OeExamStudentCloudService {
     private static final long serialVersionUID = -8874453764538303046L;
+    
     @Autowired
     private RestTemplate restTemplate;
+    
     @Autowired
     private RedisClient redisClient;
-
+    
     @Override
-    public ExamStudentSyncAllDataResp syncExamStudentAllData(ExamStudentSyncAllDataReq req) {
-        return post("exam/student/sync/all/data", req, ExamStudentSyncAllDataResp.class);
+    protected RedisClient getRedisClient() {
+        return redisClient;
     }
 
     @Override
-    public ExamStudentSyncPartDataResp syncExamStudentPartData(ExamStudentSyncPartDataReq req) {
-        return post("exam/student/sync/part/data", req, ExamStudentSyncPartDataResp.class);
+    protected RestTemplate getRestTemplate() {
+        return restTemplate;
     }
 
     @Override
-    protected RedisClient getRedisClient() {
-        return redisClient;
+    public ExamStudentSyncAllDataResp syncExamStudentAllData(ExamStudentSyncAllDataReq req) {
+        return post("exam/student/sync/all/data", req, ExamStudentSyncAllDataResp.class);
     }
 
     @Override
-    protected RestTemplate getRestTemplate() {
-        return restTemplate;
+    public ExamStudentSyncPartDataResp syncExamStudentPartData(ExamStudentSyncPartDataReq req) {
+        return post("exam/student/sync/part/data", req, ExamStudentSyncPartDataResp.class);
     }
 
+	@Override
+	public FindExamStudentInfoResp findExamStudentInfoBy(FindExamStudentInfoReq req) {
+		return post("exam/student/findExamStudentInfoBy", req, FindExamStudentInfoResp.class);
+	}
+	
 }

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

@@ -14,11 +14,18 @@ import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamScoreDataResp;
 public interface ExamScoreDataCloudService  extends CloudService{
 
 	/**
-	 * 考试记录，学生信息，分数信息等数据查询
+	 * 根据scoreId查询考试记录，学生信息，分数信息等数据
 	 * @param findExamScoreDataReq
 	 * @return
 	 */
-	public FindExamScoreDataResp findExamScoreData(FindExamScoreDataReq findExamScoreDataReq);
-	
+	public FindExamScoreDataResp findExamScoreDataByScoreId(FindExamScoreDataReq findExamScoreDataReq);
 	
+	/**
+	 * examId
+	 * studentCode
+	 * 考试记录，学生信息，分数信息等数据查询
+	 * @param findExamScoreDataReq
+	 * @return
+	 */
+	public FindExamScoreDataResp findExamScoreDataByExamIdAndStudentCode(FindExamScoreDataReq findExamScoreDataReq);
 }

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

@@ -10,8 +10,10 @@ 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.ExamStudentSyncAllDataReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncPartDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamStudentInfoReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.ExamStudentSyncAllDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.ExamStudentSyncPartDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamStudentInfoResp;
 
 /**
  * 考生信息接口
@@ -30,5 +32,12 @@ public interface OeExamStudentCloudService extends CloudService {
      * 同步考生(部分)数据
      */
     ExamStudentSyncPartDataResp syncExamStudentPartData(ExamStudentSyncPartDataReq req);
+    
+    /**
+	 * 根据条件查询考生信息
+	 * @param req
+	 * @return
+	 */
+	public FindExamStudentInfoResp findExamStudentInfoBy(FindExamStudentInfoReq req);
 
 }

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

@@ -17,7 +17,9 @@ public class ExamScoreDataBean  implements JsonSerializable {
 	 * 
 	 */
 	private static final long serialVersionUID = -5176922468872092382L;
-
+	
+	private String examName;
+	
 	private Long examId;
 	
 	private String studentName;
@@ -39,6 +41,11 @@ public class ExamScoreDataBean  implements JsonSerializable {
 	 */
 	private Double succPercent;
 	
+	/**
+     * 是否缺考
+     */
+    private Boolean isMissExam;
+	
 	private Long scoreId;
 	
 	private Double totalScore;
@@ -46,7 +53,9 @@ public class ExamScoreDataBean  implements JsonSerializable {
 	private Double objectiveScore;
 	
 	private Double subjectiveScore;
-	
+	/**
+	 * 是否违纪
+	 */
 	private Boolean isIllegality;
 
 	public Long getExamId() {
@@ -160,5 +169,21 @@ public class ExamScoreDataBean  implements JsonSerializable {
 	public void setIsIllegality(Boolean isIllegality) {
 		this.isIllegality = isIllegality;
 	}
+
+	public String getExamName() {
+		return examName;
+	}
+
+	public void setExamName(String examName) {
+		this.examName = examName;
+	}
+
+	public Boolean getIsMissExam() {
+		return isMissExam;
+	}
+
+	public void setIsMissExam(Boolean isMissExam) {
+		this.isMissExam = isMissExam;
+	}
 	
 }

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

@@ -0,0 +1,74 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import java.util.List;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年10月16日 上午10:39:12
+ * @company 	QMTH
+ * @description 查询学生条件
+ */
+public class FindStudentBean {
+
+	private Long examId;
+	
+	private Long rootOrgId;
+	
+	private String courseCode;
+	
+	private List<String> studentCodes;
+	
+	private List<String> identityNumbers;
+	
+	private String studentCode;
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getCourseCode() {
+		return courseCode;
+	}
+
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+
+	public List<String> getStudentCodes() {
+		return studentCodes;
+	}
+
+	public void setStudentCodes(List<String> studentCodes) {
+		this.studentCodes = studentCodes;
+	}
+
+	public List<String> getIdentityNumbers() {
+		return identityNumbers;
+	}
+
+	public void setIdentityNumbers(List<String> identityNumbers) {
+		this.identityNumbers = identityNumbers;
+	}
+
+	public String getStudentCode() {
+		return studentCode;
+	}
+
+	public void setStudentCode(String studentCode) {
+		this.studentCode = studentCode;
+	}
+
+}

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

@@ -0,0 +1,44 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年10月16日 上午10:39:24
+ * @company 	QMTH
+ * @description 查询学生方式
+ */
+public enum FindStudentType {
+
+	/**
+	 * 根据examId
+	 */
+	BY_EXAMID("根据examId"),
+	/**
+	 * 根据examId和身份证集合
+	 */
+	BY_EXAMID_AND_IDENTITYNUMBERS("根据examId和身份证集合"),
+	/**
+	 * 根据rootOrgId和身份证集合 
+	 */
+	BY_IDENTITYNUMBERS_AND_ROOTORGID("根据rootOrgId和身份证集合"),
+	/**
+	 * 根据examId和学号集合
+	 */
+	BY_EXAMID_AND_STUDENTCODES("根据examId和学号集合");
+	
+	
+	private FindStudentType(String desc){
+		this.desc = desc;
+	}
+	
+	private String desc;
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+	
+}

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

@@ -0,0 +1,82 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+public class OeExamStudentBean implements JsonSerializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5706923718882609779L;
+
+	private Long examId;
+	
+	private Long examStudentId;
+	
+	private String studentName;
+	
+	private String studentCode;
+	
+	private String courseCode;
+	
+	private String identityNumber;
+	
+	private Boolean finished;
+
+	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 getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+
+	public Long getExamStudentId() {
+		return examStudentId;
+	}
+
+	public void setExamStudentId(Long examStudentId) {
+		this.examStudentId = examStudentId;
+	}
+
+	public Boolean getFinished() {
+		return finished;
+	}
+
+	public void setFinished(Boolean finished) {
+		this.finished = finished;
+	}
+	
+}

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

@@ -10,7 +10,7 @@ public class FindExamScoreDataReq extends BaseRequest{
 	 * 
 	 */
 	private static final long serialVersionUID = 2305148404791040820L;
-
+	
 	private Long scoreId;
 	
 	private Long examId;

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

@@ -0,0 +1,35 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.FindStudentBean;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.FindStudentType;
+
+public class FindExamStudentInfoReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1950150084908857735L;
+
+	private FindStudentBean findStudentBean;
+	
+	private FindStudentType findStudentType;
+
+	public FindStudentBean getFindStudentBean() {
+		return findStudentBean;
+	}
+
+	public void setFindStudentBean(FindStudentBean findStudentBean) {
+		this.findStudentBean = findStudentBean;
+	}
+
+	public FindStudentType getFindStudentType() {
+		return findStudentType;
+	}
+
+	public void setFindStudentType(FindStudentType findStudentType) {
+		this.findStudentType = findStudentType;
+	}
+	
+}

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

@@ -7,6 +7,10 @@ import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamScoreDataBean;
 
 public class FindExamScoreDataResp extends BaseResponse {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6369755954855104665L;
 	private List<ExamScoreDataBean> examScoreDatas;
 
 	public List<ExamScoreDataBean> getExamScoreDatas() {

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

@@ -0,0 +1,24 @@
+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.OeExamStudentBean;
+
+public class FindExamStudentInfoResp extends BaseResponse{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -9175450795454964673L;
+
+	private List<OeExamStudentBean> examStudents;
+
+	public List<OeExamStudentBean> getExamStudents() {
+		return examStudents;
+	}
+
+	public void setExamStudents(List<OeExamStudentBean> examStudents) {
+		this.examStudents = examStudents;
+	}
+}