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
62 lines
2.3 KiB
Python
62 lines
2.3 KiB
Python
import pymysql, sys
|
|
|
|
TARGETS = [
|
|
("charge_records", "energy"),
|
|
("charge_records", "start_time"),
|
|
("charge_records", "end_time"),
|
|
("energy_stats", "total_energy"),
|
|
("download_tasks", "completed_at"),
|
|
("organizations", "parent_id"),
|
|
]
|
|
|
|
SQL = """
|
|
SELECT TABLE_NAME, COLUMN_NAME, COLUMN_TYPE, DATA_TYPE, IS_NULLABLE,
|
|
COLUMN_DEFAULT, EXTRA, COLUMN_COMMENT
|
|
FROM information_schema.COLUMNS
|
|
WHERE TABLE_SCHEMA = %s AND ((TABLE_NAME, COLUMN_NAME) IN (%s))
|
|
ORDER BY TABLE_NAME, COLUMN_NAME
|
|
"""
|
|
|
|
IDX = """
|
|
SELECT TABLE_NAME, INDEX_NAME, GROUP_CONCAT(COLUMN_NAME ORDER BY SEQ_IN_INDEX) cols, NON_UNIQUE
|
|
FROM information_schema.STATISTICS
|
|
WHERE TABLE_SCHEMA=%s AND TABLE_NAME IN ('organizations','download_tasks','energy_stats','charge_records','charge_orders')
|
|
GROUP BY TABLE_NAME, INDEX_NAME, NON_UNIQUE ORDER BY TABLE_NAME, INDEX_NAME
|
|
"""
|
|
|
|
FK = """
|
|
SELECT TABLE_NAME, CONSTRAINT_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
|
|
FROM information_schema.KEY_COLUMN_USAGE
|
|
WHERE TABLE_SCHEMA=%s AND REFERENCED_TABLE_NAME IS NOT NULL
|
|
ORDER BY TABLE_NAME, CONSTRAINT_NAME
|
|
"""
|
|
|
|
for db in ("pms_dev", "pms"):
|
|
conn = pymysql.connect(host="10.8.0.252", user="root", password="Hbhyg731024@", database=db, charset="utf8mb4")
|
|
cur = conn.cursor()
|
|
print("=" * 78)
|
|
print("DB:", db)
|
|
print("=" * 78)
|
|
placeholders = ",".join(["(%s,%s)"] * len(TARGETS))
|
|
flat = [db] + [x for t in TARGETS for x in t]
|
|
cur.execute(SQL % ("%s", placeholders), flat)
|
|
for r in cur.fetchall():
|
|
print(f" {r[0]}.{r[1]:<14} type={r[2]:<18} data={r[3]:<10} null={r[4]:<4} default={str(r[5]):<20} extra={r[6]:<20} comment={r[7]}")
|
|
print(" -- 索引 --")
|
|
cur.execute(IDX, (db,))
|
|
for r in cur.fetchall():
|
|
print(f" {r[0]:<18} {r[1]:<38} ({r[2]}) uniq={0 if r[3]==0 else 1}")
|
|
print(" -- 外键 --")
|
|
cur.execute(FK, (db,))
|
|
for r in cur.fetchall():
|
|
print(f" {r[0]:<18} {r[1]:<40} {r[2]} -> {r[3]}.{r[4]}")
|
|
# row counts
|
|
print(" -- 行数 --")
|
|
for t in ("charge_records", "energy_stats", "download_tasks", "organizations", "charge_orders"):
|
|
try:
|
|
cur.execute(f"SELECT COUNT(*) FROM {t}")
|
|
print(f" {t:<18} {cur.fetchone()[0]}")
|
|
except Exception as e:
|
|
print(f" {t:<18} ERR {e}")
|
|
conn.close()
|