From 008be75ef25dd2c7e8553fe79ec25722f4c2ea48 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 31 五月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/mapper/UserMapper.java | 2
src/main/java/com/ycl/jxkg/mapper/SubjectMapper.java | 2
src/main/java/com/ycl/jxkg/service/impl/UserEventLogServiceImpl.java | 3
src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java | 4
src/main/java/com/ycl/jxkg/domain/entity/Subject.java | 39 ++
src/main/java/com/ycl/jxkg/domain/entity/Question.java | 24
src/main/java/com/ycl/jxkg/controller/student/ExamPaperController.java | 3
src/main/java/com/ycl/jxkg/service/impl/TextContentServiceImpl.java | 3
src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationSuccessHandler.java | 6
src/main/java/com/ycl/jxkg/service/SubjectService.java | 2
src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java | 4
src/main/java/com/ycl/jxkg/context/WxContext.java | 4
src/main/java/com/ycl/jxkg/controller/admin/EducationController.java | 5
src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java | 4
src/main/java/com/ycl/jxkg/service/QuestionService.java | 2
src/main/java/com/ycl/jxkg/domain/entity/User.java | 87 +++++
src/main/java/com/ycl/jxkg/domain/entity/UserEventLog.java | 16
src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java | 4
src/main/java/com/ycl/jxkg/service/TextContentService.java | 2
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 12
src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java | 9
src/main/java/com/ycl/jxkg/mapper/TaskExamMapper.java | 2
src/main/java/com/ycl/jxkg/controller/admin/UserController.java | 7
src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java | 5
src/main/java/com/ycl/jxkg/mapper/TextContentMapper.java | 2
src/main/java/com/ycl/jxkg/mapper/UserEventLogMapper.java | 2
src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java | 2
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java | 4
src/main/java/com/ycl/jxkg/service/impl/ExamPaperQuestionCustomerAnswerServiceImpl.java | 5
src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java | 3
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java | 7
src/main/java/com/ycl/jxkg/mapper/ExamPaperMapper.java | 2
src/main/java/com/ycl/jxkg/mapper/ExamPaperAnswerMapper.java | 2
src/main/resources/mapper/UserMapper.xml | 6
src/main/java/com/ycl/jxkg/domain/entity/TextContent.java | 27 +
src/main/resources/mapper/SubjectMapper.xml | 2
src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java | 9
src/main/java/com/ycl/jxkg/mapper/TaskExamCustomerAnswerMapper.java | 2
src/main/java/com/ycl/jxkg/mapper/MessageMapper.java | 2
src/main/java/com/ycl/jxkg/config/spring/security/RestLogoutSuccessHandler.java | 4
src/main/java/com/ycl/jxkg/domain/entity/TaskExam.java | 51 +++
src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java | 5
src/main/java/com/ycl/jxkg/service/MessageService.java | 4
src/main/java/com/ycl/jxkg/service/impl/AuthenticationServiceImpl.java | 2
src/main/java/com/ycl/jxkg/listener/EmailSendListener.java | 2
src/main/java/com/ycl/jxkg/service/TaskExamCustomerAnswerService.java | 6
src/main/java/com/ycl/jxkg/domain/entity/TaskExamCustomerAnswer.java | 39 ++
src/main/java/com/ycl/jxkg/vo/student/user/UserResponseVO.java | 2
src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java | 2
src/main/java/com/ycl/jxkg/service/ExamPaperAnswerService.java | 4
src/main/java/com/ycl/jxkg/service/impl/UserTokenServiceImpl.java | 5
src/main/java/com/ycl/jxkg/controller/admin/MessageController.java | 7
src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java | 3
src/main/resources/mapper/ExamPaperQuestionCustomerAnswerMapper.xml | 2
src/main/java/com/ycl/jxkg/service/UserService.java | 2
src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java | 6
src/main/java/com/ycl/jxkg/mapper/ExamPaperQuestionCustomerAnswerMapper.java | 2
src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java | 25 +
src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java | 2
src/main/java/com/ycl/jxkg/service/impl/MessageServiceImpl.java | 4
src/main/resources/mapper/ExamPaperMapper.xml | 2
src/main/java/com/ycl/jxkg/service/UserEventLogService.java | 2
src/main/resources/mapper/TextContentMapper.xml | 2
src/main/java/com/ycl/jxkg/event/OnRegistrationCompleteEvent.java | 2
src/main/java/com/ycl/jxkg/event/UserEvent.java | 2
src/main/java/com/ycl/jxkg/service/TaskExamService.java | 4
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 2
src/main/resources/mapper/UserEventLogMapper.xml | 2
src/main/java/com/ycl/jxkg/controller/admin/TaskController.java | 4
src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java | 3
src/main/java/com/ycl/jxkg/domain/entity/UserToken.java | 51 +++
src/main/java/com/ycl/jxkg/mapper/UserTokenMapper.java | 2
src/main/java/com/ycl/jxkg/config/spring/wx/TokenHandlerInterceptor.java | 4
src/main/java/com/ycl/jxkg/service/impl/TaskExamServiceImpl.java | 10
src/main/java/com/ycl/jxkg/domain/entity/ExamPaperQuestionCustomerAnswer.java | 93 +++++
src/main/java/com/ycl/jxkg/service/AuthenticationService.java | 2
src/main/resources/mapper/QuestionMapper.xml | 2
src/main/java/com/ycl/jxkg/domain/entity/Message.java | 61 +++
src/main/java/com/ycl/jxkg/domain/entity/MessageUser.java | 54 +++
src/main/java/com/ycl/jxkg/controller/student/EducationController.java | 5
src/main/java/com/ycl/jxkg/mapper/MessageUserMapper.java | 2
src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java | 7
src/main/resources/mapper/TaskExamCustomerAnswerMapper.xml | 2
src/main/resources/mapper/TaskExamMapper.xml | 2
src/main/resources/mapper/MessageUserMapper.xml | 2
src/main/resources/mapper/UserTokenMapper.xml | 2
src/main/resources/mapper/MessageMapper.xml | 2
src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java | 5
src/main/java/com/ycl/jxkg/context/WebContext.java | 2
src/main/java/com/ycl/jxkg/base/BaseApiController.java | 2
src/main/java/com/ycl/jxkg/domain/base/AbsEntity.java | 34 ++
src/main/java/com/ycl/jxkg/domain/entity/ExamPaperAnswer.java | 25 +
src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java | 10
src/main/java/com/ycl/jxkg/service/UserTokenService.java | 4
src/main/java/com/ycl/jxkg/service/ExamPaperService.java | 4
src/main/java/com/ycl/jxkg/service/ExamPaperQuestionCustomerAnswerService.java | 2
src/main/java/com/ycl/jxkg/controller/student/UserController.java | 10
src/main/java/com/ycl/jxkg/vo/admin/user/UserResponseVO.java | 2
/dev/null | 45 --
src/main/java/com/ycl/jxkg/controller/student/DashboardController.java | 9
src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java | 6
101 files changed, 749 insertions(+), 246 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/base/BaseApiController.java b/src/main/java/com/ycl/jxkg/base/BaseApiController.java
index 190f688..67e71ba 100644
--- a/src/main/java/com/ycl/jxkg/base/BaseApiController.java
+++ b/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;
/**
diff --git a/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java b/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java
index 1e4bcee..d7904ce 100644
--- a/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java
+++ b/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationProvider.java
@@ -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("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
}
diff --git a/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationSuccessHandler.java b/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationSuccessHandler.java
index 4d28777..6a9c670 100644
--- a/src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationSuccessHandler.java
+++ b/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);
diff --git a/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java b/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java
index 38e01ee..bb3f157 100644
--- a/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java
@@ -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.");
diff --git a/src/main/java/com/ycl/jxkg/config/spring/security/RestLogoutSuccessHandler.java b/src/main/java/com/ycl/jxkg/config/spring/security/RestLogoutSuccessHandler.java
index b05e166..9a35774 100644
--- a/src/main/java/com/ycl/jxkg/config/spring/security/RestLogoutSuccessHandler.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/config/spring/wx/TokenHandlerInterceptor.java b/src/main/java/com/ycl/jxkg/config/spring/wx/TokenHandlerInterceptor.java
index 786dbf4..fd97e1a 100644
--- a/src/main/java/com/ycl/jxkg/config/spring/wx/TokenHandlerInterceptor.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/context/WebContext.java b/src/main/java/com/ycl/jxkg/context/WebContext.java
index 58ceb0e..192a7a5 100644
--- a/src/main/java/com/ycl/jxkg/context/WebContext.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/context/WxContext.java b/src/main/java/com/ycl/jxkg/context/WxContext.java
index 3c8afe5..6130dac 100644
--- a/src/main/java/com/ycl/jxkg/context/WxContext.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/EducationController.java b/src/main/java/com/ycl/jxkg/controller/admin/EducationController.java
index 04a01b1..4e271de 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/EducationController.java
+++ b/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();
}
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
index aab42b2..0f202ac 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
+++ b/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
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
index 1f543ec..1967272 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
+++ b/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();
}
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java b/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java
index 7d813bd..0cc8dc0 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/MessageController.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java b/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java
index 6bb0808..bd1d45f 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/QuestionController.java
+++ b/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();
}
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/TaskController.java b/src/main/java/com/ycl/jxkg/controller/admin/TaskController.java
index 49b2561..a5b4c29 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/TaskController.java
+++ b/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();
}
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
index 081255e..a1ecb42 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
+++ b/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();
}
diff --git a/src/main/java/com/ycl/jxkg/controller/student/DashboardController.java b/src/main/java/com/ycl/jxkg/controller/student/DashboardController.java
index 320fb1d..0542432 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/DashboardController.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/controller/student/EducationController.java b/src/main/java/com/ycl/jxkg/controller/student/EducationController.java
index 1717365..05450fb 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/EducationController.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java
index 3ac852e..4f09426 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java
+++ b/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.*;
diff --git a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/student/ExamPaperController.java
index 5600886..930ab03 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperController.java
+++ b/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.*;
diff --git a/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java b/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java
index c2b1bad..8e9996f 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java
+++ b/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
diff --git a/src/main/java/com/ycl/jxkg/controller/student/UserController.java b/src/main/java/com/ycl/jxkg/controller/student/UserController.java
index 0ddb2db..71794d8 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/UserController.java
+++ b/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() + " 娉ㄥ唽鏉ュ埌瀛︿箣鎬濆紑婧愯�冭瘯绯荤粺");
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java b/src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java
index 92dc8f7..12e0871 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java
+++ b/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 {
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java
index 16cd426..afe19bb 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/AuthController.java
@@ -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.*;
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java
index 72a8946..5e6ef23 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/DashboardController.java
@@ -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;
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
index 1e47435..94a3a09 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
@@ -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.*;
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java
index 370ad00..757347c 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java
+++ b/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.*;
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
index 54310c5..1d5e292 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
@@ -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() + " 娉ㄥ唽鏉ュ埌瀛︿箣鎬濆紑婧愯�冭瘯绯荤粺");
diff --git a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java b/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java
index fc9ed34..9e663b1 100644
--- a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/domain/ExamPaperQuestionCustomerAnswer.java b/src/main/java/com/ycl/jxkg/domain/ExamPaperQuestionCustomerAnswer.java
deleted file mode 100644
index 0027acd..0000000
--- a/src/main/java/com/ycl/jxkg/domain/ExamPaperQuestionCustomerAnswer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.ycl.jxkg.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class ExamPaperQuestionCustomerAnswer implements Serializable {
-
- private static final long serialVersionUID = 3389482731220342366L;
-
- private Integer id;
-
- /**
- * 棰樼洰Id
- */
- private Integer questionId;
-
- /**
- * 璇曞嵎Id
- */
- private Integer examPaperId;
-
- /**
- * 绛旀Id
- */
- private Integer examPaperAnswerId;
-
- /**
- * 棰樺瀷
- */
- private Integer questionType;
-
- /**
- * 瀛︾
- */
- private Integer subjectId;
-
- /**
- * 寰楀垎
- */
- private Integer customerScore;
-
- /**
- * 棰樼洰鍘熷鍒嗘暟
- */
- private Integer questionScore;
-
- /**
- * 闂鍐呭
- */
- private Integer questionTextContentId;
-
- /**
- * 鍋氶绛旀
- */
- private String answer;
-
- /**
- * 鍋氶鍐呭
- */
- private Integer textContentId;
-
- /**
- * 鏄惁姝ｇ‘
- */
- private Boolean doRight;
-
- /**
- * 鍋氶浜�
- */
- private Integer createUser;
-
- private Date createTime;
-
- private Integer itemOrder;
-
-}
diff --git a/src/main/java/com/ycl/jxkg/domain/Message.java b/src/main/java/com/ycl/jxkg/domain/Message.java
deleted file mode 100644
index 0539d78..0000000
--- a/src/main/java/com/ycl/jxkg/domain/Message.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.ycl.jxkg.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class Message implements Serializable {
-
- private static final long serialVersionUID = -3510265139403747341L;
-
- private Integer id;
-
- /**
- * 鏍囬
- */
- private String title;
-
- /**
- * 鍐呭
- */
- private String content;
-
- private Date createTime;
-
- /**
- * 鍙戦�佽�呯敤鎴稩D
- */
- private Integer sendUserId;
-
- /**
- * 鍙戦�佽�呯敤鎴峰悕
- */
- private String sendUserName;
-
- /**
- * 鍙戦�佽�呯湡瀹炲鍚�
- */
- private String sendRealName;
-
- /**
- * 鎺ユ敹浜烘暟
- */
- private Integer receiveUserCount;
-
- /**
- * 宸茶浜烘暟
- */
- private Integer readCount;
-
-}
diff --git a/src/main/java/com/ycl/jxkg/domain/MessageUser.java b/src/main/java/com/ycl/jxkg/domain/MessageUser.java
deleted file mode 100644
index 658ee6a..0000000
--- a/src/main/java/com/ycl/jxkg/domain/MessageUser.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.ycl.jxkg.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class MessageUser implements Serializable {
-
- private static final long serialVersionUID = -4042932811802896498L;
-
- private Integer id;
-
- /**
- * 娑堟伅鍐呭ID
- */
- private Integer messageId;
-
- /**
- * 鎺ユ敹浜篒D
- */
- private Integer receiveUserId;
-
- /**
- * 鎺ユ敹浜虹敤鎴峰悕
- */
- private String receiveUserName;
-
- /**
- * 鎺ユ敹浜虹湡瀹炲鍚�
- */
- private String receiveRealName;
-
- /**
- * 鏄惁宸茶
- */
- private Boolean readed;
-
- private Date createTime;
-
- /**
- * 闃呰鏃堕棿
- */
- private Date readTime;
-
-}
diff --git a/src/main/java/com/ycl/jxkg/domain/Subject.java b/src/main/java/com/ycl/jxkg/domain/Subject.java
deleted file mode 100644
index 6893b82..0000000
--- a/src/main/java/com/ycl/jxkg/domain/Subject.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.ycl.jxkg.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class Subject implements Serializable {
-
- private static final long serialVersionUID = 8058095034457106501L;
-
- private Integer id;
-
- /**
- * 璇枃 鏁板 鑻辫 绛�
- */
- private String name;
-
- /**
- * 骞寸骇 (1-12) 灏忓 鍒濅腑
- */
- private Integer level;
-
- /**
- * 涓�骞寸骇銆佷簩骞寸骇绛�
- */
- private String levelName;
-
- /**
- * 鎺掑簭
- */
- private Integer itemOrder;
-
- private Boolean deleted;
-
-}
diff --git a/src/main/java/com/ycl/jxkg/domain/TaskExam.java b/src/main/java/com/ycl/jxkg/domain/TaskExam.java
deleted file mode 100644
index 925b75e..0000000
--- a/src/main/java/com/ycl/jxkg/domain/TaskExam.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.ycl.jxkg.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class TaskExam implements Serializable {
-
- private static final long serialVersionUID = -7014704644631536195L;
-
- private Integer id;
-
- /**
- * 浠诲姟鏍囬
- */
- private String title;
-
- /**
- * 骞寸骇
- */
- private Integer gradeLevel;
-
- /**
- * 浠诲姟妗嗘灦 鍐呭涓篔SON
- */
- private Integer frameTextContentId;
-
- /**
- * 鍒涘缓鑰�
- */
- private Integer createUser;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- private Boolean deleted;
-
- /**
- * 鍒涘缓浜虹敤鎴峰悕
- */
- private String createUserName;
-
-}
diff --git a/src/main/java/com/ycl/jxkg/domain/TaskExamCustomerAnswer.java b/src/main/java/com/ycl/jxkg/domain/TaskExamCustomerAnswer.java
deleted file mode 100644
index 97ecafa..0000000
--- a/src/main/java/com/ycl/jxkg/domain/TaskExamCustomerAnswer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.ycl.jxkg.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class TaskExamCustomerAnswer implements Serializable {
-
- private static final long serialVersionUID = -556842372977600137L;
-
- private Integer id;
-
- /**
- * 浠诲姟Id
- */
- private Integer taskExamId;
-
- /**
- * 鍒涘缓鑰�
- */
- private Integer createUser;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 浠诲姟瀹屾垚鎯呭喌(Json)
- */
- private Integer textContentId;
-
-}
diff --git a/src/main/java/com/ycl/jxkg/domain/TextContent.java b/src/main/java/com/ycl/jxkg/domain/TextContent.java
deleted file mode 100644
index 853c9c9..0000000
--- a/src/main/java/com/ycl/jxkg/domain/TextContent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ycl.jxkg.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class TextContent implements Serializable {
-
- private static final long serialVersionUID = -1279530310964668131L;
-
- private Integer id;
-
- /**
- * 鍐呭(Json)
- */
- private String content;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
-}
diff --git a/src/main/java/com/ycl/jxkg/domain/User.java b/src/main/java/com/ycl/jxkg/domain/User.java
deleted file mode 100644
index 7ad2ef8..0000000
--- a/src/main/java/com/ycl/jxkg/domain/User.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.ycl.jxkg.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class User implements Serializable {
-
- private static final long serialVersionUID = -7797183521247423117L;
-
- private Integer id;
-
- private String userUuid;
-
- /**
- * 鐢ㄦ埛鍚�
- */
- private String userName;
-
- private String password;
-
- /**
- * 鐪熷疄濮撳悕
- */
- private String realName;
-
- private Integer age;
-
- /**
- * 1.鐢� 2濂�
- */
- private Integer sex;
-
- private Date birthDay;
-
- /**
- * 瀛︾敓骞寸骇(1-12)
- */
- private Integer userLevel;
-
- private String phone;
-
- /**
- * 1.瀛︾敓 3.绠＄悊鍛�
- */
- private Integer role;
-
- /**
- * 1.鍚敤 2绂佺敤
- */
- private Integer status;
-
- /**
- * 澶村儚鍦板潃
- */
- private String imagePath;
-
- private Date createTime;
-
- private Date modifyTime;
-
- private Date lastActiveTime;
-
- /**
- * 鏄惁鍒犻櫎
- */
- private Boolean deleted;
-
- /**
- * 寰俊openId
- */
- private String wxOpenId;
-
-}
diff --git a/src/main/java/com/ycl/jxkg/domain/UserToken.java b/src/main/java/com/ycl/jxkg/domain/UserToken.java
deleted file mode 100644
index 45dc7dd..0000000
--- a/src/main/java/com/ycl/jxkg/domain/UserToken.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.ycl.jxkg.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class UserToken implements Serializable {
-
- private static final long serialVersionUID = -2414443061696200360L;
-
- private Integer id;
-
- /**
- * 鐢ㄦ埛token
- */
- private String token;
-
- /**
- * 鐢ㄦ埛Id
- */
- private Integer userId;
-
- /**
- * 寰俊灏忕▼搴弌penId
- */
- private String wxOpenId;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- private Date createTime;
-
- /**
- * 缁撴潫鏃堕棿
- */
- private Date endTime;
-
- /**
- * 鐢ㄦ埛鍚�
- */
- private String userName;
-
-}
diff --git a/src/main/java/com/ycl/jxkg/domain/base/AbsEntity.java b/src/main/java/com/ycl/jxkg/domain/base/AbsEntity.java
new file mode 100644
index 0000000..3d86f70
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/base/AbsEntity.java
@@ -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;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/ExamPaper.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
similarity index 63%
rename from src/main/java/com/ycl/jxkg/domain/ExamPaper.java
rename to src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
index f28e150..e0c889d 100644
--- a/src/main/java/com/ycl/jxkg/domain/ExamPaper.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/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;
/**
* 璇曞嵎妗嗘灦 鍐呭涓篔SON
*/
+ @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;
/**
diff --git a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswer.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperAnswer.java
similarity index 60%
rename from src/main/java/com/ycl/jxkg/domain/ExamPaperAnswer.java
rename to src/main/java/com/ycl/jxkg/domain/entity/ExamPaperAnswer.java
index 8610a3c..d4e8c7a 100644
--- a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswer.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/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;
}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperQuestionCustomerAnswer.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperQuestionCustomerAnswer.java
new file mode 100644
index 0000000..34e0e56
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperQuestionCustomerAnswer.java
@@ -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;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Message.java b/src/main/java/com/ycl/jxkg/domain/entity/Message.java
new file mode 100644
index 0000000..c712851
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Message.java
@@ -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;
+
+ /**
+ * 鍙戦�佽�呯敤鎴稩D
+ */
+ @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;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/MessageUser.java b/src/main/java/com/ycl/jxkg/domain/entity/MessageUser.java
new file mode 100644
index 0000000..019b3c3
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/MessageUser.java
@@ -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;
+
+ /**
+ * 鎺ユ敹浜篒D
+ */
+ @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;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/Question.java b/src/main/java/com/ycl/jxkg/domain/entity/Question.java
similarity index 70%
rename from src/main/java/com/ycl/jxkg/domain/Question.java
rename to src/main/java/com/ycl/jxkg/domain/entity/Question.java
index 0a004e4..b5116d8 100644
--- a/src/main/java/com/ycl/jxkg/domain/Question.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/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();
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Subject.java b/src/main/java/com/ycl/jxkg/domain/entity/Subject.java
new file mode 100644
index 0000000..a76e8b0
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Subject.java
@@ -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;
+
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/TaskExam.java b/src/main/java/com/ycl/jxkg/domain/entity/TaskExam.java
new file mode 100644
index 0000000..7f2ac6d
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/TaskExam.java
@@ -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;
+
+ /**
+ * 浠诲姟妗嗘灦 鍐呭涓篔SON
+ */
+ @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;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/TaskExamCustomerAnswer.java b/src/main/java/com/ycl/jxkg/domain/entity/TaskExamCustomerAnswer.java
new file mode 100644
index 0000000..c3bd9be
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/TaskExamCustomerAnswer.java
@@ -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;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/TextContent.java b/src/main/java/com/ycl/jxkg/domain/entity/TextContent.java
new file mode 100644
index 0000000..3816d15
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/TextContent.java
@@ -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;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/User.java b/src/main/java/com/ycl/jxkg/domain/entity/User.java
new file mode 100644
index 0000000..bf68076
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/User.java
@@ -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;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/UserEventLog.java b/src/main/java/com/ycl/jxkg/domain/entity/UserEventLog.java
similarity index 69%
rename from src/main/java/com/ycl/jxkg/domain/UserEventLog.java
rename to src/main/java/com/ycl/jxkg/domain/entity/UserEventLog.java
index cd18357..5262fed 100644
--- a/src/main/java/com/ycl/jxkg/domain/UserEventLog.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/UserEventLog.java
@@ -1,6 +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 lombok.Data;
import java.io.Serializable;
@@ -8,10 +10,7 @@
@Data
@TableName("t_user_event_log")
-public class UserEventLog implements Serializable {
-
- private static final long serialVersionUID = -3951198127152024633L;
-
+public class UserEventLog extends AbsEntity {
public UserEventLog() {
@@ -24,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;
}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/UserToken.java b/src/main/java/com/ycl/jxkg/domain/entity/UserToken.java
new file mode 100644
index 0000000..23ce70d
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/entity/UserToken.java
@@ -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;
+
+ /**
+ * 寰俊灏忕▼搴弌penId
+ */
+ @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;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/event/OnRegistrationCompleteEvent.java b/src/main/java/com/ycl/jxkg/event/OnRegistrationCompleteEvent.java
index 2967246..1a8de13 100644
--- a/src/main/java/com/ycl/jxkg/event/OnRegistrationCompleteEvent.java
+++ b/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;
/**
diff --git a/src/main/java/com/ycl/jxkg/event/UserEvent.java b/src/main/java/com/ycl/jxkg/event/UserEvent.java
index e700f16..ec52622 100644
--- a/src/main/java/com/ycl/jxkg/event/UserEvent.java
+++ b/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;
/**
diff --git a/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java b/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java
index 4759dc6..bd2dcca 100644
--- a/src/main/java/com/ycl/jxkg/listener/CalculateExamPaperAnswerListener.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/listener/EmailSendListener.java b/src/main/java/com/ycl/jxkg/listener/EmailSendListener.java
index f8ec3b4..15df92b 100644
--- a/src/main/java/com/ycl/jxkg/listener/EmailSendListener.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/ExamPaperAnswerMapper.java b/src/main/java/com/ycl/jxkg/mapper/ExamPaperAnswerMapper.java
index f57d2d1..bdb36e5 100644
--- a/src/main/java/com/ycl/jxkg/mapper/ExamPaperAnswerMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/ExamPaperMapper.java b/src/main/java/com/ycl/jxkg/mapper/ExamPaperMapper.java
index 419766f..2d89aba 100644
--- a/src/main/java/com/ycl/jxkg/mapper/ExamPaperMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/ExamPaperQuestionCustomerAnswerMapper.java b/src/main/java/com/ycl/jxkg/mapper/ExamPaperQuestionCustomerAnswerMapper.java
index f932a69..c6984b5 100644
--- a/src/main/java/com/ycl/jxkg/mapper/ExamPaperQuestionCustomerAnswerMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/MessageMapper.java b/src/main/java/com/ycl/jxkg/mapper/MessageMapper.java
index e9878ac..087ac51 100644
--- a/src/main/java/com/ycl/jxkg/mapper/MessageMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/MessageUserMapper.java b/src/main/java/com/ycl/jxkg/mapper/MessageUserMapper.java
index 11d8694..8350fd4 100644
--- a/src/main/java/com/ycl/jxkg/mapper/MessageUserMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java b/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java
index f70eb08..13af03d 100644
--- a/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/SubjectMapper.java b/src/main/java/com/ycl/jxkg/mapper/SubjectMapper.java
index c9d297e..2fb21e7 100644
--- a/src/main/java/com/ycl/jxkg/mapper/SubjectMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/TaskExamCustomerAnswerMapper.java b/src/main/java/com/ycl/jxkg/mapper/TaskExamCustomerAnswerMapper.java
index ef57178..1f2cb2f 100644
--- a/src/main/java/com/ycl/jxkg/mapper/TaskExamCustomerAnswerMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/TaskExamMapper.java b/src/main/java/com/ycl/jxkg/mapper/TaskExamMapper.java
index 0999983..98aa846 100644
--- a/src/main/java/com/ycl/jxkg/mapper/TaskExamMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/TextContentMapper.java b/src/main/java/com/ycl/jxkg/mapper/TextContentMapper.java
index 27dc20e..6ead835 100644
--- a/src/main/java/com/ycl/jxkg/mapper/TextContentMapper.java
+++ b/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
diff --git a/src/main/java/com/ycl/jxkg/mapper/UserEventLogMapper.java b/src/main/java/com/ycl/jxkg/mapper/UserEventLogMapper.java
index 8813c57..ebff833 100644
--- a/src/main/java/com/ycl/jxkg/mapper/UserEventLogMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/UserMapper.java b/src/main/java/com/ycl/jxkg/mapper/UserMapper.java
index d07b560..8cc31dd 100644
--- a/src/main/java/com/ycl/jxkg/mapper/UserMapper.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/mapper/UserTokenMapper.java b/src/main/java/com/ycl/jxkg/mapper/UserTokenMapper.java
index ac2dd8b..40212fb 100644
--- a/src/main/java/com/ycl/jxkg/mapper/UserTokenMapper.java
+++ b/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
diff --git a/src/main/java/com/ycl/jxkg/service/AuthenticationService.java b/src/main/java/com/ycl/jxkg/service/AuthenticationService.java
index e445e87..8d2eac3 100644
--- a/src/main/java/com/ycl/jxkg/service/AuthenticationService.java
+++ b/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 {
diff --git a/src/main/java/com/ycl/jxkg/service/ExamPaperAnswerService.java b/src/main/java/com/ycl/jxkg/service/ExamPaperAnswerService.java
index 71bfe52..bb7f254 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamPaperAnswerService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/ExamPaperQuestionCustomerAnswerService.java b/src/main/java/com/ycl/jxkg/service/ExamPaperQuestionCustomerAnswerService.java
index 5738932..3b1c2f4 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamPaperQuestionCustomerAnswerService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
index 743bf88..41ffd3f 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/MessageService.java b/src/main/java/com/ycl/jxkg/service/MessageService.java
index 8c77ec2..9fe3845 100644
--- a/src/main/java/com/ycl/jxkg/service/MessageService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/QuestionService.java b/src/main/java/com/ycl/jxkg/service/QuestionService.java
index 4028a37..0d46d79 100644
--- a/src/main/java/com/ycl/jxkg/service/QuestionService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/SubjectService.java b/src/main/java/com/ycl/jxkg/service/SubjectService.java
index f2fc5f0..7391b68 100644
--- a/src/main/java/com/ycl/jxkg/service/SubjectService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/TaskExamCustomerAnswerService.java b/src/main/java/com/ycl/jxkg/service/TaskExamCustomerAnswerService.java
index 7d5cede..4bd74db 100644
--- a/src/main/java/com/ycl/jxkg/service/TaskExamCustomerAnswerService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/TaskExamService.java b/src/main/java/com/ycl/jxkg/service/TaskExamService.java
index d6a867a..12bd8a6 100644
--- a/src/main/java/com/ycl/jxkg/service/TaskExamService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/TextContentService.java b/src/main/java/com/ycl/jxkg/service/TextContentService.java
index f2d1d2d..43d16fb 100644
--- a/src/main/java/com/ycl/jxkg/service/TextContentService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/UserEventLogService.java b/src/main/java/com/ycl/jxkg/service/UserEventLogService.java
index 760b17c..afff450 100644
--- a/src/main/java/com/ycl/jxkg/service/UserEventLogService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/UserService.java b/src/main/java/com/ycl/jxkg/service/UserService.java
index 1aa20de..ef15c80 100644
--- a/src/main/java/com/ycl/jxkg/service/UserService.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/UserTokenService.java b/src/main/java/com/ycl/jxkg/service/UserTokenService.java
index c1885e6..20e9481 100644
--- a/src/main/java/com/ycl/jxkg/service/UserTokenService.java
+++ b/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> {
diff --git a/src/main/java/com/ycl/jxkg/service/impl/AuthenticationServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/AuthenticationServiceImpl.java
index 1610e30..ba026ee 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/AuthenticationServiceImpl.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
index 461d096..42667df 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperAnswerServiceImpl.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperQuestionCustomerAnswerServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperQuestionCustomerAnswerServiceImpl.java
index 98aab39..ba9be2a 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperQuestionCustomerAnswerServiceImpl.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
index c213d8d..09961f6 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/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 {
diff --git a/src/main/java/com/ycl/jxkg/service/impl/MessageServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/MessageServiceImpl.java
index 0b5f7db..c2e92bb 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/MessageServiceImpl.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
index 9d5130d..5771660 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
+++ b/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;
}
diff --git a/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java
index d4e4a80..9e2a967 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java b/src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java
index ce7f58d..71dbd38 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/TaskExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/TaskExamServiceImpl.java
index af78ea6..caa1735 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/TaskExamServiceImpl.java
+++ b/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 -> {
diff --git a/src/main/java/com/ycl/jxkg/service/impl/TextContentServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/TextContentServiceImpl.java
index 27dbf44..6a7460b 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/TextContentServiceImpl.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/UserEventLogServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/UserEventLogServiceImpl.java
index f101d03..f736cef 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/UserEventLogServiceImpl.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
index b626e92..f661eaf 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/UserTokenServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/UserTokenServiceImpl.java
index 67cf4d5..af7ecde 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/UserTokenServiceImpl.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/vo/admin/user/UserResponseVO.java b/src/main/java/com/ycl/jxkg/vo/admin/user/UserResponseVO.java
index 0151b49..2ee57b8 100644
--- a/src/main/java/com/ycl/jxkg/vo/admin/user/UserResponseVO.java
+++ b/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;
diff --git a/src/main/java/com/ycl/jxkg/vo/student/user/UserResponseVO.java b/src/main/java/com/ycl/jxkg/vo/student/user/UserResponseVO.java
index 50eae7e..dd316bc 100644
--- a/src/main/java/com/ycl/jxkg/vo/student/user/UserResponseVO.java
+++ b/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;
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index dd8488a..838b431 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml
index 8e25c94..f954dda 100644
--- a/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/ExamPaperQuestionCustomerAnswerMapper.xml b/src/main/resources/mapper/ExamPaperQuestionCustomerAnswerMapper.xml
index 8ce5648..c3a930f 100644
--- a/src/main/resources/mapper/ExamPaperQuestionCustomerAnswerMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/MessageMapper.xml b/src/main/resources/mapper/MessageMapper.xml
index e702a09..9504568 100644
--- a/src/main/resources/mapper/MessageMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/MessageUserMapper.xml b/src/main/resources/mapper/MessageUserMapper.xml
index 0be9a6c..62a3d8c 100644
--- a/src/main/resources/mapper/MessageUserMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index c647f09..db3a5fa 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/SubjectMapper.xml b/src/main/resources/mapper/SubjectMapper.xml
index 607c317..b7d0cf9 100644
--- a/src/main/resources/mapper/SubjectMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/TaskExamCustomerAnswerMapper.xml b/src/main/resources/mapper/TaskExamCustomerAnswerMapper.xml
index c81f56a..b797b94 100644
--- a/src/main/resources/mapper/TaskExamCustomerAnswerMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/TaskExamMapper.xml b/src/main/resources/mapper/TaskExamMapper.xml
index 286521f..24e932c 100644
--- a/src/main/resources/mapper/TaskExamMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/TextContentMapper.xml b/src/main/resources/mapper/TextContentMapper.xml
index be8f618..2154f3b 100644
--- a/src/main/resources/mapper/TextContentMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/UserEventLogMapper.xml b/src/main/resources/mapper/UserEventLogMapper.xml
index 8021ff1..4c0cf7b 100644
--- a/src/main/resources/mapper/UserEventLogMapper.xml
+++ b/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"/>
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 9b07fdf..f32c47b 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/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>
diff --git a/src/main/resources/mapper/UserTokenMapper.xml b/src/main/resources/mapper/UserTokenMapper.xml
index 232e4cf..a686d17 100644
--- a/src/main/resources/mapper/UserTokenMapper.xml
+++ b/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"/>
--
Gitblit v1.8.0