实体类调整

xiangpei

2024-05-31 013788bb3c3ec6c11274292a3af8957d4e8d1772

实体类调整

 src/main/java/com/ycl/jxkg/base/BaseApiController.java

@@ -2,7 +2,7 @@


import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import org.springframework.beans.factory.annotation.Autowired;

/**

 src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java

@@ -54,7 +54,7 @@
        String username = authentication.getName();
        String password = (String) authentication.getCredentials();

        com.ycl.jxkg.domain.User user = userService.getUserByUserName(username);
        com.ycl.jxkg.domain.entity.User user = userService.getUserByUserName(username);
        if (user == null) {
            throw new UsernameNotFoundException("用户名或密码错误");
        }

 src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationSuccessHandler.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.config.spring.security;

import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.domain.UserEventLog;
import com.ycl.jxkg.domain.entity.UserEventLog;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,12 +47,12 @@
        Object object = authentication.getPrincipal();
        if (null != object) {
            User springUser = (User) object;
            com.ycl.jxkg.domain.User user = userService.getUserByUserName(springUser.getUsername());
            com.ycl.jxkg.domain.entity.User user = userService.getUserByUserName(springUser.getUsername());
            if (null != user) {
                UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
                userEventLog.setContent(user.getUserName() + " 登录了学之思开源考试系统");
                eventPublisher.publishEvent(new UserEvent(userEventLog));
                com.ycl.jxkg.domain.User newUser = new com.ycl.jxkg.domain.User();
                com.ycl.jxkg.domain.entity.User newUser = new com.ycl.jxkg.domain.entity.User();
                newUser.setUserName(user.getUserName());
                newUser.setImagePath(user.getImagePath());
                RestUtil.response(response, SystemCode.OK.getCode(), SystemCode.OK.getMessage(), newUser);

 src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java

@@ -38,7 +38,7 @@
    @Override
    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {

        com.ycl.jxkg.domain.User user = userService.getUserByUserName(username);
        com.ycl.jxkg.domain.entity.User user = userService.getUserByUserName(username);

        if (user == null) {
            throw new UsernameNotFoundException("Username  not found.");

 src/main/java/com/ycl/jxkg/config/spring/security/RestLogoutSuccessHandler.java

@@ -1,8 +1,8 @@
package com.ycl.jxkg.config.spring.security;

import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserEventLog;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserEventLog;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;

 src/main/java/com/ycl/jxkg/config/spring/wx/TokenHandlerInterceptor.java

@@ -3,8 +3,8 @@
import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.config.spring.security.RestUtil;
import com.ycl.jxkg.context.WxContext;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserToken;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserToken;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.service.UserTokenService;
import org.apache.commons.lang3.StringUtils;

 src/main/java/com/ycl/jxkg/context/WebContext.java

@@ -1,6 +1,6 @@
package com.ycl.jxkg.context;

import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;

 src/main/java/com/ycl/jxkg/context/WxContext.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.context;

import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserToken;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserToken;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;

 src/main/java/com/ycl/jxkg/controller/admin/EducationController.java

@@ -3,7 +3,7 @@

import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.service.SubjectService;
import com.ycl.jxkg.utils.PageInfoHelper;
import com.ycl.jxkg.vo.admin.education.SubjectEditRequestVO;
@@ -12,7 +12,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
@@ -47,7 +46,6 @@
        Subject subject = new Subject();
        BeanUtils.copyProperties(model, subject);
        if (model.getId() == null) {
            subject.setDeleted(false);
            subjectService.save(subject);
        } else {
            subjectService.updateById(subject);
@@ -66,7 +64,6 @@
    @RequestMapping(value = "/subject/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        Subject subject = subjectService.getById(id);
        subject.setDeleted(true);
        subjectService.updateById(subject);
        return Result.ok();
    }

 src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java

@@ -2,9 +2,9 @@

import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.ExamPaperAnswer;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.service.*;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.ExamUtil;
@@ -14,7 +14,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@RequiredArgsConstructor

 src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java

@@ -2,7 +2,7 @@

import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.ExamPaper;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
@@ -12,7 +12,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
@@ -68,7 +67,6 @@
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        ExamPaper examPaper = examPaperService.getById(id);
        examPaper.setDeleted(true);
        examPaperService.updateById(examPaper);
        return Result.ok();
    }

 src/main/java/com/ycl/jxkg/controller/admin/MessageController.java

@@ -3,9 +3,9 @@

import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.Message;
import com.ycl.jxkg.domain.MessageUser;
import com.ycl.jxkg.domain.User;
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.service.MessageService;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.utils.DateTimeUtil;
@@ -16,7 +16,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

 src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java

@@ -3,8 +3,8 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.domain.Question;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.entity.Question;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.service.QuestionService;
@@ -17,7 +17,6 @@
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
@@ -73,7 +72,6 @@
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        Question question = questionService.getById(id);
        question.setDeleted(true);
        questionService.updateById(question);
        return Result.ok();
    }

 src/main/java/com/ycl/jxkg/controller/admin/TaskController.java

@@ -3,7 +3,7 @@

import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.TaskExam;
import com.ycl.jxkg.domain.entity.TaskExam;
import com.ycl.jxkg.service.TaskExamService;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
@@ -13,7 +13,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
@@ -55,7 +54,6 @@
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        TaskExam taskExam = taskExamService.getById(id);
        taskExam.setDeleted(true);
        taskExamService.updateById(taskExam);
        return Result.ok();
    }

 src/main/java/com/ycl/jxkg/controller/admin/UserController.java

@@ -3,8 +3,8 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserEventLog;
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.service.AuthenticationService;
import com.ycl.jxkg.service.UserEventLogService;
@@ -17,7 +17,6 @@
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
@@ -93,7 +92,6 @@
            user.setUserUuid(UUID.randomUUID().toString());
            user.setCreateTime(new Date());
            user.setLastActiveTime(new Date());
            user.setDeleted(false);
            userService.insertUser(user);
        } else {
            if (!StringUtils.isBlank(model.getPassword())) {
@@ -132,7 +130,6 @@
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        User user = userService.getUserById(id);
        user.setDeleted(true);
        userService.updateById(user);
        return Result.ok();
    }

 src/main/java/com/ycl/jxkg/controller/student/DashboardController.java

@@ -2,10 +2,10 @@

import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.TaskExam;
import com.ycl.jxkg.domain.TaskExamCustomerAnswer;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.TaskExam;
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.domain.task.TaskItemAnswerObject;
import com.ycl.jxkg.domain.task.TaskItemObject;
@@ -15,7 +15,6 @@
import com.ycl.jxkg.vo.student.dashboard.*;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

 src/main/java/com/ycl/jxkg/controller/student/EducationController.java

@@ -3,14 +3,13 @@

import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.service.SubjectService;
import com.ycl.jxkg.vo.student.education.SubjectEditRequestVO;
import com.ycl.jxkg.vo.student.education.SubjectVO;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

 src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java

@@ -3,6 +3,10 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.*;
import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
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.event.CalculateExamPaperAnswerCompleteEvent;
import com.ycl.jxkg.event.UserEvent;
@@ -20,7 +24,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.web.bind.annotation.*;


 src/main/java/com/ycl/jxkg/controller/student/ExamPaperController.java

@@ -2,7 +2,7 @@

import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.ExamPaper;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.service.ExamPaperAnswerService;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.utils.DateTimeUtil;
@@ -13,7 +13,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.web.bind.annotation.*;


 src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java

@@ -2,9 +2,9 @@

import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.service.ExamPaperQuestionCustomerAnswerService;
import com.ycl.jxkg.service.QuestionService;
@@ -22,7 +22,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@RequiredArgsConstructor

 src/main/java/com/ycl/jxkg/controller/student/UserController.java

@@ -2,10 +2,10 @@

import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.Message;
import com.ycl.jxkg.domain.MessageUser;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserEventLog;
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.event.UserEvent;
@@ -20,7 +20,6 @@
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.web.bind.annotation.*;

@@ -64,7 +63,6 @@
        user.setStatus(UserStatusEnum.Enable.getCode());
        user.setLastActiveTime(new Date());
        user.setCreateTime(new Date());
        user.setDeleted(false);
        userService.insertUser(user);
        UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
        userEventLog.setContent("欢迎 " + user.getUserName() + " 注册来到学之思开源考试系统");

 src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java

@@ -1,8 +1,8 @@
package com.ycl.jxkg.controller.wx;

import com.ycl.jxkg.context.WxContext;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserToken;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserToken;
import org.springframework.beans.factory.annotation.Autowired;

public class BaseWXApiController {

 src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java

@@ -3,14 +3,14 @@
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.config.property.SystemConfig;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
import com.ycl.jxkg.domain.UserToken;
import com.ycl.jxkg.domain.entity.UserToken;
import com.ycl.jxkg.domain.enums.UserStatusEnum;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.service.UserTokenService;
import com.ycl.jxkg.utils.WxUtil;
import com.ycl.jxkg.vo.wx.student.user.BindInfo;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

 src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java

@@ -2,10 +2,10 @@

import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
import com.ycl.jxkg.domain.TaskExam;
import com.ycl.jxkg.domain.TaskExamCustomerAnswer;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.TaskExam;
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.domain.task.TaskItemAnswerObject;
import com.ycl.jxkg.domain.task.TaskItemObject;
@@ -18,7 +18,6 @@
import com.ycl.jxkg.vo.student.dashboard.*;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

 src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java

@@ -3,6 +3,10 @@
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
import com.ycl.jxkg.domain.*;
import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
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.event.CalculateExamPaperAnswerCompleteEvent;
import com.ycl.jxkg.event.UserEvent;
@@ -21,7 +25,6 @@
import com.ycl.jxkg.vo.student.exam.ExamPaperSubmitVO;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

 src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java

@@ -2,8 +2,8 @@

import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
import com.ycl.jxkg.domain.ExamPaper;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.service.SubjectService;
import com.ycl.jxkg.utils.DateTimeUtil;
@@ -14,7 +14,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;


 src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java

@@ -2,10 +2,10 @@

import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
import com.ycl.jxkg.domain.Message;
import com.ycl.jxkg.domain.MessageUser;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserEventLog;
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.event.UserEvent;
@@ -20,7 +20,6 @@
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -66,7 +65,6 @@
        user.setStatus(UserStatusEnum.Enable.getCode());
        user.setLastActiveTime(new Date());
        user.setCreateTime(new Date());
        user.setDeleted(false);
        userService.insertUser(user);
        UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
        userEventLog.setContent("欢迎 " + user.getUserName() + " 注册来到学之思开源考试系统");

 src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java

@@ -1,6 +1,9 @@
package com.ycl.jxkg.domain;


import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
import com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer;
import lombok.Data;

import java.util.List;

 src/main/java/com/ycl/jxkg/domain/ExamPaperQuestionCustomerAnswer.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/Message.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/MessageUser.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/Subject.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/TaskExam.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/TaskExamCustomerAnswer.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/TextContent.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/User.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/UserToken.java

File was deleted

 src/main/java/com/ycl/jxkg/domain/base/AbsEntity.java

New file
@@ -0,0 +1,34 @@
package com.ycl.jxkg.domain.base;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.util.Date;

/**
 * @author xp
 * @date 2022/11/29
 */
@Data
public abstract class AbsEntity {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

//    /** 创建时间 */
//    @TableField(value = "gmt_create", fill = FieldFill.INSERT)
//    private Date gmtCreate;
//
//    /** 修改时间 */
//    @TableField(value = "gmt_update", fill = FieldFill.INSERT_UPDATE)
//    private Date gmtUpdate;

    @TableField(value = "deleted", fill = FieldFill.INSERT)
    private Integer deleted;

}

 src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java

File was renamed from src/main/java/com/ycl/jxkg/domain/ExamPaper.java
@@ -1,73 +1,86 @@
package com.ycl.jxkg.domain;
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
public class ExamPaper implements Serializable {
@TableName("t_exam_paper")
public class ExamPaper extends AbsEntity {

    private static final long serialVersionUID = 8509645224550501395L;

    private Integer id;

    /**
     * 试卷名称
     */
    @TableField("name")
    private String name;

    /**
     * 学科
     */
    @TableField("subject_id")
    private Integer subjectId;

    /**
     * 试卷类型( 1固定试卷 4.时段试卷 6.任务试卷)
     */
    @TableField("paper_type")
    private Integer paperType;

    /**
     * 年级
     */
    @TableField("grade_level")
    private Integer gradeLevel;

    /**
     * 试卷总分(千分制)
     */
    @TableField("score")
    private Integer score;

    /**
     * 题目数量
     */
    @TableField("question_count")
    private Integer questionCount;

    /**
     * 建议时长(分钟)
     */
    @TableField("suggest_time")
    private Integer suggestTime;

    /**
     * 时段试卷 开始时间
     */
    @TableField("limit_start_time")
    private Date limitStartTime;

    /**
     * 时段试卷 结束时间
     */
    @TableField("limit_end_time")
    private Date limitEndTime;

    /**
     * 试卷框架 内容为JSON
     */
    @TableField("frame_text_content_id")
    private Integer frameTextContentId;

    @TableField("create_user")
    private Integer createUser;

    @TableField("create_time")
    private Date createTime;

    private Boolean deleted;

    @TableField("task_exam_id")
    private Integer taskExamId;

}

 src/main/java/com/ycl/jxkg/domain/entity/ExamPaperAnswer.java

File was renamed from src/main/java/com/ycl/jxkg/domain/ExamPaperAnswer.java
@@ -1,79 +1,94 @@
package com.ycl.jxkg.domain;
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
public class ExamPaperAnswer implements Serializable {
@TableName("t_exam_paper_answer")
public class ExamPaperAnswer extends AbsEntity {

    private static final long serialVersionUID = -2143539181805283910L;

    private Integer id;

    @TableField("exam_paper_id")
    private Integer examPaperId;

    /**
     * 试卷名称
     */
    @TableField("paper_name")
    private String paperName;

    /**
     * 试卷类型( 1固定试卷 4.时段试卷 6.任务试卷)
     */
    @TableField("paper_type")
    private Integer paperType;

    /**
     * 学科
     */
    @TableField("subject_id")
    private Integer subjectId;

    /**
     * 系统判定得分
     */
    @TableField("system_score")
    private Integer systemScore;

    /**
     * 最终得分(千分制)
     */
    @TableField("user_score")
    private Integer userScore;

    /**
     * 试卷总分
     */
    @TableField("paper_score")
    private Integer paperScore;

    /**
     * 做对题目数量
     */
    @TableField("question_correct")
    private Integer questionCorrect;

    /**
     * 题目总数量
     */
    @TableField("question_count")
    private Integer questionCount;

    /**
     * 做题时间(秒)
     */
    @TableField("do_time")
    private Integer doTime;

    /**
     * 试卷状态(1待判分 2完成)
     */
    @TableField("status")
    private Integer status;

    /**
     * 学生
     */
    @TableField("create_user")
    private Integer createUser;

    /**
     * 提交时间
     */
    @TableField("create_time")
    private Date createTime;

    @TableField("task_exam_id")
    private Integer taskExamId;

}

 src/main/java/com/ycl/jxkg/domain/entity/ExamPaperQuestionCustomerAnswer.java

New file
@@ -0,0 +1,93 @@
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("t_exam_paper_question_customer_answer")
public class ExamPaperQuestionCustomerAnswer extends AbsEntity {

    /**
     * 题目Id
     */
    @TableField("question_id")
    private Integer questionId;

    /**
     * 试卷Id
     */
    @TableField("exam_paper_id")
    private Integer examPaperId;

    /**
     * 答案Id
     */
    @TableField("exam_paper_answer_id")
    private Integer examPaperAnswerId;

    /**
     * 题型
     */
    @TableField("question_type")
    private Integer questionType;

    /**
     * 学科
     */
    @TableField("subject_id")
    private Integer subjectId;

    /**
     * 得分
     */
    @TableField("customer_score")
    private Integer customerScore;

    /**
     * 题目原始分数
     */
    @TableField("question_score")
    private Integer questionScore;

    /**
     * 问题内容
     */
    @TableField("question_text_content_id")
    private Integer questionTextContentId;

    /**
     * 做题答案
     */
    @TableField("answer")
    private String answer;

    /**
     * 做题内容
     */
    @TableField("text_content_id")
    private Integer textContentId;

    /**
     * 是否正确
     */
    @TableField("do_right")
    private Boolean doRight;

    /**
     * 做题人
     */
    @TableField("create_user")
    private Integer createUser;

    @TableField("create_time")
    private Date createTime;

    @TableField("item_order")
    private Integer itemOrder;

}

 src/main/java/com/ycl/jxkg/domain/entity/Message.java

New file
@@ -0,0 +1,61 @@
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("t_message")
public class Message extends AbsEntity {


    /**
     * 标题
     */
    @TableField("title")
    private String title;

    /**
     * 内容
     */
    @TableField("content")
    private String content;

    @TableField("create_time")
    private Date createTime;

    /**
     * 发送者用户ID
     */
    @TableField("send_user_id")
    private Integer sendUserId;

    /**
     * 发送者用户名
     */
    @TableField("send_user_name")
    private String sendUserName;

    /**
     * 发送者真实姓名
     */
    @TableField("send_real_name")
    private String sendRealName;

    /**
     * 接收人数
     */
    @TableField("receive_user_count")
    private Integer receiveUserCount;

    /**
     * 已读人数
     */
    @TableField("read_count")
    private Integer readCount;

}

 src/main/java/com/ycl/jxkg/domain/entity/MessageUser.java

New file
@@ -0,0 +1,54 @@
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("t_message_user")
public class MessageUser extends AbsEntity {

    /**
     * 消息内容ID
     */
    @TableField("message_id")
    private Integer messageId;

    /**
     * 接收人ID
     */
    @TableField("receive_user_id")
    private Integer receiveUserId;

    /**
     * 接收人用户名
     */
    @TableField("receive_user_name")
    private String receiveUserName;

    /**
     * 接收人真实姓名
     */
    @TableField("receive_real_name")
    private String receiveRealName;

    /**
     * 是否已读
     */
    @TableField("readed")
    private Boolean readed;

    @TableField("create_time")
    private Date createTime;

    /**
     * 阅读时间
     */
    @TableField("read_time")
    private Date readTime;

}

 src/main/java/com/ycl/jxkg/domain/entity/Question.java

File was renamed from src/main/java/com/ycl/jxkg/domain/Question.java
@@ -1,5 +1,8 @@
package com.ycl.jxkg.domain;
package com.ycl.jxkg.domain.entity;

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.utils.ExamUtil;
import lombok.Data;
@@ -9,64 +12,69 @@
import java.util.List;

@Data
public class Question implements Serializable {
@TableName("t_question")
public class Question extends AbsEntity {

    private static final long serialVersionUID = 8826266720383164363L;

    private Integer id;

    /**
     *     1.单选题 2.多选题 3.判断题 4.填空题 5.简答题
     */
    @TableField("question_type")
    private Integer questionType;

    /**
     * 学科
     */
    @TableField("subject_id")
    private Integer subjectId;

    /**
     * 题目总分(千分制)
     */
    @TableField("score")
    private Integer score;

    /**
     * 级别
     */
    @TableField("grade_level")
    private Integer gradeLevel;

    /**
     * 题目难度
     */
    @TableField("difficult")
    private Integer difficult;

    /**
     * 正确答案
     */
    @TableField("correct")
    private String correct;

    /**
     * 题目 填空、 题干、解析、答案等信息
     */
    @TableField("info_text_content_id")
    private Integer infoTextContentId;

    /**
     * 创建人
     */
    @TableField("create_user")
    private Integer createUser;

    /**
     * 1.正常
     */
    @TableField("status")
    private Integer status;

    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;

    private Boolean deleted;


    public void setCorrectFromVM(String correct, List<String> correctArray) {
        int qType = this.getQuestionType();

 src/main/java/com/ycl/jxkg/domain/entity/Subject.java

New file
@@ -0,0 +1,39 @@
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;

@Data
@TableName("t_subject")
public class Subject extends AbsEntity {

    /**
     * 语文 数学 英语 等
     */
    @TableField("name")
    private String name;

    /**
     * 年级 (1-12) 小学 初中
     */
    @TableField("level")
    private Integer level;

    /**
     * 一年级、二年级等
     */
    @TableField("level_name")
    private String levelName;

    /**
     * 排序
     */
    @TableField("item_order")
    private Integer itemOrder;


}

 src/main/java/com/ycl/jxkg/domain/entity/TaskExam.java

New file
@@ -0,0 +1,51 @@
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("t_task_exam")
public class TaskExam extends AbsEntity {

    /**
     * 任务标题
     */
    @TableField("title")
    private String title;

    /**
     * 年级
     */
    @TableField("grade_level")
    private Integer gradeLevel;

    /**
     * 任务框架 内容为JSON
     */
    @TableField("frame_text_content_id")
    private Integer frameTextContentId;

    /**
     * 创建者
     */
    @TableField("create_user")
    private Integer createUser;

    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;

    /**
     * 创建人用户名
     */
    @TableField("create_user_name")
    private String createUserName;

}

 src/main/java/com/ycl/jxkg/domain/entity/TaskExamCustomerAnswer.java

New file
@@ -0,0 +1,39 @@
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("t_task_exam_customer_answer")
public class TaskExamCustomerAnswer extends AbsEntity {

    /**
     * 任务Id
     */
    @TableField("task_exam_id")
    private Integer taskExamId;

    /**
     * 创建者
     */
    @TableField("create_user")
    private Integer createUser;

    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;

    /**
     * 任务完成情况(Json)
     */
    @TableField("text_content_id")
    private Integer textContentId;

}

 src/main/java/com/ycl/jxkg/domain/entity/TextContent.java

New file
@@ -0,0 +1,27 @@
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("t_text_content")
public class TextContent extends AbsEntity {

    /**
     * 内容(Json)
     */
    @TableField("content")
    private String content;

    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;

}

 src/main/java/com/ycl/jxkg/domain/entity/User.java

New file
@@ -0,0 +1,87 @@
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("t_user")
public class User extends AbsEntity {

    @TableField("user_uuid")
    private String userUuid;

    /**
     * 用户名
     */
    @TableField("user_name")
    private String userName;

    @TableField("password")
    private String password;

    /**
     * 真实姓名
     */
    @TableField("real_name")
    private String realName;

    @TableField("age")
    private Integer age;

    /**
     * 1.男 2女
     */
    @TableField("sex")
    private Integer sex;

    @TableField("birth_day")
    private Date birthDay;

    /**
     * 学生年级(1-12)
     */
    @TableField("user_level")
    private Integer userLevel;

    @TableField("phone")
    private String phone;

    /**
     * 1.学生  3.管理员
     */
    @TableField("role")
    private Integer role;

    /**
     * 1.启用 2禁用
     */
    @TableField("status")
    private Integer status;

    /**
     * 头像地址
     */
    @TableField("image_path")
    private String imagePath;

    @TableField("create_time")
    private Date createTime;

    @TableField("modify_time")
    private Date modifyTime;

    @TableField("last_active_time")
    private Date lastActiveTime;

    /**
     * 微信openId
     */
    @TableField("wx_open_id")
    private String wxOpenId;

}

 src/main/java/com/ycl/jxkg/domain/entity/UserEventLog.java

File was renamed from src/main/java/com/ycl/jxkg/domain/UserEventLog.java
@@ -1,15 +1,16 @@
package com.ycl.jxkg.domain;
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
public class UserEventLog implements Serializable {

    private static final long serialVersionUID = -3951198127152024633L;

@TableName("t_user_event_log")
public class UserEventLog extends AbsEntity {

    public UserEventLog() {

@@ -22,31 +23,34 @@
        this.createTime = createTime;
    }

    private Integer id;

    /**
     * 用户id
     */
    @TableField("user_id")
    private Integer userId;

    /**
     * 用户名
     */
    @TableField("user_name")
    private String userName;

    /**
     * 真实姓名
     */
    @TableField("real_name")
    private String realName;

    /**
     * 内容
     */
    @TableField("content")
    private String content;

    /**
     * 时间
     */
    @TableField("create_time")
    private Date createTime;

}

 src/main/java/com/ycl/jxkg/domain/entity/UserToken.java

New file
@@ -0,0 +1,51 @@
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("t_user_token")
public class UserToken extends AbsEntity {

    /**
     * 用户token
     */
    @TableField("token")
    private String token;

    /**
     * 用户Id
     */
    @TableField("user_id")
    private Integer userId;

    /**
     * 微信小程序openId
     */
    @TableField("wx_open_id")
    private String wxOpenId;

    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;

    /**
     * 结束时间
     */
    @TableField("end_time")
    private Date endTime;

    /**
     * 用户名
     */
    @TableField("user_name")
    private String userName;

}

 src/main/java/com/ycl/jxkg/event/OnRegistrationCompleteEvent.java

@@ -1,6 +1,6 @@
package com.ycl.jxkg.event;

import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import org.springframework.context.ApplicationEvent;

/**

 src/main/java/com/ycl/jxkg/event/UserEvent.java

@@ -1,6 +1,6 @@
package com.ycl.jxkg.event;

import com.ycl.jxkg.domain.UserEventLog;
import com.ycl.jxkg.domain.entity.UserEventLog;
import org.springframework.context.ApplicationEvent;

/**

 src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java

@@ -1,6 +1,10 @@
package com.ycl.jxkg.listener;

import com.ycl.jxkg.domain.*;
import com.ycl.jxkg.domain.entity.ExamPaper;
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.event.CalculateExamPaperAnswerCompleteEvent;

 src/main/java/com/ycl/jxkg/listener/EmailSendListener.java

@@ -1,6 +1,6 @@
package com.ycl.jxkg.listener;

import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.event.OnRegistrationCompleteEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.lang.NonNull;

 src/main/java/com/ycl/jxkg/mapper/ExamPaperAnswerMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.ExamPaperAnswer;
import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.vo.admin.paper.ExamPaperAnswerPageRequestVO;
import com.ycl.jxkg.vo.student.exampaper.ExamPaperAnswerPageVO;

 src/main/java/com/ycl/jxkg/mapper/ExamPaperMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.ExamPaper;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.vo.admin.exam.ExamPaperPageRequestVO;
import com.ycl.jxkg.vo.student.dashboard.PaperFilter;

 src/main/java/com/ycl/jxkg/mapper/ExamPaperQuestionCustomerAnswerMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.other.ExamPaperAnswerUpdate;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.vo.student.question.answer.QuestionPageStudentRequestVO;

 src/main/java/com/ycl/jxkg/mapper/MessageMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.Message;
import com.ycl.jxkg.domain.entity.Message;
import com.ycl.jxkg.vo.admin.message.MessagePageRequestVO;
import org.apache.ibatis.annotations.Mapper;


 src/main/java/com/ycl/jxkg/mapper/MessageUserMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.MessageUser;
import com.ycl.jxkg.domain.entity.MessageUser;
import com.ycl.jxkg.vo.student.user.MessageRequestVO;
import org.apache.ibatis.annotations.Mapper;


 src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.Question;
import com.ycl.jxkg.domain.entity.Question;
import com.ycl.jxkg.vo.admin.question.QuestionPageRequestVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

 src/main/java/com/ycl/jxkg/mapper/SubjectMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.vo.admin.education.SubjectPageRequestVO;
import org.apache.ibatis.annotations.Mapper;


 src/main/java/com/ycl/jxkg/mapper/TaskExamCustomerAnswerMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.TaskExamCustomerAnswer;
import com.ycl.jxkg.domain.entity.TaskExamCustomerAnswer;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;


 src/main/java/com/ycl/jxkg/mapper/TaskExamMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.TaskExam;
import com.ycl.jxkg.domain.entity.TaskExam;
import com.ycl.jxkg.vo.admin.task.TaskPageRequestVO;
import org.apache.ibatis.annotations.Mapper;


 src/main/java/com/ycl/jxkg/mapper/TextContentMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.entity.TextContent;
import org.apache.ibatis.annotations.Mapper;

@Mapper

 src/main/java/com/ycl/jxkg/mapper/UserEventLogMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.UserEventLog;
import com.ycl.jxkg.domain.entity.UserEventLog;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.vo.admin.user.UserEventPageRequestVO;
import org.apache.ibatis.annotations.Mapper;

 src/main/java/com/ycl/jxkg/mapper/UserMapper.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.vo.admin.user.UserPageRequestVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

 src/main/java/com/ycl/jxkg/mapper/UserTokenMapper.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.UserToken;
import com.ycl.jxkg.domain.entity.UserToken;
import org.apache.ibatis.annotations.Mapper;

@Mapper

 src/main/java/com/ycl/jxkg/service/AuthenticationService.java

@@ -1,6 +1,6 @@
package com.ycl.jxkg.service;

import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;


public interface AuthenticationService {

 src/main/java/com/ycl/jxkg/service/ExamPaperAnswerService.java

@@ -1,9 +1,9 @@
package com.ycl.jxkg.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.ExamPaperAnswer;
import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
import com.ycl.jxkg.domain.ExamPaperAnswerInfo;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.vo.admin.paper.ExamPaperAnswerPageRequestVO;
import com.ycl.jxkg.vo.student.exam.ExamPaperSubmitVO;
import com.ycl.jxkg.vo.student.exampaper.ExamPaperAnswerPageVO;

 src/main/java/com/ycl/jxkg/service/ExamPaperQuestionCustomerAnswerService.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.other.ExamPaperAnswerUpdate;
import com.ycl.jxkg.vo.student.exam.ExamPaperSubmitItemVO;
import com.ycl.jxkg.vo.student.question.answer.QuestionPageStudentRequestVO;

 src/main/java/com/ycl/jxkg/service/ExamPaperService.java

@@ -1,8 +1,8 @@
package com.ycl.jxkg.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.ExamPaper;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.vo.admin.exam.ExamPaperEditRequestVO;
import com.ycl.jxkg.vo.admin.exam.ExamPaperPageRequestVO;
import com.ycl.jxkg.vo.student.dashboard.PaperFilter;

 src/main/java/com/ycl/jxkg/service/MessageService.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.service;

import com.ycl.jxkg.domain.Message;
import com.ycl.jxkg.domain.MessageUser;
import com.ycl.jxkg.domain.entity.Message;
import com.ycl.jxkg.domain.entity.MessageUser;
import com.ycl.jxkg.vo.admin.message.MessagePageRequestVO;
import com.ycl.jxkg.vo.student.user.MessageRequestVO;
import com.github.pagehelper.PageInfo;

 src/main/java/com/ycl/jxkg/service/QuestionService.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.Question;
import com.ycl.jxkg.domain.entity.Question;
import com.ycl.jxkg.vo.admin.question.QuestionEditRequestVO;
import com.ycl.jxkg.vo.admin.question.QuestionPageRequestVO;
import com.github.pagehelper.PageInfo;

 src/main/java/com/ycl/jxkg/service/SubjectService.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.vo.admin.education.SubjectPageRequestVO;
import com.github.pagehelper.PageInfo;


 src/main/java/com/ycl/jxkg/service/TaskExamCustomerAnswerService.java

@@ -1,9 +1,9 @@
package com.ycl.jxkg.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.ExamPaper;
import com.ycl.jxkg.domain.ExamPaperAnswer;
import com.ycl.jxkg.domain.TaskExamCustomerAnswer;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
import com.ycl.jxkg.domain.entity.TaskExamCustomerAnswer;

import java.util.Date;
import java.util.List;

 src/main/java/com/ycl/jxkg/service/TaskExamService.java

@@ -1,8 +1,8 @@
package com.ycl.jxkg.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.TaskExam;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.TaskExam;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.vo.admin.task.TaskPageRequestVO;
import com.ycl.jxkg.vo.admin.task.TaskRequestVO;
import com.github.pagehelper.PageInfo;

 src/main/java/com/ycl/jxkg/service/TextContentService.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.entity.TextContent;

import java.util.Date;
import java.util.List;

 src/main/java/com/ycl/jxkg/service/UserEventLogService.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.UserEventLog;
import com.ycl.jxkg.domain.entity.UserEventLog;
import com.ycl.jxkg.vo.admin.user.UserEventPageRequestVO;
import com.github.pagehelper.PageInfo;


 src/main/java/com/ycl/jxkg/service/UserService.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.vo.admin.user.UserPageRequestVO;
import com.github.pagehelper.PageInfo;


 src/main/java/com/ycl/jxkg/service/UserTokenService.java

@@ -1,8 +1,8 @@
package com.ycl.jxkg.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserToken;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserToken;

public interface UserTokenService extends IService<UserToken> {


 src/main/java/com/ycl/jxkg/service/impl/AuthenticationServiceImpl.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.service.impl;

import com.ycl.jxkg.config.property.SystemConfig;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.utils.RsaUtil;

 src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java

@@ -2,6 +2,7 @@

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;
@@ -26,7 +27,6 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -37,7 +37,7 @@

@Service
@RequiredArgsConstructor
public class ExamPaperAnswerServiceImpl extends ServiceImpl<ExamPaperAnswerMapper ,ExamPaperAnswer> implements ExamPaperAnswerService {
public class ExamPaperAnswerServiceImpl extends ServiceImpl<ExamPaperAnswerMapper , ExamPaperAnswer> implements ExamPaperAnswerService {

    private final ExamPaperAnswerMapper examPaperAnswerMapper;
    private final ExamPaperMapper examPaperMapper;

 src/main/java/com/ycl/jxkg/service/impl/ExamPaperQuestionCustomerAnswerServiceImpl.java

@@ -1,10 +1,10 @@
package com.ycl.jxkg.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer;
import com.ycl.jxkg.domain.other.ExamPaperAnswerUpdate;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
import com.ycl.jxkg.mapper.ExamPaperQuestionCustomerAnswerMapper;
import com.ycl.jxkg.service.ExamPaperQuestionCustomerAnswerService;
@@ -17,7 +17,6 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;

 src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java

@@ -1,8 +1,7 @@
package com.ycl.jxkg.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.enums.ExamPaperTypeEnum;
import com.ycl.jxkg.domain.exam.ExamPaperQuestionItemObject;
import com.ycl.jxkg.domain.exam.ExamPaperTitleItemObject;
@@ -26,12 +25,11 @@
import com.ycl.jxkg.vo.student.exam.ExamPaperPageVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.domain.ExamPaper;
import com.ycl.jxkg.domain.Question;
import com.ycl.jxkg.domain.User;
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -39,7 +37,6 @@
import java.util.Date;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.stream.Collectors;

@Service
@@ -91,7 +88,6 @@
            examPaper.setFrameTextContentId(frameTextContent.getId());
            examPaper.setCreateTime(now);
            examPaper.setCreateUser(user.getId());
            examPaper.setDeleted(false);
            examPaperFromVM(examPaperEditRequestVO, examPaper, titleItemsVM);
            examPaperMapper.insert(examPaper);
        } else {

 src/main/java/com/ycl/jxkg/service/impl/MessageServiceImpl.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.service.impl;

import com.ycl.jxkg.domain.Message;
import com.ycl.jxkg.domain.MessageUser;
import com.ycl.jxkg.domain.entity.Message;
import com.ycl.jxkg.domain.entity.MessageUser;
import com.ycl.jxkg.mapper.MessageMapper;
import com.ycl.jxkg.mapper.MessageUserMapper;
import com.ycl.jxkg.service.MessageService;

 src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java

@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.Question;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.entity.Question;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.enums.QuestionStatusEnum;
import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
import com.ycl.jxkg.domain.question.QuestionItemObject;
@@ -22,7 +22,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -70,7 +69,6 @@
        question.setDifficult(model.getDifficult());
        question.setInfoTextContentId(infoTextContent.getId());
        question.setCreateUser(userId);
        question.setDeleted(false);
        questionMapper.insert(question);
        return question;
    }

 src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java

@@ -1,14 +1,13 @@
package com.ycl.jxkg.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.mapper.SubjectMapper;
import com.ycl.jxkg.service.SubjectService;
import com.ycl.jxkg.vo.admin.education.SubjectPageRequestVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

 src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java

@@ -1,17 +1,16 @@
package com.ycl.jxkg.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.ExamPaper;
import com.ycl.jxkg.domain.ExamPaperAnswer;
import com.ycl.jxkg.domain.TaskExamCustomerAnswer;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
import com.ycl.jxkg.domain.entity.TaskExamCustomerAnswer;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.task.TaskItemAnswerObject;
import com.ycl.jxkg.mapper.TaskExamCustomerAnswerMapper;
import com.ycl.jxkg.service.TaskExamCustomerAnswerService;
import com.ycl.jxkg.service.TextContentService;
import com.ycl.jxkg.utils.JsonUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Arrays;

 src/main/java/com/ycl/jxkg/service/impl/TaskExamServiceImpl.java

@@ -1,10 +1,10 @@
package com.ycl.jxkg.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.ExamPaper;
import com.ycl.jxkg.domain.TaskExam;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.ExamPaper;
import com.ycl.jxkg.domain.entity.TaskExam;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.task.TaskItemObject;
import com.ycl.jxkg.mapper.ExamPaperMapper;
import com.ycl.jxkg.mapper.TaskExamMapper;
@@ -20,7 +20,6 @@
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -56,7 +55,6 @@
            taskExam.setCreateUser(user.getId());
            taskExam.setCreateUserName(user.getUserName());
            taskExam.setCreateTime(now);
            taskExam.setDeleted(false);

            //保存任务结构
            TextContent textContent = textContentService.jsonConvertInsert(model.getPaperItems(), now, p -> {

 src/main/java/com/ycl/jxkg/service/impl/TextContentServiceImpl.java

@@ -1,12 +1,11 @@
package com.ycl.jxkg.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.mapper.TextContentMapper;
import com.ycl.jxkg.service.TextContentService;
import com.ycl.jxkg.utils.JsonUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;

 src/main/java/com/ycl/jxkg/service/impl/UserEventLogServiceImpl.java

@@ -1,7 +1,7 @@
package com.ycl.jxkg.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.UserEventLog;
import com.ycl.jxkg.domain.entity.UserEventLog;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.mapper.UserEventLogMapper;
import com.ycl.jxkg.service.UserEventLogService;
@@ -10,7 +10,6 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;

 src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.exception.BusinessException;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.event.OnRegistrationCompleteEvent;
import com.ycl.jxkg.mapper.UserMapper;
import com.ycl.jxkg.service.UserService;
@@ -11,7 +11,6 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

 src/main/java/com/ycl/jxkg/service/impl/UserTokenServiceImpl.java

@@ -2,14 +2,13 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.config.property.SystemConfig;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserToken;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserToken;
import com.ycl.jxkg.mapper.UserTokenMapper;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.service.UserTokenService;
import com.ycl.jxkg.utils.DateTimeUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;


 src/main/java/com/ycl/jxkg/vo/admin/user/UserResponseVO.java

@@ -1,6 +1,6 @@
package com.ycl.jxkg.vo.admin.user;

import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.utils.DateTimeUtil;
import lombok.Data;
import org.springframework.beans.BeanUtils;

 src/main/java/com/ycl/jxkg/vo/student/user/UserResponseVO.java

@@ -1,6 +1,6 @@
package com.ycl.jxkg.vo.student.user;

import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.utils.DateTimeUtil;
import lombok.Data;
import org.springframework.beans.BeanUtils;

 src/main/resources/mapper/ExamPaperAnswerMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.ExamPaperAnswerMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.ExamPaperAnswer">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaperAnswer">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="exam_paper_id" jdbcType="INTEGER" property="examPaperId"/>
        <result column="paper_name" jdbcType="VARCHAR" property="paperName"/>

 src/main/resources/mapper/ExamPaperMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.ExamPaperMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.ExamPaper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaper">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="name" jdbcType="VARCHAR" property="name"/>
        <result column="subject_id" jdbcType="INTEGER" property="subjectId"/>

 src/main/resources/mapper/ExamPaperQuestionCustomerAnswerMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.ExamPaperQuestionCustomerAnswerMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.ExamPaperQuestionCustomerAnswer">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="question_id" jdbcType="INTEGER" property="questionId"/>
        <result column="exam_paper_id" jdbcType="INTEGER" property="examPaperId"/>

 src/main/resources/mapper/MessageMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.MessageMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.Message">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.Message">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="title" jdbcType="VARCHAR" property="title"/>
        <result column="content" jdbcType="VARCHAR" property="content"/>

 src/main/resources/mapper/MessageUserMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.MessageUserMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.MessageUser">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.MessageUser">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="message_id" jdbcType="INTEGER" property="messageId"/>
        <result column="receive_user_id" jdbcType="INTEGER" property="receiveUserId"/>

 src/main/resources/mapper/QuestionMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.QuestionMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.Question">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.Question">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="question_type" jdbcType="INTEGER" property="questionType"/>
        <result column="subject_id" jdbcType="INTEGER" property="subjectId"/>

 src/main/resources/mapper/SubjectMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.SubjectMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.Subject">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.Subject">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="name" jdbcType="VARCHAR" property="name"/>
        <result column="level" jdbcType="INTEGER" property="level"/>

 src/main/resources/mapper/TaskExamCustomerAnswerMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.TaskExamCustomerAnswerMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.TaskExamCustomerAnswer">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.TaskExamCustomerAnswer">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="task_exam_id" jdbcType="INTEGER" property="taskExamId"/>
        <result column="create_user" jdbcType="INTEGER" property="createUser"/>

 src/main/resources/mapper/TaskExamMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.TaskExamMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.TaskExam">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.TaskExam">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="title" jdbcType="VARCHAR" property="title"/>
        <result column="grade_level" jdbcType="INTEGER" property="gradeLevel"/>

 src/main/resources/mapper/TextContentMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.TextContentMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.TextContent">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.TextContent">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="content" jdbcType="VARCHAR" property="content"/>
        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>

 src/main/resources/mapper/UserEventLogMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.UserEventLogMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.UserEventLog">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.UserEventLog">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="user_id" jdbcType="INTEGER" property="userId"/>
        <result column="user_name" jdbcType="VARCHAR" property="userName"/>

 src/main/resources/mapper/UserMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.UserMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.User">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.User">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="user_uuid" jdbcType="VARCHAR" property="userUuid"/>
        <result column="user_name" jdbcType="VARCHAR" property="userName"/>
@@ -108,7 +108,7 @@
    </select>


    <insert id="insertUser" parameterType="com.ycl.jxkg.domain.User"
    <insert id="insertUser" parameterType="com.ycl.jxkg.domain.entity.User"
            useGeneratedKeys="true" keyProperty="id">
        insert into t_user
            (user_uuid, user_name, password, real_name, age, last_active_time)
@@ -128,7 +128,7 @@
    </insert>


    <update id="updateUser" parameterType="com.ycl.jxkg.domain.User">
    <update id="updateUser" parameterType="com.ycl.jxkg.domain.entity.User">
        update t_user
        <set>
            <if test="realName != null">real_name = #{realName},</if>

 src/main/resources/mapper/UserTokenMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.UserTokenMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.UserToken">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.UserToken">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="token" jdbcType="VARCHAR" property="token"/>
        <result column="user_id" jdbcType="INTEGER" property="userId"/>