From 6e21c6472843d67bfb5dd590e33207a58d41695e Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期四, 02 三月 2023 22:09:51 +0800
Subject: [PATCH] !292 mapstruct-plus 接入替换 BeanUtil * add 新增 mapstruct-plus 用于实体类转换 ;
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java
index e1dfae8..3f34a23 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java
@@ -4,14 +4,19 @@
import cn.hutool.core.io.FileUtil;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.MapstructUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.file.MimeTypeUtils;
-import com.ruoyi.common.web.core.BaseController;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.system.domain.SysUser;
+import com.ruoyi.common.web.core.BaseController;
+import com.ruoyi.system.domain.bo.SysUserBo;
+import com.ruoyi.system.domain.bo.SysUserProfileBo;
+import com.ruoyi.system.domain.vo.AvatarVo;
+import com.ruoyi.system.domain.vo.ProfileVo;
import com.ruoyi.system.domain.vo.SysOssVo;
+import com.ruoyi.system.domain.vo.SysUserVo;
import com.ruoyi.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
@@ -21,7 +26,6 @@
import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
-import java.util.Map;
/**
* 涓汉淇℃伅 涓氬姟澶勭悊
@@ -35,19 +39,19 @@
public class SysProfileController extends BaseController {
private final ISysUserService userService;
- private final ISysOssService iSysOssService;
+ private final ISysOssService sysOssService;
/**
* 涓汉淇℃伅
*/
@GetMapping
- public R<Map<String, Object>> profile() {
- SysUser user = userService.selectUserById(LoginHelper.getUserId());
- return R.ok(Map.of(
- "user", user,
- "roleGroup", userService.selectUserRoleGroup(user.getUserName()),
- "postGroup", userService.selectUserPostGroup(user.getUserName())
- ));
+ public R<ProfileVo> profile() {
+ SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
+ ProfileVo profileVo = new ProfileVo();
+ profileVo.setUser(user);
+ profileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserName()));
+ profileVo.setPostGroup(userService.selectUserPostGroup(user.getUserName()));
+ return R.ok(profileVo);
}
/**
@@ -55,7 +59,8 @@
*/
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping
- public R<Void> updateProfile(@RequestBody SysUser user) {
+ public R<Void> updateProfile(@RequestBody SysUserProfileBo profile) {
+ SysUserBo user = MapstructUtils.convert(profile, SysUserBo.class);
if (StringUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
return R.fail("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
@@ -65,10 +70,6 @@
return R.fail("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
user.setUserId(LoginHelper.getUserId());
- user.setUserName(null);
- user.setPassword(null);
- user.setAvatar(null);
- user.setDeptId(null);
if (userService.updateUserProfile(user) > 0) {
return R.ok();
}
@@ -84,7 +85,7 @@
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping("/updatePwd")
public R<Void> updatePwd(String oldPassword, String newPassword) {
- SysUser user = userService.selectUserById(LoginHelper.getUserId());
+ SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
String userName = user.getUserName();
String password = user.getPassword();
if (!BCrypt.checkpw(oldPassword, password)) {
@@ -107,16 +108,18 @@
*/
@Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
@PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {
+ public R<AvatarVo> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {
if (!avatarfile.isEmpty()) {
String extension = FileUtil.extName(avatarfile.getOriginalFilename());
if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
return R.fail("鏂囦欢鏍煎紡涓嶆纭紝璇蜂笂浼�" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "鏍煎紡");
}
- SysOssVo oss = iSysOssService.upload(avatarfile);
+ SysOssVo oss = sysOssService.upload(avatarfile);
String avatar = oss.getUrl();
- if (userService.updateUserAvatar(LoginHelper.getUsername(), avatar)) {
- return R.ok(Map.of("imgUrl", avatar));
+ if (userService.updateUserAvatar(LoginHelper.getUsername(), oss.getOssId())) {
+ AvatarVo avatarVo = new AvatarVo();
+ avatarVo.setImgUrl(avatar);
+ return R.ok(avatarVo);
}
}
return R.fail("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛�");
--
Gitblit v1.9.3