From f588e522f2b130613dd7b3f7f8183ca71ba78e71 Mon Sep 17 00:00:00 2001 From: zzhuan <1260310633@qq.com> Date: Thu, 15 Jan 2026 14:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E8=A1=A8?= =?UTF-8?q?=E5=8A=A0=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xinghe/codegen/entity/RoleFunEntity.java | 18 +++++++++++------- .../entity/req/role/RoleBindFunReq.java | 5 +++++ .../entity/res/role/RoleQueryFunRes.java | 3 +++ .../xinghe/codegen/mapper/def/RoleFunDef.java | 9 +++++++-- .../codegen/service/impl/RoleServiceImpl.java | 2 ++ 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/cczsa/xinghe/codegen/entity/RoleFunEntity.java b/src/main/java/com/cczsa/xinghe/codegen/entity/RoleFunEntity.java index 14868bc..e62eb9b 100644 --- a/src/main/java/com/cczsa/xinghe/codegen/entity/RoleFunEntity.java +++ b/src/main/java/com/cczsa/xinghe/codegen/entity/RoleFunEntity.java @@ -1,22 +1,21 @@ package com.cczsa.xinghe.codegen.entity; +import com.cczsa.xinghe.codegen.entity.enums.ClientTypeEnum; import com.cczsa.xinghe.codegen.entity.enums.UsableConfigEnum; import com.cczsa.xinghe.codegen.handler.PostgreSQLJsonTypeHandler; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import org.postgresql.util.PGobject; - -import java.io.Serial; -import java.util.List; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; /** * 角色权限表 实体类。 @@ -69,4 +68,9 @@ public class RoleFunEntity extends BaseEntity implements Serializable { @Column(typeHandler = PostgreSQLJsonTypeHandler.class) private List excludeField; + /** + * 客户端类型：0 PC端，1 小程序端，2 H5端 + */ + private ClientTypeEnum clientType; + } diff --git a/src/main/java/com/cczsa/xinghe/codegen/entity/req/role/RoleBindFunReq.java b/src/main/java/com/cczsa/xinghe/codegen/entity/req/role/RoleBindFunReq.java index e9e05ba..1739145 100644 --- a/src/main/java/com/cczsa/xinghe/codegen/entity/req/role/RoleBindFunReq.java +++ b/src/main/java/com/cczsa/xinghe/codegen/entity/req/role/RoleBindFunReq.java @@ -1,5 +1,6 @@ package com.cczsa.xinghe.codegen.entity.req.role; +import com.cczsa.xinghe.codegen.entity.enums.ClientTypeEnum; import com.cczsa.xinghe.codegen.entity.enums.UsableConfigEnum; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; @@ -42,4 +43,8 @@ public class RoleBindFunReq implements Serializable { @Schema(description = "排除的字段 根据 fieldConfig 进行设置") private List excludeField; + @NotNull(message = "客户端类型不能为空") + @Schema(description = "客户端类型：0 PC端，1 小程序端，2 H5端") + private ClientTypeEnum clientType; + } diff --git a/src/main/java/com/cczsa/xinghe/codegen/entity/res/role/RoleQueryFunRes.java b/src/main/java/com/cczsa/xinghe/codegen/entity/res/role/RoleQueryFunRes.java index f477fd6..b676010 100644 --- a/src/main/java/com/cczsa/xinghe/codegen/entity/res/role/RoleQueryFunRes.java +++ b/src/main/java/com/cczsa/xinghe/codegen/entity/res/role/RoleQueryFunRes.java @@ -87,6 +87,9 @@ public class RoleQueryFunRes implements Serializable { @Column(typeHandler = PostgreSQLJsonTypeHandler.class) private List excludeField; + @Schema(description = "功能客户端类型：0 PC端，1 小程序端，2 H5端") + private ClientTypeEnum funClientType; + @Schema(description = "子菜单") private List children; diff --git a/src/main/java/com/cczsa/xinghe/codegen/mapper/def/RoleFunDef.java b/src/main/java/com/cczsa/xinghe/codegen/mapper/def/RoleFunDef.java index ab2ce7b..9bb05fa 100644 --- a/src/main/java/com/cczsa/xinghe/codegen/mapper/def/RoleFunDef.java +++ b/src/main/java/com/cczsa/xinghe/codegen/mapper/def/RoleFunDef.java @@ -27,7 +27,7 @@ public class RoleFunDef extends TableDef { public final QueryColumn ID = new QueryColumn(this, "id"); /** - * 权限ID + * 操作ID */ public final QueryColumn FUN_ID = new QueryColumn(this, "fun_id"); @@ -41,6 +41,11 @@ public class RoleFunDef extends TableDef { */ public final QueryColumn DATA_SCOPE = new QueryColumn(this, "data_scope"); + /** + * 客户端类型：0 PC端，1 小程序端，2 H5端 + */ + public final QueryColumn CLIENT_TYPE = new QueryColumn(this, "client_type"); + /** * 排除的字段 */ @@ -59,7 +64,7 @@ public class RoleFunDef extends TableDef { /** * 默认字段，不包含逻辑删除或者 large 等字段。 */ - public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, ROLE_ID, FUN_ID, DATA_SCOPE, ASSIGN_DATA_SCOPE, EXCLUDE_FIELD}; + public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, ROLE_ID, FUN_ID, DATA_SCOPE, ASSIGN_DATA_SCOPE, EXCLUDE_FIELD, CLIENT_TYPE}; public RoleFunDef() { super("", "cg_role_fun"); diff --git a/src/main/java/com/cczsa/xinghe/codegen/service/impl/RoleServiceImpl.java b/src/main/java/com/cczsa/xinghe/codegen/service/impl/RoleServiceImpl.java index 9b0de92..5cf4ea2 100644 --- a/src/main/java/com/cczsa/xinghe/codegen/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/cczsa/xinghe/codegen/service/impl/RoleServiceImpl.java @@ -174,6 +174,7 @@ public class RoleServiceImpl implements RoleService { roleFunEntity.setFunId(req.getFunId()); roleFunEntity.setDataScope(req.getDataScope()); roleFunEntity.setExcludeField(req.getExcludeField()); + roleFunEntity.setClientType(req.getClientType()); if (req.getExcludeField() == null || !req.getExcludeField().isEmpty()) { roleFunEntity.setExcludeField(new ArrayList<>()); } @@ -253,6 +254,7 @@ public class RoleServiceImpl implements RoleService { roleQueryFunRes.setAssignDataScope(roleFunEntity.getAssignDataScope()); roleQueryFunRes.setIsSelect(true); roleQueryFunRes.setFunBindId(roleFunEntity.getId()); + roleQueryFunRes.setFunClientType(roleFunEntity.getClientType()); } else { // 如果角色没有此功能的权限，设置默认值 roleQueryFunRes.setDataScope(null);