ee92102f3c
- user_scopes 由"假开关"做成生效：粒度到项目级（组织隔离 ∧ 项目∈范围，取交集）；未配置=不限制（逐字向后兼容）；
总管理员豁免；脏数据保守忽略不锁死；配置期校验存在性+归属；逐接口叠加（列表/详情/写操作/Excel 导出落 scope_project_ids）；
前端新增"数据范围"弹窗入口。顺带修 GET /api/charge-orders 此前完全没有组织隔离（跨租户泄露）、
GET /api/projects/{id}/cabinets 的 500
- 数据库列类型系统性对齐：扫描并修复 pms_dev 32 项 / pms 18 项漂移（时间列统一 DATETIME，sqlx NaiveDateTime 只兼容 DATETIME）；
DECIMAL→BIGINT 与列注释口径拉平；修复生产 GET /api/charge-orders、GET /api/device-logs 必然 500 的根因；
恢复 7 张表丢失的 updated_at ON UPDATE（行为变化，已记入 AGENTS.md）；修正 SCHEMA_SQL 前向引用（空库建表必崩）；
新增 tools/db_schema_diff.py（漂移检查，退出码可接部署前置）与 test/schema_alignment_e2e.py
- 安全加固四项：上传去 .svg + 魔数嗅探（堵存储型 XSS）；登录失败锁定(5次/15分)+challenge 限流+并发闸门+验证码容差收紧；
服务降权 root→pms；nginx 安全头 + limit_req + CORS 白名单收敛
- TCP 连接登录门控（上行+下行同一规则）：login 前只放行 auth_str/login（PRE_LOGIN_ALLOWED_ACTS）
- 状态位按归属层级展示：柜级 status1/status2 显示在柜子（含柜门 + 开门按钮，独立动作不联动业务）、
仓体级 batt_status/pow_status 显示在仓体；两端解析函数同源同名
- 能耗报表改实时聚合 charge_records（原 energy_stats 全表只读不写导致报表恒 0）+ 补复合索引
- 组织可见性：新增 GET /api/my-organizations（工厂全量、客户仅本组织）
- 仓体 status 仅表占用，充满/故障由 Redis 通道状态派生
- 订单/占用/队列运维缺口：h5 建单漏单、214 仓体自愈、device:reports 上限、死信 TTL、LimitNOFILE、
每日 mysqldump + 回滚点保留 5 次
- 文档：AGENTS.md 补层级可见性/数据范围/状态位约定/数据库工具/行为变化；docs/API.md 删除废弃 TCP 章节、接口总表对齐 mod.rs
73 lines
2.8 KiB
Python
73 lines
2.8 KiB
Python
"""清理临时联调数据：只删除本任务自己插入的行（按记录到的 ID），
|
||
并删除测试期间产生的 download_tasks 行；**保留**新增的两条索引（迁移产物）。
|
||
|
||
删除顺序按外键依赖：charge_records → compartments → cabin_boards → cabinets → projects → organizations
|
||
"""
|
||
import json
|
||
import os
|
||
import pymysql
|
||
|
||
HERE = os.path.dirname(os.path.abspath(__file__))
|
||
with open(os.path.join(HERE, "temp_ids.json"), encoding="utf-8") as fh:
|
||
main_ids = json.load(fh)
|
||
with open(os.path.join(HERE, "temp_ids_orgB.json"), encoding="utf-8") as fh:
|
||
orgb_ids = json.load(fh)
|
||
|
||
record_ids = main_ids["record_ids"] + [orgb_ids["record_id"]]
|
||
compartment_ids = main_ids["compartment_ids"] + [orgb_ids["compartment_id"]]
|
||
board_ids = main_ids["board_ids"] + [orgb_ids["board_id"]]
|
||
cabinet_ids = main_ids["cabinet_ids"] + [orgb_ids["cabinet_id"]]
|
||
project_ids = [main_ids["project_id"], orgb_ids["project_id"]]
|
||
org_ids = [orgb_ids["org_id"]]
|
||
user_ids = [main_ids["user_id"]]
|
||
task_ids = [1, 2, 3, 4] # 本次测试创建的下载任务
|
||
|
||
conn = pymysql.connect(host="10.8.0.252", user="root",
|
||
password="Hbhyg731024@", database="pms_dev")
|
||
cur = conn.cursor()
|
||
|
||
steps = [
|
||
("charge_records", "id", record_ids),
|
||
("compartments", "id", compartment_ids),
|
||
("cabin_boards", "id", board_ids),
|
||
("cabinets", "id", cabinet_ids),
|
||
("projects", "id", project_ids),
|
||
("organizations", "id", org_ids),
|
||
# download_tasks.user_id 外键指向 users.id ⇒ 必须**先**删 download_tasks 再删 users
|
||
("download_tasks", "id", task_ids),
|
||
("users", "id", user_ids),
|
||
]
|
||
for table, col, ids in steps:
|
||
if not ids:
|
||
continue
|
||
ph = ",".join(["%s"] * len(ids))
|
||
cur.execute(f"DELETE FROM {table} WHERE {col} IN ({ph})", ids)
|
||
print(f"DELETE {table:16} {cur.rowcount:2d} 行 (ids={ids})")
|
||
|
||
conn.commit()
|
||
|
||
print("\n=== 清理后校验 ===")
|
||
for table, sql in [
|
||
("charge_records", "SELECT COUNT(*) FROM charge_records"),
|
||
("energy_stats", "SELECT COUNT(*) FROM energy_stats"),
|
||
("cabinets", "SELECT COUNT(*) FROM cabinets"),
|
||
("projects", "SELECT COUNT(*) FROM projects"),
|
||
("organizations", "SELECT COUNT(*) FROM organizations"),
|
||
("users", "SELECT COUNT(*) FROM users"),
|
||
("compartments", "SELECT COUNT(*) FROM compartments"),
|
||
("cabin_boards", "SELECT COUNT(*) FROM cabin_boards"),
|
||
("download_tasks", "SELECT COUNT(*) FROM download_tasks"),
|
||
]:
|
||
cur.execute(sql)
|
||
print(f" {table:16} = {cur.fetchone()[0]}")
|
||
|
||
cur.execute(
|
||
"SELECT index_name, GROUP_CONCAT(column_name ORDER BY seq_in_index) FROM information_schema.statistics "
|
||
"WHERE table_schema='pms_dev' AND table_name='charge_records' GROUP BY index_name ORDER BY index_name"
|
||
)
|
||
print(" charge_records 索引（应保留）：", cur.fetchall())
|
||
|
||
cur.close()
|
||
conn.close()
|
||
print("\n临时数据清理完成")
|