From b0cc232cd4129cac41807b49434568c17f0dac2c Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 22 Apr 2024 11:10:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E8=A7=92?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kqapi/common/enumeration/RoleEnum.java | 30 ---------------- .../kqapi/user/controller/UserInfoController.java | 4 +-- .../kqapi/user/manage/UserInfoManage.java | 26 +++++--------- .../kqapi/user/model/po/SaveUserReq.java | 3 -- .../kqapi/user/model/po/UserListReq.java | 6 ---- .../kqapi/user/model/vo/ResUserListVO.java | 41 ---------------------- .../kqapi/user/model/vo/UserBasicInfoVO.java | 10 ++---- .../kqapi/user/model/vo/UserDetailVO.java | 4 --- .../ningdatech/kqapi/user/model/vo/UserListVO.java | 38 ++++++++++++++++++++ 9 files changed, 52 insertions(+), 110 deletions(-) delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/common/enumeration/RoleEnum.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/ResUserListVO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserListVO.java diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/enumeration/RoleEnum.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/enumeration/RoleEnum.java deleted file mode 100644 index f3fa589..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/common/enumeration/RoleEnum.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ningdatech.kqapi.common.enumeration; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * @author liuxinxin - * @date 2022/11/23 下午4:32 - * 系统角色 - */ -@Getter -@AllArgsConstructor -public enum RoleEnum { - - engineer("工程师"), - project_manager("项目经理"), - project_leader("项目负责人"), - enterprise_admin("企业管理员"), - regional_general_manager("地区总经理"), - driver("驾驶员"), - super_admin("超级管理员"), - driver_admin("车管员"); - - private final String displayName; - - public boolean eq(String name) { - return this.name().equals(name); - } - -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/user/controller/UserInfoController.java b/kqapi/src/main/java/com/ningdatech/kqapi/user/controller/UserInfoController.java index afed9ee..6f09200 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/user/controller/UserInfoController.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/user/controller/UserInfoController.java @@ -6,7 +6,7 @@ import com.ningdatech.basic.model.PageVo; import com.ningdatech.kqapi.user.manage.UserInfoManage; import com.ningdatech.kqapi.user.model.po.*; import com.ningdatech.kqapi.user.model.vo.UserBasicInfoVO; -import com.ningdatech.kqapi.user.model.vo.ResUserListVO; +import com.ningdatech.kqapi.user.model.vo.UserListVO; import com.ningdatech.kqapi.user.model.vo.UserDetailVO; import com.ningdatech.kqapi.user.service.IUserInfoService; import com.ningdatech.log.annotation.WebLog; @@ -65,7 +65,7 @@ public class UserInfoController { @PostMapping(value = "/list") @ApiOperation(value = "用户列表筛选") @WebLog(value = "用户列表筛选") - public PageVo listUser(@Valid @RequestBody UserListReq request) { + public PageVo listUser(@Valid @RequestBody UserListReq request) { return userInfoManage.listUser(request); } diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/user/manage/UserInfoManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/user/manage/UserInfoManage.java index 25512ad..f3dd0e2 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/user/manage/UserInfoManage.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/user/manage/UserInfoManage.java @@ -11,8 +11,8 @@ import com.ningdatech.basic.exception.BizException; import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.util.CollUtils; import com.ningdatech.kqapi.common.constant.BizConst; -import com.ningdatech.kqapi.common.enumeration.RoleEnum; import com.ningdatech.kqapi.security.constant.AuthTypeEnum; +import com.ningdatech.kqapi.security.model.UserInfoDetails; import com.ningdatech.kqapi.user.model.entity.UserAuth; import com.ningdatech.kqapi.user.model.entity.UserInfo; import com.ningdatech.kqapi.user.model.enumerization.AccountStatus; @@ -20,8 +20,8 @@ import com.ningdatech.kqapi.user.model.po.ChangeAccountStatusReq; import com.ningdatech.kqapi.user.model.po.ModifyPasswordReq; import com.ningdatech.kqapi.user.model.po.SaveUserReq; import com.ningdatech.kqapi.user.model.po.UserListReq; +import com.ningdatech.kqapi.user.model.vo.UserListVO; import com.ningdatech.kqapi.user.model.vo.UserBasicInfoVO; -import com.ningdatech.kqapi.user.model.vo.ResUserListVO; import com.ningdatech.kqapi.user.model.vo.UserDetailVO; import com.ningdatech.kqapi.user.service.IUserAuthService; import com.ningdatech.kqapi.user.service.IUserInfoService; @@ -136,33 +136,30 @@ public class UserInfoManage { .userName(info.getUsername()) .avatarFileId(info.getAvatarFileId()) .phoneNo(info.getMobile()) - .role(RoleEnum.valueOf(info.getRole())) .accountStatus(info.getAccountStatus()) .build(); } - public PageVo listUser(UserListReq req) { + public PageVo listUser(UserListReq req) { // 获取入参 String realName = req.getRealName(); // 获取区域列表 Wrapper query = Wrappers.lambdaQuery(UserInfo.class) .like(StrUtil.isNotBlank(realName), UserInfo::getRealName, realName) .eq(StrUtil.isNotBlank(req.getMobile()), UserInfo::getMobile, req.getMobile()) - .eq(req.getRole() != null, UserInfo::getRole, req.getRole()) .orderByDesc(UserInfo::getUpdateOn); Page page = userInfoService.page(req.page(), query); - PageVo pageVo = new PageVo<>(); + PageVo pageVo = new PageVo<>(); long total = page.getTotal(); pageVo.setTotal(total); if (total > 0) { - Function mapping = r -> { - ResUserListVO res = new ResUserListVO(); + Function mapping = r -> { + UserListVO res = new UserListVO(); res.setUserId(r.getId()); res.setRealName(r.getRealName()); res.setCreateTime(r.getCreateOn()); res.setPhoneNo(r.getMobile()); res.setAccountStatus(r.getAccountStatus()); - BizUtils.notBlank(r.getRole(), w -> res.setRole(RoleEnum.valueOf(w))); return res; }; pageVo.setRecords(CollUtils.convert(page.getRecords(), mapping)); @@ -171,15 +168,10 @@ public class UserInfoManage { } public UserBasicInfoVO getBasicInfo() { - Long userId = LoginUserUtil.getUserId(); - UserInfo userInfo = userInfoService.getById(userId); + UserInfoDetails details = LoginUserUtil.loginUserDetail(); UserBasicInfoVO result = new UserBasicInfoVO(); - result.setUserId(userId); - result.setRealName(userInfo.getRealName()); - BizUtils.notBlank(userInfo.getRole(), role -> { - result.setRole(RoleEnum.valueOf(role)); - result.setRoleName(result.getRole().getDisplayName()); - }); + result.setUserId(details.getUserId()); + result.setRealName(details.getRealName()); return result; } diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/po/SaveUserReq.java b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/po/SaveUserReq.java index 0f97014..415d5af 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/po/SaveUserReq.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/po/SaveUserReq.java @@ -1,7 +1,6 @@ package com.ningdatech.kqapi.user.model.po; import cn.hutool.core.lang.RegexPool; -import com.ningdatech.kqapi.common.enumeration.RoleEnum; import com.ningdatech.kqapi.user.model.enumerization.AccountStatus; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,8 +40,6 @@ public class SaveUserReq { @ApiModelProperty("密码") private String password; - private RoleEnum role; - @ApiModelProperty("免冠照图片文件id") private Long avatarFileId; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/po/UserListReq.java b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/po/UserListReq.java index 15ae30c..60a88bb 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/po/UserListReq.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/po/UserListReq.java @@ -1,7 +1,6 @@ package com.ningdatech.kqapi.user.model.po; import com.ningdatech.basic.model.PagePo; -import com.ningdatech.kqapi.common.enumeration.RoleEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,11 +22,6 @@ public class UserListReq extends PagePo { @ApiModelProperty("用户姓名") private String realName; - /** - * {@link RoleEnum} - */ - private RoleEnum role; - @ApiModelProperty("手机号") private String mobile; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/ResUserListVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/ResUserListVO.java deleted file mode 100644 index 87afe94..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/ResUserListVO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.ningdatech.kqapi.user.model.vo; - -import com.ningdatech.kqapi.common.enumeration.RoleEnum; -import com.ningdatech.kqapi.user.model.enumerization.AccountStatus; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.time.LocalDateTime; - -/** - *

- * ResUserListVO - *

- * - * @author WendyYang - * @since 10:32 2024/4/20 - */ -@Data -@ApiModel("用户列表筛选VO") -public class ResUserListVO { - - @ApiModelProperty("用户id") - private Long userId; - - @ApiModelProperty("用户姓名") - private String realName; - - @NotBlank - @ApiModelProperty("手机号") - private String phoneNo; - - private RoleEnum role; - - @ApiModelProperty("创建时间") - private LocalDateTime createTime; - - private AccountStatus accountStatus; - -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserBasicInfoVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserBasicInfoVO.java index c243913..bad231c 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserBasicInfoVO.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserBasicInfoVO.java @@ -1,6 +1,5 @@ package com.ningdatech.kqapi.user.model.vo; -import com.ningdatech.kqapi.common.enumeration.RoleEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,13 +19,10 @@ public class UserBasicInfoVO { @ApiModelProperty("用户id") private Long userId; - @ApiModelProperty("角色") - private RoleEnum role; - - @ApiModelProperty("角色名称") - private String roleName; - @ApiModelProperty("用户真实姓名") private String realName; + @ApiModelProperty("用户手机号") + private String phoneNo; + } diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserDetailVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserDetailVO.java index a3a2101..d08cc8e 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserDetailVO.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserDetailVO.java @@ -1,6 +1,5 @@ package com.ningdatech.kqapi.user.model.vo; -import com.ningdatech.kqapi.common.enumeration.RoleEnum; import com.ningdatech.kqapi.user.model.enumerization.AccountStatus; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -34,9 +33,6 @@ public class UserDetailVO { @ApiModelProperty("用户登陆名") private String userName; - @ApiModelProperty("角色") - private RoleEnum role; - @ApiModelProperty("免冠照图片文件id") private Long avatarFileId; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserListVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserListVO.java new file mode 100644 index 0000000..19cbcee --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/user/model/vo/UserListVO.java @@ -0,0 +1,38 @@ +package com.ningdatech.kqapi.user.model.vo; + +import com.ningdatech.kqapi.user.model.enumerization.AccountStatus; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.time.LocalDateTime; + +/** + *

+ * ResUserListVO + *

+ * + * @author WendyYang + * @since 10:32 2024/4/20 + */ +@Data +@ApiModel("用户列表筛选VO") +public class UserListVO { + + @ApiModelProperty("用户id") + private Long userId; + + @ApiModelProperty("用户姓名") + private String realName; + + @NotBlank + @ApiModelProperty("手机号") + private String phoneNo; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + private AccountStatus accountStatus; + +}