Merge branch 'main' of http://git.dibox.tech/parttime/smart_grid_iot
This commit is contained in:
andyesfly committed
commit
3596462eca
34 files changed
+2703
-93
No files matched your search
+50
-18
@@ -52,7 +52,7 @@ INSERT INTO sys_menu (id, parent_id, menu_name, menu_path, component, icon, sort
|
||||
(1, NULL, '客户管理', '/customer', NULL, 'TeamOutlined', 1, 1, 'customer:list', 1),
|
||||
(2, NULL, '项目管理', '/project', NULL, 'ProjectOutlined', 2, 1, 'project:list', 1),
|
||||
(3, NULL, '运营派单', '/dispatch', NULL, 'ScheduleOutlined', 3, 1, 'dispatch:list', 1),
|
||||
(4, NULL, '设备监控', '/device', NULL, 'MonitorOutlined', 4, 2, 'device:list', 1),
|
||||
(4, NULL, '设备监控', '/device', NULL, 'MonitorOutlined', 4, 1, 'device:list', 1),
|
||||
(5, NULL, '统计报表', '/report', NULL, 'BarChartOutlined', 5, 2, 'report:list', 1),
|
||||
(6, NULL, '系统管理', '/system', NULL, 'SettingOutlined', 6, 1, 'system:list', 1)
|
||||
ON CONFLICT (id) DO UPDATE SET
|
||||
@@ -109,18 +109,19 @@ ON CONFLICT (id) DO UPDATE SET
|
||||
permission = EXCLUDED.permission,
|
||||
visible = EXCLUDED.visible;
|
||||
|
||||
-- 初始菜单（项目域子菜单 + 客户扩展子菜单，id：24-31 + 空间拓扑 32 + 安装派单 33）
|
||||
-- 项目域：客户拜访(customer:visit) / 项目勘察(project:survey) / 项目方案(project:plan)
|
||||
-- 合同管理(project:contract) / 安装派单(project:install)
|
||||
-- 初始菜单（项目域子菜单 + 客户扩展子菜单，id：24-31 + 空间拓扑 32）
|
||||
-- 项目域：客户拜访(customer:visit) / 项目方案(project:plan)
|
||||
-- 合同管理(project:contract)
|
||||
-- 项目验收(project:acceptance) / 回访记录(project:visit)
|
||||
-- 客户域：空间拓扑与用电架构(customer:topology)
|
||||
-- 注：客户拜访归属“项目管理”，但仍沿用 /customer/visit 路径与 customer:visit 权限码
|
||||
-- 注：项目勘察(27)/项目安装(33) 已迁至运营派单 parent_id=3（见下方运营派单块注释）
|
||||
INSERT INTO sys_menu (id, parent_id, menu_name, menu_path, component, icon, sort_order, menu_type, permission, visible) VALUES
|
||||
(24, 2, '客户拜访', '/customer/visit', 'customer/visit/index', 'xt-jihuabaifang', 1, 2, 'customer:visit', 1),
|
||||
(27, 2, '项目勘察', '/project/survey', 'project/survey/index', 'xt-xiangmukancha', 2, 2, 'project:survey', 1),
|
||||
(27, 3, '项目勘察', '/dispatch/survey', 'dispatch/survey/index', 'xt-xiangmukancha', 2, 2, 'project:survey', 1),
|
||||
(28, 2, '项目方案', '/project/plan', 'project/plan/index', 'xt-xiangmufangan', 3, 2, 'project:plan', 1),
|
||||
(29, 2, '合同管理', '/project/contract', 'project/contract/index', 'FileDoneOutlined', 4, 2, 'project:contract', 1),
|
||||
(33, 2, '项目安装', '/project/install', 'project/install/index', 'ToolOutlined', 5, 2, 'project:install', 1),
|
||||
(33, 3, '项目安装', '/dispatch/install', 'dispatch/install/index', 'ToolOutlined', 3, 2, 'project:install', 1),
|
||||
(30, 2, '项目验收', '/project/acceptance', 'project/acceptance/index', 'ThunderboltOutlined', 6, 2, 'project:acceptance',1),
|
||||
(31, 2, '回访记录', '/project/visit', 'project/visit/index', 'AuditOutlined', 7, 2, 'project:visit', 1),
|
||||
(32, 1, '空间拓扑与用电架构', '/customer/topology', 'customer/topology/index', 'xt-topology', 5, 2, 'customer:topology',1)
|
||||
@@ -135,11 +136,13 @@ ON CONFLICT (id) DO UPDATE SET
|
||||
permission = EXCLUDED.permission,
|
||||
visible = EXCLUDED.visible;
|
||||
|
||||
-- 初始菜单（运营派单子菜单，parent_id=3，id：55-56）
|
||||
-- 初始菜单（运营派单子菜单，parent_id=3）
|
||||
-- 运营派单域统一 id 分配（避免历史上 36/37 被两段 INSERT 复用而互相覆盖）：
|
||||
-- 34 运维费定价 / 35 勘察费用（归属项目管理 parent_id=2） / 36 电工登记管理
|
||||
-- 27 项目勘察 / 33 项目安装（自项目管理 parent_id=2 迁入）
|
||||
-- 34 运维费定价 / 35 勘察费用（均归属基础数据 parent_id=59） / 36 电工登记管理
|
||||
-- 37-46 按钮权限
|
||||
-- 55 报修派单 / 56 维保派单
|
||||
-- 子菜单排序：36 电工登记管理(1) → 27 项目勘察(2) → 33 项目安装(3) → 55 报修派单(4) → 56 维保派单(5)
|
||||
INSERT INTO sys_menu (id, parent_id, menu_name, menu_path, component, icon, sort_order, menu_type, permission, visible) VALUES
|
||||
(55, 3, '报修派单', '/dispatch/repair', 'dispatch/repair/index', 'ToolOutlined', 4, 2, 'dispatch:repair', 1),
|
||||
(56, 3, '维保派单', '/dispatch/maintenance', 'dispatch/maintenance/index', 'ToolOutlined', 5, 2, 'dispatch:maintenance',1)
|
||||
@@ -154,17 +157,17 @@ ON CONFLICT (id) DO UPDATE SET
|
||||
permission = EXCLUDED.permission,
|
||||
visible = EXCLUDED.visible;
|
||||
|
||||
-- 运营派单子菜单（parent_id=3；其中 35 勘察费用及其按钮 40/41/42 已归属项目管理 parent_id=2；id：34/36 为菜单项，37-39/43-46 为按钮权限）
|
||||
-- 运营派单子菜单（parent_id=3；其中 34 运维费定价及按钮 37-39、35 勘察费用及按钮 40-42 已归属基础数据 parent_id=59；id：36 为菜单项，43-46 为按钮权限）
|
||||
INSERT INTO sys_menu (id, parent_id, menu_name, menu_path, component, icon, sort_order, menu_type, permission, visible) VALUES
|
||||
(34, 3, '运维费定价', '/dispatch/price', 'dispatch/price/index', 'MoneyCollectOutlined', 2, 2, 'dispatch:price', 1),
|
||||
(35, 2, '勘察费用', '/dispatch/cost', 'dispatch/cost/index', 'AccountBookOutlined', 8, 2, 'dispatch:cost', 1),
|
||||
(34, 59, '运维费定价', '/base/price', 'base/price/index', 'MoneyCollectOutlined', 2, 2, 'dispatch:price', 1),
|
||||
(35, 59, '勘察费用', '/base/cost', 'base/cost/index', 'AccountBookOutlined', 8, 2, 'dispatch:cost', 1),
|
||||
(36, 3, '电工登记管理', '/dispatch/worker', 'dispatch/worker/index', 'ToolOutlined', 1, 2, 'dispatch:worker', 1),
|
||||
(37, 3, '新增价目', NULL, NULL, NULL, 1, 3, 'price:create', 1),
|
||||
(38, 3, '编辑价目', NULL, NULL, NULL, 2, 3, 'price:update', 1),
|
||||
(39, 3, '删除价目', NULL, NULL, NULL, 3, 3, 'price:delete', 1),
|
||||
(40, 2, '新增勘察费用', NULL, NULL, NULL, 9, 3, 'cost:create', 1),
|
||||
(41, 2, '编辑勘察费用', NULL, NULL, NULL, 10, 3, 'cost:update', 1),
|
||||
(42, 2, '删除勘察费用', NULL, NULL, NULL, 11, 3, 'cost:delete', 1),
|
||||
(37, 34, '新增价目', NULL, NULL, NULL, 1, 3, 'price:create', 1),
|
||||
(38, 34, '编辑价目', NULL, NULL, NULL, 2, 3, 'price:update', 1),
|
||||
(39, 34, '删除价目', NULL, NULL, NULL, 3, 3, 'price:delete', 1),
|
||||
(40, 35, '新增勘察费用', NULL, NULL, NULL, 9, 3, 'cost:create', 1),
|
||||
(41, 35, '编辑勘察费用', NULL, NULL, NULL, 10, 3, 'cost:update', 1),
|
||||
(42, 35, '删除勘察费用', NULL, NULL, NULL, 11, 3, 'cost:delete', 1),
|
||||
(43, 3, '新增电工', NULL, NULL, NULL, 7, 3, 'worker:create', 1),
|
||||
(44, 3, '编辑电工', NULL, NULL, NULL, 8, 3, 'worker:update', 1),
|
||||
(45, 3, '删除电工', NULL, NULL, NULL, 9, 3, 'worker:delete', 1),
|
||||
@@ -299,7 +302,36 @@ INSERT INTO sys_role_menu (role_id, menu_id) VALUES
|
||||
ON CONFLICT (role_id, menu_id) DO NOTHING;
|
||||
|
||||
-- ------------------------------------------------------------
|
||||
-- 8. 定时任务种子（sys_job，按 job_key 幂等）
|
||||
-- 8. 设备域菜单拆分（设备监控目录 + 设备管理台账子菜单 / 基础数据目录 + 智电设备型号子菜单）
|
||||
-- 设备监控(id=4)由菜单项改为目录 menu_type=1；台账子菜单挂在设备监控下
|
||||
-- 基础数据为新一级目录，智电设备型号（基础数据，与客户无关）挂其下
|
||||
-- 注：id 用 58-60（55-57 已被生产库报修派单/维保派单/重置电工密码占用，避免重跑冲突）
|
||||
-- ------------------------------------------------------------
|
||||
INSERT INTO sys_menu (id, parent_id, menu_name, menu_path, component, icon, sort_order, menu_type, permission, visible) VALUES
|
||||
(58, 4, '设备管理台账', '/device/equipment', 'device/equipment/index', 'MonitorOutlined', 1, 2, 'device:list', 1),
|
||||
(59, NULL, '基础数据', '/base', NULL, 'DatabaseOutlined', 5, 1, 'base:list', 1),
|
||||
(60, 59, '智电设备型号', '/base/smart-device', 'device/smart-device/index', 'ApartmentOutlined', 1, 2, 'device:model', 1)
|
||||
ON CONFLICT (id) DO UPDATE SET
|
||||
parent_id = EXCLUDED.parent_id,
|
||||
menu_name = EXCLUDED.menu_name,
|
||||
menu_path = EXCLUDED.menu_path,
|
||||
component = EXCLUDED.component,
|
||||
icon = EXCLUDED.icon,
|
||||
sort_order = EXCLUDED.sort_order,
|
||||
menu_type = EXCLUDED.menu_type,
|
||||
permission = EXCLUDED.permission,
|
||||
visible = EXCLUDED.visible;
|
||||
|
||||
-- 角色-菜单绑定：ADMIN（role_id=1）拥有 58-60
|
||||
INSERT INTO sys_role_menu (role_id, menu_id) VALUES
|
||||
(1, 58), (1, 59), (1, 60)
|
||||
ON CONFLICT (role_id, menu_id) DO NOTHING;
|
||||
|
||||
-- 重置 sys_menu 自增序列（覆盖到 60）
|
||||
SELECT setval('sys_menu_id_seq', 60, true);
|
||||
|
||||
-- ------------------------------------------------------------
|
||||
-- 9. 定时任务种子（sys_job，按 job_key 幂等）
|
||||
-- ------------------------------------------------------------
|
||||
INSERT INTO sys_job (job_key, job_name, cron_expression, params, retry_times, retry_interval, status, remark) VALUES
|
||||
('demo_heartbeat', '示例心跳', '*/5 * * * *', '{"message":"heartbeat"}'::jsonb, 0, 60, 1,
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
-- 设备域菜单拆分-恢复版：先恢复被误覆盖的 55/56/57（报修派单/维保派单/重置电工密码），
|
||||
-- 再用空闲 id 58-60 创建设备域菜单。修复由 20261007_device_menu_split.sql 引入的覆盖事故。
|
||||
BEGIN;
|
||||
|
||||
-- ------------------------------------------------------------
|
||||
-- 1) 恢复 id=55 报修派单（原字段：parent=3 /dispatch/repair dispatch:repair）
|
||||
-- ------------------------------------------------------------
|
||||
UPDATE sys_menu SET
|
||||
parent_id = 3,
|
||||
menu_name = '报修派单',
|
||||
menu_path = '/dispatch/repair',
|
||||
component = 'dispatch/repair/index',
|
||||
icon = 'ToolOutlined',
|
||||
sort_order = 3,
|
||||
menu_type = 2,
|
||||
permission = 'dispatch:repair',
|
||||
visible = 1
|
||||
WHERE id = 55;
|
||||
|
||||
-- ------------------------------------------------------------
|
||||
-- 2) 恢复 id=56 维保派单（原字段：parent=3 /dispatch/maintenance dispatch:maintenance）
|
||||
-- ------------------------------------------------------------
|
||||
UPDATE sys_menu SET
|
||||
parent_id = 3,
|
||||
menu_name = '维保派单',
|
||||
menu_path = '/dispatch/maintenance',
|
||||
component = 'dispatch/maintenance/index',
|
||||
icon = 'ToolOutlined',
|
||||
sort_order = 4,
|
||||
menu_type = 2,
|
||||
permission = 'dispatch:maintenance',
|
||||
visible = 1
|
||||
WHERE id = 56;
|
||||
|
||||
-- ------------------------------------------------------------
|
||||
-- 3) 恢复 id=57 重置电工密码（原字段：parent=3 按钮权限 worker:reset-password）
|
||||
-- ------------------------------------------------------------
|
||||
UPDATE sys_menu SET
|
||||
parent_id = 3,
|
||||
menu_name = '重置电工密码',
|
||||
menu_path = NULL,
|
||||
component = NULL,
|
||||
icon = NULL,
|
||||
sort_order = 11,
|
||||
menu_type = 3,
|
||||
permission = 'worker:reset-password',
|
||||
visible = 1
|
||||
WHERE id = 57;
|
||||
|
||||
-- 清理误绑定的角色菜单：(1,57) 保留给 ADMIN（重置电工密码按钮），并确保绑定存在
|
||||
-- (2,55)(2,56) 语义已随恢复回到报修/维保派单，保留即可，无需改动
|
||||
INSERT INTO sys_role_menu (role_id, menu_id) VALUES (1, 57)
|
||||
ON CONFLICT (role_id, menu_id) DO NOTHING;
|
||||
|
||||
-- ------------------------------------------------------------
|
||||
-- 4) 设备监控(id=4)：菜单项 → 目录(menu_type=2→1)，保持 /device 与 device:list
|
||||
-- ------------------------------------------------------------
|
||||
UPDATE sys_menu SET menu_type = 1 WHERE id = 4 AND menu_type = 2;
|
||||
|
||||
-- ------------------------------------------------------------
|
||||
-- 5) 设备域菜单使用空闲 id 58-60
|
||||
-- ------------------------------------------------------------
|
||||
INSERT INTO sys_menu (id, parent_id, menu_name, menu_path, component, icon, sort_order, menu_type, permission, visible) VALUES
|
||||
(58, 4, '设备管理台账', '/device/equipment', 'device/equipment/index', 'MonitorOutlined', 1, 2, 'device:list', 1),
|
||||
(59, NULL, '基础数据', '/base', NULL, 'DatabaseOutlined', 5, 1, 'base:list', 1),
|
||||
(60, 59, '智电设备型号', '/base/smart-device', 'device/smart-device/index', 'ApartmentOutlined', 1, 2, 'device:model', 1)
|
||||
ON CONFLICT (id) DO UPDATE SET
|
||||
parent_id = EXCLUDED.parent_id,
|
||||
menu_name = EXCLUDED.menu_name,
|
||||
menu_path = EXCLUDED.menu_path,
|
||||
component = EXCLUDED.component,
|
||||
icon = EXCLUDED.icon,
|
||||
sort_order = EXCLUDED.sort_order,
|
||||
menu_type = EXCLUDED.menu_type,
|
||||
permission = EXCLUDED.permission,
|
||||
visible = EXCLUDED.visible;
|
||||
|
||||
-- ------------------------------------------------------------
|
||||
-- 6) 角色-菜单绑定：ADMIN(role_id=1) 拥有 58-60；SALESMAN 不给设备/基础数据权限
|
||||
-- ------------------------------------------------------------
|
||||
INSERT INTO sys_role_menu (role_id, menu_id) VALUES
|
||||
(1, 58), (1, 59), (1, 60)
|
||||
ON CONFLICT (role_id, menu_id) DO NOTHING;
|
||||
|
||||
-- 重置序列（覆盖到 60，避免后续手动插入冲突）
|
||||
SELECT setval('sys_menu_id_seq', GREATEST((SELECT MAX(id) FROM sys_menu), 60), true);
|
||||
|
||||
COMMIT;
|
||||
@@ -0,0 +1,5 @@
|
||||
-- 客户建筑信息表增加地下楼层数 floordown_count（INT，默认0）
|
||||
-- 语义：floor_count 为地上楼层数，floordown_count 为地下楼层数
|
||||
-- 幂等：ADD COLUMN IF NOT EXISTS 重复执行安全
|
||||
ALTER TABLE customer_building
|
||||
ADD COLUMN IF NOT EXISTS floordown_count INT DEFAULT 0;
|
||||
@@ -0,0 +1,23 @@
|
||||
-- 将勘察费用(id=35)、运维费定价(id=34) 从项目管理(2)/运营派单(3) 迁移到 基础数据(parent_id=59)
|
||||
-- 1) 两个页面菜单改挂到逻辑基础数据(59)，路径/组件改为 /base/*
|
||||
-- 2) 各自按钮(parent 原为模块 id)改挂到所属页面菜单下，保证随页面迁移
|
||||
-- 幂等：仅更新存在的行；重复执行结果一致
|
||||
UPDATE sys_menu
|
||||
SET parent_id = 59,
|
||||
menu_path = '/base/price',
|
||||
component = 'base/price/index',
|
||||
sort_order = 2
|
||||
WHERE id = 34;
|
||||
|
||||
UPDATE sys_menu
|
||||
SET parent_id = 59,
|
||||
menu_path = '/base/cost',
|
||||
component = 'base/cost/index',
|
||||
sort_order = 3
|
||||
WHERE id = 35;
|
||||
|
||||
-- 运维费定价按钮(price:create/update/delete) 挂到菜单 34
|
||||
UPDATE sys_menu SET parent_id = 34 WHERE id IN (37, 38, 39);
|
||||
|
||||
-- 勘察费用按钮(cost:create/update/delete) 挂到菜单 35
|
||||
UPDATE sys_menu SET parent_id = 35 WHERE id IN (40, 41, 42);
|
||||
@@ -0,0 +1,21 @@
|
||||
-- 将项目勘察(id=27)、项目安装(id=33) 从项目管理(parent_id=2) 迁移到 运营派单(parent_id=3)
|
||||
-- 目标子菜单顺序：电工登记管理(sort=1) → 项目勘察(27,sort=2) → 项目安装(33,sort=3) → 报修派单(sort=4) → 维保派单(sort=5)
|
||||
-- 路径/组件改为 /dispatch/*（按用户确认，URL 与菜单归属一致）
|
||||
-- 幂等：仅更新存在的行；重复执行结果一致
|
||||
UPDATE sys_menu
|
||||
SET parent_id = 3,
|
||||
menu_path = '/dispatch/survey',
|
||||
component = 'dispatch/survey/index',
|
||||
sort_order = 2
|
||||
WHERE id = 27;
|
||||
|
||||
UPDATE sys_menu
|
||||
SET parent_id = 3,
|
||||
menu_path = '/dispatch/install',
|
||||
component = 'dispatch/install/index',
|
||||
sort_order = 3
|
||||
WHERE id = 33;
|
||||
|
||||
-- 报修派单(55)/维保派单(56) 排序后移至 4/5（若已是 4/5 则不变，保证顺序稳定）
|
||||
UPDATE sys_menu SET sort_order = 4 WHERE id = 55;
|
||||
UPDATE sys_menu SET sort_order = 5 WHERE id = 56;
|
||||
Reference in new issue
Block a user