From 9acb221152a2f1cdfb5134f07d7973a428ffe1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Tue, 10 Nov 2026 10:31:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=8E=E7=AE=A1=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=9B=B4=E5=90=8D=E3=80=8C=E5=A4=96=E8=A7=82=E4=B8=93=E5=88=A9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E3=80=8D=E2=80=94=E2=80=94V191=20?= =?UTF-8?q?=E6=94=B9=20columns.name=EF=BC=88V190=20=E5=B7=B2=E4=B8=8A?= =?UTF-8?q?=E4=BA=A7=E4=B8=8D=E5=8F=AF=E5=9B=9E=E6=94=B9=EF=BC=89=EF=BC=9B?= =?UTF-8?q?routes=20=E6=A0=87=E9=A2=98/=E9=A1=B5=E5=A4=B4=20h3/403=20?= =?UTF-8?q?=E6=96=87=E6=A1=88=E5=90=8C=E6=AD=A5=EF=BC=9B=E6=8C=82=E8=BD=BD?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=96=AD=E8=A8=80=E9=9A=8F=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patent/AppearancePatentCleanItemsPage.vue | 2 +- admin-frontend-vue/src/router/routes.ts | 2 +- .../appearance-patent-clean-page.test.ts | 2 +- ...nAppearancePatentCleanItemsController.java | 4 +- ...1__appearance_patent_clean_menu_rename.sql | 43 +++++++++++++++++++ 5 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 backend-java/src/main/resources/db/V191__appearance_patent_clean_menu_rename.sql diff --git a/admin-frontend-vue/src/pages/patent/AppearancePatentCleanItemsPage.vue b/admin-frontend-vue/src/pages/patent/AppearancePatentCleanItemsPage.vue index e1279dbb5..a35a0f95b 100644 --- a/admin-frontend-vue/src/pages/patent/AppearancePatentCleanItemsPage.vue +++ b/admin-frontend-vue/src/pages/patent/AppearancePatentCleanItemsPage.vue @@ -88,7 +88,7 @@ onMounted(() => {
-

外观专利无侵权数据

+

外观专利数据库

diff --git a/admin-frontend-vue/src/router/routes.ts b/admin-frontend-vue/src/router/routes.ts index 251e99bde..ddd6f7c01 100644 --- a/admin-frontend-vue/src/router/routes.ts +++ b/admin-frontend-vue/src/router/routes.ts @@ -44,7 +44,7 @@ export const adminPages: AdminPageDef[] = [ { path: 'asin-center/query', menuKey: 'admin_query_asin', title: '查询ASIN', companyScoped: true, load: () => import('@/pages/asin/QueryAsinPage.vue') }, { path: 'asin-center/categories', menuKey: 'admin_product_categories', title: '商品类目', companyScoped: false, load: () => import('@/pages/asin/ProductCategoryPage.vue') }, { path: 'asin-center/skip-price', menuKey: 'admin_skip_price_asin', title: '最低价ASIN', companyScoped: true, load: () => import('@/pages/asin/SkipPricePage.vue') }, - { path: 'patent-center/clean-items', menuKey: 'admin_appearance_patent_clean_items', title: '外观专利无侵权数据', companyScoped: true, load: () => import('@/pages/patent/AppearancePatentCleanItemsPage.vue') }, + { path: 'patent-center/clean-items', menuKey: 'admin_appearance_patent_clean_items', title: '外观专利数据库', companyScoped: true, load: () => import('@/pages/patent/AppearancePatentCleanItemsPage.vue') }, ] export function routeOf(page: AdminPageDef): RouteRecordRaw { diff --git a/admin-frontend-vue/tests/mount/appearance-patent-clean-page.test.ts b/admin-frontend-vue/tests/mount/appearance-patent-clean-page.test.ts index 32c885f4f..7aabbdb4d 100644 --- a/admin-frontend-vue/tests/mount/appearance-patent-clean-page.test.ts +++ b/admin-frontend-vue/tests/mount/appearance-patent-clean-page.test.ts @@ -88,7 +88,7 @@ describe('AC-5 外观专利无侵权数据页(分页列表,参照去重数 const page = adminPages.find((p) => p.path === 'patent-center/clean-items') expect(page).toBeTruthy() expect(page?.menuKey).toBe(MENU_KEY) - expect(page?.title).toBe('外观专利无侵权数据') + expect(page?.title).toBe('外观专利数据库') expect(page?.companyScoped).toBe(true) const scoped = COMPANY_SCOPED_PAGES.find((p) => p.menuKey === MENU_KEY) expect(scoped).toBeTruthy() diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/controller/AdminAppearancePatentCleanItemsController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/controller/AdminAppearancePatentCleanItemsController.java index 2029cfa75..f66058444 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/controller/AdminAppearancePatentCleanItemsController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/controller/AdminAppearancePatentCleanItemsController.java @@ -81,11 +81,11 @@ public class AdminAppearancePatentCleanItemsController { private RequestOperator requireCleanItemsAccess(HttpServletRequest request) { AdminUserEntity operator = resolveOperator(request); if (operator == null || operator.getId() == null || operator.getId() <= 0) { - throw new BusinessException(403, "无权访问外观专利无侵权数据"); + throw new BusinessException(403, "无权访问外观专利数据库"); } boolean superAdmin = DeviceSessionPolicy.isSuper(adminAuthSupport.currentRole(operator)); if (!superAdmin && !hasCleanItemsPermission(operator)) { - throw new BusinessException(403, "无权访问外观专利无侵权数据"); + throw new BusinessException(403, "无权访问外观专利数据库"); } return new RequestOperator(operator.getId(), superAdmin, operator); } diff --git a/backend-java/src/main/resources/db/V191__appearance_patent_clean_menu_rename.sql b/backend-java/src/main/resources/db/V191__appearance_patent_clean_menu_rename.sql new file mode 100644 index 000000000..ce9631fc2 --- /dev/null +++ b/backend-java/src/main/resources/db/V191__appearance_patent_clean_menu_rename.sql @@ -0,0 +1,43 @@ +-- 迁移 V191:后管菜单「外观专利无侵权数据」更名「外观专利数据库」(2026-11-10 用户口径) +-- ============================================================= +-- 1. 变更目的:v1.3 上线的后管只读页菜单展示名按用户口径更名——「外观专利无侵权数据」 +-- 改为「外观专利数据库」。只改 columns.name 展示名,column_key/route_path/ +-- parent_id/sort_order 与授权关系一律不动:权限判定走 column_key(Phase 3 控制器 +-- 菜单双匹配的判据锚点),与展示名无关,改名对鉴权零影响。V190 已应用上产, +-- 按「已发布迁移不可回改」纪律另立本迁移,不回改 V190。 +-- +-- 2. 形状口径:V190 建的菜单是每公司一行(company_id=1 模板行 + 其余公司逐家复制), +-- 本迁移按 column_key 全量更名,天然覆盖所有公司(含停用公司)。 +-- +-- 3. 影响表与数据量:columns 更新 N 行(N=公司数),字典小表,毫秒级。 +-- +-- 4. 可重跑性:UPDATE 带 name <> 新名 守卫,重跑逐条 no-op;自检闸门只读。 +-- +-- 5. 回滚(人工补丁,写成注释以免落在 Flyway 扫描路径里被当迁移执行): +-- UPDATE columns SET name='外观专利无侵权数据' +-- WHERE column_key='admin_appearance_patent_clean_items'; +-- DELETE FROM flyway_schema_history WHERE version='191'; +-- ============================================================= + +-- ---------- 1. 全量更名(每公司一行,含停用公司) ---------- +UPDATE `columns` +SET `name` = '外观专利数据库' +WHERE `column_key` = 'admin_appearance_patent_clean_items' + AND `name` <> '外观专利数据库'; + +-- ---------- 2. 自检闸门:不为 0 就抛 1048(列 must_be_zero NOT NULL) ---------- +CREATE TEMPORARY TABLE IF NOT EXISTS `_v191_gate` (`must_be_zero` INT NOT NULL); + +-- 闸门 1:每家公司该菜单恰好一行且都已是新名(改名不改行数、不漏公司) +INSERT INTO `_v191_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_appearance_patent_clean_items' + GROUP BY c.`id` + HAVING COUNT(col.`id`) <> 1 OR MAX(col.`name` <> '外观专利数据库') = 1 +) bad; + +DROP TEMPORARY TABLE `_v191_gate`;