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; 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; 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; 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; 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; 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.*; 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; 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; 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; 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; 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; 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; 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; 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;
@@ -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; /** 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;
@@ -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;
File was renamed from src/main/java/com/ycl/jxkg/domain/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()) { src/main/java/com/ycl/jxkg/enums/ExamPaperAnswerStatusEnum.java
File was renamed from src/main/java/com/ycl/jxkg/domain/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()) { src/main/java/com/ycl/jxkg/enums/ExamPaperTypeEnum.java
File was renamed from src/main/java/com/ycl/jxkg/domain/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()) { src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
File was renamed from src/main/java/com/ycl/jxkg/domain/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()) { src/main/java/com/ycl/jxkg/enums/RoleEnum.java
File was renamed from src/main/java/com/ycl/jxkg/domain/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()) { src/main/java/com/ycl/jxkg/enums/UserStatusEnum.java
File was renamed from src/main/java/com/ycl/jxkg/domain/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()) { src/main/java/com/ycl/jxkg/enums/VisibilityEnum.java
File was renamed from src/main/java/com/ycl/jxkg/domain/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()) { src/main/java/com/ycl/jxkg/enums/general/ClassesStatusEnum.java
File was renamed from src/main/java/com/ycl/jxkg/domain/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; src/main/java/com/ycl/jxkg/enums/general/StatusEnum.java
File was renamed from src/main/java/com/ycl/jxkg/domain/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; 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; 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; 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; 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; 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; 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; 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; 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:
