refactor: 个人中心接口调整

This commit is contained in:
ray
2024-08-14 08:22:00 +08:00
parent c15f601e09
commit fe070ec48a
5 changed files with 48 additions and 6 deletions

View File

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.youlai.system.common.result.PageResult;
import com.youlai.system.common.result.Result;
import com.youlai.system.model.form.UserProfileForm;
import com.youlai.system.model.vo.UserProfileVO;
import com.youlai.system.util.ExcelUtils;
import com.youlai.system.enums.LogModuleEnum;
import com.youlai.system.model.dto.UserImportDTO;
@@ -173,10 +174,10 @@ public class SysUserController {
@Operation(summary = "获取个人中心用户信息")
@GetMapping("/{userId}/profile")
public Result<UserProfileForm> getUserProfile(
public Result<UserProfileVO> getUserProfile(
@PathVariable Long userId
) {
UserProfileForm userProfile = userService.getUserProfile(userId);
UserProfileVO userProfile = userService.getUserProfile(userId);
return Result.success(userProfile);
}

View File

@@ -8,6 +8,7 @@ import com.youlai.system.model.dto.UserImportDTO;
import com.youlai.system.model.form.UserProfileForm;
import com.youlai.system.model.vo.UserInfoVO;
import com.youlai.system.model.vo.UserPageVO;
import com.youlai.system.model.vo.UserProfileVO;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -42,7 +43,7 @@ public interface UserConverter {
SysUser toEntity(UserImportDTO vo);
UserProfileForm toProfileForm(SysUser entity);
UserProfileVO toProfileVO(SysUser entity);
SysUser toEntity(UserProfileForm formData);
}

View File

@@ -0,0 +1,38 @@
package com.youlai.system.model.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* 个人中心用户信息
*
* @author Ray
* @since 2024/8/13
*/
@Schema(description = "个人中心用户信息")
@Data
public class UserProfileVO {
@Schema(description = "用户ID")
private Long id;
@Schema(description = "用户名")
private String username;
@Schema(description = "用户昵称")
private String nickname;
@Schema(description = "头像URL")
private String avatar;
@Schema(description = "性别")
private Integer gender;
@Schema(description = "手机号")
private String mobile;
@Schema(description = "邮箱")
private String email;
}

View File

@@ -11,6 +11,7 @@ import com.youlai.system.model.query.UserPageQuery;
import com.youlai.system.model.dto.UserExportDTO;
import com.youlai.system.model.vo.UserInfoVO;
import com.youlai.system.model.vo.UserPageVO;
import com.youlai.system.model.vo.UserProfileVO;
import java.util.List;
@@ -106,7 +107,7 @@ public interface SysUserService extends IService<SysUser> {
*
* @return
*/
UserProfileForm getUserProfile(Long userId);
UserProfileVO getUserProfile(Long userId);
/**
* 修改个人中心用户信息

View File

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.system.common.constant.SystemConstants;
import com.youlai.system.converter.UserConverter;
import com.youlai.system.model.form.UserProfileForm;
import com.youlai.system.model.vo.UserProfileVO;
import com.youlai.system.security.util.SecurityUtils;
import com.youlai.system.mapper.SysUserMapper;
import com.youlai.system.model.dto.UserAuthInfo;
@@ -258,9 +259,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @return
*/
@Override
public UserProfileForm getUserProfile(Long userId) {
public UserProfileVO getUserProfile(Long userId) {
SysUser entity = this.getById(userId);
return userConverter.toProfileForm(entity);
return userConverter.toProfileVO(entity);
}
/**