From a7d9c06388c884b03261c6bef1d73f68d3b2c388 Mon Sep 17 00:00:00 2001 From: shizhendong Date: Tue, 22 Oct 2024 15:45:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ASW-105=20=E5=86=85=E7=BD=AE=20role=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Owner,maintainer,developer,guest --- .../net/geedge/asw/common/util/Constants.java | 24 ++ .../sys/service/impl/SysRoleServiceImpl.java | 2 +- .../service/impl/WorkspaceServiceImpl.java | 10 + .../resources/db/migration/R__AZ_sys_menu.sql | 6 + .../db/migration/R__AZ_sys_role_menu.sql | 210 +++++++++++++----- .../db/migration/V1.0.01__INIT_TABLES.sql | 8 +- 6 files changed, 204 insertions(+), 56 deletions(-) diff --git a/src/main/java/net/geedge/asw/common/util/Constants.java b/src/main/java/net/geedge/asw/common/util/Constants.java index 2fe4f98..d2bb0de 100644 --- a/src/main/java/net/geedge/asw/common/util/Constants.java +++ b/src/main/java/net/geedge/asw/common/util/Constants.java @@ -110,4 +110,28 @@ public class Constants { public static final List ANDROID_PACKAGE_TYPE_LIST = T.ListUtil.of("xapk", "apk"); public static final String EMPTY_FILE_MD5 = "d41d8cd98f00b204e9800998ecf8427e"; + + + /** + * 系统内置角色 + */ + public static enum BuiltInRoleEnum { + OWNER("owner"), + + MAINTAINER("maintainer"), + + DEVELOPER("developer"), + + GUEST("guest"); + + private String id; + + BuiltInRoleEnum(String id) { + this.id = id; + } + + public String getId() { + return id; + } + } } diff --git a/src/main/java/net/geedge/asw/module/sys/service/impl/SysRoleServiceImpl.java b/src/main/java/net/geedge/asw/module/sys/service/impl/SysRoleServiceImpl.java index a87b274..38dc819 100644 --- a/src/main/java/net/geedge/asw/module/sys/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/sys/service/impl/SysRoleServiceImpl.java @@ -81,7 +81,7 @@ public class SysRoleServiceImpl extends ServiceImpl i @Override public Page queryList(Map params) { - params.put("orderBy", T.StrUtil.emptyToDefault(T.MapUtil.getStr(params, "orderBy"), "name")); + params.put("orderBy", T.StrUtil.emptyToDefault(T.MapUtil.getStr(params, "orderBy"), "create_timestamp")); Page page = new Query(SysRoleEntity.class).getPage(params); List roleList = this.getBaseMapper().queryList(page, params); page.setRecords(roleList); diff --git a/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java b/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java index 1f6b139..46239aa 100644 --- a/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.geedge.asw.common.util.ASWException; +import net.geedge.asw.common.util.Constants; import net.geedge.asw.common.util.RCode; import net.geedge.asw.common.util.T; import net.geedge.asw.module.workspace.dao.WorkspaceDao; @@ -60,6 +61,15 @@ public class WorkspaceServiceImpl extends ServiceImpl