From 51185ccb95aafb008ce2c8f27f82e23e93e07730 Mon Sep 17 00:00:00 2001 From: ennian001 Date: Thu, 11 Jan 2024 03:25:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/auth/controller/LimitedIpController.java | 8 ++++---- .../center/auth/controller/TenantController.java | 8 ++++---- .../center/auth/controller/UserLoginController.java | 12 ++++++------ .../pnoker/center/auth/entity/bo/ResourceBO.java | 4 ++-- .../center/auth/entity/query/LabelBindQuery.java | 4 ++-- .../pnoker/center/auth/entity/vo/ResourceVO.java | 7 ++++--- .../center/auth/entity/vo/RoleResourceBindVO.java | 10 +++++----- .../pnoker/center/auth/entity/vo/RoleUserBindVO.java | 8 ++++---- .../github/pnoker/center/auth/entity/vo/RoleVO.java | 5 +++-- .../pnoker/center/auth/entity/vo/TenantBindVO.java | 6 +++--- .../auth/service/impl/LabelBindServiceImpl.java | 5 ++--- 11 files changed, 39 insertions(+), 38 deletions(-) diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/LimitedIpController.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/LimitedIpController.java index 468ee38ac..986f976af 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/LimitedIpController.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/LimitedIpController.java @@ -79,9 +79,9 @@ public class LimitedIpController implements BaseController { * @return R of String */ @PostMapping("/delete/{id}") - public R delete(@NotNull @PathVariable(value = "id") String id) { + public R delete(@NotNull @PathVariable(value = "id") Long id) { try { - limitedIpService.remove(Long.parseLong(id)); + limitedIpService.remove(id); return R.ok(ResponseEnum.DELETE_SUCCESS); } catch (Exception e) { log.error(e.getMessage(), e); @@ -118,9 +118,9 @@ public class LimitedIpController implements BaseController { * @return LimitedIpVO {@link LimitedIpVO} */ @GetMapping("/id/{id}") - public R selectById(@NotNull @PathVariable(value = "id") String id) { + public R selectById(@NotNull @PathVariable(value = "id") Long id) { try { - LimitedIpBO entityBO = limitedIpService.selectById(Long.parseLong(id)); + LimitedIpBO entityBO = limitedIpService.selectById(id); LimitedIpVO entityVO = limitedIpBuilder.buildVOByBO(entityBO); return R.ok(entityVO); } catch (Exception e) { diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/TenantController.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/TenantController.java index 1c952439e..bc675a1b7 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/TenantController.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/TenantController.java @@ -78,9 +78,9 @@ public class TenantController implements BaseController { * @return R of String */ @PostMapping("/delete/{id}") - public R delete(@NotNull @PathVariable(value = "id") String id) { + public R delete(@NotNull @PathVariable(value = "id") Long id) { try { - tenantService.remove(Long.parseLong(id)); + tenantService.remove(id); return R.ok(ResponseEnum.DELETE_SUCCESS); } catch (Exception e) { log.error(e.getMessage(), e); @@ -117,9 +117,9 @@ public class TenantController implements BaseController { * @return TenantVO {@link TenantVO} */ @GetMapping("/id/{id}") - public R selectById(@NotNull @PathVariable(value = "id") String id) { + public R selectById(@NotNull @PathVariable(value = "id") Long id) { try { - TenantBO entityBO = tenantService.selectById(Long.parseLong(id)); + TenantBO entityBO = tenantService.selectById(id); TenantVO entityVO = tenantBuilder.buildVOByBO(entityBO); return R.ok(entityVO); } catch (Exception e) { diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/UserLoginController.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/UserLoginController.java index 7b3e38082..76d3cde5f 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/UserLoginController.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/controller/UserLoginController.java @@ -81,9 +81,9 @@ public class UserLoginController implements BaseController { * @return R of String */ @PostMapping("/delete/{id}") - public R delete(@NotNull @PathVariable(value = "id") String id) { + public R delete(@NotNull @PathVariable(value = "id") Long id) { try { - userLoginService.remove(Long.parseLong(id)); + userLoginService.remove(id); return R.ok(ResponseEnum.DELETE_SUCCESS); } catch (Exception e) { log.error(e.getMessage(), e); @@ -120,9 +120,9 @@ public class UserLoginController implements BaseController { * @return 是否重置 */ @PostMapping("/reset/{id}") - public R restPassword(@NotNull @PathVariable(value = "id") String id) { + public R restPassword(@NotNull @PathVariable(value = "id") Long id) { try { - userPasswordService.restPassword(Long.parseLong(id)); + userPasswordService.restPassword(id); return R.ok(); } catch (Exception e) { log.error(e.getMessage(), e); @@ -137,9 +137,9 @@ public class UserLoginController implements BaseController { * @return UserLoginVO {@link UserLoginVO} */ @GetMapping("/id/{id}") - public R selectById(@NotNull @PathVariable(value = "id") String id) { + public R selectById(@NotNull @PathVariable(value = "id") Long id) { try { - UserLoginBO entityBO = userLoginService.selectById(Long.parseLong(id)); + UserLoginBO entityBO = userLoginService.selectById(id); UserLoginVO entityVO = userLoginBuilder.buildVOByBO(entityBO); return R.ok(entityVO); } catch (Exception e) { diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/bo/ResourceBO.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/bo/ResourceBO.java index 7bca42a1b..5227a9d49 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/bo/ResourceBO.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/bo/ResourceBO.java @@ -41,7 +41,7 @@ public class ResourceBO extends BaseBO { /** * 权限资源父级ID */ - private String parentResourceId; + private Long parentResourceId; /** * 权限资源名称 @@ -73,7 +73,7 @@ public class ResourceBO extends BaseBO { /** * 权限资源实体ID */ - private String entityId; + private Long entityId; /** * 资源拓展信息 diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/query/LabelBindQuery.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/query/LabelBindQuery.java index 566475e34..f6cfba90e 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/query/LabelBindQuery.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/query/LabelBindQuery.java @@ -52,11 +52,11 @@ public class LabelBindQuery implements Serializable { * 标签ID */ @Schema(description = "标签ID") - private String labelId; + private Long labelId; /** * 实体ID */ @Schema(description = "实体ID") - private String entityId; + private Long entityId; } \ No newline at end of file diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/ResourceVO.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/ResourceVO.java index 5c2170d9c..16fb608ea 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/ResourceVO.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/ResourceVO.java @@ -32,6 +32,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; /** @@ -54,7 +55,7 @@ public class ResourceVO extends BaseVO { @Schema(description = "权限资源父级ID") @NotBlank(message = "Resource parent id can't be empty", groups = {Add.class, Update.class}) - private String parentResourceId; + private Long parentResourceId; /** * 权限资源名称 @@ -96,9 +97,9 @@ public class ResourceVO extends BaseVO { * 权限资源实体ID */ @Schema(description = "权限资源实体ID") - @NotBlank(message = "实体ID不能为空", + @NotNull(message = "实体ID不能为空", groups = {Add.class, Update.class}) - private String entityId; + private Long entityId; /** * 资源拓展信息 diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleResourceBindVO.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleResourceBindVO.java index edf027690..4cc707864 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleResourceBindVO.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleResourceBindVO.java @@ -26,7 +26,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * RoleResourceBind VO @@ -46,15 +46,15 @@ public class RoleResourceBindVO extends BaseVO { * 角色ID */ @Schema(description = "角色ID") - @NotBlank(message = "Role id can't be empty", + @NotNull(message = "Role id can't be empty", groups = {Add.class, Update.class}) - private String roleId; + private Long roleId; /** * 权限资源ID */ @Schema(description = "权限资源ID") - @NotBlank(message = "Resource id can't be empty", + @NotNull(message = "Resource id can't be empty", groups = {Add.class, Update.class}) - private String resourceId; + private Long resourceId; } diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleUserBindVO.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleUserBindVO.java index c541823cc..0582313e5 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleUserBindVO.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleUserBindVO.java @@ -26,7 +26,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * RoleUserBind VO @@ -46,15 +46,15 @@ public class RoleUserBindVO extends BaseVO { * 角色ID */ @Schema(description = "角色ID") - @NotBlank(message = "Role id can't be empty", + @NotNull(message = "Role id can't be empty", groups = {Add.class, Update.class}) - private String roleId; + private Long roleId; /** * 用户ID */ @Schema(description = "用户ID") - @NotBlank(message = "User id can't be empty", + @NotNull(message = "User id can't be empty", groups = {Add.class, Update.class}) private Long userId; } diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleVO.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleVO.java index b9e869874..8c2b10bb1 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleVO.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/RoleVO.java @@ -30,6 +30,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; /** @@ -50,9 +51,9 @@ public class RoleVO extends BaseVO { * 角色父级ID */ @Schema(description = "角色父级ID") - @NotBlank(message = "Role parent id can't be empty", + @NotNull(message = "Role parent id can't be empty", groups = {Add.class, Update.class}) - private String parentRoleId; + private Long parentRoleId; /** * 角色名称 diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/TenantBindVO.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/TenantBindVO.java index 74a245902..2351dc3f0 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/TenantBindVO.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/entity/vo/TenantBindVO.java @@ -26,7 +26,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * TenantBind VO @@ -46,7 +46,7 @@ public class TenantBindVO extends BaseVO { * 租户ID */ @Schema(description = "租户ID") - @NotBlank(message = "Tenant id can't be empty", + @NotNull(message = "Tenant id can't be empty", groups = {Add.class, Update.class}) private Long tenantId; @@ -54,7 +54,7 @@ public class TenantBindVO extends BaseVO { * 用户ID */ @Schema(description = "用户ID") - @NotBlank(message = "User id can't be empty", + @NotNull(message = "User id can't be empty", groups = {Add.class, Update.class}) private Long userId; } diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/LabelBindServiceImpl.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/LabelBindServiceImpl.java index f7f811854..32e92ae7b 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/LabelBindServiceImpl.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/LabelBindServiceImpl.java @@ -16,7 +16,6 @@ package io.github.pnoker.center.auth.service.impl; -import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -111,8 +110,8 @@ public class LabelBindServiceImpl implements LabelBindService { */ private LambdaQueryWrapper fuzzyQuery(LabelBindQuery entityQuery) { LambdaQueryWrapper wrapper = Wrappers.query().lambda(); - wrapper.eq(CharSequenceUtil.isNotEmpty(entityQuery.getLabelId()), LabelBindDO::getLabelId, entityQuery.getLabelId()); - wrapper.eq(CharSequenceUtil.isNotEmpty(entityQuery.getEntityId()), LabelBindDO::getEntityId, entityQuery.getEntityId()); + wrapper.eq(ObjectUtil.isNotEmpty(entityQuery.getLabelId()), LabelBindDO::getLabelId, entityQuery.getLabelId()); + wrapper.eq(ObjectUtil.isNotEmpty(entityQuery.getEntityId()), LabelBindDO::getEntityId, entityQuery.getEntityId()); return wrapper; }