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 | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 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 6ef39e4..2025622 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/UserController.java
@@ -2,12 +2,14 @@
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.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.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;
@@ -15,12 +17,14 @@
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
-import com.ycl.jxkg.vo.student.user.*;
+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.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -29,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 {
@@ -39,22 +44,12 @@
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 Result<UserResponseVO> current() {
User user = getCurrentUser();
UserResponseVO userVm = UserResponseVO.from(user);
return Result.ok(userVm);
}
-
@RequestMapping(value = "/register", method = RequestMethod.POST)
public Result register(@RequestBody @Valid UserRegisterVO model) {
@@ -71,24 +66,19 @@
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 Result.ok();
}
-
@RequestMapping(value = "/update", method = RequestMethod.POST)
public Result update(@RequestBody @Valid UserUpdateVO model) {
- if (StringUtils.isBlank(model.getBirthDay())) {
- model.setBirthDay(null);
- }
- User user = userService.selectById(getCurrentUser().getId());
+ 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));
@@ -140,4 +130,10 @@
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