From a049337c55f02246b436d2f0c43acb3ee4da2845 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 06 六月 2024 09:34:47 +0800
Subject: [PATCH] 枚举类单独根目录
---
src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java | 4 +-
src/main/java/com/ycl/jxkg/service/impl/ExamPaperQuestionCustomerAnswerServiceImpl.java | 2
src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java | 5 +-
src/main/java/com/ycl/jxkg/enums/general/ClassesStatusEnum.java | 2
src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java | 4 +-
src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java | 8 +--
src/main/java/com/ycl/jxkg/domain/entity/Question.java | 5 +-
src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java | 4 +-
src/main/java/com/ycl/jxkg/enums/VisibilityEnum.java | 4 +-
src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java | 6 --
src/main/java/com/ycl/jxkg/config/spring/security/SecurityConfigurer.java | 2
src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java | 2
src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java | 2
src/main/java/com/ycl/jxkg/enums/RoleEnum.java | 4 +-
src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java | 2
src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java | 4 +-
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 6 --
src/main/java/com/ycl/jxkg/enums/UserStatusEnum.java | 4 +-
src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java | 4 +-
src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java | 2
src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java | 2
src/main/java/com/ycl/jxkg/controller/admin/UserController.java | 4 +-
src/main/java/com/ycl/jxkg/enums/ExamPaperAnswerStatusEnum.java | 4 +-
src/main/java/com/ycl/jxkg/enums/general/StatusEnum.java | 2
src/main/java/com/ycl/jxkg/controller/student/UserController.java | 5 +-
src/main/java/com/ycl/jxkg/enums/DeductTypeEnum.java | 4 +-
src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionResponseVO.java | 2
src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java | 2
src/main/java/com/ycl/jxkg/controller/student/DashboardController.java | 2
src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java | 2
src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java | 2
src/main/java/com/ycl/jxkg/domain/entity/Classes.java | 2
src/main/resources/application.yml | 2
src/main/java/com/ycl/jxkg/enums/ExamPaperTypeEnum.java | 4 +-
34 files changed, 51 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java b/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java
index d7904ce..e2ff848 100644
--- a/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java
+++ b/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java
@@ -2,8 +2,8 @@
import com.ycl.jxkg.context.WebContext;
-import com.ycl.jxkg.domain.enums.RoleEnum;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+import com.ycl.jxkg.enums.RoleEnum;
+import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java b/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java
index bb3f157..005a33c 100644
--- a/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java
@@ -1,6 +1,6 @@
package com.ycl.jxkg.config.spring.security;
-import com.ycl.jxkg.domain.enums.RoleEnum;
+import com.ycl.jxkg.enums.RoleEnum;
import com.ycl.jxkg.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.GrantedAuthority;
diff --git a/src/main/java/com/ycl/jxkg/config/spring/security/SecurityConfigurer.java b/src/main/java/com/ycl/jxkg/config/spring/security/SecurityConfigurer.java
index 7312941..1eb012c 100644
--- a/src/main/java/com/ycl/jxkg/config/spring/security/SecurityConfigurer.java
+++ b/src/main/java/com/ycl/jxkg/config/spring/security/SecurityConfigurer.java
@@ -2,7 +2,7 @@
import com.ycl.jxkg.config.property.CookieConfig;
import com.ycl.jxkg.config.property.SystemConfig;
-import com.ycl.jxkg.domain.enums.RoleEnum;
+import com.ycl.jxkg.enums.RoleEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java b/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java
index 7285a76..bf1555a 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java
@@ -4,12 +4,12 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.base.SystemCode;
-import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.domain.vo.admin.question.QuestionEditRequestVO;
import com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO;
import com.ycl.jxkg.domain.vo.admin.question.QuestionResponseVO;
import com.ycl.jxkg.service.QuestionService;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
import com.ycl.jxkg.utils.ErrorUtil;
import com.ycl.jxkg.utils.HtmlUtil;
import com.ycl.jxkg.utils.JsonUtil;
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
index d9aa558..17c4c88 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
@@ -3,11 +3,11 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
-import com.ycl.jxkg.domain.enums.RoleEnum;
+import com.ycl.jxkg.enums.RoleEnum;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserEventLog;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.domain.vo.StudentVO;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.UserEventLogService;
diff --git a/src/main/java/com/ycl/jxkg/controller/student/DashboardController.java b/src/main/java/com/ycl/jxkg/controller/student/DashboardController.java
index dbc7927..eb9fa82 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/DashboardController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/DashboardController.java
@@ -6,7 +6,7 @@
import com.ycl.jxkg.domain.entity.TaskExamCustomerAnswer;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.entity.User;
-import com.ycl.jxkg.domain.enums.ExamPaperTypeEnum;
+import com.ycl.jxkg.enums.ExamPaperTypeEnum;
import com.ycl.jxkg.domain.task.TaskItemAnswerObject;
import com.ycl.jxkg.domain.task.TaskItemObject;
import com.ycl.jxkg.service.*;
diff --git a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java
index e0605d3..3cf880e 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java
@@ -7,7 +7,7 @@
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserEventLog;
-import com.ycl.jxkg.domain.enums.ExamPaperAnswerStatusEnum;
+import com.ycl.jxkg.enums.ExamPaperAnswerStatusEnum;
import com.ycl.jxkg.event.CalculateExamPaperAnswerCompleteEvent;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.service.ExamPaperAnswerService;
diff --git a/src/main/java/com/ycl/jxkg/controller/student/UserController.java b/src/main/java/com/ycl/jxkg/controller/student/UserController.java
index 0ceabd8..6896106 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/UserController.java
@@ -1,14 +1,13 @@
package com.ycl.jxkg.controller.student;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.entity.Message;
import com.ycl.jxkg.domain.entity.MessageUser;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserEventLog;
-import com.ycl.jxkg.domain.enums.RoleEnum;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+import com.ycl.jxkg.enums.RoleEnum;
+import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.MessageService;
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java
index 61437cf..b2975cd 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java
@@ -4,7 +4,7 @@
import com.ycl.jxkg.config.property.SystemConfig;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
import com.ycl.jxkg.domain.entity.UserToken;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.service.UserTokenService;
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java
index baf0ed9..470f167 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java
@@ -6,7 +6,7 @@
import com.ycl.jxkg.domain.entity.TaskExamCustomerAnswer;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.entity.User;
-import com.ycl.jxkg.domain.enums.ExamPaperTypeEnum;
+import com.ycl.jxkg.enums.ExamPaperTypeEnum;
import com.ycl.jxkg.domain.task.TaskItemAnswerObject;
import com.ycl.jxkg.domain.task.TaskItemObject;
import com.ycl.jxkg.service.ExamPaperService;
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
index 98677b9..49b1487 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
@@ -7,7 +7,7 @@
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserEventLog;
-import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
import com.ycl.jxkg.event.CalculateExamPaperAnswerCompleteEvent;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.service.ExamPaperAnswerService;
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
index 1670667..376026c 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
@@ -6,8 +6,8 @@
import com.ycl.jxkg.domain.entity.MessageUser;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserEventLog;
-import com.ycl.jxkg.domain.enums.RoleEnum;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+import com.ycl.jxkg.enums.RoleEnum;
+import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.MessageService;
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Classes.java b/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
index 1c3619f..a8af373 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
-import com.ycl.jxkg.domain.enums.general.ClassesStatusEnum;
+import com.ycl.jxkg.enums.general.ClassesStatusEnum;
import lombok.Data;
import java.util.Date;
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Question.java b/src/main/java/com/ycl/jxkg/domain/entity/Question.java
index f02b8a6..4075d4f 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Question.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Question.java
@@ -4,12 +4,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
-import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
-import com.ycl.jxkg.domain.enums.general.StatusEnum;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.general.StatusEnum;
import com.ycl.jxkg.utils.ExamUtil;
import lombok.Data;
-import java.io.Serializable;
import java.util.Date;
import java.util.List;
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
index 963d76d..89ba6eb 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ClassesVO.java
@@ -4,15 +4,11 @@
import com.ycl.jxkg.domain.base.AbsVo;
import com.ycl.jxkg.domain.entity.Classes;
-import java.time.LocalDateTime;
import java.util.Date;
-import java.util.List;
-import com.ycl.jxkg.domain.enums.general.ClassesStatusEnum;
+import com.ycl.jxkg.enums.general.ClassesStatusEnum;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java
index 2594ca7..16e7d90 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java
@@ -1,6 +1,6 @@
package com.ycl.jxkg.domain.vo.admin.education;
-import com.ycl.jxkg.domain.enums.general.StatusEnum;
+import com.ycl.jxkg.enums.general.StatusEnum;
import lombok.Data;
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionResponseVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionResponseVO.java
index f0c721c..3daafaa 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionResponseVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/question/QuestionResponseVO.java
@@ -1,6 +1,6 @@
package com.ycl.jxkg.domain.vo.admin.question;
-import com.ycl.jxkg.domain.enums.general.StatusEnum;
+import com.ycl.jxkg.enums.general.StatusEnum;
import lombok.Data;
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/DeductTypeEnum.java b/src/main/java/com/ycl/jxkg/enums/DeductTypeEnum.java
similarity index 88%
rename from src/main/java/com/ycl/jxkg/domain/enums/DeductTypeEnum.java
rename to src/main/java/com/ycl/jxkg/enums/DeductTypeEnum.java
index 31f7d09..359290e 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/DeductTypeEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/DeductTypeEnum.java
@@ -1,4 +1,4 @@
-package com.ycl.jxkg.domain.enums;
+package com.ycl.jxkg.enums;
import java.util.HashMap;
import java.util.Map;
@@ -18,7 +18,7 @@
}
- private static final Map<Integer, DeductTypeEnum> keyMap = new HashMap<>();
+ private static Map<Integer, DeductTypeEnum> keyMap = new HashMap<>();
static {
for (DeductTypeEnum item : DeductTypeEnum.values()) {
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/ExamPaperAnswerStatusEnum.java b/src/main/java/com/ycl/jxkg/enums/ExamPaperAnswerStatusEnum.java
similarity index 85%
rename from src/main/java/com/ycl/jxkg/domain/enums/ExamPaperAnswerStatusEnum.java
rename to src/main/java/com/ycl/jxkg/enums/ExamPaperAnswerStatusEnum.java
index 965ae74..28c925a 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/ExamPaperAnswerStatusEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/ExamPaperAnswerStatusEnum.java
@@ -1,4 +1,4 @@
-package com.ycl.jxkg.domain.enums;
+package com.ycl.jxkg.enums;
import java.util.HashMap;
import java.util.Map;
@@ -27,7 +27,7 @@
- private static final Map<Integer, ExamPaperAnswerStatusEnum> keyMap = new HashMap<>();
+ private static Map<Integer, ExamPaperAnswerStatusEnum> keyMap = new HashMap<>();
static {
for (ExamPaperAnswerStatusEnum item : ExamPaperAnswerStatusEnum.values()) {
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/ExamPaperTypeEnum.java b/src/main/java/com/ycl/jxkg/enums/ExamPaperTypeEnum.java
similarity index 85%
rename from src/main/java/com/ycl/jxkg/domain/enums/ExamPaperTypeEnum.java
rename to src/main/java/com/ycl/jxkg/enums/ExamPaperTypeEnum.java
index a1b51a5..8c64af2 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/ExamPaperTypeEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/ExamPaperTypeEnum.java
@@ -1,4 +1,4 @@
-package com.ycl.jxkg.domain.enums;
+package com.ycl.jxkg.enums;
import java.util.HashMap;
import java.util.Map;
@@ -18,7 +18,7 @@
}
- private static final Map<Integer, ExamPaperTypeEnum> keyMap = new HashMap<>();
+ private static Map<Integer, ExamPaperTypeEnum> keyMap = new HashMap<>();
static {
for (ExamPaperTypeEnum item : ExamPaperTypeEnum.values()) {
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/QuestionTypeEnum.java b/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
similarity index 91%
rename from src/main/java/com/ycl/jxkg/domain/enums/QuestionTypeEnum.java
rename to src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
index 1b5b392..6398b77 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/QuestionTypeEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
@@ -1,4 +1,4 @@
-package com.ycl.jxkg.domain.enums;
+package com.ycl.jxkg.enums;
import java.util.HashMap;
import java.util.Map;
@@ -20,7 +20,7 @@
}
- private static final Map<Integer, QuestionTypeEnum> keyMap = new HashMap<>();
+ private static Map<Integer, QuestionTypeEnum> keyMap = new HashMap<>();
static {
for (QuestionTypeEnum item : QuestionTypeEnum.values()) {
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/RoleEnum.java b/src/main/java/com/ycl/jxkg/enums/RoleEnum.java
similarity index 86%
rename from src/main/java/com/ycl/jxkg/domain/enums/RoleEnum.java
rename to src/main/java/com/ycl/jxkg/enums/RoleEnum.java
index 165bafb..de0ebeb 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/RoleEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/RoleEnum.java
@@ -1,4 +1,4 @@
-package com.ycl.jxkg.domain.enums;
+package com.ycl.jxkg.enums;
import java.util.HashMap;
import java.util.Map;
@@ -18,7 +18,7 @@
this.name = name;
}
- private static final Map<Integer, RoleEnum> keyMap = new HashMap<>();
+ private static Map<Integer, RoleEnum> keyMap = new HashMap<>();
static {
for (RoleEnum item : RoleEnum.values()) {
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/UserStatusEnum.java b/src/main/java/com/ycl/jxkg/enums/UserStatusEnum.java
similarity index 85%
rename from src/main/java/com/ycl/jxkg/domain/enums/UserStatusEnum.java
rename to src/main/java/com/ycl/jxkg/enums/UserStatusEnum.java
index 0766723..6e2d2ae 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/UserStatusEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/UserStatusEnum.java
@@ -1,4 +1,4 @@
-package com.ycl.jxkg.domain.enums;
+package com.ycl.jxkg.enums;
import java.util.HashMap;
@@ -17,7 +17,7 @@
this.name = name;
}
- private static final Map<Integer, UserStatusEnum> keyMap = new HashMap<>();
+ private static Map<Integer, UserStatusEnum> keyMap = new HashMap<>();
static {
for (UserStatusEnum item : UserStatusEnum.values()) {
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/VisibilityEnum.java b/src/main/java/com/ycl/jxkg/enums/VisibilityEnum.java
similarity index 88%
rename from src/main/java/com/ycl/jxkg/domain/enums/VisibilityEnum.java
rename to src/main/java/com/ycl/jxkg/enums/VisibilityEnum.java
index 5606948..8c4f58b 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/VisibilityEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/VisibilityEnum.java
@@ -1,4 +1,4 @@
-package com.ycl.jxkg.domain.enums;
+package com.ycl.jxkg.enums;
import java.util.HashMap;
import java.util.Map;
@@ -32,7 +32,7 @@
}
- private static final Map<String, VisibilityEnum> keyMap = new HashMap<>();
+ private static Map<String, VisibilityEnum> keyMap = new HashMap<>();
static {
for (VisibilityEnum item : VisibilityEnum.values()) {
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/general/ClassesStatusEnum.java b/src/main/java/com/ycl/jxkg/enums/general/ClassesStatusEnum.java
similarity index 91%
rename from src/main/java/com/ycl/jxkg/domain/enums/general/ClassesStatusEnum.java
rename to src/main/java/com/ycl/jxkg/enums/general/ClassesStatusEnum.java
index b135615..55436ea 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/general/ClassesStatusEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/general/ClassesStatusEnum.java
@@ -1,4 +1,4 @@
-package com.ycl.jxkg.domain.enums.general;
+package com.ycl.jxkg.enums.general;
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/com/ycl/jxkg/domain/enums/general/StatusEnum.java b/src/main/java/com/ycl/jxkg/enums/general/StatusEnum.java
similarity index 91%
rename from src/main/java/com/ycl/jxkg/domain/enums/general/StatusEnum.java
rename to src/main/java/com/ycl/jxkg/enums/general/StatusEnum.java
index 3f9162d..76cb0c7 100644
--- a/src/main/java/com/ycl/jxkg/domain/enums/general/StatusEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/general/StatusEnum.java
@@ -1,4 +1,4 @@
-package com.ycl.jxkg.domain.enums.general;
+package com.ycl.jxkg.enums.general;
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java b/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java
index 0a56336..e03ff41 100644
--- a/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java
+++ b/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java
@@ -5,8 +5,8 @@
import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
import com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.entity.TextContent;
-import com.ycl.jxkg.domain.enums.ExamPaperTypeEnum;
-import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.ExamPaperTypeEnum;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
import com.ycl.jxkg.event.CalculateExamPaperAnswerCompleteEvent;
import com.ycl.jxkg.service.ExamPaperAnswerService;
import com.ycl.jxkg.service.ExamPaperQuestionCustomerAnswerService;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
index f7caea6..988eb64 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.jxkg.domain.entity.Classes;
-import com.ycl.jxkg.domain.enums.general.ClassesStatusEnum;
+import com.ycl.jxkg.enums.general.ClassesStatusEnum;
import com.ycl.jxkg.mapper.ClassesMapper;
import com.ycl.jxkg.service.ClassesService;
import com.ycl.jxkg.base.Result;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
index 41d8df1..dd3e547 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
@@ -3,13 +3,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.*;
import com.ycl.jxkg.domain.entity.*;
-import com.ycl.jxkg.domain.enums.ExamPaperAnswerStatusEnum;
-import com.ycl.jxkg.domain.enums.ExamPaperTypeEnum;
-import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
-import com.ycl.jxkg.domain.exam.ExamPaperTitleItemObject;
+import com.ycl.jxkg.enums.ExamPaperAnswerStatusEnum;
+import com.ycl.jxkg.enums.ExamPaperTypeEnum;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.other.ExamPaperAnswerUpdate;
-import com.ycl.jxkg.domain.task.TaskItemAnswerObject;
import com.ycl.jxkg.mapper.ExamPaperAnswerMapper;
import com.ycl.jxkg.mapper.ExamPaperMapper;
import com.ycl.jxkg.mapper.QuestionMapper;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperQuestionCustomerAnswerServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperQuestionCustomerAnswerServiceImpl.java
index 3757532..d738ccf 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperQuestionCustomerAnswerServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperQuestionCustomerAnswerServiceImpl.java
@@ -5,7 +5,7 @@
import com.ycl.jxkg.domain.other.ExamPaperAnswerUpdate;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.entity.TextContent;
-import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
import com.ycl.jxkg.mapper.ExamPaperQuestionCustomerAnswerMapper;
import com.ycl.jxkg.service.ExamPaperQuestionCustomerAnswerService;
import com.ycl.jxkg.service.TextContentService;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
index ccefd50..f661b55 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.entity.TextContent;
-import com.ycl.jxkg.domain.enums.ExamPaperTypeEnum;
+import com.ycl.jxkg.enums.ExamPaperTypeEnum;
import com.ycl.jxkg.domain.exam.ExamPaperQuestionItemObject;
import com.ycl.jxkg.domain.exam.ExamPaperTitleItemObject;
import com.ycl.jxkg.domain.other.KeyValue;
@@ -15,25 +15,21 @@
import com.ycl.jxkg.service.enums.ActionEnum;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.JsonUtil;
-import com.ycl.jxkg.utils.ExamUtil;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperTitleItemVO;
-import com.ycl.jxkg.domain.vo.admin.question.QuestionEditRequestVO;
import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter;
import com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo;
import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.domain.entity.ExamPaper;
-import com.ycl.jxkg.domain.entity.Question;
import com.ycl.jxkg.domain.entity.User;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
index 4ceda84..758c8c1 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
@@ -5,8 +5,8 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.domain.entity.Question;
-import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
-import com.ycl.jxkg.domain.enums.general.StatusEnum;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.general.StatusEnum;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.question.QuestionItemObject;
import com.ycl.jxkg.domain.question.QuestionObject;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
index 77ae849..1b25a59 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.entity.UserEventLog;
-import com.ycl.jxkg.domain.enums.RoleEnum;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+import com.ycl.jxkg.enums.RoleEnum;
+import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.domain.form.RegisterForm;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.vo.StudentVO;
@@ -12,7 +12,6 @@
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.event.OnRegistrationCompleteEvent;
import com.ycl.jxkg.mapper.UserMapper;
-import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.domain.vo.admin.user.UserPageRequestVO;
import com.github.pagehelper.PageHelper;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bb632b2..1f863bd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -24,7 +24,7 @@
configuration:
default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler # 閫氱敤鏋氫妇澶勭悊鍣�
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 鏃ュ織鎵撳嵃
- type-enums-package: com.ycl.jxkg.domain.enums.general # 閫氱敤鏋氫妇鎵�鍦ㄥ寘璺緞
+ type-enums-package: com.ycl.jxkg.enums.general # 閫氱敤鏋氫妇鎵�鍦ㄥ寘璺緞
mapper-locations: classpath*:mapper/*.xml # mapper.xml浣嶇疆
system:
--
Gitblit v1.8.0