....

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamAuditController.java

@@ -13,16 +13,16 @@ import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.JsonMapper;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.excel.ExportUtils;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.AuditStatus;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.DisciplineType;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamProperties;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.SelectType;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamAuditService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.*;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.web.support.Naked;

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamRecordController.java

@@ -10,11 +10,11 @@ package cn.com.qmth.examcloud.core.oe.admin.api.controller;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.JsonMapper;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.excel.ExportUtils;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordForMarkingRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordForMarkingEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamType;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordForMarkingRepo;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordQuery;

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamRecordDataController.java

@@ -2,8 +2,8 @@ package cn.com.qmth.examcloud.core.oe.admin.api.controller;
 
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamRecordDataBeanConvert;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamRecordDataDomain;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamRecordQuestionsController.java

@@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordQuestionsRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordQuestionsEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordQuestionsRepo;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamStudentController.java

@@ -12,10 +12,10 @@ import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.JsonMapper;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.excel.ExportUtils;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.*;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.web.support.Naked;
 import io.swagger.annotations.Api;

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

@@ -1,5 +1,22 @@
 package cn.com.qmth.examcloud.core.oe.admin.api.provider;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.mysql.cj.util.StringUtils;
+
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamRecordForSelectScore;
@@ -14,34 +31,28 @@ import cn.com.qmth.examcloud.core.oe.admin.api.response.GetExamPhotoVerifyDataRe
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetToBeMarkExamRecordResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamRecordForSelectScoreResp;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.*;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.*;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamCaptureRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordQuestionsRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamCaptureEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamQuestionEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordForMarkingEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordQuestionsEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordForMarkingService;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.question.commons.core.question.AnswerType;
 import cn.com.qmth.examcloud.question.commons.core.question.QuestionType;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
-import com.mysql.cj.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author chenken

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

@@ -13,11 +13,11 @@ import cn.com.qmth.examcloud.core.oe.admin.api.response.GetSingleExamRecordDataR
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoPageResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoResp;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordForMarkingEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordForMarkingService;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;

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

@@ -10,11 +10,11 @@ import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveSubjectiveQuestionSco
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetSubjectiveAnswerResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QuerySubjectiveAnswerListResp;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordQuestionsRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamQuestionEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordQuestionsEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordQuestionsRepo;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordQuestionsService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.SubjectiveQuestionScoreInfo;
 import cn.com.qmth.examcloud.question.commons.core.question.AnswerType;

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

@@ -13,8 +13,8 @@ import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamScoreBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryExamScoreReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamScoreResp;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreRepo;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,5 +1,18 @@
 package cn.com.qmth.examcloud.core.oe.admin.api.provider;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
@@ -9,17 +22,36 @@ import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreDataCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamScoreDataBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.QueryCapturePhotoBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ScoreDataBean;
-import cn.com.qmth.examcloud.core.oe.admin.api.request.*;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.*;
+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.GetFinalScoreDataReq;
+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.request.QueryScoreDataReq;
+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.GetFinalScoreDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetScoreDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryCapturePhotoResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryScoreDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.*;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamAuditRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamCaptureRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamAuditEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamCaptureEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentFinalScoreEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.DisciplineType;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamType;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.*;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentFinalScoreService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
@@ -29,18 +61,6 @@ import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @Api(tags = "考试分数信息相关接口")
 @RestController

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

@@ -11,8 +11,8 @@ 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;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreObtainQueueRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreObtainQueueEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreObtainQueueRepo;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;

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

@@ -15,10 +15,10 @@ import cn.com.qmth.examcloud.core.oe.admin.api.bean.OeExamStudentBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ToBeMarkExamStudentBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.*;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.*;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordForMarkingRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordForMarkingEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordForMarkingRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamStudentRepo;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import com.mysql.cj.util.StringUtils;
 import io.swagger.annotations.Api;

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

@@ -6,16 +6,16 @@ import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamStudentDataBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamStudentScoreDataBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.GetExamStudentDataReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetExamStudentDataResp;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordQuestionsRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamQuestionEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordQuestionsEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamProperties;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordQuestionsRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.ExamStudentEffectiveScoreInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentInfo;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;

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

@@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.core.oe.admin.api.OeAdminScorePushCloudService;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScorePushQueueRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScorePushQueueRepo;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreQueueService;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;

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

@@ -2,10 +2,10 @@ package cn.com.qmth.examcloud.core.oe.admin.api.provider;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamStudentBeanConvert;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentInfo;
 import cn.com.qmth.examcloud.global.api.HandleSyncCloudService;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamAuditRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamAuditRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamCaptureQueueRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamCaptureQueueRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamCaptureRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamCaptureRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamFaceLivenessVerifyRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamFaceLivenessVerifyRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamFileAnswerTempRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamFileAnswerTempRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import java.util.Date;
 import java.util.List;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamQuestionPlayTimeRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamQuestionPlayTimeRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import java.util.List;
 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamRecordDataRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamRecordDataRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamRecordForMarkingRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamRecordForMarkingRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import java.util.List;
 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamRecordPaperStructRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamRecordPaperStructRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamRecordQuestionsRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamRecordQuestionsRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import java.util.List;
 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamScoreNoticeQueueRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamScoreNoticeQueueRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamScoreObtainQueueRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamScoreObtainQueueRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import java.util.Date;
 import java.util.List;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamScorePushQueueRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamScorePushQueueRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import java.util.List;
 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamScoreRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamScoreRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamStudentFinalScoreRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamStudentFinalScoreRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamStudentRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamStudentRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import java.util.Date;
 import java.util.List;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/ExamingRecordRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamingRecordRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 
 import org.springframework.data.jpa.repository.JpaRepository;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/FaceBiopsyItemRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/FaceBiopsyItemRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/FaceBiopsyItemStepRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/FaceBiopsyItemStepRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/FaceBiopsyRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/FaceBiopsyRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/HandInExamRecordRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/HandInExamRecordRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 
 import org.springframework.data.jpa.repository.JpaRepository;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/OfflineFileRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/OfflineFileRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/repository/OrgScoreHandleRepo.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/OrgScoreHandleRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.repository;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import java.util.List;
 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/helper/FaceBiopsyHelper.java

@@ -1,161 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.helper;
-
-import cn.com.qmth.examcloud.commons.util.StringUtil;
-import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamProperties;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.FaceBiopsyScheme;
-import cn.com.qmth.examcloud.support.cache.CacheHelper;
-import cn.com.qmth.examcloud.support.cache.bean.ExamPropertyCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.OrgPropertyCacheBean;
-import cn.com.qmth.examcloud.support.privilege.PrivilegeDefine;
-import cn.com.qmth.examcloud.support.privilege.PrivilegeManager;
-import com.sun.mail.imap.protocol.BODY;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * @Description 活体检测帮助类
- * @Author lideyin
- * @Date 2019/11/6 15:01
- * @Version 1.0
- */
-public class FaceBiopsyHelper {
-    /**
-     * 获取活体检测方案
-     *
-     * @param rootOrgId
-     * @return
-     */
-    public static FaceBiopsyScheme getFaceBiopsyScheme(Long rootOrgId) {
-        OrgPropertyCacheBean orgProperty = CacheHelper.getOrgProperty(rootOrgId,
-                Constants.IDENTIFICATION_OF_LIVING_BODY_SCHEME_KEY);
-        if (orgProperty.getHasValue()) {
-            if (FaceBiopsyScheme.FACE_ID.getCode().equals(orgProperty.getValue())) {
-                return FaceBiopsyScheme.FACE_ID;
-            }
-            return FaceBiopsyScheme.NEW;
-        }
-        //默认使用旧活体检测方案(即faceId方案)
-        return FaceBiopsyScheme.FACE_ID;
-    }
-
-    /**
-     * 是否开启人脸
-     *
-     * @param rootOrgId
-     * @param examId
-     * @param studentId
-     * @return
-     */
-    public static Boolean isFaceEnable(Long rootOrgId, Long examId, Long studentId) {
-        //判断是否有人脸识别的权限
-        String faceCheck = PrivilegeDefine.RootOrgFunctions.OnlineExamFunctions.FaceCheck.CODE;
-        Boolean hasFaceCheckFunction = PrivilegeManager.judge(rootOrgId, faceCheck);
-
-        //如果有权限，具体的人脸识别的配置值
-        ExamPropertyCacheBean examConf = ExamCacheTransferHelper.getCachedExamProperty(examId,
-                studentId, ExamProperties.IS_FACE_ENABLE.name());
-        String examValue = examConf.getValue();
-
-        if (!hasFaceCheckFunction) {
-            return false;
-        }
-
-        if (StringUtils.isBlank(examValue)) {
-            return false;
-        }
-
-        if (StringUtil.isTrue(examValue)) {
-            return true;
-        }
-
-        return false;
-
-    }
-
-    /**
-     * 是否开启人脸活体检测
-     *
-     * @param rootOrgId
-     * @param examId
-     * @param studentId
-     * @return
-     */
-    public static Boolean isFaceVerify(Long rootOrgId, Long examId, Long studentId) {
-        ExamSettingsCacheBean examSettings = CacheHelper.getExamSettings(examId);
-
-        //如果未开启人脸识别，则直接返回false
-        Boolean faceEnable = isFaceEnable(rootOrgId, examId, studentId);
-        if (!faceEnable) {
-            return false;
-        }
-
-        //人脸活体检测权限
-        String IdentificationOfLivingBody = PrivilegeDefine.RootOrgFunctions.OnlineExamFunctions.IdentificationOfLivingBody.CODE;
-        Boolean hasIdentificationOfLivingBodyFunction = PrivilegeManager
-                .judge(examSettings.getRootOrgId(), IdentificationOfLivingBody);
-
-        //人脸活体检测配置值
-        ExamPropertyCacheBean examConf = CacheHelper.getExamProperty(examId, ExamProperties.IS_FACE_VERIFY.name());
-        String examValue = examConf.getValue();
-
-        if (!hasIdentificationOfLivingBodyFunction) {
-            return false;
-        }
-
-        if (StringUtils.isBlank(examValue)) {
-            return false;
-        }
-
-        if (StringUtil.isTrue(examValue)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * 进入考试是否验证人脸识别(强制、非强制)
-     *
-     * @return
-     */
-    public static Boolean isFaceCheck(Long examId, Long studentId) {
-        String isFaceCheck = ExamCacheTransferHelper.getCachedExamProperty(examId,
-                studentId, ExamProperties.IS_FACE_CHECK.name()).getValue();
-        if (StringUtils.isBlank(isFaceCheck)) {
-            return false;
-        }
-        return Boolean.valueOf(isFaceCheck);
-    }
-
-    /**
-     * 判断是否有人脸识别权限
-     *
-     * @param rootOrgId
-     * @param examId
-     * @return
-     * @author WANGWEI
-     */
-    private Boolean faceCheckEnabled(Long rootOrgId, Long examId, Long studentId) {
-        String faceCheck = PrivilegeDefine.RootOrgFunctions.OnlineExamFunctions.FaceCheck.CODE;
-        Boolean hasFaceCheckFunction = PrivilegeManager.judge(rootOrgId, faceCheck);
-
-        ExamPropertyCacheBean examConf = ExamCacheTransferHelper.getCachedExamProperty(examId,
-                studentId, ExamProperties.IS_FACE_ENABLE.name());
-        String examValue = examConf.getValue();
-
-        if (!hasFaceCheckFunction) {
-            return false;
-        }
-
-        if (StringUtils.isBlank(examValue)) {
-            return false;
-        }
-
-        if (StringUtil.isTrue(examValue)) {
-            return true;
-        }
-
-        return false;
-    }
-}

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/scorepushrule/cugr/CugrExamScorePushRuleServiceImpl.java

@@ -1,32 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service.scorepushrule.cugr;
-
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.scorepushrule.ExamScorePushRuleService;
-
-/**
- * 
- * @author  	chenken
- * @date    	2018年10月18日 下午4:08:51
- * @company 	QMTH
- * @description 地质大学（武汉）入学  orgCode:cugr.ecs.qmth.com.cn
- */
-@Service("cugrExamScorePushRuleServiceImpl")
-public class CugrExamScorePushRuleServiceImpl implements ExamScorePushRuleService{
-	
-	@Override
-	public boolean pushScoreRule(ExamRecordDataEntity examRecordData) {
-		//违纪
-  		if(examRecordData.getIsIllegality()){
-  			return false;
-  		}
-  		//有警告且未审核
-		if(examRecordData.getIsWarn() && !examRecordData.getIsAudit()){
-			return false;
-		}
-		return true;
-	}
-	
-}
-

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/scorepushrule/cup/CupExamScorePushRuleServiceImpl.java

@@ -1,32 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service.scorepushrule.cup;
-
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.scorepushrule.ExamScorePushRuleService;
-
-
-/**
- * 
- * @author  	chenken
- * @date    	2018年10月18日 下午4:09:26
- * @company 	QMTH
- * @description 石油大学  orgCode:cup.ecs.qmth.com.cn
- */
-@Service("cupExamScorePushRuleServiceImpl")
-public class CupExamScorePushRuleServiceImpl implements ExamScorePushRuleService{
-	
-	@Override
-	public boolean pushScoreRule(ExamRecordDataEntity examRecordData) {
-		//违纪
-  		if(examRecordData.getIsIllegality()){
-  			return false;
-  		}
-  		//有警告且未审核
-		if(examRecordData.getIsWarn() && !examRecordData.getIsAudit()){
-			return false;
-		}
-		return true;
-	}
-
-}

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/ExamScoreNoticeQueueService.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamScoreNoticeQueueService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service;
+package cn.com.qmth.examcloud.core.oe.admin.service;
 
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreNoticeQueueEntity;
 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/ExamScoreObtainQueueService.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamScoreObtainQueueService.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service;
+package cn.com.qmth.examcloud.core.oe.admin.service;
 
 import javax.validation.constraints.NotNull;
 
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.info.NotifyUrlInfo;
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.NotifyUrlInfo;
 
 /**
  * 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/ExamScorePushQueueService.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamScorePushQueueService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service;
+package cn.com.qmth.examcloud.core.oe.admin.service;
 
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/GainBaseDataService.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/GainBaseDataService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service;
+package cn.com.qmth.examcloud.core.oe.admin.service;
 
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/LocalCacheService.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/LocalCacheService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service;
+package cn.com.qmth.examcloud.core.oe.admin.service;
 
 import java.util.Map;
 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/info/NotifyUrlInfo.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/NotifyUrlInfo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.info;
+package cn.com.qmth.examcloud.core.oe.admin.service.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.commons.util.HttpMethod;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examrecord/ExamRecordEntityConvert.java

@@ -11,14 +11,14 @@ import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.DateUtils;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.TrueFalse;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import com.google.common.collect.Lists;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/cache/ExamRecordPropertyCache.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.cache;
 
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.support.cache.bean.ExamRecordPropertyCacheBean;
 import cn.com.qmth.examcloud.web.cache.RandomObjectRedisCache;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamAuditServiceImpl.java

@@ -13,23 +13,23 @@ import cn.com.qmth.examcloud.core.oe.admin.base.jpa.Searcher;
 import cn.com.qmth.examcloud.core.oe.admin.base.jpa.SpecUtils;
 import cn.com.qmth.examcloud.core.oe.admin.base.jpa.SqlWrapper;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamAuditRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordForMarkingRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamAuditEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordForMarkingEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.*;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamAuditRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordForMarkingRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.ExamScoreObtainQueueService;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.ExamScorePushQueueService;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.LocalCacheService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamAuditService;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreObtainQueueService;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamScorePushQueueService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
+import cn.com.qmth.examcloud.core.oe.admin.service.LocalCacheService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.*;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.core.oe.student.api.OeExamRecordForMarkingCloudService;
 import cn.com.qmth.examcloud.core.oe.student.api.request.SaveExamRecordForMarkingReq;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamCaptureServiceImpl.java

@@ -9,17 +9,17 @@ package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamCaptureRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamAuditEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamCaptureEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.AuditStatus;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamCaptureRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamAuditService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamCaptureService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examcapture.ExamCaptureAuditInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examcapture.ExamCaptureInfo;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import com.google.common.collect.Lists;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordForMarkingServiceImpl.java

@@ -16,10 +16,10 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordForMarkingRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordForMarkingEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamType;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.MarkingType;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordForMarkingRepo;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordForMarkingService;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordPaperStructServiceImpl.java

@@ -3,10 +3,10 @@ package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.NewQuestionType;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Sentence;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordPaperStructRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordPaperStructEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordPaperStructRepo;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordPaperStructService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.ExamRecordQuestionsInfo;
 import cn.com.qmth.examcloud.core.questions.api.ExtractConfigCloudService;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordQuestionsServiceImpl.java

@@ -1,14 +1,14 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.QuestionTypeUtil;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordQuestionsRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamQuestionEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordQuestionsEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamType;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordQuestionsRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreRepo;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordQuestionsService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentFinalScoreService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.SubjectiveQuestionScoreInfo;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordServiceImpl.java

@@ -10,6 +10,9 @@ package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.oe.admin.base.jpa.SqlWrapper;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordQuestionsRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamQuestionEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordQuestionsEntity;
@@ -17,20 +20,17 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.MarkingType;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordQuestionsRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.LocalCacheService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
+import cn.com.qmth.examcloud.core.oe.admin.service.LocalCacheService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.ExamStudentEffectiveScoreInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordEntityConvert;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamStudentQuestionScoreInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentInfo;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/impl/ExamScoreNoticeQueueServiceImpl.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamScoreNoticeQueueServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service.impl;
+package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 import java.util.Date;
 
@@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreNoticeQueueRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreNoticeQueueEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreNoticeQueueRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.ExamScoreNoticeQueueService;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreNoticeQueueService;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 
 /**

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/impl/ExamScoreObtainQueueServiceImpl.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamScoreObtainQueueServiceImpl.java

@@ -1,15 +1,15 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service.impl;
+package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 import cn.com.qmth.examcloud.commons.util.HttpMethod;
 import cn.com.qmth.examcloud.commons.util.OKHttpUtil;
 import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreObtainQueueRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreObtainQueueEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamProperties;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.info.NotifyUrlInfo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreObtainQueueRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.ExamScoreObtainQueueService;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreObtainQueueService;
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.NotifyUrlInfo;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.SysPropertyCacheBean;
 import org.apache.commons.lang3.StringUtils;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/impl/ExamScorePushQueueServiceImpl.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamScorePushQueueServiceImpl.java

@@ -1,22 +1,23 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service.impl;
+package cn.com.qmth.examcloud.core.oe.admin.service.impl;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScorePushQueueRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.OrgScoreHandleRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScorePushQueue;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.OrgScoreHandleEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamProperties;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScorePushQueueRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.OrgScoreHandleRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.ExamScorePushQueueService;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.scorepushrule.ExamScorePushRuleService;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamScorePushQueueService;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
+import cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.ExamScorePushRuleService;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
 
 /**
  * @author chenken

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamScoreQueueServiceImpl.java

@@ -6,12 +6,12 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScorePushQueueRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScorePushQueue;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScorePushQueueRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamScorePushService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreQueueService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 
 

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamScoreServiceImpl.java

@@ -11,6 +11,8 @@ import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.oe.admin.base.jpa.SpecUtils;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.CommonUtil;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
@@ -19,16 +21,12 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamProperties;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.MarkingType;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.LocalCacheService;
 import cn.com.qmth.examcloud.core.oe.admin.service.*;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreEntityConvert;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentInfo;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamStudentFinalScoreServiceImpl.java

@@ -1,5 +1,9 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentFinalScoreRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
@@ -7,12 +11,8 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentFinalScoreEntit
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamProperties;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.MarkingType;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamStudentFinalScoreRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentFinalScoreService;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamStudentServiceImpl.java

@@ -11,19 +11,19 @@ import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.oe.admin.base.jpa.SpecUtils;
 import cn.com.qmth.examcloud.core.oe.admin.base.jpa.SqlWrapper;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordForMarkingRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordForMarkingEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.*;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordForMarkingRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamStudentRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.LocalCacheService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
+import cn.com.qmth.examcloud.core.oe.admin.service.LocalCacheService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.*;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.support.cache.bean.ExamPropertyCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/impl/GainBaseDataServiceImpl.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/GainBaseDataServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service.impl;
+package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
@@ -13,7 +13,7 @@ import cn.com.qmth.examcloud.core.basic.api.request.GetSystemPropertyReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetCourseResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetStudentResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetSystemPropertyResp;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/impl/LocalCacheServiceImpl.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/LocalCacheServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service.impl;
+package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 import java.util.Map;
 
@@ -12,8 +12,8 @@ import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.StudentBean;
 import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.LocalCacheService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
+import cn.com.qmth.examcloud.core.oe.admin.service.LocalCacheService;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
 
 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/helper/ExamCacheTransferHelper.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/others/ExamCacheTransferHelper.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.admin.dao.helper;
+package cn.com.qmth.examcloud.core.oe.admin.service.others;
 
 import cn.com.qmth.examcloud.api.commons.enums.ExamSpecialSettingsType;
 import cn.com.qmth.examcloud.commons.util.StringUtil;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/pushscore/bean/ExamScorePushInfo.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/pushscore/bean/ExamScorePushInfo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.admin.service.impl.pushscore.bean;
+package cn.com.qmth.examcloud.core.oe.admin.service.pushscore.bean;
 
 import java.util.Date;
 
@@ -6,53 +6,54 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 /**
  * 
- * @author  	chenken
- * @date    	2018年10月15日 下午4:05:20
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年10月15日 下午4:05:20
+ * @company QMTH
  * @description 推送给学校的考试记录，学生信息，分数信息等数据
  */
-public class ExamScorePushInfo  implements JsonSerializable {
+public class ExamScorePushInfo implements JsonSerializable {
 
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = -5176922468872092382L;
-	
+
 	private String examName;
-	
+
 	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 Boolean isMissExam;
-	
+	 * 是否缺考
+	 */
+	private Boolean isMissExam;
+
 	private Long scoreId;
-	
+
 	private Double totalScore;
-	
+
 	private Double objectiveScore;
-	
+
 	private Double subjectiveScore;
+
 	/**
 	 * 是否违纪
 	 */
@@ -185,5 +186,5 @@ public class ExamScorePushInfo  implements JsonSerializable {
 	public void setIsMissExam(Boolean isMissExam) {
 		this.isMissExam = isMissExam;
 	}
-	
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/pushscore/cugr/CugrExamScorePushServiceImpl.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/pushscore/cugr/CugrExamScorePushServiceImpl.java

@@ -1,14 +1,14 @@
-package cn.com.qmth.examcloud.core.oe.admin.service.impl.pushscore.cugr;
+package cn.com.qmth.examcloud.core.oe.admin.service.pushscore.cugr;
 
 import cn.com.qmth.examcloud.commons.util.DateUtil;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScorePushQueueRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScorePushQueue;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScorePushQueueRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamScorePushService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreQueueService;
+import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/pushscore/cup/CupExamScorePushServiceImpl.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/pushscore/cup/CupExamScorePushServiceImpl.java

@@ -1,22 +1,10 @@
-package cn.com.qmth.examcloud.core.oe.admin.service.impl.pushscore.cup;
+package cn.com.qmth.examcloud.core.oe.admin.service.pushscore.cup;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URI;
 
-import cn.com.qmth.examcloud.commons.util.JsonUtil;
-import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScorePushQueue;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScorePushQueueRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamStudentRepo;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamScorePushService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreQueueService;
-import cn.com.qmth.examcloud.core.oe.admin.service.impl.pushscore.bean.ExamScorePushInfo;
-import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
-import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
@@ -31,10 +19,23 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URI;
+import cn.com.qmth.examcloud.commons.util.JsonUtil;
+import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScorePushQueueRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScorePushQueue;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamScorePushService;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreQueueService;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
+import cn.com.qmth.examcloud.core.oe.admin.service.pushscore.bean.ExamScorePushInfo;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
+import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 
 /**
  * @author chenken

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/pushscore/swufe/SwufeExamScorePushServiceImpl.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/pushscore/swufe/SwufeExamScorePushServiceImpl.java

@@ -1,21 +1,12 @@
-package cn.com.qmth.examcloud.core.oe.admin.service.impl.pushscore.swufe;
+package cn.com.qmth.examcloud.core.oe.admin.service.pushscore.swufe;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
-import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
-import cn.com.qmth.examcloud.core.oe.admin.base.utils.CommonUtil;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScorePushQueue;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
-import cn.com.qmth.examcloud.core.oe.admin.dao.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamScoreRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.repository.ExamStudentRepo;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamScorePushService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreQueueService;
-import cn.com.qmth.examcloud.core.oe.admin.service.impl.pushscore.bean.ExamScorePushInfo;
-import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
-import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;
@@ -31,12 +22,22 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
+import cn.com.qmth.examcloud.core.oe.admin.base.utils.CommonUtil;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScorePushQueue;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamScorePushService;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreQueueService;
+import cn.com.qmth.examcloud.core.oe.admin.service.others.ExamCacheTransferHelper;
+import cn.com.qmth.examcloud.core.oe.admin.service.pushscore.bean.ExamScorePushInfo;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
+import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 
 /**
  * 

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/scorepushrule/ExamScorePushRuleService.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/scorepushrule/ExamScorePushRuleService.java

@@ -1,23 +1,22 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service.scorepushrule;
+package cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule;
 
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 
-
-
 /**
  * 
- * @author  	chenken
- * @date    	2018年9月8日 上午11:16:50
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年9月8日 上午11:16:50
+ * @company QMTH
  * @description 推送分数接口
  */
 public interface ExamScorePushRuleService {
-	
+
 	/**
 	 * 需要满足的推送成绩规则
+	 * 
 	 * @param scorePushReq
 	 * @return
 	 */
 	public boolean pushScoreRule(ExamRecordDataEntity examRecordData);
-	
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/scorepushrule/cugr/CugrExamScorePushRuleServiceImpl.java

@@ -0,0 +1,31 @@
+package cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.cugr;
+
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
+import cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.ExamScorePushRuleService;
+
+/**
+ * 
+ * @author chenken
+ * @date 2018年10月18日 下午4:08:51
+ * @company QMTH
+ * @description 地质大学（武汉）入学 orgCode:cugr.ecs.qmth.com.cn
+ */
+@Service("cugrExamScorePushRuleServiceImpl")
+public class CugrExamScorePushRuleServiceImpl implements ExamScorePushRuleService {
+
+	@Override
+	public boolean pushScoreRule(ExamRecordDataEntity examRecordData) {
+		// 违纪
+		if (examRecordData.getIsIllegality()) {
+			return false;
+		}
+		// 有警告且未审核
+		if (examRecordData.getIsWarn() && !examRecordData.getIsAudit()) {
+			return false;
+		}
+		return true;
+	}
+
+}

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/scorepushrule/cup/CupExamScorePushRuleServiceImpl.java

@@ -0,0 +1,31 @@
+package cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.cup;
+
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
+import cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.ExamScorePushRuleService;
+
+/**
+ * 
+ * @author chenken
+ * @date 2018年10月18日 下午4:09:26
+ * @company QMTH
+ * @description 石油大学 orgCode:cup.ecs.qmth.com.cn
+ */
+@Service("cupExamScorePushRuleServiceImpl")
+public class CupExamScorePushRuleServiceImpl implements ExamScorePushRuleService {
+
+	@Override
+	public boolean pushScoreRule(ExamRecordDataEntity examRecordData) {
+		// 违纪
+		if (examRecordData.getIsIllegality()) {
+			return false;
+		}
+		// 有警告且未审核
+		if (examRecordData.getIsWarn() && !examRecordData.getIsAudit()) {
+			return false;
+		}
+		return true;
+	}
+
+}

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/service/scorepushrule/swufe/SwufeExamScorePushRuleServiceImpl.java → examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/scorepushrule/swufe/SwufeExamScorePushRuleServiceImpl.java

@@ -1,20 +1,19 @@
-package cn.com.qmth.examcloud.core.oe.admin.dao.service.scorepushrule.swufe;
+package cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.swufe;
 
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.service.scorepushrule.ExamScorePushRuleService;
-
+import cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.ExamScorePushRuleService;
 
 /**
  * 
- * @author  	chenken
- * @date    	2018年10月18日 下午4:09:47
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年10月18日 下午4:09:47
+ * @company QMTH
  * @description 西南财经大学 orgCode:swufe.ecs.qmth.com.cn
  */
 @Service("swufeExamScorePushRuleServiceImpl")
-public class SwufeExamScorePushRuleServiceImpl implements ExamScorePushRuleService{
+public class SwufeExamScorePushRuleServiceImpl implements ExamScorePushRuleService {
 
 	@Override
 	public boolean pushScoreRule(ExamRecordDataEntity examRecordData) {