From 6d9d4b98b2b65a381305d706064d3e823538ee0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 23 Oct 2026 21:54:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(permission):=20=E5=B8=B8=E7=94=A8=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E4=B8=8E=E5=93=81=E7=89=8CGating=E5=BA=93=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=9D=83=E9=99=90=E8=90=BD=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - V163:APP 一级分组 brand_common_tools(105,排前端工具之前)+三工具子菜单 pricing-calc / five-asin / keyword-share,按公司复制树,全量账号默认授组行 (读侧展开子孙,管理员可收组、可按工具单独授) - V164:admin 菜单 admin_brand_gating(admin_group_data 组,sort 36), 按公司复制树,不预授(管理员在菜单权限配置自行分配) - PermissionMenuSchemaInitializer 两处默认种子同步登记 --- .../PermissionMenuSchemaInitializer.java | 2 + .../db/V163__brand_common_tools_app_menu.sql | 110 ++++++++++++++++++ .../db/V164__admin_brand_gating_menu.sql | 89 ++++++++++++++ 3 files changed, 201 insertions(+) create mode 100644 backend-java/src/main/resources/db/V163__brand_common_tools_app_menu.sql create mode 100644 backend-java/src/main/resources/db/V164__admin_brand_gating_menu.sql diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java index 0e27bb1ca..93e4aad95 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java @@ -33,6 +33,7 @@ public class PermissionMenuSchemaInitializer { private final JdbcTemplate jdbcTemplate; private static final List DEFAULT_APP_MENUS = List.of( + new DefaultAppMenu("常用工具", "brand_common_tools", "brand-common-tools", 105), new DefaultAppMenu("前端工具", "brand_front_tools", "brand-front-tools", 110), new DefaultAppMenu("运营工具", "brand_operation_tools", "brand-operation-tools", 120), new DefaultAppMenu("后勤工具", "brand_logistics_tools", "brand-logistics-tools", 130) @@ -82,6 +83,7 @@ public class PermissionMenuSchemaInitializer { new DefaultAdminMenu("品牌数据库", "admin_invalid_asin_data", "invalid-asin-data", 35, "admin_group_data"), new DefaultAdminMenu("查询ASIN", "admin_query_asin", "query-asin", 65, "admin_group_data"), new DefaultAdminMenu("商品类目", "admin_product_categories", "product-categories", 66, "admin_group_data"), + new DefaultAdminMenu("品牌Gating库", "admin_brand_gating", "brand-gating", 36, "admin_group_data"), new DefaultAdminMenu("店铺密钥管理", "admin_shop_keys", "shop-keys", 40, "admin_group_shop"), new DefaultAdminMenu("店铺管理", "admin_shop_manage", "shop-manage", 50, "admin_group_shop"), new DefaultAdminMenu("最低价ASIN设置", "admin_skip_price_asin", "skip-price-asin", 60, "admin_group_shop"), diff --git a/backend-java/src/main/resources/db/V163__brand_common_tools_app_menu.sql b/backend-java/src/main/resources/db/V163__brand_common_tools_app_menu.sql new file mode 100644 index 000000000..ca23da974 --- /dev/null +++ b/backend-java/src/main/resources/db/V163__brand_common_tools_app_menu.sql @@ -0,0 +1,110 @@ +-- ============================================================= +-- 迁移 V163__brand_common_tools_app_menu +-- +-- 1. 变更目的:工具台新增「常用工具」APP 一级分组(brand_common_tools)+ 三个工具子菜单 +-- (pricing-calc 定价利润换算 / five-asin 五国ASIN快速查询 / keyword-share 五国关键词共享)。 +-- 前端卡片经客户端壳拉起本地 exe,不在本后端开新页面。组与工具各自可授:默认给全量账号 +-- 授组行(读侧由 PermissionMenuService 展开子孙,见 V80 头注),管理员可收组、也可只授单个工具。 +-- +-- 2. 口径: +-- - 排序 105~108:组行 105,三个子菜单 106/107/108,整组排在 前端工具(110)/运营工具(120)/ +-- 后勤工具(130) 之前,作为首个分类。 +-- - company_id = 1 的行是模板树(PermissionMenuService.copyTreeFromTemplate 的源头), +-- 其余公司(含 status=0 的停用公司)逐家复制一份——与 V149「复制对全公司做」同一理由: +-- 一行菜单不构成成本,别让启用公司变成要先补树的步骤。子菜单 parent_id 必须认本公司组行, +-- 严禁跨公司认父(V149 闸门 2 同一口径)。 +-- - 【默认授权】给 users 全表每只账号按其 company_id 授本公司的组行(user_column_permission +-- 直授),保证现网用户升级后直接可见;读侧组行展开子孙 ⇒ 三个工具随组可见。子菜单行不预授, +-- 管理员收组后可按工具单独授。停用账号照授,不构成可见入口(登录即拦),省一条 WHERE 的同时 +-- 避免解禁后菜单凭空消失。 +-- +-- 3. 影响表与数据量:columns +4N 行(N = 公司数;每家 1 组行 + 3 子菜单行), +-- user_column_permission +N×账号数行(只授组行);均为字典/授权小表,毫秒级,不碰锁热点表。 +-- +-- 4. 【可重跑性】组行 INSERT 带 NOT EXISTS 守卫(uk_company_column_key 口径), +-- 授权 INSERT IGNORE(依赖 uk_user_id_column_id 唯一键);重跑逐条 no-op。 +-- ============================================================= + +-- ---------- 1. 公司 1 模板树插组行 ---------- +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '常用工具', 'brand_common_tools', 'app', 'brand-common-tools', 105, NULL, 1 +WHERE NOT EXISTS ( + SELECT 1 FROM `columns` + WHERE `company_id` = 1 AND `column_key` = 'brand_common_tools' +); + +-- ---------- 2. 复制到其余公司(含停用公司) ---------- +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '常用工具', 'brand_common_tools', 'app', 'brand-common-tools', 105, NULL, c.`id` +FROM `company` c +WHERE c.`id` <> 1 + AND NOT EXISTS ( + SELECT 1 FROM `columns` col + WHERE col.`company_id` = c.`id` AND col.`column_key` = 'brand_common_tools' + ); + +-- ---------- 3. 三个工具子菜单(每家公司认本公司组行) ---------- +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '定价利润换算', 'pricing-calc', 'app', 'pricing-calc', 106, grp.`id`, grp.`company_id` +FROM `columns` grp +WHERE grp.`column_key` = 'brand_common_tools' + AND NOT EXISTS ( + SELECT 1 FROM `columns` col + WHERE col.`company_id` = grp.`company_id` AND col.`column_key` = 'pricing-calc' + ); + +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '五国ASIN快速查询', 'five-asin', 'app', 'five-asin', 107, grp.`id`, grp.`company_id` +FROM `columns` grp +WHERE grp.`column_key` = 'brand_common_tools' + AND NOT EXISTS ( + SELECT 1 FROM `columns` col + WHERE col.`company_id` = grp.`company_id` AND col.`column_key` = 'five-asin' + ); + +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '五国关键词共享', 'keyword-share', 'app', 'keyword-share', 108, grp.`id`, grp.`company_id` +FROM `columns` grp +WHERE grp.`column_key` = 'brand_common_tools' + AND NOT EXISTS ( + SELECT 1 FROM `columns` col + WHERE col.`company_id` = grp.`company_id` AND col.`column_key` = 'keyword-share' + ); + +-- ---------- 4. 全量账号默认授权组行(按账号所属公司授本公司的组行) ---------- +INSERT IGNORE INTO `user_column_permission` (`user_id`, `column_id`) +SELECT u.`id`, col.`id` +FROM `users` u +JOIN `columns` col + ON col.`company_id` = u.`company_id` + AND col.`column_key` = 'brand_common_tools'; + +-- ---------- 4. 自检闸门:不为 0 就抛 1048(列 must_be_zero NOT NULL,V143/V149 家族) ---------- +CREATE TEMPORARY TABLE IF NOT EXISTS `_v163_gate` (`must_be_zero` INT NOT NULL); + +-- 闸门 1:每家公司都必须恰好一行 brand_common_tools 组行——专防第 1/2 段被 +-- NOT EXISTS 守卫"一声不响少一家树"(那家公司的账号静默看不到分类,而不是报错)。 +INSERT INTO `_v163_gate` +SELECT IF(COUNT(*) = 0, 0, NULL) +FROM ( + SELECT c.`id` + FROM `company` c + JOIN `columns` col ON col.`company_id` = c.`id` AND col.`column_key` = 'brand_common_tools' + GROUP BY c.`id` + HAVING COUNT(*) <> 1 +) bad; + +-- 闸门 2:brand_common_tools 的授权绝不指向别公司的组行(第 3 段的 JOIN 条件挡了, +-- 这一道给"手工插错授权"留复验位)。 +INSERT INTO `_v163_gate` +SELECT IF(COUNT(*) = 0, 0, NULL) +FROM ( + SELECT g.`user_id` + FROM `user_column_permission` g + JOIN `users` u ON u.`id` = g.`user_id` + JOIN `columns` col ON col.`id` = g.`column_id` + WHERE col.`column_key` = 'brand_common_tools' + AND col.`company_id` <> u.`company_id` +) bad; + +DROP TEMPORARY TABLE `_v163_gate`; diff --git a/backend-java/src/main/resources/db/V164__admin_brand_gating_menu.sql b/backend-java/src/main/resources/db/V164__admin_brand_gating_menu.sql new file mode 100644 index 000000000..e3a4e5e65 --- /dev/null +++ b/backend-java/src/main/resources/db/V164__admin_brand_gating_menu.sql @@ -0,0 +1,89 @@ +-- ============================================================= +-- 迁移 V164__admin_brand_gating_menu +-- +-- 1. 变更目的:管理后台「数据管理」组新增「品牌Gating库」菜单行 +-- (column_key='admin_brand_gating',route_path='brand-gating'),承接原独立小网页后台 +-- (gating_web_admin.py)并入数富管理后台。业务表 biz_brand_gating 主库早已存在, +-- 本迁移只动菜单字典,不建业务表。 +-- +-- 2. 口径: +-- - 排序 36:admin_group_data 组现有行 30(去重数据汇总)/35(品牌数据库)/65(查询ASIN)/66(商品类目), +-- 取 35 与 65 之间的空档,紧跟品牌数据库。 +-- - company_id = 1 的行是模板树(PermissionMenuSchemaInitializer 与 +-- PermissionMenuService.copyTreeFromTemplate 的源头),其余公司(含 status=0 的停用公司) +-- 逐家复制一份(与 V149「复制对全公司做」、V163 同一理由)。子行 parent_id 必须认本公司 +-- admin_group_data 组行,严禁跨公司认父(V149 闸门 2 同一口径)。 +-- - 幂等守卫按 (company_id, column_key) 判存;同时防 (menu_type, route_path) 唯一键 +-- (uk_company_menu_type_route_path)撞行——若该公司已有别的 column_key 占了 +-- admin/brand-gating 路由,跳过插入而不是让迁移撞 1062 报错。 +-- - 【默认授权】本迁移不预授 user_column_permission:管理员后续在「菜单权限配置」里 +-- 自行按公司分配(requireConsolePageAccess 门:管理员角色直通,普通账号凭授权进)。 +-- +-- 3. 影响表与数据量:columns +N 行(N = 公司数),字典小表,毫秒级,不碰锁热点表。 +-- +-- 4. 【可重跑性】两段 INSERT 都带 NOT EXISTS 守卫;重跑逐条 no-op。 +-- ============================================================= + +-- ---------- 1. 公司 1 模板行(认公司 1 的 admin_group_data 组行) ---------- +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '品牌Gating库', 'admin_brand_gating', 'admin', 'brand-gating', 36, grp.`id`, 1 +FROM `columns` grp +WHERE grp.`company_id` = 1 AND grp.`column_key` = 'admin_group_data' + AND NOT EXISTS ( + SELECT 1 FROM `columns` + WHERE `company_id` = 1 + AND (`column_key` = 'admin_brand_gating' + OR (`menu_type` = 'admin' AND `route_path` = 'brand-gating')) + ); + +-- ---------- 2. 复制到其余公司(含停用公司),各自认本公司组行 ---------- +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '品牌Gating库', 'admin_brand_gating', 'admin', 'brand-gating', 36, grp.`id`, c.`id` +FROM `company` c +JOIN `columns` grp ON grp.`company_id` = c.`id` AND grp.`column_key` = 'admin_group_data' +WHERE c.`id` <> 1 + AND NOT EXISTS ( + SELECT 1 FROM `columns` col + WHERE col.`company_id` = c.`id` + AND (col.`column_key` = 'admin_brand_gating' + OR (col.`menu_type` = 'admin' AND col.`route_path` = 'brand-gating')) + ); + +-- ---------- 3. 自检闸门:不为 0 就抛 1048(列 must_be_zero NOT NULL,V143/V149/V163 家族) ---------- +CREATE TEMPORARY TABLE IF NOT EXISTS `_v164_gate` (`must_be_zero` INT NOT NULL); + +-- 闸门 1:每家公司都必须恰好一行 admin_brand_gating——LEFT JOIN 口径把"少一家"也算进来 +-- (V163 闸门 1 是 INNER JOIN,只防重复不防缺失;这里两家闸门一起补全)。 +-- 少一家 ⇒ 那家公司的管理员在菜单配置里静默看不到这一页,而不是报错,必须靠这道闸拦住。 +INSERT INTO `_v164_gate` +SELECT IF(COUNT(*) = 0, 0, NULL) +FROM ( + SELECT c.`id` + FROM `company` c + LEFT JOIN `columns` col ON col.`company_id` = c.`id` AND col.`column_key` = 'admin_brand_gating' + GROUP BY c.`id` + HAVING COUNT(col.`id`) <> 1 +) bad; + +-- 闸门 2:admin/brand-gating 路由不允许被别的 column_key 占行(NOT EXISTS 守卫挡了增量, +-- 这一道给"手工插错行/历史遗留撞行"留复验位,撞行即 uk_company_menu_type_route_path 隐患)。 +INSERT INTO `_v164_gate` +SELECT IF(COUNT(*) = 0, 0, NULL) +FROM `columns` col +WHERE col.`menu_type` = 'admin' + AND col.`route_path` = 'brand-gating' + AND col.`column_key` <> 'admin_brand_gating'; + +-- 闸门 3:admin_brand_gating 行的父必须是本公司的 admin_group_data 组行(第 2 段的 JOIN +-- 条件挡了,这一道给"手工认错父/跨公司认父"留复验位,V149 闸门 2 同一口径)。 +INSERT INTO `_v164_gate` +SELECT IF(COUNT(*) = 0, 0, NULL) +FROM ( + SELECT col.`id` + FROM `columns` col + LEFT JOIN `columns` grp ON grp.`id` = col.`parent_id` AND grp.`column_key` = 'admin_group_data' + WHERE col.`column_key` = 'admin_brand_gating' + AND (grp.`id` IS NULL OR grp.`company_id` <> col.`company_id`) +) bad; + +DROP TEMPORARY TABLE `_v164_gate`;