BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 1c854bb54729b9de093c13c0823b12d501d1eeda

Authored by YunaiV
1 parent 6d179320

【代码评审】INFRA：代码生成在 vben5 的模版

Inline Side-by-side
Showing 4 changed files with 19 additions and 33 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java
  View file @1c854bb
... ... @@ -5,23 +5,25 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
7 7 import cn.iocoder.yudao.module.system.controller.admin.socail.vo.user.SocialUserBindReqVO;
8   -import cn.iocoder.yudao.module.system.controller.admin.socail.vo.user.SocialUserUnbindReqVO;
9 8 import cn.iocoder.yudao.module.system.controller.admin.socail.vo.user.SocialUserPageReqVO;
10 9 import cn.iocoder.yudao.module.system.controller.admin.socail.vo.user.SocialUserRespVO;
  10 +import cn.iocoder.yudao.module.system.controller.admin.socail.vo.user.SocialUserUnbindReqVO;
11 11 import cn.iocoder.yudao.module.system.convert.social.SocialUserConvert;
12 12 import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO;
13 13 import cn.iocoder.yudao.module.system.service.social.SocialUserService;
14 14 import io.swagger.v3.oas.annotations.Operation;
15 15 import io.swagger.v3.oas.annotations.Parameter;
16 16 import io.swagger.v3.oas.annotations.tags.Tag;
  17 +import jakarta.annotation.Resource;
  18 +import jakarta.validation.Valid;
17 19 import org.springframework.security.access.prepost.PreAuthorize;
18 20 import org.springframework.validation.annotation.Validated;
19 21 import org.springframework.web.bind.annotation.*;
20 22  
21   -import jakarta.annotation.Resource;
22   -import jakarta.validation.Valid;
  23 +import java.util.List;
23 24  
24 25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  26 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
25 27 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
26 28  
27 29 @Tag(name = "管理后台 - 社交用户")
... ... @@ -48,6 +50,15 @@ public class SocialUserController {
48 50 return CommonResult.success(true);
49 51 }
50 52  
  53 + @GetMapping("/get-bind-list")
  54 + @Operation(summary = "获得绑定社交用户列表")
  55 + public CommonResult<List<SocialUserRespVO>> getBindSocialUserList() {
  56 + List<SocialUserDO> list = socialUserService.getSocialUserList(getLoginUserId(), UserTypeEnum.ADMIN.getValue());
  57 + return success(convertList(list, socialUser -> new SocialUserRespVO() // 返回精简信息
  58 + .setId(socialUser.getId()).setType(socialUser.getType()).setOpenid(socialUser.getOpenid())
  59 + .setNickname(socialUser.getNickname()).setAvatar(socialUser.getNickname())));
  60 + }
  61 +
51 62 // ==================== 社交用户 CRUD ====================
52 63  
53 64 @GetMapping("/get")
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java
  View file @1c854bb
1 1 package cn.iocoder.yudao.module.system.controller.admin.user;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4   -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
5 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
6 5 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
7 6 import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileRespVO;
... ... @@ -11,23 +10,21 @@ import cn.iocoder.yudao.module.system.convert.user.UserConvert;
11 10 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
12 11 import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
13 12 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
14   -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO;
15 13 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
16 14 import cn.iocoder.yudao.module.system.service.dept.DeptService;
17 15 import cn.iocoder.yudao.module.system.service.dept.PostService;
18 16 import cn.iocoder.yudao.module.system.service.permission.PermissionService;
19 17 import cn.iocoder.yudao.module.system.service.permission.RoleService;
20   -import cn.iocoder.yudao.module.system.service.social.SocialUserService;
21 18 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
22   -import io.swagger.v3.oas.annotations.tags.Tag;
23 19 import io.swagger.v3.oas.annotations.Operation;
  20 +import io.swagger.v3.oas.annotations.tags.Tag;
  21 +import jakarta.annotation.Resource;
  22 +import jakarta.validation.Valid;
24 23 import lombok.extern.slf4j.Slf4j;
25 24 import org.springframework.validation.annotation.Validated;
26 25 import org.springframework.web.bind.annotation.*;
27 26 import org.springframework.web.multipart.MultipartFile;
28 27  
29   -import jakarta.annotation.Resource;
30   -import jakarta.validation.Valid;
31 28 import java.util.List;
32 29  
33 30 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
... ... @@ -52,8 +49,6 @@ public class UserProfileController {
52 49 private PermissionService permissionService;
53 50 @Resource
54 51 private RoleService roleService;
55   - @Resource
56   - private SocialUserService socialService;
57 52  
58 53 @GetMapping("/get")
59 54 @Operation(summary = "获得登录用户信息")
... ... @@ -67,9 +62,7 @@ public class UserProfileController {
67 62 DeptDO dept = user.getDeptId() != null ? deptService.getDept(user.getDeptId()) : null;
68 63 // 获得岗位信息
69 64 List<PostDO> posts = CollUtil.isNotEmpty(user.getPostIds()) ? postService.getPostList(user.getPostIds()) : null;
70   - // 获得社交用户信息
71   - List<SocialUserDO> socialUsers = socialService.getSocialUserList(user.getId(), UserTypeEnum.ADMIN.getValue());
72   - return success(UserConvert.INSTANCE.convert(user, userRoles, dept, posts, socialUsers));
  65 + return success(UserConvert.INSTANCE.convert(user, userRoles, dept, posts));
73 66 }
74 67  
75 68 @PutMapping("/update")
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java
  View file @1c854bb
... ... @@ -55,21 +55,5 @@ public class UserProfileRespVO {
55 55 * 所属岗位数组
56 56 */
57 57 private List<PostSimpleRespVO> posts;
58   - /**
59   - * 社交用户数组
60   - */
61   - private List<SocialUser> socialUsers;
62   -
63   - @Schema(description = "社交用户")
64   - @Data
65   - public static class SocialUser {
66   -
67   - @Schema(description = "社交平台的类型，参见 SocialTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
68   - private Integer type;
69   -
70   - @Schema(description = "社交用户的 openid", requiredMode = Schema.RequiredMode.REQUIRED, example = "IPRmJ0wvBptiPIlGEZiPewGwiEiE")
71   - private String openid;
72   -
73   - }
74 58  
75 59 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java
  View file @1c854bb
... ... @@ -12,7 +12,6 @@ import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSimpleRe
12 12 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
13 13 import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
14 14 import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
15   -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO;
16 15 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
17 16 import org.mapstruct.Mapper;
18 17 import org.mapstruct.factory.Mappers;
... ... @@ -46,12 +45,11 @@ public interface UserConvert {
46 45 }
47 46  
48 47 default UserProfileRespVO convert(AdminUserDO user, List<RoleDO> userRoles,
49   - DeptDO dept, List<PostDO> posts, List<SocialUserDO> socialUsers) {
  48 + DeptDO dept, List<PostDO> posts) {
50 49 UserProfileRespVO userVO = BeanUtils.toBean(user, UserProfileRespVO.class);
51 50 userVO.setRoles(BeanUtils.toBean(userRoles, RoleSimpleRespVO.class));
52 51 userVO.setDept(BeanUtils.toBean(dept, DeptSimpleRespVO.class));
53 52 userVO.setPosts(BeanUtils.toBean(posts, PostSimpleRespVO.class));
54   - userVO.setSocialUsers(BeanUtils.toBean(socialUsers, UserProfileRespVO.SocialUser.class));
55 53 return userVO;
56 54 }
57 55  
... ...