From eda55530e64d87f6c642ce4596dc288a49f258cc Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 03 七月 2024 18:39:12 +0800
Subject: [PATCH] 学生考试分页增加提交状态，登录学生信息返回
---
src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java | 114 +++++++++++++++++++++++++++------------------------------
1 files changed, 54 insertions(+), 60 deletions(-)
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 2e70c3b..376026c 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
@@ -1,24 +1,25 @@
package com.ycl.jxkg.controller.wx.student;
-import com.ycl.jxkg.base.RestResponse;
+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.enums.RoleEnum;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+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.enums.RoleEnum;
+import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.MessageService;
import com.ycl.jxkg.service.UserEventLogService;
import com.ycl.jxkg.service.UserService;
-import com.ycl.jxkg.utility.DateTimeUtil;
-import com.ycl.jxkg.utility.PageInfoHelper;
-import com.ycl.jxkg.viewmodel.student.user.*;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.PageInfoHelper;
+import com.ycl.jxkg.domain.vo.student.user.*;
import com.github.pagehelper.PageInfo;
+import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +30,7 @@
import java.util.UUID;
import java.util.stream.Collectors;
-
+@RequiredArgsConstructor
@Controller("WXStudentUserController")
@RequestMapping(value = "/api/wx/student/user")
@ResponseBody
@@ -41,30 +42,22 @@
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;
- this.messageService = messageService;
- this.authenticationService = authenticationService;
- this.eventPublisher = eventPublisher;
- }
-
@RequestMapping(value = "/current", method = RequestMethod.POST)
- public RestResponse<UserResponseVM> current() {
+ public Result<UserResponseVO> current() {
User user = getCurrentUser();
- UserResponseVM userVm = UserResponseVM.from(user);
+ UserResponseVO userVm = UserResponseVO.from(user);
userVm.setBirthDay(DateTimeUtil.dateShortFormat(user.getBirthDay()));
- return RestResponse.ok(userVm);
+ return Result.ok(userVm);
}
@RequestMapping(value = "/register", method = RequestMethod.POST)
- public RestResponse register(@Valid UserRegisterVM model) {
+ public Result register(@Valid UserRegisterVO model) {
User existUser = userService.getUserByUserName(model.getUserName());
if (null != existUser) {
- return new RestResponse<>(2, "鐢ㄦ埛宸插瓨鍦�");
+ return new Result<>(2, "鐢ㄦ埛宸插瓨鍦�");
}
- User user = modelMapper.map(model, User.class);
+ User user = new User();
+ BeanUtils.copyProperties(model, user);
String encodePwd = authenticationService.pwdEncode(model.getPassword());
user.setUserUuid(UUID.randomUUID().toString());
user.setPassword(encodePwd);
@@ -72,78 +65,79 @@
user.setStatus(UserStatusEnum.Enable.getCode());
user.setLastActiveTime(new Date());
user.setCreateTime(new Date());
- user.setDeleted(false);
- userService.insertByFilter(user);
+ userService.insertUser(user);
UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
- userEventLog.setContent("娆㈣繋 " + user.getUserName() + " 娉ㄥ唽鏉ュ埌瀛︿箣鎬濆紑婧愯�冭瘯绯荤粺");
+ userEventLog.setContent("娆㈣繋 " + user.getUserName() + " 娉ㄥ唽鏉ュ埌姹熻タ绌虹闊宠棰戝煿璁郴缁�");
eventPublisher.publishEvent(new UserEvent(userEventLog));
- return RestResponse.ok();
+ return Result.ok();
}
@RequestMapping(value = "/update", method = RequestMethod.POST)
- public RestResponse<UserResponseVM> update(@Valid UserUpdateVM model) {
+ public Result<UserResponseVO> update(@Valid UserUpdateVO model) {
if (StringUtils.isBlank(model.getBirthDay())) {
model.setBirthDay(null);
}
- User user = userService.selectById(getCurrentUser().getId());
- modelMapper.map(model, user);
+ User user = userService.getById(getCurrentUser().getId());
+ BeanUtils.copyProperties(model, user);
user.setModifyTime(new Date());
- userService.updateByIdFilter(user);
+ userService.updateUser(user);
UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
userEventLog.setContent(user.getUserName() + " 鏇存柊浜嗕釜浜鸿祫鏂�");
eventPublisher.publishEvent(new UserEvent(userEventLog));
- UserResponseVM userVm = UserResponseVM.from(user);
- return RestResponse.ok(userVm);
+ UserResponseVO userVm = UserResponseVO.from(user);
+ return Result.ok(userVm);
}
@RequestMapping(value = "/log", method = RequestMethod.POST)
- public RestResponse<List<UserEventLogVM>> log() {
+ public Result<List<UserEventLogVO>> log() {
User user = getCurrentUser();
List<UserEventLog> userEventLogs = userEventLogService.getUserEventLogByUserId(user.getId());
- List<UserEventLogVM> userEventLogVMS = userEventLogs.stream().map(d -> {
- UserEventLogVM vm = modelMapper.map(d, UserEventLogVM.class);
- vm.setCreateTime(DateTimeUtil.dateFormat(d.getCreateTime()));
- return vm;
+ List<UserEventLogVO> userEventLogVOS = userEventLogs.stream().map(d -> {
+ UserEventLogVO vo = new UserEventLogVO();
+ BeanUtils.copyProperties(d, vo);
+ vo.setCreateTime(DateTimeUtil.dateFormat(d.getCreateTime()));
+ return vo;
}).collect(Collectors.toList());
- return RestResponse.ok(userEventLogVMS);
+ return Result.ok(userEventLogVOS);
}
@RequestMapping(value = "/message/page", method = RequestMethod.POST)
- public RestResponse<PageInfo<MessageResponseVM>> messagePageList(MessageRequestVM messageRequestVM) {
- messageRequestVM.setReceiveUserId(getCurrentUser().getId());
- PageInfo<MessageUser> messageUserPageInfo = messageService.studentPage(messageRequestVM);
+ public Result<PageInfo<MessageResponseVO>> messagePageList(MessageRequestVO messageRequestVO) {
+ messageRequestVO.setReceiveUserId(getCurrentUser().getId());
+ PageInfo<MessageUser> messageUserPageInfo = messageService.studentPage(messageRequestVO);
List<Integer> ids = messageUserPageInfo.getList().stream().map(d -> d.getMessageId()).collect(Collectors.toList());
List<Message> messages = ids.size() != 0 ? messageService.selectMessageByIds(ids) : null;
- PageInfo<MessageResponseVM> page = PageInfoHelper.copyMap(messageUserPageInfo, e -> {
- MessageResponseVM vm = modelMapper.map(e, MessageResponseVM.class);
+ PageInfo<MessageResponseVO> page = PageInfoHelper.copyMap(messageUserPageInfo, e -> {
+ MessageResponseVO vo = new MessageResponseVO();
+ BeanUtils.copyProperties(e, vo);
messages.stream().filter(d -> e.getMessageId().equals(d.getId())).findFirst().ifPresent(message -> {
- vm.setTitle(message.getTitle());
- vm.setContent(message.getContent());
- vm.setSendUserName(message.getSendUserName());
+ vo.setTitle(message.getTitle());
+ vo.setContent(message.getContent());
+ vo.setSendUserName(message.getSendUserName());
});
- vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- return vm;
+ vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
+ return vo;
});
- return RestResponse.ok(page);
+ return Result.ok(page);
}
@RequestMapping(value = "/message/detail/{id}", method = RequestMethod.POST)
- public RestResponse messageDetail(@PathVariable Integer id) {
+ public Result messageDetail(@PathVariable Integer id) {
Message message = messageService.messageDetail(id);
- return RestResponse.ok(message);
+ return Result.ok(message);
}
@RequestMapping(value = "/message/unreadCount", method = RequestMethod.POST)
- public RestResponse unReadCount() {
+ public Result unReadCount() {
Integer count = messageService.unReadCount(getCurrentUser().getId());
- return RestResponse.ok(count);
+ return Result.ok(count);
}
@RequestMapping(value = "/message/read/{id}", method = RequestMethod.POST)
- public RestResponse read(@PathVariable Integer id) {
+ public Result read(@PathVariable Integer id) {
messageService.read(id);
- return RestResponse.ok();
+ return Result.ok();
}
}
--
Gitblit v1.8.0