wangwei 7 年 前
コミット
60813f3b73
20 ファイル変更24 行追加23 行削除
  1. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/CommonGainScoreController.java
  2. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamController.java
  3. 2 2
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/FaceppController.java
  4. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ScorePushController.java
  5. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/StudentInfoController.java
  6. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/ScoreController.java
  7. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/StudentExamInfoController.java
  8. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/ExamService.java
  9. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/ExamStudentImportService.java
  10. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/FaceppService.java
  11. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/OutletScoreService.java
  12. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/ScorePushService.java
  13. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/StudentInfoService.java
  14. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/UpyunService.java
  15. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/ExamServiceImpl.java
  16. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/OutletScoreServiceImpl.java
  17. 1 1
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/StudentInfoServiceImpl.java
  18. 2 2
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/scorePush/SydxScorePushServiceImpl.java
  19. 2 2
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/scorePush/XncdScorePushServiceImpl.java
  20. 2 1
      pom.xml

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/CommonGainScoreController.java

@@ -2,11 +2,11 @@ package cn.com.qmth.examcloud.exchange.outer.api.provider;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.outlet.dto.OutletScore;
 import cn.com.qmth.examcloud.outlet.repo.ExamScoreRepo;
 import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
 import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
-import cn.com.qmth.examcloud.outlet.service.OutletScoreService;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamController.java

@@ -14,12 +14,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.outer.service.ExamService;
 import cn.com.qmth.examcloud.outlet.dto.ExamReq;
 import cn.com.qmth.examcloud.outlet.entity.OutletExam;
 import cn.com.qmth.examcloud.outlet.exception.SaveExamException;
 import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
 import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
-import cn.com.qmth.examcloud.outlet.service.ExamService;
 
 /**
  * @author  	chenken

+ 2 - 2
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/FaceppController.java

@@ -3,6 +3,8 @@ package cn.com.qmth.examcloud.exchange.outer.api.provider;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.outer.service.FaceppService;
+import cn.com.qmth.examcloud.exchange.outer.service.UpyunService;
 import cn.com.qmth.examcloud.outlet.client.ExamStudentClient;
 import cn.com.qmth.examcloud.outlet.client.StudentFaceInfoClient;
 import cn.com.qmth.examcloud.outlet.exception.DetectNoFaceException;
@@ -11,8 +13,6 @@ import cn.com.qmth.examcloud.outlet.exception.InvalidJpgException;
 import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
 import cn.com.qmth.examcloud.outlet.response.IBaseResponse;
 import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
-import cn.com.qmth.examcloud.outlet.service.FaceppService;
-import cn.com.qmth.examcloud.outlet.service.UpyunService;
 import cn.com.qmth.examcloud.common.dto.core.StudentFaceInfo;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ScorePushController.java

@@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
+import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
 import cn.com.qmth.examcloud.outlet.enums.OrgIdServiceEnum;
 import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
 import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
-import cn.com.qmth.examcloud.outlet.service.ScorePushService;
 import cn.com.qmth.examcloud.outlet.utils.SpringContextUtils;
 
 /**

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/StudentInfoController.java

@@ -16,11 +16,11 @@ import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.outer.service.StudentInfoService;
 import cn.com.qmth.examcloud.outlet.dto.StudentInfoReq;
 import cn.com.qmth.examcloud.outlet.exception.SaveExamStudentException;
 import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
 import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
-import cn.com.qmth.examcloud.outlet.service.StudentInfoService;
 /**
  * @author  	chenken
  * @date    	2018年5月7日 下午4:30:29

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/ScoreController.java

@@ -2,10 +2,10 @@ package cn.com.qmth.examcloud.exchange.outer.api.provider.sydx;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.outlet.dto.OutletScore;
 import cn.com.qmth.examcloud.outlet.repo.ExamScoreRepo;
 import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
-import cn.com.qmth.examcloud.outlet.service.OutletScoreService;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/StudentExamInfoController.java

@@ -3,6 +3,7 @@ package cn.com.qmth.examcloud.exchange.outer.api.provider.sydx;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.outer.service.ExamStudentImportService;
 import cn.com.qmth.examcloud.outlet.dto.ExamStudentImportDTO;
 import cn.com.qmth.examcloud.outlet.exception.NoSuchCourseLevelException;
 import cn.com.qmth.examcloud.outlet.exception.NoSuchExamException;
@@ -11,7 +12,6 @@ import cn.com.qmth.examcloud.outlet.exception.SaveExamStudentException;
 import cn.com.qmth.examcloud.outlet.response.FailureBaseResponse;
 import cn.com.qmth.examcloud.outlet.response.SuccessBaseResponse;
 import cn.com.qmth.examcloud.outlet.response.IBaseResponse;
-import cn.com.qmth.examcloud.outlet.service.ExamStudentImportService;
 
 import com.alibaba.fastjson.JSON;
 

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/service/ExamService.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/ExamService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.service;
+package cn.com.qmth.examcloud.exchange.outer.service;
 
 import cn.com.qmth.examcloud.outlet.dto.ExamReq;
 import cn.com.qmth.examcloud.outlet.entity.OutletExam;

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/service/ExamStudentImportService.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/ExamStudentImportService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.service;
+package cn.com.qmth.examcloud.exchange.outer.service;
 
 import java.util.Date;
 import java.util.List;

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/service/FaceppService.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/FaceppService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.service;
+package cn.com.qmth.examcloud.exchange.outer.service;
 
 import cn.com.qmth.examcloud.common.dto.core.Student;
 import cn.com.qmth.examcloud.common.dto.core.StudentFaceInfo;

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/service/OutletScoreService.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/OutletScoreService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.service;
+package cn.com.qmth.examcloud.exchange.outer.service;
 
 import java.util.List;
 

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/service/ScorePushService.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/ScorePushService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.service;
+package cn.com.qmth.examcloud.exchange.outer.service;
 
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
 

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/service/StudentInfoService.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/StudentInfoService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.service;
+package cn.com.qmth.examcloud.exchange.outer.service;
 
 import java.util.List;
 

+ 1 - 1
examcloud-outlet-api/src/main/java/cn/com/qmth/examcloud/outlet/service/UpyunService.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/UpyunService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.outlet.service;
+package cn.com.qmth.examcloud.exchange.outer.service;
 
 import main.java.com.UpYun;
 import org.springframework.beans.factory.annotation.Value;

+ 1 - 1
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/ExamServiceImpl.java

@@ -7,11 +7,11 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
+import cn.com.qmth.examcloud.exchange.outer.service.ExamService;
 import cn.com.qmth.examcloud.outlet.client.ExamClient;
 import cn.com.qmth.examcloud.outlet.dto.ExamReq;
 import cn.com.qmth.examcloud.outlet.entity.OutletExam;
 import cn.com.qmth.examcloud.outlet.exception.SaveExamException;
-import cn.com.qmth.examcloud.outlet.service.ExamService;
 
 /**
  * @author  	chenken

+ 1 - 1
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/OutletScoreServiceImpl.java

@@ -16,11 +16,11 @@ import cn.com.qmth.examcloud.common.dto.em.ExamScore;
 import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.common.dto.em.enums.MarkingType;
+import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.outlet.dao.ExamRecordDao;
 import cn.com.qmth.examcloud.outlet.dao.ExamScoreDao;
 import cn.com.qmth.examcloud.outlet.dao.OutletScoreDao;
 import cn.com.qmth.examcloud.outlet.dto.OutletScore;
-import cn.com.qmth.examcloud.outlet.service.OutletScoreService;
 
 /**
  * @author  	chenken

+ 1 - 1
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/StudentInfoServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.core.User;
 import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
+import cn.com.qmth.examcloud.exchange.outer.service.StudentInfoService;
 import cn.com.qmth.examcloud.outlet.client.CourseClient;
 import cn.com.qmth.examcloud.outlet.client.ExamClient;
 import cn.com.qmth.examcloud.outlet.client.ExamStudentClient;
@@ -27,7 +28,6 @@ import cn.com.qmth.examcloud.outlet.entity.OutletStudent;
 import cn.com.qmth.examcloud.outlet.enums.OutletOrgType;
 import cn.com.qmth.examcloud.outlet.exception.NoSuchCourseLevelException;
 import cn.com.qmth.examcloud.outlet.exception.SaveExamStudentException;
-import cn.com.qmth.examcloud.outlet.service.StudentInfoService;
 
 /**
  * @author  	chenken

+ 2 - 2
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/scorePush/SydxScorePushServiceImpl.java

@@ -21,11 +21,11 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
+import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
+import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
 import cn.com.qmth.examcloud.outlet.dao.OutletScoreDao;
 import cn.com.qmth.examcloud.outlet.dto.OutletScore;
 import cn.com.qmth.examcloud.outlet.repo.ExamScoreRepo;
-import cn.com.qmth.examcloud.outlet.service.OutletScoreService;
-import cn.com.qmth.examcloud.outlet.service.ScorePushService;
 
 /**
  * @author  	chenken

+ 2 - 2
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/scorePush/XncdScorePushServiceImpl.java

@@ -22,10 +22,10 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
 import cn.com.qmth.examcloud.common.dto.oe.marking.PushScoreActionEnum;
+import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
+import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
 import cn.com.qmth.examcloud.outlet.dto.OutletScore;
 import cn.com.qmth.examcloud.outlet.repo.ExamScoreRepo;
-import cn.com.qmth.examcloud.outlet.service.OutletScoreService;
-import cn.com.qmth.examcloud.outlet.service.ScorePushService;
 import cn.com.qmth.examcloud.outlet.utils.OutletUtils;
 
 /**

+ 2 - 1
pom.xml

@@ -24,5 +24,6 @@
 
 		<module>examcloud-outlet-api</module>
 		<module>examcloud-outlet-domain</module>
-	</modules>
+    <module>examcloud-exchange-outer-client</module>
+  </modules>
 </project>