diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/DashboardController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/DashboardController.java index 0c3291f..fdafa7d 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/DashboardController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/DashboardController.java @@ -5,6 +5,7 @@ import com.mindskip.xzs.base.RestResponse; import com.mindskip.xzs.service.*; import com.mindskip.xzs.utility.DateTimeUtil; import com.mindskip.xzs.viewmodel.admin.dashboard.IndexVM; +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; @@ -21,6 +22,7 @@ public class DashboardController extends BaseApiController { private final ExamPaperQuestionCustomerAnswerService examPaperQuestionCustomerAnswerService; private final UserEventLogService userEventLogService; + @Autowired public DashboardController(ExamPaperService examPaperService, QuestionService questionService, ExamPaperAnswerService examPaperAnswerService, ExamPaperQuestionCustomerAnswerService examPaperQuestionCustomerAnswerService, UserEventLogService userEventLogService) { this.examPaperService = examPaperService; this.questionService = questionService; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/EducationController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/EducationController.java index d243757..f57e9eb 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/EducationController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/EducationController.java @@ -10,6 +10,7 @@ import com.mindskip.xzs.viewmodel.admin.education.SubjectEditRequestVM; import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM; import com.mindskip.xzs.viewmodel.admin.education.SubjectResponseVM; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -21,6 +22,7 @@ public class EducationController extends BaseApiController { private final SubjectService subjectService; + @Autowired public EducationController(SubjectService subjectService) { this.subjectService = subjectService; } diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java index 81ae57f..14173e7 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java @@ -10,6 +10,7 @@ import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperPageRequestVM; import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM; import com.mindskip.xzs.viewmodel.admin.exam.ExamResponseVM; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -20,6 +21,7 @@ public class ExamPaperController extends BaseApiController { private final ExamPaperService examPaperService; + @Autowired public ExamPaperController(ExamPaperService examPaperService) { this.examPaperService = examPaperService; } diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/MessageController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/MessageController.java index 587da48..b36d44f 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/MessageController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/MessageController.java @@ -14,6 +14,7 @@ import com.mindskip.xzs.viewmodel.admin.message.MessagePageRequestVM; import com.mindskip.xzs.viewmodel.admin.message.MessageResponseVM; import com.mindskip.xzs.viewmodel.admin.message.MessageSendVM; import com.github.pagehelper.PageInfo; +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; @@ -31,6 +32,7 @@ public class MessageController extends BaseApiController { private final MessageService messageService; private final UserService userService; + @Autowired public MessageController(MessageService messageService, UserService userService) { this.messageService = messageService; this.userService = userService; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java index eb30916..21a558a 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java @@ -15,6 +15,7 @@ import com.mindskip.xzs.viewmodel.admin.question.QuestionPageRequestVM; import com.mindskip.xzs.viewmodel.admin.question.QuestionResponseVM; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -26,6 +27,7 @@ public class QuestionController extends BaseApiController { private final QuestionService questionService; private final TextContentService textContentService; + @Autowired public QuestionController(QuestionService questionService, TextContentService textContentService) { this.questionService = questionService; this.textContentService = textContentService; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/TaskController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/TaskController.java index 75161c1..a36a9e5 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/TaskController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/TaskController.java @@ -11,6 +11,7 @@ import com.mindskip.xzs.viewmodel.admin.task.TaskPageRequestVM; import com.mindskip.xzs.viewmodel.admin.task.TaskPageResponseVM; import com.mindskip.xzs.viewmodel.admin.task.TaskRequestVM; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -21,6 +22,7 @@ public class TaskController extends BaseApiController { private final TaskExamService taskExamService; + @Autowired public TaskController(TaskExamService taskExamService) { this.taskExamService = taskExamService; } diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/UploadController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/UploadController.java index ecf7907..32a4b03 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/UploadController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/UploadController.java @@ -11,6 +11,7 @@ import com.mindskip.xzs.viewmodel.admin.file.UploadResultVM; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -34,6 +35,7 @@ public class UploadController extends BaseApiController { private static final String IMAGE_UPLOAD_FILE = "upFile"; private final UserService userService; + @Autowired public UploadController(FileUpload fileUpload, SystemConfig systemConfig, UserService userService) { this.fileUpload = fileUpload; this.systemConfig = systemConfig; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/UserController.java index 092f78f..c1ed77d 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/UserController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/admin/UserController.java @@ -15,6 +15,7 @@ import com.mindskip.xzs.utility.PageInfoHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -34,6 +35,7 @@ public class UserController extends BaseApiController { private final UserEventLogService userEventLogService; private final AuthenticationService authenticationService; + @Autowired public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService) { this.userService = userService; this.userEventLogService = userEventLogService; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java index 6034223..a3b7fe8 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java @@ -13,6 +13,7 @@ import com.mindskip.xzs.service.*; import com.mindskip.xzs.utility.DateTimeUtil; import com.mindskip.xzs.utility.JsonUtil; import com.mindskip.xzs.viewmodel.student.dashboard.*; +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; @@ -33,6 +34,7 @@ public class DashboardController extends BaseApiController { private final TaskExamCustomerAnswerService taskExamCustomerAnswerService; private final TextContentService textContentService; + @Autowired public DashboardController(UserService userService, ExamPaperService examPaperService, QuestionService questionService, TaskExamService taskExamService, TaskExamCustomerAnswerService taskExamCustomerAnswerService, TextContentService textContentService) { this.userService = userService; this.examPaperService = examPaperService; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/EducationController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/EducationController.java index 32e7beb..8778141 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/EducationController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/EducationController.java @@ -8,6 +8,7 @@ import com.mindskip.xzs.domain.User; import com.mindskip.xzs.service.SubjectService; import com.mindskip.xzs.viewmodel.student.education.SubjectEditRequestVM; import com.mindskip.xzs.viewmodel.student.education.SubjectVM; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -19,6 +20,7 @@ public class EducationController extends BaseApiController { private final SubjectService subjectService; + @Autowired public EducationController(SubjectService subjectService) { this.subjectService = subjectService; } diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/ExamPaperAnswerController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/ExamPaperAnswerController.java index 9707e59..52c3abc 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/ExamPaperAnswerController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/ExamPaperAnswerController.java @@ -18,6 +18,7 @@ import com.mindskip.xzs.viewmodel.student.exam.ExamPaperSubmitVM; import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageResponseVM; import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageVM; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.web.bind.annotation.*; @@ -33,6 +34,7 @@ public class ExamPaperAnswerController extends BaseApiController { private final SubjectService subjectService; private final ApplicationEventPublisher eventPublisher; + @Autowired public ExamPaperAnswerController(ExamPaperAnswerService examPaperAnswerService, ExamPaperService examPaperService, SubjectService subjectService, ApplicationEventPublisher eventPublisher) { this.examPaperAnswerService = examPaperAnswerService; this.examPaperService = examPaperService; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java index b813796..9ec1659 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java @@ -11,6 +11,7 @@ import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM; import com.mindskip.xzs.viewmodel.student.exam.ExamPaperPageResponseVM; import com.mindskip.xzs.viewmodel.student.exam.ExamPaperPageVM; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.web.bind.annotation.*; @@ -24,6 +25,7 @@ public class ExamPaperController extends BaseApiController { private final ExamPaperAnswerService examPaperAnswerService; private final ApplicationEventPublisher eventPublisher; + @Autowired public ExamPaperController(ExamPaperService examPaperService, ExamPaperAnswerService examPaperAnswerService, ApplicationEventPublisher eventPublisher) { this.examPaperService = examPaperService; this.examPaperAnswerService = examPaperAnswerService; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/QuestionAnswerController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/QuestionAnswerController.java index fa4cbf4..de62a9d 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/QuestionAnswerController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/QuestionAnswerController.java @@ -20,6 +20,7 @@ import com.mindskip.xzs.viewmodel.student.question.answer.QuestionAnswerVM; import com.mindskip.xzs.viewmodel.student.question.answer.QuestionPageStudentRequestVM; import com.mindskip.xzs.viewmodel.student.question.answer.QuestionPageStudentResponseVM; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController("StudentQuestionAnswerController") @@ -31,6 +32,7 @@ public class QuestionAnswerController extends BaseApiController { private final TextContentService textContentService; private final SubjectService subjectService; + @Autowired public QuestionAnswerController(ExamPaperQuestionCustomerAnswerService examPaperQuestionCustomerAnswerService, QuestionService questionService, TextContentService textContentService, SubjectService subjectService) { this.examPaperQuestionCustomerAnswerService = examPaperQuestionCustomerAnswerService; this.questionService = questionService; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/QuestionController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/QuestionController.java index 31bd9a0..a597bd6 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/QuestionController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/QuestionController.java @@ -2,6 +2,7 @@ package com.mindskip.xzs.controller.student; import com.mindskip.xzs.base.BaseApiController; import com.mindskip.xzs.service.QuestionService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController("StudentQuestionController") @@ -10,7 +11,7 @@ public class QuestionController extends BaseApiController { private final QuestionService questionService; - + @Autowired public QuestionController(QuestionService questionService) { this.questionService = questionService; } diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/UploadController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/UploadController.java index dce24b0..5905da4 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/UploadController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/UploadController.java @@ -6,6 +6,7 @@ import com.mindskip.xzs.base.RestResponse; import com.mindskip.xzs.service.FileUpload; import com.mindskip.xzs.service.UserService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @@ -25,6 +26,7 @@ public class UploadController extends BaseApiController { private final FileUpload fileUpload; private final UserService userService; + @Autowired public UploadController(FileUpload fileUpload, UserService userService) { this.fileUpload = fileUpload; this.userService = userService; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/UserController.java b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/UserController.java index 99f1075..a1aa72e 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/controller/student/UserController.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/controller/student/UserController.java @@ -18,6 +18,7 @@ import com.mindskip.xzs.utility.PageInfoHelper; import com.mindskip.xzs.viewmodel.student.user.*; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.web.bind.annotation.*; @@ -41,6 +42,7 @@ public class UserController extends BaseApiController { private final AuthenticationService authenticationService; private final ApplicationEventPublisher eventPublisher; + @Autowired public UserController(UserService userService, UserEventLogService userEventLogService, MessageService messageService, AuthenticationService authenticationService, ApplicationEventPublisher eventPublisher) { this.userService = userService; this.userEventLogService = userEventLogService; diff --git a/source/xzs/src/main/java/com/mindskip/xzs/service/impl/AuthenticationServiceImpl.java b/source/xzs/src/main/java/com/mindskip/xzs/service/impl/AuthenticationServiceImpl.java index 6ecae17..ea84548 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/service/impl/AuthenticationServiceImpl.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/service/impl/AuthenticationServiceImpl.java @@ -5,21 +5,25 @@ import com.mindskip.xzs.domain.User; import com.mindskip.xzs.service.AuthenticationService; import com.mindskip.xzs.service.UserService; import com.mindskip.xzs.utility.RsaUtil; -import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * @author 武汉思维跳跃科技有限公司 */ @Service -@AllArgsConstructor public class AuthenticationServiceImpl implements AuthenticationService { private final UserService userService; - private final SystemConfig systemConfig; + @Autowired + public AuthenticationServiceImpl(UserService userService, SystemConfig systemConfig) { + this.userService = userService; + this.systemConfig = systemConfig; + } + /** * @param username username diff --git a/source/xzs/src/main/java/com/mindskip/xzs/service/impl/BaseServiceImpl.java b/source/xzs/src/main/java/com/mindskip/xzs/service/impl/BaseServiceImpl.java index e57ec3f..dd7e3bf 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/service/impl/BaseServiceImpl.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/service/impl/BaseServiceImpl.java @@ -4,10 +4,13 @@ import com.mindskip.xzs.repository.BaseMapper; import com.mindskip.xzs.service.BaseService; import lombok.AllArgsConstructor; -@AllArgsConstructor public abstract class BaseServiceImpl implements BaseService { - BaseMapper baseMapper; + private final BaseMapper baseMapper; + + public BaseServiceImpl(BaseMapper baseMapper) { + this.baseMapper = baseMapper; + } @Override public int deleteById(Integer id) { diff --git a/source/xzs/src/main/java/com/mindskip/xzs/service/impl/FileUploadImpl.java b/source/xzs/src/main/java/com/mindskip/xzs/service/impl/FileUploadImpl.java index db650e3..ddc7391 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/service/impl/FileUploadImpl.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/service/impl/FileUploadImpl.java @@ -14,16 +14,22 @@ import com.qiniu.util.Auth; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.InputStream; @Service -@AllArgsConstructor public class FileUploadImpl implements FileUpload { private final Logger logger = LoggerFactory.getLogger(FileUpload.class); private final SystemConfig systemConfig; + + @Autowired + public FileUploadImpl(SystemConfig systemConfig) { + this.systemConfig = systemConfig; + } + @Override public String uploadFile(InputStream inputStream, long size, String extName) { QnConfig qnConfig = systemConfig.getQn(); diff --git a/source/xzs/src/main/java/com/mindskip/xzs/service/impl/MessageServiceImpl.java b/source/xzs/src/main/java/com/mindskip/xzs/service/impl/MessageServiceImpl.java index e3d296a..a472a88 100644 --- a/source/xzs/src/main/java/com/mindskip/xzs/service/impl/MessageServiceImpl.java +++ b/source/xzs/src/main/java/com/mindskip/xzs/service/impl/MessageServiceImpl.java @@ -10,6 +10,7 @@ import com.mindskip.xzs.viewmodel.student.user.MessageRequestVM; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,12 +18,17 @@ import java.util.Date; import java.util.List; @Service -@AllArgsConstructor public class MessageServiceImpl implements MessageService { private final MessageMapper messageMapper; private final MessageUserMapper messageUserMapper; + @Autowired + public MessageServiceImpl(MessageMapper messageMapper, MessageUserMapper messageUserMapper) { + this.messageMapper = messageMapper; + this.messageUserMapper = messageUserMapper; + } + @Override public List selectMessageByIds(List ids) { return messageMapper.selectByIds(ids);