From 8546b3d285af4235a0ef615a0c6e89486ae2c806 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 17 十月 2024 21:01:37 +0800
Subject: [PATCH] 达梦不支持value改为values
---
src/main/java/com/ycl/jxkg/controller/student/UserController.java | 120 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 60 insertions(+), 60 deletions(-)
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 86c48b3..2025622 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/UserController.java
@@ -1,25 +1,30 @@
package com.ycl.jxkg.controller.student;
import com.ycl.jxkg.base.BaseApiController;
-import com.ycl.jxkg.base.RestResponse;
-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.base.Result;
+import com.ycl.jxkg.domain.entity.Message;
+import com.ycl.jxkg.domain.entity.MessageUser;
+import com.ycl.jxkg.domain.entity.User;
+import com.ycl.jxkg.domain.entity.UserEventLog;
+import com.ycl.jxkg.domain.form.StudentUpdatePwdForm;
+import com.ycl.jxkg.domain.form.UpdatePwdForm;
+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 io.swagger.annotations.ApiOperation;
+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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -28,6 +33,7 @@
import java.util.UUID;
import java.util.stream.Collectors;
+@RequiredArgsConstructor
@RestController("StudentUserController")
@RequestMapping(value = "/api/student/user")
public class UserController extends BaseApiController {
@@ -38,30 +44,21 @@
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);
- return RestResponse.ok(userVm);
+ UserResponseVO userVm = UserResponseVO.from(user);
+ return Result.ok(userVm);
}
-
@RequestMapping(value = "/register", method = RequestMethod.POST)
- public RestResponse register(@RequestBody @Valid UserRegisterVM model) {
+ public Result register(@RequestBody @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);
@@ -69,71 +66,74 @@
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() + " 娉ㄥ唽鏉ュ埌瀛︿箣鎬濆紑婧愯�冭瘯绯荤粺");
eventPublisher.publishEvent(new UserEvent(userEventLog));
- return RestResponse.ok();
+ return Result.ok();
}
-
@RequestMapping(value = "/update", method = RequestMethod.POST)
- public RestResponse update(@RequestBody @Valid UserUpdateVM model) {
- if (StringUtils.isBlank(model.getBirthDay())) {
- model.setBirthDay(null);
- }
- User user = userService.selectById(getCurrentUser().getId());
- modelMapper.map(model, user);
+ public Result update(@RequestBody @Valid UserUpdateVO model) {
+ 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));
- return RestResponse.ok();
+ return Result.ok();
}
@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(@RequestBody MessageRequestVM messageRequestVM) {
- messageRequestVM.setReceiveUserId(getCurrentUser().getId());
- PageInfo<MessageUser> messageUserPageInfo = messageService.studentPage(messageRequestVM);
+ public Result<PageInfo<MessageResponseVO>> messagePageList(@RequestBody 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/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();
}
+ @ApiOperation(value = "淇敼瀵嗙爜", tags = {"淇敼瀵嗙爜"})
+ @PostMapping("/update/password")
+ public Result<Object> updatePassword(@RequestBody @Validated StudentUpdatePwdForm form) {
+ userService.updateStudentPassword(form);
+ return Result.ok("淇敼鎴愬姛");
+ }
}
--
Gitblit v1.8.0