wangwei 5 년 전
부모
커밋
a464106bbf
100개의 변경된 파일190개의 추가작업 그리고 188개의 파일을 삭제
  1. 1 1
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamAuditBeanConvert.java
  2. 1 1
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamRecordDataBeanConvert.java
  3. 4 4
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamRecordDataDomain.java
  4. 12 12
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamAuditController.java
  5. 8 8
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamRecordController.java
  6. 2 2
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamRecordDataController.java
  7. 2 2
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamRecordPaperStructController.java
  8. 3 3
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamRecordQuestionsController.java
  9. 3 3
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamScoreController.java
  10. 5 5
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamStudentController.java
  11. 4 4
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamRecordCloudServiceProvider.java
  12. 9 8
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamRecordForMarkingCloudServiceProvider.java
  13. 6 6
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamRecordQuestionsCloudServiceProvider.java
  14. 2 2
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamScoreCloudServiceProvider.java
  15. 7 7
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamScoreDataCloudServiceProvider.java
  16. 3 3
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamScoreObtainQueueCloudServiceProvider.java
  17. 4 4
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamStudentCloudServiceProvider.java
  18. 6 6
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/ExamStudentDataCloudServiceProvider.java
  19. 2 2
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/OeAdminScorePushCloudServiceProvider.java
  20. 4 4
      examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/SyncCloudServiceProvider.java
  21. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/Constants.java
  22. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/Model.java
  23. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/Op.java
  24. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/Order.java
  25. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/Searcher.java
  26. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/SpecUtils.java
  27. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/SqlWrapper.java
  28. 3 3
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/Check.java
  29. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/CommonUtil.java
  30. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/DateUtils.java
  31. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/FileDisposeUtil.java
  32. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/HtmlUtil.java
  33. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/HttpPoolUtil.java
  34. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/JsonMapper.java
  35. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/NewQuestionType.java
  36. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/PagingAndSortingDTO.java
  37. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/PagingAndSortingSpecification.java
  38. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/QEncodeUtil.java
  39. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/QuerySpecification.java
  40. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/QuestionTypeUtil.java
  41. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/RowIterator.java
  42. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/Sentence.java
  43. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/baiduFaceVerify/BaiduFaceVerifyUtil.java
  44. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/baiduFaceVerify/Base64Util.java
  45. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/baiduFaceVerify/GsonUtils.java
  46. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/baiduFaceVerify/HttpUtil.java
  47. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ColumnSetting.java
  48. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelError.java
  49. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelErrorType.java
  50. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelProperty.java
  51. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelReader.java
  52. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelReaderHandle.java
  53. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelUtils.java
  54. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelWriter.java
  55. 1 1
      examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExportUtils.java
  56. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/UniqueRuleHolder.java
  57. 3 3
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/cache/ExamRecordPropertyCache.java
  58. 3 3
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamAuditEntity.java
  59. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamCaptureEntity.java
  60. 2 2
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamCaptureQueueEntity.java
  61. 2 2
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamFaceLivenessVerifyEntity.java
  62. 2 2
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamFileAnswerTempEntity.java
  63. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamQuestionEntity.java
  64. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamQuestionPlayTime.java
  65. 5 5
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamRecordDataEntity.java
  66. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamRecordForMarkingEntity.java
  67. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamRecordPaperStructEntity.java
  68. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamRecordQuestionsEntity.java
  69. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamScoreEntity.java
  70. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamScoreNoticeQueueEntity.java
  71. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamScoreObtainQueueEntity.java
  72. 4 3
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamScorePushQueue.java
  73. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamStudentEntity.java
  74. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamStudentFinalScoreEntity.java
  75. 2 2
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamingRecordEntity.java
  76. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/FaceBiopsyEntity.java
  77. 2 2
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/FaceBiopsyItemEntity.java
  78. 3 3
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/FaceBiopsyItemStepEntity.java
  79. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/HandInExamRecordEntity.java
  80. 3 3
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/OfflineFileEntity.java
  81. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/OrgScoreHandleEntity.java
  82. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/AuditStatus.java
  83. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/CourseLevel.java
  84. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/DisciplineType.java
  85. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExamCaptureQueueStatus.java
  86. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExamProperties.java
  87. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExamRecordStatus.java
  88. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExamScoreQueueStatus.java
  89. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExamType.java
  90. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FaceBiopsyAction.java
  91. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FaceBiopsyScheme.java
  92. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FaceBiopsyType.java
  93. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FaceVerifyResult.java
  94. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FileAnswerAcknowledgeStatus.java
  95. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FinishStatus.java
  96. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/HandInExamType.java
  97. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/IsSuccess.java
  98. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/MarkingType.java
  99. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/QuesStructType.java
  100. 1 1
      examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ResourceType.java

+ 1 - 1
examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamAuditBeanConvert.java

@@ -7,8 +7,8 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.api.bean;
 
-import cn.com.qmth.examcloud.core.oe.common.enums.DisciplineType;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.DisciplineType;
 
 /**
  * 类信息转换

+ 1 - 1
examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamRecordDataBeanConvert.java

@@ -9,7 +9,7 @@ package cn.com.qmth.examcloud.core.oe.admin.api.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordDataEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 
 /**
  * 类信息转换

+ 4 - 4
examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamRecordDataDomain.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.examcloud.core.oe.admin.api.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.common.enums.ExamRecordStatus;
-import cn.com.qmth.examcloud.core.oe.common.enums.IsSuccess;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess;
 
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -102,7 +102,7 @@ public class ExamRecordDataDomain implements JsonSerializable {
      */
     private Double faceSuccessPercent;
     /**
-     * @see cn.com.qmth.examcloud.core.oe.common.enums.IsSuccess
+     * @see cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess
      * 活体检测结果
      */
     @Enumerated(EnumType.STRING)

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

@@ -9,20 +9,20 @@ package cn.com.qmth.examcloud.core.oe.admin.api.controller;
 
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
+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.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.bean.examaudit.*;
-import cn.com.qmth.examcloud.core.oe.common.base.Constants;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.JsonMapper;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.excel.ExportUtils;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.common.enums.AuditStatus;
-import cn.com.qmth.examcloud.core.oe.common.enums.DisciplineType;
-import cn.com.qmth.examcloud.core.oe.common.enums.ExamProperties;
-import cn.com.qmth.examcloud.core.oe.common.enums.SelectType;
-import cn.com.qmth.examcloud.core.oe.common.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.common.service.GainBaseDataService;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.web.support.Naked;

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

@@ -7,18 +7,18 @@
 
 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.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;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamStudentQuestionScoreInfo;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.JsonMapper;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.excel.ExportUtils;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordForMarkingEntity;
-import cn.com.qmth.examcloud.core.oe.common.enums.ExamType;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordForMarkingRepo;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.web.support.Naked;
 import io.swagger.annotations.Api;

+ 2 - 2
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.common.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.common.repository.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;

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

@@ -6,9 +6,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 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.entity.ExamRecordPaperStructEntity;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordPaperStructService;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordPaperStructEntity;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -6,9 +6,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.core.oe.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordQuestionsEntity;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordQuestionsRepo;
+import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
+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;

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

@@ -20,12 +20,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 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.base.utils.JsonMapper;
+import cn.com.qmth.examcloud.core.oe.admin.base.utils.excel.ExportUtils;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreService;
 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.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.JsonMapper;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.excel.ExportUtils;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.web.support.Naked;
 import io.swagger.annotations.Api;

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

@@ -9,13 +9,13 @@ package cn.com.qmth.examcloud.core.oe.admin.api.controller;
 
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 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.bean.examstudent.*;
-import cn.com.qmth.examcloud.core.oe.common.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.JsonMapper;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.excel.ExportUtils;
-import cn.com.qmth.examcloud.core.oe.common.service.GainBaseDataService;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.web.support.Naked;
 import io.swagger.annotations.Api;

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

@@ -13,11 +13,11 @@ import cn.com.qmth.examcloud.core.oe.admin.api.response.CheckExamIsStartedResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetExamPhotoVerifyDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.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.service.ExamRecordForMarkingService;
-import cn.com.qmth.examcloud.core.oe.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.entity.*;
-import cn.com.qmth.examcloud.core.oe.common.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.common.repository.*;
 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;

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

@@ -12,13 +12,13 @@ import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamRecordForMarking
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetSingleExamRecordDataResp;
 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.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.core.oe.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordForMarkingEntity;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamStudentEntity;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamStudentRepo;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import com.google.common.collect.Lists;
@@ -36,12 +36,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.persistence.criteria.Predicate;
+
+import static cn.com.qmth.examcloud.core.oe.admin.base.Constants.OE_CODE_400;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import static cn.com.qmth.examcloud.core.oe.common.base.Constants.OE_CODE_400;
-
 /**
  * @author chenken
  * @date 2018年9月27日 上午11:01:23

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

@@ -9,14 +9,14 @@ import cn.com.qmth.examcloud.core.oe.admin.api.request.QuerySubjectiveAnswerList
 import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveSubjectiveQuestionScoreReq;
 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.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.core.oe.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamQuestionEntity;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordQuestionsEntity;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordQuestionsRepo;
 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;

+ 2 - 2
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.common.entity.ExamScoreEntity;
-import cn.com.qmth.examcloud.core.oe.common.repository.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;

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

@@ -11,15 +11,15 @@ 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.base.utils.Check;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.*;
+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.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.entity.*;
-import cn.com.qmth.examcloud.core.oe.common.enums.DisciplineType;
-import cn.com.qmth.examcloud.core.oe.common.enums.ExamType;
-import cn.com.qmth.examcloud.core.oe.common.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.common.repository.*;
-import cn.com.qmth.examcloud.core.oe.common.service.GainBaseDataService;
 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;

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

@@ -10,9 +10,9 @@ import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreObtainQueueCloudService;
 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.common.base.utils.Check;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamScoreObtainQueueEntity;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamScoreObtainQueueRepo;
+import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
+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;

+ 4 - 4
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.common.entity.ExamRecordForMarkingEntity;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamStudentEntity;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordForMarkingRepo;
-import cn.com.qmth.examcloud.core.oe.common.repository.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;

+ 6 - 6
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.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.bean.ExamStudentEffectiveScoreInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentInfo;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamQuestionEntity;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordQuestionsEntity;
-import cn.com.qmth.examcloud.core.oe.common.enums.ExamProperties;
-import cn.com.qmth.examcloud.core.oe.common.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordQuestionsRepo;
-import cn.com.qmth.examcloud.core.oe.common.service.GainBaseDataService;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;

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

@@ -7,9 +7,9 @@ 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.service.ExamScoreQueueService;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamScorePushQueueRepo;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.Api;
 

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

@@ -2,12 +2,12 @@ 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.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.core.oe.common.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamStudentEntity;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.common.repository.ExamStudentRepo;
 import cn.com.qmth.examcloud.global.api.HandleSyncCloudService;
 import cn.com.qmth.examcloud.global.api.request.*;
 import cn.com.qmth.examcloud.global.api.response.*;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/Constants.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/Constants.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base;
+package cn.com.qmth.examcloud.core.oe.admin.base;
 
 /**
  * 系统常量

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/jpa/Model.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/Model.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.jpa;
+package cn.com.qmth.examcloud.core.oe.admin.base.jpa;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/jpa/Op.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/Op.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.jpa;
+package cn.com.qmth.examcloud.core.oe.admin.base.jpa;
 
 /**
  * 操作枚举类

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/jpa/Order.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/Order.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.jpa;
+package cn.com.qmth.examcloud.core.oe.admin.base.jpa;
 
 import org.springframework.data.domain.Sort;
 

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/jpa/Searcher.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/Searcher.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.jpa;
+package cn.com.qmth.examcloud.core.oe.admin.base.jpa;
 
 import java.io.Serializable;
 import java.util.ArrayList;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/jpa/SpecUtils.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/SpecUtils.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.jpa;
+package cn.com.qmth.examcloud.core.oe.admin.base.jpa;
 
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/jpa/SqlWrapper.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/jpa/SqlWrapper.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.jpa;
+package cn.com.qmth.examcloud.core.oe.admin.base.jpa;
 
 import java.util.Collection;
 

+ 3 - 3
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/Check.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/Check.java

@@ -5,7 +5,9 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
+
+import static cn.com.qmth.examcloud.core.oe.admin.base.Constants.OE_CODE_400;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
@@ -13,8 +15,6 @@ import java.util.Map;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 
-import static cn.com.qmth.examcloud.core.oe.common.base.Constants.OE_CODE_400;
-
 /**
  * 参数校验类
  *

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/CommonUtil.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/CommonUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/DateUtils.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/DateUtils.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/FileDisposeUtil.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/FileDisposeUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/HtmlUtil.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/HtmlUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import org.springframework.util.StringUtils;
 

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/HttpPoolUtil.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/HttpPoolUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import org.apache.commons.logging.Log; 
 import org.apache.commons.logging.LogFactory; 

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/JsonMapper.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/JsonMapper.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/NewQuestionType.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/NewQuestionType.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 public enum NewQuestionType {
 

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/PagingAndSortingDTO.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/PagingAndSortingDTO.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 /**
  * 分页DTO

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/PagingAndSortingSpecification.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/PagingAndSortingSpecification.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/QEncodeUtil.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/QEncodeUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import java.math.BigInteger;
 import java.security.MessageDigest;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/QuerySpecification.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/QuerySpecification.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/QuestionTypeUtil.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/QuestionTypeUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import cn.com.qmth.examcloud.question.commons.core.question.QuestionType;
 

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/RowIterator.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/RowIterator.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import com.esotericsoftware.reflectasm.ConstructorAccess;
 import com.esotericsoftware.reflectasm.FieldAccess;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/Sentence.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/Sentence.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.base.utils;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/baiduFaceVerify/BaiduFaceVerifyUtil.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/baiduFaceVerify/BaiduFaceVerifyUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.baiduFaceVerify;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.baiduFaceVerify;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/baiduFaceVerify/Base64Util.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/baiduFaceVerify/Base64Util.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.baiduFaceVerify;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.baiduFaceVerify;
 
 /**
  * Base64 工具类

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/baiduFaceVerify/GsonUtils.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/baiduFaceVerify/GsonUtils.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
  */
-package cn.com.qmth.examcloud.core.oe.common.base.utils.baiduFaceVerify;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.baiduFaceVerify;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/baiduFaceVerify/HttpUtil.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/baiduFaceVerify/HttpUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.baiduFaceVerify;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.baiduFaceVerify;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/excel/ColumnSetting.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ColumnSetting.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.excel;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.excel;
 
 /**
  * Created by zhengmin on 2016/6/22.

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/excel/ExcelError.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelError.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.excel;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.excel;
 /**
  * 
  * @Description: excel导入错误

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/excel/ExcelErrorType.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelErrorType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.excel;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.excel;
 
 /**
  * 

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/excel/ExcelProperty.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelProperty.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.excel;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.excel;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/excel/ExcelReader.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelReader.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.excel;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.excel;
 
 import java.io.IOException;
 import java.io.InputStream;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/excel/ExcelReaderHandle.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelReaderHandle.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.excel;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.excel;
 
 public interface ExcelReaderHandle {
 	

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/excel/ExcelUtils.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelUtils.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.excel;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.excel;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/excel/ExcelWriter.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExcelWriter.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.excel;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.excel;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.FillPatternType;

+ 1 - 1
examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/common/base/utils/excel/ExportUtils.java → examcloud-core-oe-admin-base/src/main/java/cn/com/qmth/examcloud/core/oe/admin/base/utils/excel/ExportUtils.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.base.utils.excel;
+package cn.com.qmth.examcloud.core.oe.admin.base.utils.excel;
 
 import java.io.OutputStream;
 import java.net.URLEncoder;

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/UniqueRuleHolder.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/UniqueRuleHolder.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common;
+package cn.com.qmth.examcloud.core.oe.admin.dao;
 
 import cn.com.qmth.examcloud.web.jpa.UniqueRule;
 import com.google.common.collect.Lists;

+ 3 - 3
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/cache/ExamRecordPropertyCache.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/cache/ExamRecordPropertyCache.java

@@ -1,7 +1,7 @@
-package cn.com.qmth.examcloud.core.oe.common.cache;
+package cn.com.qmth.examcloud.core.oe.admin.dao.cache;
 
-import cn.com.qmth.examcloud.core.oe.common.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.common.repository.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;

+ 3 - 3
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamAuditEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamAuditEntity.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import javax.persistence.*;
 
-import cn.com.qmth.examcloud.core.oe.common.enums.AuditStatus;
-import cn.com.qmth.examcloud.core.oe.common.enums.DisciplineType;
+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.web.jpa.JpaEntity;
 
 

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamCaptureEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamCaptureEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 import org.hibernate.annotations.DynamicInsert;

+ 2 - 2
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamCaptureQueueEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamCaptureQueueEntity.java

@@ -1,8 +1,8 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import javax.persistence.*;
 
-import cn.com.qmth.examcloud.core.oe.common.enums.ExamCaptureQueueStatus;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamCaptureQueueStatus;
 import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 import cn.com.qmth.examcloud.web.jpa.WithIdJpaEntity;
 

+ 2 - 2
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamFaceLivenessVerifyEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamFaceLivenessVerifyEntity.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import java.util.Date;
 
 import javax.persistence.*;
 
-import cn.com.qmth.examcloud.core.oe.common.enums.FaceVerifyResult;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.FaceVerifyResult;
 import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 
 

+ 2 - 2
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamFileAnswerTempEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamFileAnswerTempEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -10,7 +10,7 @@ import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.Table;
 
-import cn.com.qmth.examcloud.core.oe.common.enums.FileAnswerAcknowledgeStatus;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.FileAnswerAcknowledgeStatus;
 import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 
 @Entity

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamQuestionEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamQuestionEntity.java

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

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamQuestionPlayTime.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamQuestionPlayTime.java

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

+ 5 - 5
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamRecordDataEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamRecordDataEntity.java

@@ -1,8 +1,8 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
-import cn.com.qmth.examcloud.core.oe.common.enums.ExamRecordStatus;
-import cn.com.qmth.examcloud.core.oe.common.enums.ExamType;
-import cn.com.qmth.examcloud.core.oe.common.enums.IsSuccess;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamType;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess;
 import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 import org.hibernate.annotations.DynamicInsert;
 
@@ -188,7 +188,7 @@ public class ExamRecordDataEntity extends JpaEntity {
      */
     private Double faceSuccessPercent;
     /**
-     * @see cn.com.qmth.examcloud.core.oe.common.enums.IsSuccess
+     * @see cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess
      * 活体检测结果
      */
     @Column(length = 20)

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamRecordForMarkingEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamRecordForMarkingEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import javax.persistence.*;
 

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamRecordPaperStructEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamRecordPaperStructEntity.java

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

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamRecordQuestionsEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamRecordQuestionsEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import org.springframework.data.mongodb.core.mapping.Document;
 

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamScoreEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamScoreEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import javax.persistence.*;
 

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamScoreNoticeQueueEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamScoreNoticeQueueEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamScoreObtainQueueEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamScoreObtainQueueEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import javax.persistence.*;
 

+ 4 - 3
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamScorePushQueue.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamScorePushQueue.java

@@ -1,8 +1,9 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
-
-import cn.com.qmth.examcloud.core.oe.common.enums.ExamScoreQueueStatus;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import javax.persistence.*;
+
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
+
 import java.io.Serializable;
 import java.util.Date;
 

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamStudentEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamStudentEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamStudentFinalScoreEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamStudentFinalScoreEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import cn.com.qmth.examcloud.web.jpa.WithIdJpaEntity;
 

+ 2 - 2
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/ExamingRecordEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamingRecordEntity.java

@@ -1,6 +1,6 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
-import cn.com.qmth.examcloud.core.oe.common.enums.ExamType;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamType;
 import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 
 import javax.persistence.*;

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/FaceBiopsyEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/FaceBiopsyEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import cn.com.qmth.examcloud.web.jpa.WithIdJpaEntity;
 

+ 2 - 2
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/FaceBiopsyItemEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/FaceBiopsyItemEntity.java

@@ -1,6 +1,6 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
-import cn.com.qmth.examcloud.core.oe.common.enums.FaceBiopsyType;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.FaceBiopsyType;
 import cn.com.qmth.examcloud.web.jpa.WithIdJpaEntity;
 import com.sun.org.apache.xpath.internal.operations.Bool;
 

+ 3 - 3
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/FaceBiopsyItemStepEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/FaceBiopsyItemStepEntity.java

@@ -1,7 +1,7 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
-import cn.com.qmth.examcloud.core.oe.common.enums.FaceBiopsyAction;
-import cn.com.qmth.examcloud.core.oe.common.enums.ResourceType;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.FaceBiopsyAction;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ResourceType;
 import cn.com.qmth.examcloud.web.jpa.WithIdJpaEntity;
 
 import javax.persistence.*;

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/HandInExamRecordEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/HandInExamRecordEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 

+ 3 - 3
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/OfflineFileEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/OfflineFileEntity.java

@@ -1,7 +1,7 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
-import cn.com.qmth.examcloud.core.oe.common.enums.AuditStatus;
-import cn.com.qmth.examcloud.core.oe.common.enums.DisciplineType;
+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.web.jpa.JpaEntity;
 
 import javax.persistence.*;

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/entity/OrgScoreHandleEntity.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/OrgScoreHandleEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.entity;
+package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
 import javax.persistence.*;
 

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/AuditStatus.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/AuditStatus.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * 审核状态

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/CourseLevel.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/CourseLevel.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * 课程层次

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/DisciplineType.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/DisciplineType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/ExamCaptureQueueStatus.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExamCaptureQueueStatus.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * @author chenken

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/ExamProperties.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExamProperties.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * 

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/ExamRecordStatus.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExamRecordStatus.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * 考试记录状态

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/ExamScoreQueueStatus.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExamScoreQueueStatus.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * @author chenken

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/ExamType.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExamType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 
 /**

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/FaceBiopsyAction.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FaceBiopsyAction.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 /*
  * @Description 人脸活体检测动作
  * @Author lideyin

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/FaceBiopsyScheme.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FaceBiopsyScheme.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * @Description 活体检测方案枚举

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/FaceBiopsyType.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FaceBiopsyType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 /*
  * @Description 人脸活体检测类型
  * @Author lideyin

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/FaceVerifyResult.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FaceVerifyResult.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * @author  	chenken

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/FileAnswerAcknowledgeStatus.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FileAnswerAcknowledgeStatus.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * 文件作答的响应状态

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/FinishStatus.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/FinishStatus.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * 完成状态

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/HandInExamType.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/HandInExamType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 
 /**

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/IsSuccess.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/IsSuccess.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/MarkingType.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/MarkingType.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 /**
  * 阅卷类型

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/QuesStructType.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/QuesStructType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 
 public enum QuesStructType {
 	

+ 1 - 1
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/common/enums/ResourceType.java → examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ResourceType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.core.oe.common.enums;
+package cn.com.qmth.examcloud.core.oe.admin.dao.enums;
 /*
  * @Description 资源类型
  * @Author lideyin

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.