100 lines
3.7 KiB
Python
Raw Normal View History

feat(scope)+fix(db)+feat(security): 数据范围(项目级)生效、库列类型对齐、安全加固、状态位分层展示、能耗实时聚合 - 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
2026-09-20 02:44:51 +08:00
"""临时联调数据:为能耗报表验证准备 pms_dev 数据,并打印清理所需的 ID。
产出:
- 1 个临时用户(role=2,总管理员)→ 用于自签 JWT
- 1 个临时项目(org=1)+ 2 个临时柜子(含板/仓体)→ 用于验证项目/柜分组
- 6 条 charge_records(3 柜 × 2 天)→ 用于验证分组与趋势
所有 ID 写入 temp_ids.json,供 cleanup_temp_data.py 精确删除。
"""
import json
import os
import pymysql
HERE = os.path.dirname(os.path.abspath(__file__))
DB = dict(host="10.8.0.252", user="root", password="Hbhyg731024@", database="pms_dev")
conn = pymysql.connect(**DB)
cur = conn.cursor()
created = {
"user_id": None,
"project_id": None,
"cabinet_ids": [],
"board_ids": [],
"compartment_ids": [],
"record_ids": [],
}
# ---------------------------------------------------------------- 临时总管理员
cur.execute(
"INSERT INTO users (phone, name, password, role, organization_id, status) "
"VALUES (%s, %s, %s, %s, %s, %s)",
("19900000001", "能耗验证临时管理员", "x", 2, None, 1),
)
created["user_id"] = cur.lastrowid
# ------------------------------------------------- 临时项目(org=1,验证项目分组)
cur.execute(
"INSERT INTO projects (organization_id, name) VALUES (%s, %s)",
(1, "能耗验证临时项目"),
)
temp_project_id = cur.lastrowid
created["project_id"] = temp_project_id
# ------------------------------------- 临时柜子 ×2(挂临时项目;imei 15 位、abstract_id 唯一)
for idx, name in enumerate(["能耗验证临时柜A", "能耗验证临时柜B"], start=1):
cur.execute(
"INSERT INTO cabinets (project_id, abstract_id, imei, name, status) "
"VALUES (%s, %s, %s, %s, %s)",
(temp_project_id, f"99-0000000{idx}", f"99900000000000{idx}", name, 1),
)
cabinet_id = cur.lastrowid
created["cabinet_ids"].append(cabinet_id)
cur.execute(
"INSERT INTO cabin_boards (cabinet_id, board_id, status) VALUES (%s, %s, %s)",
(cabinet_id, 1, 1),
)
board_id = cur.lastrowid
created["board_ids"].append(board_id)
cur.execute(
"INSERT INTO compartments (cabin_board_id, channel_id, status) VALUES (%s, %s, %s)",
(board_id, 1, 0),
)
created["compartment_ids"].append(cur.lastrowid)
comp_a, comp_b = created["compartment_ids"]
cab_a, cab_b = created["cabinet_ids"]
# ----------------------------------------------------------- 6 条充电记录
# 3 个柜子(已有柜 1 + 临时柜 A/B)× 2 天(今天 / 昨天):
# 柜1 今天 220 Wh 昨天 1000 Wh (项目 1「联调测试项目」)
# 柜A 今天 330 Wh 昨天 2000 Wh (临时项目)
# 柜B 今天 440 Wh 昨天 3000 Wh (临时项目)
# 期望:今日合计 990 Wh;本月合计 990 + 6000 = 6990 Wh
plan = [
(1, 1, 220, "CURDATE()"),
(1, 1, 1000, "DATE_SUB(CURDATE(), INTERVAL 1 DAY)"),
(cab_a, comp_a, 330, "CURDATE()"),
(cab_a, comp_a, 2000, "DATE_SUB(CURDATE(), INTERVAL 1 DAY)"),
(cab_b, comp_b, 440, "CURDATE()"),
(cab_b, comp_b, 3000, "DATE_SUB(CURDATE(), INTERVAL 1 DAY)"),
]
for cabinet_id, compartment_id, energy, day_expr in plan:
cur.execute(
"INSERT INTO charge_records "
"(compartment_id, cabinet_id, start_time, end_time, energy, max_temperature, status) "
f"VALUES (%s, %s, {day_expr} + INTERVAL 10 HOUR, {day_expr} + INTERVAL 12 HOUR, %s, %s, %s)",
(compartment_id, cabinet_id, energy, 29815, 0),
)
created["record_ids"].append(cur.lastrowid)
conn.commit()
with open(os.path.join(HERE, "temp_ids.json"), "w", encoding="utf-8") as fh:
json.dump(created, fh, ensure_ascii=False, indent=2)
print(json.dumps(created, ensure_ascii=False, indent=2))
cur.close()
conn.close()