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

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

@@ -7,8 +7,10 @@ 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.GetExamPhotoVerifyDataReq;
 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.GetExamPhotoVerifyDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamRecordForSelectScoreResp;
 
 
@@ -51,4 +53,9 @@ public class ExamRecordCloudServiceClient extends AdminCloudClientSupport implem
 		return post("examRecord/queryExamRecordForSelectScoreByExamStudentId", req, QueryExamRecordForSelectScoreResp.class);
 	}
 
+	@Override
+	public GetExamPhotoVerifyDataResp getExamPhotoVerifyData(GetExamPhotoVerifyDataReq req) {
+		return post("examRecord/getExamPhotoVerifyData", req, GetExamPhotoVerifyDataResp.class);
+	}
+
 }

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

@@ -2,8 +2,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.CheckExamIsStartedReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetExamPhotoVerifyDataReq;
 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.GetExamPhotoVerifyDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamRecordForSelectScoreResp;
 
 /**
@@ -34,4 +36,11 @@ public interface ExamRecordCloudService extends CloudService{
 	 * @return
 	 */
 	public QueryExamRecordForSelectScoreResp queryExamRecordForSelectScoreByExamStudentId(QueryExamRecordForSelectScoreReq req);
+	
+	/**
+	 * 查询照片数据
+	 * @param req
+	 * @return
+	 */
+	public GetExamPhotoVerifyDataResp getExamPhotoVerifyData(GetExamPhotoVerifyDataReq req);
 }

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

@@ -42,6 +42,15 @@ public class ExamRecordForMarkingBean implements JsonSerializable{
 	 * 客观分总分
 	 */
 	private Double objectiveScore;
+	
+	/**
+	 * 文件路径:离线考试
+	 */
+	private String offlineFileUrl;
+	/**
+	 * 文件名称:离线考试
+	 */
+	private String offlineFileName; 
 
 	public Long getId() {
 		return id;
@@ -106,5 +115,21 @@ public class ExamRecordForMarkingBean implements JsonSerializable{
 	public void setObjectiveScore(Double objectiveScore) {
 		this.objectiveScore = objectiveScore;
 	}
+
+	public String getOfflineFileUrl() {
+		return offlineFileUrl;
+	}
+
+	public void setOfflineFileUrl(String offlineFileUrl) {
+		this.offlineFileUrl = offlineFileUrl;
+	}
+
+	public String getOfflineFileName() {
+		return offlineFileName;
+	}
+
+	public void setOfflineFileName(String offlineFileName) {
+		this.offlineFileName = offlineFileName;
+	}
 	
 }

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/GetExamPhotoVerifyDataReq.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 GetExamPhotoVerifyDataReq extends BaseRequest{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3051405694777031427L;
+	private Long scoreId;
+
+	public Long getScoreId() {
+		return scoreId;
+	}
+
+	public void setScoreId(Long scoreId) {
+		this.scoreId = scoreId;
+	}
+	
+}

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

@@ -0,0 +1,60 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+
+public class GetExamPhotoVerifyDataResp extends BaseResponse{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2735205397742150106L;
+	/**
+	 * 分数ID
+	 */
+	private Long scoreId;
+	/**
+	 * 总的人脸检测成功率(%)
+	 */
+	private double successRate;
+	/**
+	 * 陌生人脸出现总次数
+	 */
+	private int strangerCount;
+	/**
+	 * 照片URL集合
+	 */
+	private List<String> photoUrls;
+
+	public Long getScoreId() {
+		return scoreId;
+	}
+
+	public void setScoreId(Long scoreId) {
+		this.scoreId = scoreId;
+	}
+
+	public double getSuccessRate() {
+		return successRate;
+	}
+
+	public void setSuccessRate(double successRate) {
+		this.successRate = successRate;
+	}
+
+	public int getStrangerCount() {
+		return strangerCount;
+	}
+
+	public void setStrangerCount(int strangerCount) {
+		this.strangerCount = strangerCount;
+	}
+
+	public List<String> getPhotoUrls() {
+		return photoUrls;
+	}
+
+	public void setPhotoUrls(List<String> photoUrls) {
+		this.photoUrls = photoUrls;
+	}
+}

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

@@ -0,0 +1,40 @@
+package cn.com.qmth.examcloud.core.oe.student.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.oe.student.api.OeExamRecordForMarkingCloudService;
+import cn.com.qmth.examcloud.core.oe.student.api.request.SaveExamRecordForMarkingReq;
+
+@Service
+public class OeExamRecordForMarkingCloudServiceClient extends BasicCloudClientSupport  implements OeExamRecordForMarkingCloudService {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8762454977750448054L;
+
+	@Autowired
+	private RestTemplate restTemplate;
+
+	@Autowired
+	private RedisClient redisClient;
+	
+	@Override
+	public void saveExamRecordForMarking(SaveExamRecordForMarkingReq req) {
+		post("examRecordForMarking/saveExamRecordForMarking", req);
+	}
+
+	@Override
+	protected RestTemplate getRestTemplate() {
+		return restTemplate;
+	}
+
+	@Override
+	protected RedisClient getRedisClient() {
+		return redisClient;
+	}
+
+}

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

@@ -0,0 +1,39 @@
+package cn.com.qmth.examcloud.core.oe.student.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.oe.student.api.OeScorePushCloudService;
+
+@Service
+public class OeScorePushCloudServiceClient extends BasicCloudClientSupport implements OeScorePushCloudService{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1682623291259562715L;
+
+	@Autowired
+	private RestTemplate restTemplate;
+
+	@Autowired
+	private RedisClient redisClient;
+	
+	@Override
+	public void scorePush() {
+		post("oeScorePush", null);
+	}
+
+	@Override
+	protected RestTemplate getRestTemplate() {
+		return restTemplate;
+	}
+
+	@Override
+	protected RedisClient getRedisClient() {
+		return redisClient;
+	}
+
+}

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

@@ -0,0 +1,10 @@
+package cn.com.qmth.examcloud.core.oe.student.api;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
+import cn.com.qmth.examcloud.core.oe.student.api.request.SaveExamRecordForMarkingReq;
+
+public interface OeExamRecordForMarkingCloudService extends CloudService{
+
+	public void saveExamRecordForMarking(SaveExamRecordForMarkingReq req);
+	
+}

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

@@ -0,0 +1,20 @@
+package cn.com.qmth.examcloud.core.oe.student.api;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
+
+/**
+ * 
+ * @author  	chenken
+ * @date    	2018年9月8日 上午10:37:42
+ * @company 	QMTH
+ * @description 分数推送
+ */
+public interface OeScorePushCloudService extends CloudService{
+	
+	/**
+	 * 分数推送:定时器调用
+	 * @return
+	 */
+	public void scorePush();
+	
+}

examcloud-core-oe-student-api/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/request/SaveExamRecordForMarkingReq.java

@@ -0,0 +1,73 @@
+package cn.com.qmth.examcloud.core.oe.student.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class SaveExamRecordForMarkingReq extends BaseRequest{
+
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5598031673904835427L;
+
+	private Long examId;
+	
+	private Long examRecordDataId;
+	
+	private Long examStudentId;
+	
+	private String basePaperId;
+	
+	private String paperType;
+	
+	private Long CourseId;
+	
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+
+	public Long getExamStudentId() {
+		return examStudentId;
+	}
+
+	public void setExamStudentId(Long examStudentId) {
+		this.examStudentId = examStudentId;
+	}
+
+	public String getBasePaperId() {
+		return basePaperId;
+	}
+
+	public void setBasePaperId(String basePaperId) {
+		this.basePaperId = basePaperId;
+	}
+
+	public String getPaperType() {
+		return paperType;
+	}
+
+	public void setPaperType(String paperType) {
+		this.paperType = paperType;
+	}
+
+	public Long getCourseId() {
+		return CourseId;
+	}
+
+	public void setCourseId(Long courseId) {
+		CourseId = courseId;
+	}
+
+}

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/ScorePushCloudService.java

@@ -1,5 +0,0 @@
-package cn.com.qmth.examcloud.exchange.inner.api;
-
-public interface ScorePushCloudService {
-
-}