调整结构

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamApi.java

@@ -36,20 +36,20 @@ import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
 import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.examwork.api.controller.bean.CourseGroupBean;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamRepo;
-import cn.com.qmth.examcloud.service.examwork.dao.CourseGroupRelationRepo;
-import cn.com.qmth.examcloud.service.examwork.dao.CourseGroupRepo;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamOrgRepo;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
-import cn.com.qmth.examcloud.service.examwork.entity.Exam;
-import cn.com.qmth.examcloud.service.examwork.entity.CourseGroupEntity;
-import cn.com.qmth.examcloud.service.examwork.entity.CourseGroupRelation;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgEntity;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgPK;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
-import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
-import cn.com.qmth.examcloud.service.examwork.service.ExamService;
-import cn.com.qmth.examcloud.service.examwork.service.ExamStudentService;
+import cn.com.qmth.examcloud.core.examwork.dao.CourseGroupRelationRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.CourseGroupRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamOrgRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupEntity;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupRelation;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgEntity;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgPK;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudent;
+import cn.com.qmth.examcloud.core.examwork.dao.enums.ExamType;
+import cn.com.qmth.examcloud.core.examwork.service.impl.ExamService;
+import cn.com.qmth.examcloud.core.examwork.service.impl.ExamStudentService;
 import io.swagger.annotations.ApiOperation;
 
 /**

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamCourseApi.java

@@ -1,8 +1,9 @@
 package cn.com.qmth.examcloud.core.examwork.api.controller;
 
-import cn.com.qmth.examcloud.service.examwork.criteria.ExamCourseCriteria;
-import cn.com.qmth.examcloud.service.examwork.dto.ExamCourseDTO;
-import cn.com.qmth.examcloud.service.examwork.service.ExamCourseService;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.ExamCourseCriteria;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.ExamCourseDTO;
+import cn.com.qmth.examcloud.core.examwork.service.impl.ExamCourseService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamOrgTimeApi.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.examcloud.core.examwork.api.controller;
 
 import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamOrgTimeRepo;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgTime;
-import cn.com.qmth.examcloud.service.examwork.service.ExamOrgTimeService;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamOrgTimeRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgTime;
+import cn.com.qmth.examcloud.core.examwork.service.impl.ExamOrgTimeService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamPaperTypeApi.java

@@ -1,8 +1,8 @@
 package cn.com.qmth.examcloud.core.examwork.api.controller;
 
-import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
-import cn.com.qmth.examcloud.service.examwork.dto.ExamPaperTypeDTO;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.ExamPaperTypeDTO;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudent;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamScoreApi.java

@@ -1,8 +1,8 @@
 package cn.com.qmth.examcloud.core.examwork.api.controller;
 
-import cn.com.qmth.examcloud.service.examwork.dao.ExamScoreRepo;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamScore;
-import cn.com.qmth.examcloud.service.examwork.service.ExamScoreService;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamScore;
+import cn.com.qmth.examcloud.core.examwork.service.impl.ExamScoreService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamStudentApi.java

@@ -44,14 +44,14 @@ import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.examwork.base.util.ExportUtils;
 import cn.com.qmth.examcloud.core.examwork.base.util.ImportUtils;
-import cn.com.qmth.examcloud.service.examwork.assembler.ExamStudentAssembler;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamRepo;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
-import cn.com.qmth.examcloud.service.examwork.dto.ExamStudentDTO;
-import cn.com.qmth.examcloud.service.examwork.dto.OrgExamInfoDTO;
-import cn.com.qmth.examcloud.service.examwork.entity.Exam;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
-import cn.com.qmth.examcloud.service.examwork.service.ExamStudentService;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.ExamStudentAssembler;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.ExamStudentDTO;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.OrgExamInfoDTO;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudent;
+import cn.com.qmth.examcloud.core.examwork.service.impl.ExamStudentService;
 import io.swagger.annotations.ApiOperation;
 
 /**

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamCloudServiceProvider.java

@@ -10,13 +10,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
+import cn.com.qmth.examcloud.core.examwork.dao.enums.ExamType;
+import cn.com.qmth.examcloud.core.examwork.service.impl.ExamService;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
-import cn.com.qmth.examcloud.service.examwork.entity.Exam;
-import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
-import cn.com.qmth.examcloud.service.examwork.service.ExamService;
 import io.swagger.annotations.ApiOperation;
 
 /**

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

@@ -8,12 +8,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.commons.base.util.BeanCopierUtil;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.ExamStudentDTO;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudent;
+import cn.com.qmth.examcloud.core.examwork.service.impl.ExamStudentService;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
-import cn.com.qmth.examcloud.service.examwork.dto.ExamStudentDTO;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
-import cn.com.qmth.examcloud.service.examwork.service.ExamStudentService;
 
 /**
  * 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/CourseGroupRelationRepo.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/CourseGroupRelationRepo.java

@@ -1,12 +1,12 @@
-package cn.com.qmth.examcloud.service.examwork.dao;
+package cn.com.qmth.examcloud.core.examwork.dao;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.examwork.entity.CourseGroupRelation;
-import cn.com.qmth.examcloud.service.examwork.entity.CourseGroupRelationPK;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupRelation;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupRelationPK;
 
 /**
  * 类注释

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/CourseGroupRepo.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/CourseGroupRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.dao;
+package cn.com.qmth.examcloud.core.examwork.dao;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.examwork.entity.CourseGroupEntity;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.CourseGroupEntity;
 
 /**
  * 类注释

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/ExamOrgRepo.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/ExamOrgRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.dao;
+package cn.com.qmth.examcloud.core.examwork.dao;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgEntity;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgEntity;
 
 public interface ExamOrgRepo
 		extends

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/ExamOrgTimeRepo.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/ExamOrgTimeRepo.java

@@ -1,7 +1,5 @@
-package cn.com.qmth.examcloud.service.examwork.dao;
+package cn.com.qmth.examcloud.core.examwork.dao;
 
-import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgTime;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -10,6 +8,9 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgTime;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudent;
+
 import java.util.List;
 
 public interface ExamOrgTimeRepo extends JpaRepository<ExamOrgTime, Long>, JpaSpecificationExecutor<ExamOrgTime> {

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/ExamRepo.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/ExamRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.dao;
+package cn.com.qmth.examcloud.core.examwork.dao;
 
 import java.util.List;
 
@@ -6,10 +6,10 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
-
-import cn.com.qmth.examcloud.service.examwork.entity.Exam;
 import org.springframework.transaction.annotation.Transactional;
 
+import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
+
 public interface ExamRepo extends JpaRepository<Exam, Long>,QueryByExampleExecutor<Exam>{
 
 	List<Exam> findByOrgId(Long orgId);

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/ExamScoreRepo.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/ExamScoreRepo.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.service.examwork.dao;
+package cn.com.qmth.examcloud.core.examwork.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-
-import cn.com.qmth.examcloud.service.examwork.entity.ExamScore;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamScore;
+
 public interface ExamScoreRepo extends JpaRepository<ExamScore, Long>,QueryByExampleExecutor<ExamScore> {
 }

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/ExamStudentRepo.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/ExamStudentRepo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.dao;
+package cn.com.qmth.examcloud.core.examwork.dao;
 
 import java.util.List;
 
@@ -10,10 +10,10 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
-
-import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
 import org.springframework.transaction.annotation.Transactional;
 
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudent;
+
 public interface ExamStudentRepo extends JpaRepository<ExamStudent, Long>, QueryByExampleExecutor<ExamStudent>, JpaSpecificationExecutor<ExamStudent> {
     Page<ExamStudent> findByExamId(Long examId, Pageable pageable);
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/criteria/BasePageable.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/bean/BasePageable.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.criteria;
+package cn.com.qmth.examcloud.core.examwork.dao.bean;
 
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/criteria/ExamCourseCriteria.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/bean/ExamCourseCriteria.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.criteria;
+package cn.com.qmth.examcloud.core.examwork.dao.bean;
 
 
 /**

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dto/ExamCourseDTO.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/bean/ExamCourseDTO.java

@@ -1,6 +1,6 @@
-package cn.com.qmth.examcloud.service.examwork.dto;
+package cn.com.qmth.examcloud.core.examwork.dao.bean;
 
-import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
+import cn.com.qmth.examcloud.core.examwork.dao.enums.ExamType;
 
 /**
  * Created by yuanpan on 2017/4/12.

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dto/ExamPaperTypeDTO.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/bean/ExamPaperTypeDTO.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.dto;
+package cn.com.qmth.examcloud.core.examwork.dao.bean;
 
 /**
  * Created by yuanpan on 2017/4/12.

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/assembler/ExamStudentAssembler.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/bean/ExamStudentAssembler.java

@@ -1,9 +1,8 @@
-package cn.com.qmth.examcloud.service.examwork.assembler;
+package cn.com.qmth.examcloud.core.examwork.dao.bean;
 
 import org.springframework.stereotype.Component;
 
-import cn.com.qmth.examcloud.service.examwork.dto.ExamStudentDTO;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudent;
 
 @Component
 public class ExamStudentAssembler {

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dto/ExamStudentDTO.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/bean/ExamStudentDTO.java

@@ -1,8 +1,8 @@
-package cn.com.qmth.examcloud.service.examwork.dto;
+package cn.com.qmth.examcloud.core.examwork.dao.bean;
 
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelProperty;
 import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-import cn.com.qmth.examcloud.service.examwork.entity.Exam;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
 
 public class ExamStudentDTO implements JsonSerializable{
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/dto/OrgExamInfoDTO.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/bean/OrgExamInfoDTO.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.dto;
+package cn.com.qmth.examcloud.core.examwork.dao.bean;
 
 import java.io.Serializable;
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/CourseGroupEntity.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/CourseGroupEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.entity;
+package cn.com.qmth.examcloud.core.examwork.dao.entity;
 
 import java.util.Date;
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/CourseGroupRelation.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/CourseGroupRelation.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.entity;
+package cn.com.qmth.examcloud.core.examwork.dao.entity;
 
 import java.io.Serializable;
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/CourseGroupRelationPK.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/CourseGroupRelationPK.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.entity;
+package cn.com.qmth.examcloud.core.examwork.dao.entity;
 
 import java.io.Serializable;
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/Exam.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/Exam.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.entity;
+package cn.com.qmth.examcloud.core.examwork.dao.entity;
 
 import java.util.Date;
 
@@ -15,9 +15,9 @@ import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
-import cn.com.qmth.examcloud.service.examwork.enums.MarkingType;
-import cn.com.qmth.examcloud.service.examwork.enums.PracticeType;
+import cn.com.qmth.examcloud.core.examwork.dao.enums.ExamType;
+import cn.com.qmth.examcloud.core.examwork.dao.enums.MarkingType;
+import cn.com.qmth.examcloud.core.examwork.dao.enums.PracticeType;
 
 /**
  * Created by songyue on 17/1/13.

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamOrgEntity.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/ExamOrgEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.entity;
+package cn.com.qmth.examcloud.core.examwork.dao.entity;
 
 import java.util.Date;
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamOrgPK.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/ExamOrgPK.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.entity;
+package cn.com.qmth.examcloud.core.examwork.dao.entity;
 
 import java.io.Serializable;
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamOrgTime.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/ExamOrgTime.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.entity;
+package cn.com.qmth.examcloud.core.examwork.dao.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamScore.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/ExamScore.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.entity;
+package cn.com.qmth.examcloud.core.examwork.dao.entity;
 
 import java.io.Serializable;
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamStudent.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/ExamStudent.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.entity;
+package cn.com.qmth.examcloud.core.examwork.dao.entity;
 
 import java.io.Serializable;
 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/enums/ExamType.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/enums/ExamType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.enums;
+package cn.com.qmth.examcloud.core.examwork.dao.enums;
 
 /**
  * 

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/enums/MarkingType.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/enums/MarkingType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.enums;
+package cn.com.qmth.examcloud.core.examwork.dao.enums;
 
 /**
  * Created by songyue on 17/6/22.

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/enums/PracticeType.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/enums/PracticeType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.enums;
+package cn.com.qmth.examcloud.core.examwork.dao.enums;
 
 /**
  * Created by songyue on 17/6/22.

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/service/examwork/enums/isValid.java → examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/enums/isValid.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.enums;
+package cn.com.qmth.examcloud.core.examwork.dao.enums;
 
 /**
  * Created by songyue on 17/1/13.

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamCourseService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamCourseService.java

@@ -1,8 +1,9 @@
-package cn.com.qmth.examcloud.service.examwork.service;
+package cn.com.qmth.examcloud.core.examwork.service.impl;
+
+import cn.com.qmth.examcloud.core.examwork.dao.bean.ExamCourseCriteria;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.ExamCourseDTO;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
 
-import cn.com.qmth.examcloud.service.examwork.criteria.ExamCourseCriteria;
-import cn.com.qmth.examcloud.service.examwork.dto.ExamCourseDTO;
-import cn.com.qmth.examcloud.service.examwork.entity.Exam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamOrgTimeService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamOrgTimeService.java

@@ -1,7 +1,8 @@
-package cn.com.qmth.examcloud.service.examwork.service;
+package cn.com.qmth.examcloud.core.examwork.service.impl;
+
+import cn.com.qmth.examcloud.core.examwork.dao.ExamOrgTimeRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgTime;
 
-import cn.com.qmth.examcloud.service.examwork.dao.ExamOrgTimeRepo;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamScoreService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamScoreService.java

@@ -1,7 +1,8 @@
-package cn.com.qmth.examcloud.service.examwork.service;
+package cn.com.qmth.examcloud.core.examwork.service.impl;
+
+import cn.com.qmth.examcloud.core.examwork.dao.ExamScoreRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamScore;
 
-import cn.com.qmth.examcloud.service.examwork.dao.ExamScoreRepo;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamScore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.service;
+package cn.com.qmth.examcloud.core.examwork.service.impl;
 
 import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.contains;
 
@@ -8,11 +8,13 @@ import java.util.List;
 
 import cn.com.qmth.examcloud.common.dto.core.Org;
 import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamOrgTimeRepo;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgTime;
-import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
-import cn.com.qmth.examcloud.service.examwork.service.rpc.OrgService;
-import cn.com.qmth.examcloud.service.examwork.service.sync.DataSendService;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamOrgTimeRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgTime;
+import cn.com.qmth.examcloud.core.examwork.dao.enums.ExamType;
+import cn.com.qmth.examcloud.core.examwork.service.mq.DataSendService;
+import cn.com.qmth.examcloud.core.examwork.service.rpc.OrgService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
@@ -22,10 +24,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.service.examwork.dao.ExamRepo;
-import cn.com.qmth.examcloud.service.examwork.entity.Exam;
-
 import org.springframework.transaction.annotation.Transactional;
 
 /**

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamStudentService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamStudentService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.service;
+package cn.com.qmth.examcloud.core.examwork.service.impl;
 
 import java.io.InputStream;
 import java.sql.ResultSet;
@@ -35,20 +35,20 @@ import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReader;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReaderHandle;
-import cn.com.qmth.examcloud.service.examwork.assembler.ExamStudentAssembler;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamOrgTimeRepo;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamRepo;
-import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
-import cn.com.qmth.examcloud.service.examwork.dto.ExamStudentDTO;
-import cn.com.qmth.examcloud.service.examwork.dto.OrgExamInfoDTO;
-import cn.com.qmth.examcloud.service.examwork.entity.Exam;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamOrgTime;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
-import cn.com.qmth.examcloud.service.examwork.enums.ExamType;
-import cn.com.qmth.examcloud.service.examwork.service.rpc.CourseService;
-import cn.com.qmth.examcloud.service.examwork.service.rpc.OrgService;
-import cn.com.qmth.examcloud.service.examwork.service.rpc.SpecialtyService;
-import cn.com.qmth.examcloud.service.examwork.service.rpc.StudentService;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamOrgTimeRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.ExamStudentAssembler;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.ExamStudentDTO;
+import cn.com.qmth.examcloud.core.examwork.dao.bean.OrgExamInfoDTO;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamOrgTime;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudent;
+import cn.com.qmth.examcloud.core.examwork.dao.enums.ExamType;
+import cn.com.qmth.examcloud.core.examwork.service.rpc.CourseService;
+import cn.com.qmth.examcloud.core.examwork.service.rpc.OrgService;
+import cn.com.qmth.examcloud.core.examwork.service.rpc.SpecialtyService;
+import cn.com.qmth.examcloud.core.examwork.service.rpc.StudentService;
 
 /**
  * 考试学生服务类

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/sync/DataReceiveService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/mq/DataReceiveService.java

@@ -1,7 +1,8 @@
-package cn.com.qmth.examcloud.service.examwork.service.sync;
+package cn.com.qmth.examcloud.core.examwork.service.mq;
+
+import cn.com.qmth.examcloud.core.examwork.dao.ExamStudentRepo;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudent;
 
-import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
 import com.qmth.commons.dataSync.core.annotations.DataReceive;
 import com.qmth.commons.dataSync.core.entity.BaseSyncData;
 import com.qmth.commons.dataSync.core.service.DataSyncService;

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/sync/DataSendService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/mq/DataSendService.java

@@ -1,11 +1,11 @@
-package cn.com.qmth.examcloud.service.examwork.service.sync;
+package cn.com.qmth.examcloud.core.examwork.service.mq;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.em.ExamSync;
 import cn.com.qmth.examcloud.commons.base.util.BeanCopierUtil;
-import cn.com.qmth.examcloud.service.examwork.entity.Exam;
+import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
 
 import com.qmth.commons.dataSync.core.service.DataSyncService;
 

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/CourseService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/CourseService.java

@@ -1,11 +1,12 @@
-package cn.com.qmth.examcloud.service.examwork.service.rpc;
+package cn.com.qmth.examcloud.core.examwork.service.rpc;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.core.Course;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
-import cn.com.qmth.examcloud.service.examwork.service.rpc.client.CourseClient;
+import cn.com.qmth.examcloud.core.examwork.service.rpc.client.CourseClient;
+
 import java.util.List;
 
 /**

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/OeService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/OeService.java

@@ -1,9 +1,10 @@
-package cn.com.qmth.examcloud.service.examwork.service.rpc;
+package cn.com.qmth.examcloud.core.examwork.service.rpc;
 
-import cn.com.qmth.examcloud.service.examwork.service.rpc.client.OeClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import cn.com.qmth.examcloud.core.examwork.service.rpc.client.OeClient;
+
 /**
  * Created by songyue on 17/7/20.
  */

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/OrgService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/OrgService.java

@@ -1,11 +1,11 @@
-package cn.com.qmth.examcloud.service.examwork.service.rpc;
+package cn.com.qmth.examcloud.core.examwork.service.rpc;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.core.Org;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
-import cn.com.qmth.examcloud.service.examwork.service.rpc.client.OrgClient;
+import cn.com.qmth.examcloud.core.examwork.service.rpc.client.OrgClient;
 
 import java.util.List;
 

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/SpecialtyService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/SpecialtyService.java

@@ -1,10 +1,11 @@
-package cn.com.qmth.examcloud.service.examwork.service.rpc;
+package cn.com.qmth.examcloud.core.examwork.service.rpc;
 
 import cn.com.qmth.examcloud.common.dto.core.Course;
 import cn.com.qmth.examcloud.common.dto.core.Specialty;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
-import cn.com.qmth.examcloud.service.examwork.service.rpc.client.CourseClient;
-import cn.com.qmth.examcloud.service.examwork.service.rpc.client.SpecialtyClient;
+import cn.com.qmth.examcloud.core.examwork.service.rpc.client.CourseClient;
+import cn.com.qmth.examcloud.core.examwork.service.rpc.client.SpecialtyClient;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/StudentService.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/StudentService.java

@@ -1,11 +1,11 @@
-package cn.com.qmth.examcloud.service.examwork.service.rpc;
+package cn.com.qmth.examcloud.core.examwork.service.rpc;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.core.Student;
 import cn.com.qmth.examcloud.commons.base.util.GsonUtil;
-import cn.com.qmth.examcloud.service.examwork.service.rpc.client.StudentClient;
+import cn.com.qmth.examcloud.core.examwork.service.rpc.client.StudentClient;
 
 /**
  * 

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/client/CourseClient.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/CourseClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.service.rpc.client;
+package cn.com.qmth.examcloud.core.examwork.service.rpc.client;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/client/OeClient.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/OeClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.service.rpc.client;
+package cn.com.qmth.examcloud.core.examwork.service.rpc.client;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.RequestHeader;

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/client/OrgClient.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/OrgClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.service.rpc.client;
+package cn.com.qmth.examcloud.core.examwork.service.rpc.client;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/client/SpecialtyClient.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/SpecialtyClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.service.rpc.client;
+package cn.com.qmth.examcloud.core.examwork.service.rpc.client;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/client/StudentClient.java → examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/rpc/client/StudentClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.examwork.service.rpc.client;
+package cn.com.qmth.examcloud.core.examwork.service.rpc.client;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;

examcloud-core-examwork-starter/src/main/java/cn/com/qmth/examcloud/core/examwork/starter/CoreExamWorkApp.java

@@ -41,7 +41,7 @@ import cn.com.qmth.examcloud.commons.web.redis.RedisClientImpl;
 @EnableJpaAuditing
 @SpringBootApplication
 @EnableEurekaClient
-@EnableFeignClients(basePackages = {"cn.com.qmth.examcloud.service.examwork.service.rpc"})
+@EnableFeignClients(basePackages = {"cn.com.qmth.examcloud.core.examwork.service.rpc.client"})
 @EnableDiscoveryClient
 @EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
 public class CoreExamWorkApp {