Преглед изворни кода

新增武汉大学-whu分支

wangliang пре 2 година
родитељ
комит
5898875ea2
100 измењених фајлова са 195 додато и 191 уклоњено
  1. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/auth/AuthBean.java
  2. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/auth/ExpireTimeBean.java
  3. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/AuthOrgInfoDto.java
  4. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/CloudMarkingScoreDto.java
  5. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/EasyExcelStudentDto.java
  6. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/EasyTestSheetDto.java
  7. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/ExamCourseMappingDto.java
  8. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/ExamDownloadRecordDto.java
  9. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/ExamSyncTotalDownloadDto.java
  10. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/MenuDto.java
  11. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/MenuPrivilegeDto.java
  12. 2 2
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/OrgDto.java
  13. 2 2
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/PrivilegeCacheDto.java
  14. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/dto/ToolsPoiExcelStudentDto.java
  15. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/params/ClientLoginParam.java
  16. 1 3
      eds-common/src/main/java/com/qmth/eds/common/bean/params/LoginParam.java
  17. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/result/EditResult.java
  18. 3 3
      eds-common/src/main/java/com/qmth/eds/common/bean/result/LoginResult.java
  19. 2 2
      eds-common/src/main/java/com/qmth/eds/common/bean/result/MenuResult.java
  20. 2 2
      eds-common/src/main/java/com/qmth/eds/common/bean/result/PrivilegeResult.java
  21. 2 2
      eds-common/src/main/java/com/qmth/eds/common/bean/result/RolePrivilegeResult.java
  22. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/result/SyncTaskListResult.java
  23. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/result/SysUserResult.java
  24. 1 1
      eds-common/src/main/java/com/qmth/eds/common/bean/result/UserLoginCheckResult.java
  25. 2 2
      eds-common/src/main/java/com/qmth/eds/common/config/DictionaryConfig.java
  26. 1 1
      eds-common/src/main/java/com/qmth/eds/common/job/service/JobService.java
  27. 1 1
      eds-common/src/main/java/com/qmth/eds/common/job/service/TimedSyncSchoolJob.java
  28. 1 1
      eds-common/src/main/java/com/qmth/eds/common/job/service/TimedSyncTaskJob.java
  29. 4 4
      eds-common/src/main/java/com/qmth/eds/common/job/service/impl/JobServiceImpl.java
  30. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/BasicAttachmentMapper.java
  31. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/BasicMessageMapper.java
  32. 2 3
      eds-common/src/main/java/com/qmth/eds/common/mapper/BasicSchoolMapper.java
  33. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/BasicVerifyCodeMapper.java
  34. 1 1
      eds-common/src/main/java/com/qmth/eds/common/mapper/CloudMarkingExamMapper.java
  35. 1 1
      eds-common/src/main/java/com/qmth/eds/common/mapper/CloudMarkingScoreForeignMapper.java
  36. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/CloudMarkingScoreMapper.java
  37. 11 0
      eds-common/src/main/java/com/qmth/eds/common/mapper/ExamCourseMappingMapper.java
  38. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/ExamDownloadRecordMapper.java
  39. 1 1
      eds-common/src/main/java/com/qmth/eds/common/mapper/ExamScheduleTaskMapper.java
  40. 1 1
      eds-common/src/main/java/com/qmth/eds/common/mapper/ExamSemesterMapper.java
  41. 1 1
      eds-common/src/main/java/com/qmth/eds/common/mapper/ExamSyncStudentMapper.java
  42. 1 1
      eds-common/src/main/java/com/qmth/eds/common/mapper/ExamSyncStudentTempMapper.java
  43. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/ExamSyncTotalMapper.java
  44. 1 1
      eds-common/src/main/java/com/qmth/eds/common/mapper/ExamTypeMapper.java
  45. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/SysCollegeMapper.java
  46. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/SysConfigMapper.java
  47. 2 3
      eds-common/src/main/java/com/qmth/eds/common/mapper/SysOrgMapper.java
  48. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/SysPrivilegeMapper.java
  49. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/SysRoleMapper.java
  50. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/SysRolePrivilegeMapper.java
  51. 1 1
      eds-common/src/main/java/com/qmth/eds/common/mapper/SysUserMapper.java
  52. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/SysUserRoleMapper.java
  53. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/TBSessionMapper.java
  54. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/TBSyncTaskMapper.java
  55. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/TBTaskMapper.java
  56. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/TGErrorMapper.java
  57. 2 2
      eds-common/src/main/java/com/qmth/eds/common/mapper/TSAuthMapper.java
  58. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/AsyncTaskService.java
  59. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/AuthInfoService.java
  60. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/BasicAttachmentService.java
  61. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/BasicMessageService.java
  62. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/BasicSchoolService.java
  63. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/BasicVerifyCodeService.java
  64. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/CloudMarkingExamService.java
  65. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/CloudMarkingScoreForeignService.java
  66. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/CloudMarkingScoreService.java
  67. 4 4
      eds-common/src/main/java/com/qmth/eds/common/service/CommonCacheService.java
  68. 7 7
      eds-common/src/main/java/com/qmth/eds/common/service/CommonService.java
  69. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/DataSyncService.java
  70. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/ExamCourseMappingService.java
  71. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/ExamDownloadRecordService.java
  72. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/ExamScheduleTaskService.java
  73. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/ExamSemesterService.java
  74. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/ExamSyncStudentService.java
  75. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/ExamSyncStudentTempService.java
  76. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/ExamSyncTotalService.java
  77. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/ExamTypeService.java
  78. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/QuartzService.java
  79. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/SysCollegeService.java
  80. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/SysConfigService.java
  81. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/SysOrgService.java
  82. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/SysPrivilegeService.java
  83. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/SysRolePrivilegeService.java
  84. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/SysRoleService.java
  85. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/SysUserRoleService.java
  86. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/SysUserService.java
  87. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/TBSessionService.java
  88. 3 3
      eds-common/src/main/java/com/qmth/eds/common/service/TBSyncTaskService.java
  89. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/TBTaskService.java
  90. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/TGErrorService.java
  91. 1 1
      eds-common/src/main/java/com/qmth/eds/common/service/TSAuthService.java
  92. 2 2
      eds-common/src/main/java/com/qmth/eds/common/service/TeachcloudCommonService.java
  93. 7 8
      eds-common/src/main/java/com/qmth/eds/common/service/impl/AuthInfoServiceImpl.java
  94. 4 4
      eds-common/src/main/java/com/qmth/eds/common/service/impl/BasicAttachmentServiceImpl.java
  95. 5 5
      eds-common/src/main/java/com/qmth/eds/common/service/impl/BasicMessageServiceImpl.java
  96. 3 3
      eds-common/src/main/java/com/qmth/eds/common/service/impl/BasicSchoolServiceImpl.java
  97. 4 4
      eds-common/src/main/java/com/qmth/eds/common/service/impl/BasicVerifyCodeServiceImpl.java
  98. 4 5
      eds-common/src/main/java/com/qmth/eds/common/service/impl/CloudMarkingExamServiceImpl.java
  99. 4 4
      eds-common/src/main/java/com/qmth/eds/common/service/impl/CloudMarkingScoreForeignServiceImpl.java
  100. 4 5
      eds-common/src/main/java/com/qmth/eds/common/service/impl/CloudMarkingScoreServiceImpl.java

+ 1 - 1
src/main/java/com/qmth/eds/bean/auth/AuthBean.java → eds-common/src/main/java/com/qmth/eds/common/bean/auth/AuthBean.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.auth;
+package com.qmth.eds.common.bean.auth;
 
 import com.qmth.eds.common.entity.BasicSchool;
 import com.qmth.eds.common.entity.SysOrg;

+ 1 - 1
src/main/java/com/qmth/eds/bean/auth/ExpireTimeBean.java → eds-common/src/main/java/com/qmth/eds/common/bean/auth/ExpireTimeBean.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.auth;
+package com.qmth.eds.common.bean.auth;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/qmth/eds/bean/dto/AuthOrgInfoDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/AuthOrgInfoDto.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.dto;
+package com.qmth.eds.common.bean.dto;
 
 import com.qmth.boot.core.solar.model.AppControl;
 import com.qmth.boot.core.solar.model.OrgInfo;

+ 1 - 1
src/main/java/com/qmth/eds/bean/dto/CloudMarkingScoreDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/CloudMarkingScoreDto.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.dto;
+package com.qmth.eds.common.bean.dto;
 
 import java.io.Serializable;
 

+ 1 - 1
src/main/java/com/qmth/eds/bean/dto/EasyExcelStudentDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/EasyExcelStudentDto.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.dto;
+package com.qmth.eds.common.bean.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;

+ 1 - 1
src/main/java/com/qmth/eds/bean/dto/EasyTestSheetDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/EasyTestSheetDto.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.dto;
+package com.qmth.eds.common.bean.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;

+ 1 - 1
src/main/java/com/qmth/eds/bean/dto/ExamCourseMappingDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/ExamCourseMappingDto.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.dto;//package com.qmth.teachcloud.data.store.bean.dto;
+package com.qmth.eds.common.bean.dto;//package com.qmth.teachcloud.data.store.bean.dto;
 
 
 import com.qmth.boot.tools.excel.annotation.ExcelColumn;

+ 1 - 1
src/main/java/com/qmth/eds/bean/dto/ExamDownloadRecordDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/ExamDownloadRecordDto.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.dto;
+package com.qmth.eds.common.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

+ 1 - 1
src/main/java/com/qmth/eds/bean/dto/ExamSyncTotalDownloadDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/ExamSyncTotalDownloadDto.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.dto;
+package com.qmth.eds.common.bean.dto;
 
 import com.qmth.eds.common.entity.ExamSyncTotal;
 

+ 1 - 1
src/main/java/com/qmth/eds/bean/dto/MenuDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/MenuDto.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.dto;
+package com.qmth.eds.common.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

+ 1 - 1
src/main/java/com/qmth/eds/bean/dto/MenuPrivilegeDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/MenuPrivilegeDto.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.dto;
+package com.qmth.eds.common.bean.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;

+ 2 - 2
src/main/java/com/qmth/eds/bean/dto/OrgDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/OrgDto.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.bean.dto;
+package com.qmth.eds.common.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.bean.result.SysUserResult;
+import com.qmth.eds.common.bean.result.SysUserResult;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.ArrayList;

+ 2 - 2
src/main/java/com/qmth/eds/bean/dto/PrivilegeCacheDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/PrivilegeCacheDto.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.bean.dto;
+package com.qmth.eds.common.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.common.enums.RoleTypeEnum;
 import com.qmth.eds.common.enums.PrivilegeEnum;
+import com.qmth.eds.common.enums.RoleTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

+ 1 - 1
src/main/java/com/qmth/eds/bean/dto/ToolsPoiExcelStudentDto.java → eds-common/src/main/java/com/qmth/eds/common/bean/dto/ToolsPoiExcelStudentDto.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.dto;//package com.qmth.teachcloud.data.store.bean.dto;
+package com.qmth.eds.common.bean.dto;//package com.qmth.teachcloud.data.store.bean.dto;
 
 
 import com.qmth.boot.tools.excel.annotation.ExcelColumn;

+ 1 - 1
src/main/java/com/qmth/eds/bean/params/ClientLoginParam.java → eds-common/src/main/java/com/qmth/eds/common/bean/params/ClientLoginParam.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.params;
+package com.qmth.eds.common.bean.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;

+ 1 - 3
src/main/java/com/qmth/eds/bean/params/LoginParam.java → eds-common/src/main/java/com/qmth/eds/common/bean/params/LoginParam.java

@@ -1,9 +1,7 @@
-package com.qmth.eds.bean.params;
+package com.qmth.eds.common.bean.params;
 
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @Description: 用户登录
  * @Param:

+ 1 - 1
src/main/java/com/qmth/eds/bean/result/EditResult.java → eds-common/src/main/java/com/qmth/eds/common/bean/result/EditResult.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.result;
+package com.qmth.eds.common.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

+ 3 - 3
src/main/java/com/qmth/eds/bean/result/LoginResult.java → eds-common/src/main/java/com/qmth/eds/common/bean/result/LoginResult.java

@@ -1,12 +1,12 @@
-package com.qmth.eds.bean.result;
+package com.qmth.eds.common.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.common.enums.AppSourceEnum;
-import com.qmth.eds.common.util.ServletUtil;
 import com.qmth.eds.common.entity.BasicSchool;
 import com.qmth.eds.common.entity.SysOrg;
 import com.qmth.eds.common.entity.SysUser;
+import com.qmth.eds.common.enums.AppSourceEnum;
+import com.qmth.eds.common.util.ServletUtil;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

+ 2 - 2
src/main/java/com/qmth/eds/bean/result/MenuResult.java → eds-common/src/main/java/com/qmth/eds/common/bean/result/MenuResult.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.bean.result;
+package com.qmth.eds.common.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.bean.dto.MenuPrivilegeDto;
+import com.qmth.eds.common.bean.dto.MenuPrivilegeDto;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

+ 2 - 2
src/main/java/com/qmth/eds/bean/result/PrivilegeResult.java → eds-common/src/main/java/com/qmth/eds/common/bean/result/PrivilegeResult.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.bean.result;
+package com.qmth.eds.common.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.bean.dto.PrivilegeCacheDto;
+import com.qmth.eds.common.bean.dto.PrivilegeCacheDto;
 import com.qmth.eds.common.enums.PrivilegeEnum;
 import io.swagger.annotations.ApiModelProperty;
 

+ 2 - 2
src/main/java/com/qmth/eds/bean/result/RolePrivilegeResult.java → eds-common/src/main/java/com/qmth/eds/common/bean/result/RolePrivilegeResult.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.bean.result;
+package com.qmth.eds.common.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.bean.dto.PrivilegeCacheDto;
+import com.qmth.eds.common.bean.dto.PrivilegeCacheDto;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

+ 1 - 1
src/main/java/com/qmth/eds/bean/result/SyncTaskListResult.java → eds-common/src/main/java/com/qmth/eds/common/bean/result/SyncTaskListResult.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.result;
+package com.qmth.eds.common.bean.result;
 
 import com.qmth.eds.common.entity.TBSyncTask;
 

+ 1 - 1
src/main/java/com/qmth/eds/bean/result/SysUserResult.java → eds-common/src/main/java/com/qmth/eds/common/bean/result/SysUserResult.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.result;
+package com.qmth.eds.common.bean.result;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;

+ 1 - 1
src/main/java/com/qmth/eds/bean/result/UserLoginCheckResult.java → eds-common/src/main/java/com/qmth/eds/common/bean/result/UserLoginCheckResult.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.bean.result;
+package com.qmth.eds.common.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

+ 2 - 2
src/main/java/com/qmth/eds/core/config/DictionaryConfig.java → eds-common/src/main/java/com/qmth/eds/common/config/DictionaryConfig.java

@@ -1,6 +1,6 @@
-package com.qmth.eds.core.config;
+package com.qmth.eds.common.config;
 
-import com.qmth.eds.core.domain.*;
+import com.qmth.eds.common.domain.*;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
src/main/java/com/qmth/eds/job/service/JobService.java → eds-common/src/main/java/com/qmth/eds/common/job/service/JobService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.job.service;
+package com.qmth.eds.common.job.service;
 
 import java.io.IOException;
 

+ 1 - 1
src/main/java/com/qmth/eds/job/service/TimedSyncSchoolJob.java → eds-common/src/main/java/com/qmth/eds/common/job/service/TimedSyncSchoolJob.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.job.service;
+package com.qmth.eds.common.job.service;
 
 import com.qmth.eds.common.contant.SystemConstant;
 import org.quartz.JobExecutionContext;

+ 1 - 1
src/main/java/com/qmth/eds/job/service/TimedSyncTaskJob.java → eds-common/src/main/java/com/qmth/eds/common/job/service/TimedSyncTaskJob.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.job.service;
+package com.qmth.eds.common.job.service;
 
 import org.jetbrains.annotations.NotNull;
 import org.quartz.JobExecutionContext;

+ 4 - 4
src/main/java/com/qmth/eds/job/service/impl/JobServiceImpl.java → eds-common/src/main/java/com/qmth/eds/common/job/service/impl/JobServiceImpl.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.job.service.impl;
+package com.qmth.eds.common.job.service.impl;
 
 import com.qmth.eds.common.entity.ExamScheduleTask;
-import com.qmth.eds.job.service.JobService;
-import com.qmth.eds.service.AsyncTaskService;
-import com.qmth.eds.service.ExamScheduleTaskService;
+import com.qmth.eds.common.job.service.JobService;
+import com.qmth.eds.common.service.AsyncTaskService;
+import com.qmth.eds.common.service.ExamScheduleTaskService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

+ 2 - 2
src/main/java/com/qmth/eds/mapper/BasicAttachmentMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/BasicAttachmentMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.BasicAttachment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.BasicAttachment;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/mapper/BasicMessageMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/BasicMessageMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.BasicMessage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.BasicMessage;
 
 /**
  * <p>

+ 2 - 3
src/main/java/com/qmth/eds/mapper/BasicSchoolMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/BasicSchoolMapper.java

@@ -1,8 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
+import com.qmth.eds.common.base.CustomBaseMapper;
 import com.qmth.eds.common.entity.BasicSchool;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.eds.core.base.CustomBaseMapper;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/mapper/BasicVerifyCodeMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/BasicVerifyCodeMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.BasicVerifyCode;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.BasicVerifyCode;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/qmth/eds/mapper/CloudMarkingExamMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/CloudMarkingExamMapper.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.eds.common.entity.CloudMarkingExam;

+ 1 - 1
src/main/java/com/qmth/eds/mapper/CloudMarkingScoreForeignMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/CloudMarkingScoreForeignMapper.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.eds.common.entity.CloudMarkingScoreForeign;

+ 2 - 2
src/main/java/com/qmth/eds/mapper/CloudMarkingScoreMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/CloudMarkingScoreMapper.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.eds.bean.dto.CloudMarkingScoreDto;
+import com.qmth.eds.common.bean.dto.CloudMarkingScoreDto;
 import com.qmth.eds.common.entity.CloudMarkingScore;
 import org.apache.ibatis.annotations.Param;
 

+ 11 - 0
eds-common/src/main/java/com/qmth/eds/common/mapper/ExamCourseMappingMapper.java

@@ -0,0 +1,11 @@
+package com.qmth.eds.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.ExamCourseMapping;
+
+/**
+ * 考务课程代码和云阅卷课程代码关系表 Mapper 接口
+ */
+public interface ExamCourseMappingMapper extends BaseMapper<ExamCourseMapping> {
+
+}

+ 2 - 2
src/main/java/com/qmth/eds/mapper/ExamDownloadRecordMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/ExamDownloadRecordMapper.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.eds.bean.dto.ExamDownloadRecordDto;
+import com.qmth.eds.common.bean.dto.ExamDownloadRecordDto;
 import com.qmth.eds.common.entity.ExamDownloadRecord;
 import org.apache.ibatis.annotations.Param;
 

+ 1 - 1
src/main/java/com/qmth/eds/mapper/ExamScheduleTaskMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/ExamScheduleTaskMapper.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.eds.common.entity.ExamScheduleTask;

+ 1 - 1
src/main/java/com/qmth/eds/mapper/ExamSemesterMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/ExamSemesterMapper.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.eds.common.entity.ExamSemester;

+ 1 - 1
src/main/java/com/qmth/eds/mapper/ExamSyncStudentMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/ExamSyncStudentMapper.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.eds.common.entity.ExamSyncStudent;

+ 1 - 1
src/main/java/com/qmth/eds/mapper/ExamSyncStudentTempMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/ExamSyncStudentTempMapper.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.eds.common.entity.ExamSyncStudentTemp;

+ 2 - 2
src/main/java/com/qmth/eds/mapper/ExamSyncTotalMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/ExamSyncTotalMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.eds.bean.dto.ExamSyncTotalDownloadDto;
+import com.qmth.eds.common.bean.dto.ExamSyncTotalDownloadDto;
 import com.qmth.eds.common.entity.ExamSyncTotal;
 import org.apache.ibatis.annotations.Param;
 

+ 1 - 1
src/main/java/com/qmth/eds/mapper/ExamTypeMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/ExamTypeMapper.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.eds.common.entity.ExamType;

+ 2 - 2
src/main/java/com/qmth/eds/mapper/SysCollegeMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/SysCollegeMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
+import com.qmth.eds.common.base.CustomBaseMapper;
 import com.qmth.eds.common.entity.SysCollege;
-import com.qmth.eds.core.base.CustomBaseMapper;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/mapper/SysConfigMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/SysConfigMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.SysConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.SysConfig;
 
 /**
  * <p>

+ 2 - 3
src/main/java/com/qmth/eds/mapper/SysOrgMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/SysOrgMapper.java

@@ -1,8 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
+import com.qmth.eds.common.base.CustomBaseMapper;
 import com.qmth.eds.common.entity.SysOrg;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.eds.core.base.CustomBaseMapper;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/mapper/SysPrivilegeMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/SysPrivilegeMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.SysPrivilege;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.SysPrivilege;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/mapper/SysRoleMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/SysRoleMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.SysRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.SysRole;
 
 import java.util.List;
 

+ 2 - 2
src/main/java/com/qmth/eds/mapper/SysRolePrivilegeMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/SysRolePrivilegeMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.SysRolePrivilege;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.SysRolePrivilege;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/qmth/eds/mapper/SysUserMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/SysUserMapper.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.eds.common.entity.SysUser;

+ 2 - 2
src/main/java/com/qmth/eds/mapper/SysUserRoleMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/SysUserRoleMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.SysUserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.SysUserRole;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/mapper/TBSessionMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/TBSessionMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.TBSession;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.TBSession;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/mapper/TBSyncTaskMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/TBSyncTaskMapper.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.eds.bean.result.SyncTaskListResult;
+import com.qmth.eds.common.bean.result.SyncTaskListResult;
 import com.qmth.eds.common.entity.TBSyncTask;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
src/main/java/com/qmth/eds/mapper/TBTaskMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/TBTaskMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.TBTask;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.TBTask;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/mapper/TGErrorMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/TGErrorMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
-import com.qmth.eds.common.entity.TGError;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.eds.common.entity.TGError;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/mapper/TSAuthMapper.java → eds-common/src/main/java/com/qmth/eds/common/mapper/TSAuthMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.mapper;
+package com.qmth.eds.common.mapper;
 
+import com.qmth.eds.common.base.CustomBaseMapper;
 import com.qmth.eds.common.entity.TSAuth;
-import com.qmth.eds.core.base.CustomBaseMapper;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/qmth/eds/service/AsyncTaskService.java → eds-common/src/main/java/com/qmth/eds/common/service/AsyncTaskService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.qmth.eds.common.entity.ExamScheduleTask;
 import com.qmth.eds.common.entity.TBSyncTask;

+ 1 - 1
src/main/java/com/qmth/eds/service/AuthInfoService.java → eds-common/src/main/java/com/qmth/eds/common/service/AuthInfoService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.qmth.boot.core.solar.model.AppInfo;
 import com.qmth.eds.common.enums.AuthEnum;

+ 2 - 2
src/main/java/com/qmth/eds/service/BasicAttachmentService.java → eds-common/src/main/java/com/qmth/eds/common/service/BasicAttachmentService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.BasicAttachment;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.BasicAttachment;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/service/BasicMessageService.java → eds-common/src/main/java/com/qmth/eds/common/service/BasicMessageService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.BasicMessage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.BasicMessage;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/service/BasicSchoolService.java → eds-common/src/main/java/com/qmth/eds/common/service/BasicSchoolService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.BasicSchool;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.BasicSchool;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/service/BasicVerifyCodeService.java → eds-common/src/main/java/com/qmth/eds/common/service/BasicVerifyCodeService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.BasicVerifyCode;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.BasicVerifyCode;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/qmth/eds/service/CloudMarkingExamService.java → eds-common/src/main/java/com/qmth/eds/common/service/CloudMarkingExamService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.eds.common.entity.CloudMarkingExam;

+ 1 - 1
src/main/java/com/qmth/eds/service/CloudMarkingScoreForeignService.java → eds-common/src/main/java/com/qmth/eds/common/service/CloudMarkingScoreForeignService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

+ 2 - 2
src/main/java/com/qmth/eds/service/CloudMarkingScoreService.java → eds-common/src/main/java/com/qmth/eds/common/service/CloudMarkingScoreService.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.eds.bean.dto.CloudMarkingScoreDto;
+import com.qmth.eds.common.bean.dto.CloudMarkingScoreDto;
 import com.qmth.eds.common.entity.CloudMarkingScore;
 
 /**

+ 4 - 4
src/main/java/com/qmth/eds/service/CommonCacheService.java → eds-common/src/main/java/com/qmth/eds/common/service/CommonCacheService.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.bean.auth.AuthBean;
-import com.qmth.eds.bean.dto.AuthOrgInfoDto;
-import com.qmth.eds.bean.result.MenuResult;
+import com.qmth.eds.common.bean.auth.AuthBean;
+import com.qmth.eds.common.bean.dto.AuthOrgInfoDto;
+import com.qmth.eds.common.bean.result.MenuResult;
 import com.qmth.eds.common.entity.*;
 import com.qmth.eds.common.enums.PrivilegePropertyEnum;
 

+ 7 - 7
src/main/java/com/qmth/eds/service/CommonService.java → eds-common/src/main/java/com/qmth/eds/common/service/CommonService.java

@@ -1,15 +1,15 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.bean.dto.PrivilegeCacheDto;
-import com.qmth.eds.bean.result.RolePrivilegeResult;
-import com.qmth.eds.common.enums.AppSourceEnum;
-import com.qmth.eds.bean.auth.AuthBean;
-import com.qmth.eds.bean.result.LoginResult;
-import com.qmth.eds.bean.result.MenuResult;
+import com.qmth.eds.common.bean.auth.AuthBean;
+import com.qmth.eds.common.bean.dto.PrivilegeCacheDto;
+import com.qmth.eds.common.bean.result.LoginResult;
+import com.qmth.eds.common.bean.result.MenuResult;
+import com.qmth.eds.common.bean.result.RolePrivilegeResult;
 import com.qmth.eds.common.entity.BasicAttachment;
 import com.qmth.eds.common.entity.SysRolePrivilege;
 import com.qmth.eds.common.entity.SysUser;
 import com.qmth.eds.common.entity.SysUserRole;
+import com.qmth.eds.common.enums.AppSourceEnum;
 import com.qmth.eds.common.enums.PrivilegePropertyEnum;
 
 import javax.servlet.http.HttpServletResponse;

+ 1 - 1
src/main/java/com/qmth/eds/service/DataSyncService.java → eds-common/src/main/java/com/qmth/eds/common/service/DataSyncService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.qmth.eds.common.entity.ExamScheduleTask;
 import com.qmth.eds.common.entity.TBSyncTask;

+ 1 - 1
src/main/java/com/qmth/eds/service/ExamCourseMappingService.java → eds-common/src/main/java/com/qmth/eds/common/service/ExamCourseMappingService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

+ 2 - 2
src/main/java/com/qmth/eds/service/ExamDownloadRecordService.java → eds-common/src/main/java/com/qmth/eds/common/service/ExamDownloadRecordService.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.eds.bean.dto.ExamDownloadRecordDto;
+import com.qmth.eds.common.bean.dto.ExamDownloadRecordDto;
 import com.qmth.eds.common.entity.ExamDownloadRecord;
 
 /**

+ 1 - 1
src/main/java/com/qmth/eds/service/ExamScheduleTaskService.java → eds-common/src/main/java/com/qmth/eds/common/service/ExamScheduleTaskService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

+ 1 - 1
src/main/java/com/qmth/eds/service/ExamSemesterService.java → eds-common/src/main/java/com/qmth/eds/common/service/ExamSemesterService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

+ 1 - 1
src/main/java/com/qmth/eds/service/ExamSyncStudentService.java → eds-common/src/main/java/com/qmth/eds/common/service/ExamSyncStudentService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.eds.common.entity.ExamSyncStudent;

+ 1 - 1
src/main/java/com/qmth/eds/service/ExamSyncStudentTempService.java → eds-common/src/main/java/com/qmth/eds/common/service/ExamSyncStudentTempService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.eds.common.entity.ExamSyncStudentTemp;

+ 2 - 2
src/main/java/com/qmth/eds/service/ExamSyncTotalService.java → eds-common/src/main/java/com/qmth/eds/common/service/ExamSyncTotalService.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.eds.bean.dto.ExamSyncTotalDownloadDto;
+import com.qmth.eds.common.bean.dto.ExamSyncTotalDownloadDto;
 import com.qmth.eds.common.entity.ExamSyncTotal;
 
 import javax.servlet.http.HttpServletResponse;

+ 1 - 1
src/main/java/com/qmth/eds/service/ExamTypeService.java → eds-common/src/main/java/com/qmth/eds/common/service/ExamTypeService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

+ 1 - 1
src/main/java/com/qmth/eds/service/QuartzService.java → eds-common/src/main/java/com/qmth/eds/common/service/QuartzService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import org.springframework.scheduling.quartz.QuartzJobBean;
 

+ 1 - 1
src/main/java/com/qmth/eds/service/SysCollegeService.java → eds-common/src/main/java/com/qmth/eds/common/service/SysCollegeService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.eds.common.entity.SysCollege;

+ 2 - 2
src/main/java/com/qmth/eds/service/SysConfigService.java → eds-common/src/main/java/com/qmth/eds/common/service/SysConfigService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.SysConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.SysConfig;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/service/SysOrgService.java → eds-common/src/main/java/com/qmth/eds/common/service/SysOrgService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.SysOrg;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.SysOrg;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/service/SysPrivilegeService.java → eds-common/src/main/java/com/qmth/eds/common/service/SysPrivilegeService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.SysPrivilege;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.SysPrivilege;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/service/SysRolePrivilegeService.java → eds-common/src/main/java/com/qmth/eds/common/service/SysRolePrivilegeService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.SysRolePrivilege;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.SysRolePrivilege;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/service/SysRoleService.java → eds-common/src/main/java/com/qmth/eds/common/service/SysRoleService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.SysRole;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.SysRole;
 
 import java.util.List;
 

+ 2 - 2
src/main/java/com/qmth/eds/service/SysUserRoleService.java → eds-common/src/main/java/com/qmth/eds/common/service/SysUserRoleService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.SysUserRole;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.SysUserRole;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/qmth/eds/service/SysUserService.java → eds-common/src/main/java/com/qmth/eds/common/service/SysUserService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

+ 2 - 2
src/main/java/com/qmth/eds/service/TBSessionService.java → eds-common/src/main/java/com/qmth/eds/common/service/TBSessionService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.TBSession;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.TBSession;
 
 /**
  * <p>

+ 3 - 3
src/main/java/com/qmth/eds/service/TBSyncTaskService.java → eds-common/src/main/java/com/qmth/eds/common/service/TBSyncTaskService.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.eds.bean.result.SyncTaskListResult;
+import com.qmth.eds.common.bean.result.SyncTaskListResult;
 import com.qmth.eds.common.entity.ExamScheduleTask;
 import com.qmth.eds.common.entity.TBSyncTask;
 import com.qmth.eds.common.enums.TaskResultEnum;
@@ -19,7 +19,7 @@ public interface TBSyncTaskService extends IService<TBSyncTask> {
 
     TBSyncTask saveTask(ExamScheduleTask examScheduleTask, TaskTypeEnum type, boolean isAuto);
 
-    void updateStatusAndResultById(Long id,TaskStatusEnum status, TaskResultEnum result, String errorMessage);
+    void updateStatusAndResultById(Long id, TaskStatusEnum status, TaskResultEnum result, String errorMessage);
 
     TBSyncTask saveTask(Long collegeId, Long semesterId, Long examTypeId, TaskTypeEnum type, String remark);
 

+ 2 - 2
src/main/java/com/qmth/eds/service/TBTaskService.java → eds-common/src/main/java/com/qmth/eds/common/service/TBTaskService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.TBTask;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.TBTask;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/qmth/eds/service/TGErrorService.java → eds-common/src/main/java/com/qmth/eds/common/service/TGErrorService.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.common.entity.TGError;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.eds.common.entity.TGError;
 
 /**
  * <p>

+ 1 - 1
src/main/java/com/qmth/eds/service/TSAuthService.java → eds-common/src/main/java/com/qmth/eds/common/service/TSAuthService.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.eds.common.entity.TSAuth;

+ 2 - 2
src/main/java/com/qmth/eds/service/TeachcloudCommonService.java → eds-common/src/main/java/com/qmth/eds/common/service/TeachcloudCommonService.java

@@ -1,6 +1,6 @@
-package com.qmth.eds.service;
+package com.qmth.eds.common.service;
 
-import com.qmth.eds.bean.result.LoginResult;
+import com.qmth.eds.common.bean.result.LoginResult;
 import com.qmth.eds.common.entity.SysUser;
 import com.qmth.eds.common.enums.AppSourceEnum;
 

+ 7 - 8
src/main/java/com/qmth/eds/service/impl/AuthInfoServiceImpl.java → eds-common/src/main/java/com/qmth/eds/common/service/impl/AuthInfoServiceImpl.java

@@ -1,11 +1,12 @@
-package com.qmth.eds.service.impl;
+package com.qmth.eds.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.core.solar.config.SolarProperties;
 import com.qmth.boot.core.solar.model.AppInfo;
 import com.qmth.boot.core.solar.model.OrgInfo;
 import com.qmth.boot.core.solar.service.SolarService;
-import com.qmth.eds.bean.dto.AuthOrgInfoDto;
+import com.qmth.eds.common.bean.dto.AuthOrgInfoDto;
+import com.qmth.eds.common.config.DictionaryConfig;
 import com.qmth.eds.common.contant.SystemConstant;
 import com.qmth.eds.common.entity.BasicSchool;
 import com.qmth.eds.common.entity.SysCollege;
@@ -14,13 +15,11 @@ import com.qmth.eds.common.entity.TSAuth;
 import com.qmth.eds.common.enums.AuthEnum;
 import com.qmth.eds.common.enums.ExceptionResultEnum;
 import com.qmth.eds.common.enums.UploadFileEnum;
+import com.qmth.eds.common.mapper.BasicSchoolMapper;
+import com.qmth.eds.common.mapper.SysOrgMapper;
+import com.qmth.eds.common.mapper.TSAuthMapper;
+import com.qmth.eds.common.service.*;
 import com.qmth.eds.common.util.FileStoreUtil;
-import com.qmth.eds.core.config.DictionaryConfig;
-import com.qmth.eds.mapper.BasicSchoolMapper;
-import com.qmth.eds.mapper.SysCollegeMapper;
-import com.qmth.eds.mapper.SysOrgMapper;
-import com.qmth.eds.mapper.TSAuthMapper;
-import com.qmth.eds.service.*;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 4 - 4
src/main/java/com/qmth/eds/service/impl/BasicAttachmentServiceImpl.java → eds-common/src/main/java/com/qmth/eds/common/service/impl/BasicAttachmentServiceImpl.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.service.impl;
+package com.qmth.eds.common.service.impl;
 
-import com.qmth.eds.common.entity.BasicAttachment;
-import com.qmth.eds.mapper.BasicAttachmentMapper;
-import com.qmth.eds.service.BasicAttachmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.eds.common.entity.BasicAttachment;
+import com.qmth.eds.common.mapper.BasicAttachmentMapper;
+import com.qmth.eds.common.service.BasicAttachmentService;
 import org.springframework.stereotype.Service;
 
 /**

+ 5 - 5
src/main/java/com/qmth/eds/service/impl/BasicMessageServiceImpl.java → eds-common/src/main/java/com/qmth/eds/common/service/impl/BasicMessageServiceImpl.java

@@ -1,16 +1,16 @@
-package com.qmth.eds.service.impl;
+package com.qmth.eds.common.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.eds.bean.dto.ExamSyncTotalDownloadDto;
+import com.qmth.eds.common.bean.dto.ExamSyncTotalDownloadDto;
 import com.qmth.eds.common.contant.SystemConstant;
 import com.qmth.eds.common.entity.BasicMessage;
 import com.qmth.eds.common.enums.ExceptionResultEnum;
 import com.qmth.eds.common.enums.MessageEnum;
-import com.qmth.eds.mapper.BasicMessageMapper;
-import com.qmth.eds.service.BasicMessageService;
-import com.qmth.eds.service.ExamSyncTotalService;
+import com.qmth.eds.common.mapper.BasicMessageMapper;
+import com.qmth.eds.common.service.BasicMessageService;
+import com.qmth.eds.common.service.ExamSyncTotalService;
 import com.qmth.eds.common.util.SmsUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

+ 3 - 3
src/main/java/com/qmth/eds/service/impl/BasicSchoolServiceImpl.java → eds-common/src/main/java/com/qmth/eds/common/service/impl/BasicSchoolServiceImpl.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.service.impl;
+package com.qmth.eds.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.eds.common.entity.BasicSchool;
-import com.qmth.eds.mapper.BasicSchoolMapper;
-import com.qmth.eds.service.BasicSchoolService;
+import com.qmth.eds.common.mapper.BasicSchoolMapper;
+import com.qmth.eds.common.service.BasicSchoolService;
 import org.springframework.stereotype.Service;
 
 /**

+ 4 - 4
src/main/java/com/qmth/eds/service/impl/BasicVerifyCodeServiceImpl.java → eds-common/src/main/java/com/qmth/eds/common/service/impl/BasicVerifyCodeServiceImpl.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.service.impl;
+package com.qmth.eds.common.service.impl;
 
-import com.qmth.eds.common.entity.BasicVerifyCode;
-import com.qmth.eds.mapper.BasicVerifyCodeMapper;
-import com.qmth.eds.service.BasicVerifyCodeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.eds.common.entity.BasicVerifyCode;
+import com.qmth.eds.common.mapper.BasicVerifyCodeMapper;
+import com.qmth.eds.common.service.BasicVerifyCodeService;
 import org.springframework.stereotype.Service;
 
 /**

+ 4 - 5
src/main/java/com/qmth/eds/service/impl/CloudMarkingExamServiceImpl.java → eds-common/src/main/java/com/qmth/eds/common/service/impl/CloudMarkingExamServiceImpl.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service.impl;
+package com.qmth.eds.common.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,10 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.eds.common.contant.SystemConstant;
 import com.qmth.eds.common.entity.CloudMarkingExam;
 import com.qmth.eds.common.enums.ExceptionResultEnum;
+import com.qmth.eds.common.mapper.CloudMarkingExamMapper;
+import com.qmth.eds.common.service.CloudMarkingExamService;
 import com.qmth.eds.common.tools.CloudMarkingUtil;
-import com.qmth.eds.common.util.ServletUtil;
-import com.qmth.eds.mapper.CloudMarkingExamMapper;
-import com.qmth.eds.service.CloudMarkingExamService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,7 +34,7 @@ public class CloudMarkingExamServiceImpl extends ServiceImpl<CloudMarkingExamMap
     @Transactional
     @Override
     public List<CloudMarkingExam> syncExam(Long collegeId) {
-        if(collegeId == null){
+        if (collegeId == null) {
             throw ExceptionResultEnum.ERROR.exception("请选择学院");
         }
         UpdateWrapper<CloudMarkingExam> updateWrapper = new UpdateWrapper<>();

+ 4 - 4
src/main/java/com/qmth/eds/service/impl/CloudMarkingScoreForeignServiceImpl.java → eds-common/src/main/java/com/qmth/eds/common/service/impl/CloudMarkingScoreForeignServiceImpl.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.service.impl;
+package com.qmth.eds.common.service.impl;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
@@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.eds.common.entity.CloudMarkingScoreForeign;
 import com.qmth.eds.common.enums.ExceptionResultEnum;
+import com.qmth.eds.common.mapper.CloudMarkingScoreForeignMapper;
+import com.qmth.eds.common.service.CloudMarkingScoreForeignService;
 import com.qmth.eds.common.util.FileUtil;
 import com.qmth.eds.common.util.ServletUtil;
-import com.qmth.eds.mapper.CloudMarkingScoreForeignMapper;
-import com.qmth.eds.service.CloudMarkingScoreForeignService;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
@@ -24,7 +24,7 @@ import java.util.List;
 public class CloudMarkingScoreForeignServiceImpl extends ServiceImpl<CloudMarkingScoreForeignMapper, CloudMarkingScoreForeign> implements CloudMarkingScoreForeignService {
     @Override
     public IPage<CloudMarkingScoreForeign> pageData(Long semesterId, Long examTypeId, Long collegeId, String examId, Integer pageNumber, Integer pageSize) {
-        if(collegeId == null){
+        if (collegeId == null) {
             throw ExceptionResultEnum.ERROR.exception("请选择学院");
         }
         QueryWrapper<CloudMarkingScoreForeign> queryWrapper = new QueryWrapper<>();

+ 4 - 5
src/main/java/com/qmth/eds/service/impl/CloudMarkingScoreServiceImpl.java → eds-common/src/main/java/com/qmth/eds/common/service/impl/CloudMarkingScoreServiceImpl.java

@@ -1,15 +1,14 @@
-package com.qmth.eds.service.impl;
+package com.qmth.eds.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.eds.bean.dto.CloudMarkingScoreDto;
-import com.qmth.eds.bean.dto.ExamDownloadRecordDto;
+import com.qmth.eds.common.bean.dto.CloudMarkingScoreDto;
 import com.qmth.eds.common.entity.CloudMarkingScore;
+import com.qmth.eds.common.mapper.CloudMarkingScoreMapper;
+import com.qmth.eds.common.service.CloudMarkingScoreService;
 import com.qmth.eds.common.util.ServletUtil;
-import com.qmth.eds.mapper.CloudMarkingScoreMapper;
-import com.qmth.eds.service.CloudMarkingScoreService;
 import org.springframework.stereotype.Service;
 
 @Service

Неке датотеке нису приказане због велике количине промена