shishengliang/ln-bi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
290 Commits 8 Branches 0 Tags
8b4fb6563f630a9e98f430bc9189cbada89d83f6
Commit Graph
10 Commits
Author SHA1 Message Date
kkfluousandClaude Opus 4.7 8b4fb6563f refactor(energy): 简化为始终过滤 GF_HECRI_BILL，移除条件判断
ci/woodpecker/push/woodpecker Pipeline was successful
Details 
去掉 shouldFilterGfBills 探测、5 分钟缓存、JQ 存在性判定。
4 处氢能查询无条件追加 GF_HECRI_BILL 过滤，逻辑更直接。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 20:26:52 +08:00
kkfluousandClaude Opus 4.7 e187c0d02e feat(energy): 嘉燃经开站存在 JQ 单时全局过滤 GF_HECRI_BILL 历史订单
ci/woodpecker/push/woodpecker Pipeline was successful
Details 
业务背景：旧系统加氢账单使用 GF_HECRI_BILL 前缀，新系统统一改用 JQ 前缀。
切换期间两套数据共存，会重复计入加氢量。约定：当嘉兴嘉燃经开站出现 JQ
订单（视为切到新单号体系），全局过滤掉 GF_HECRI_BILL 前缀的历史订单。

实现：
- shouldFilterGfBills() 探测嘉兴嘉燃经开站是否有 JQ 单，结果缓存 5 分钟
- GF_EXCLUDE_CLAUSE = b.bill_code NOT LIKE 'GF\_HECRI\_BILL%' ESCAPE '\\'
- 应用到 4 处氢能查询：KPI、Top5、区域占比、daily 站点聚合

实测：当前嘉燃经开 4508 JQ + 665 GF，嘉锦 11783 JQ + 1 GF，全部 GF 已隐藏。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 20:23:03 +08:00
kkfluousandClaude Opus 4.7 c788dd4577 fix(energy): 单价直接取 MAX(cost_price)，不重算不返 null
ci/woodpecker/push/woodpecker Pipeline was successful
Details 
之前用 MIN=MAX...ELSE NULL 判定，再 NULLIF 排零，遇到「1 笔 0 元免费单 + 多笔 35 元正价单」
仍可能误判混合，最终页面显示「—」（如佛山豪汇石油加氢站）。

按业务约定：单价就是订单上记录的成本价，不做"统一性"判定，也不返 null。
改用 MAX(b.cost_price)：
  - 自然忽略 0 元免费/赠送单（被正价 max 掉）
  - 同价组等于原价
  - 极少数真正混合价组也展示该日付出过的最高单价（仍是订单上的真实数字）

回退类型：HydrogenStationRow.pricePerKg 重新固定为 number。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 19:56:26 +08:00
kkfluousandClaude Opus 4.7 3851335843 fix(energy): 氢能单价不再加权，混合价组显示「—」并修复 hydrogen_time 歧义
ci/woodpecker/push/woodpecker Pipeline was successful
Details 
- pricePerKg 改为 CASE WHEN MIN=MAX THEN MIN ELSE NULL，
  同价组返回原价（无小数误读），混合价组返回 null
- 类型 HydrogenStationRow.pricePerKg: number | null
- 前端 mobile/desktop 两处展示在 null 时显示「—」
- 修复 ER_NON_UNIQ_ERROR：tab_import_hydrogen_order 也有 hydrogen_time 字段，
  把 SELECT/ORDER BY 中 ${HYDROGEN_LOCAL} 替换为显式 b.hydrogen_time 限定
- 实测：712 个站点-日组中 682 个同价直接显示原价，30 个混合显示「—」

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 19:51:41 +08:00
kkfluousandClaude Opus 4.7 d0a644cf18 fix(energy): 氢能站点名补全 tab_import_hydrogen_order，单价改为按量加权
ci/woodpecker/push/woodpecker Pipeline was successful
Details 
站点名 fallback 链新增第三档：
  内部站表 → 外部站表 → tab_import_hydrogen_order(by bill_code) → 「未关联/未知 #ID」
经此关联，原来 140 条「未知站点」补全为 9 个真实站名（洛阳新红山、佛山新城等）

单价之前用 AVG(cost_price) 简单平均，混合价组会算出 34.0334... 这种
意外小数（看起来像被「重新计算」）。改为按量加权效率价：
  ROUND(SUM(cost_expense) / NULLIF(SUM(hydrogen_quantity), 0), 2)
单一价格组自动等于原价，混合价组得到真实付款单价。

Top5 与每日聚合两处 SQL 同步修改。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 19:46:56 +08:00
kkfluousandClaude Opus 4.7 0d30ee2df5 fix(energy): 氢能站点 fallback 区分「未关联」与「未知 #ID」
ci/woodpecker/push/woodpecker Pipeline was successful
Details 
之前两张 site 表都查不到的账单，UI 一律显示「未知站点」。
其中 137 条 station_id 为 NULL（账单未填站点），3 条 station_id
有值但站点表没收录（站点删除/字典漂移）。账单上的 cost_price 是真实的，
所以会出现「未知站点 25 元/Kg」这种可追溯但难定位的情况。

现在 SQL fallback 改为：
  - station_id IS NULL → 「未关联站点」
  - station_id 不为空但 join 不上 → 「未知站点 #ID」
方便定位具体是哪条字典记录缺失。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 19:41:57 +08:00
kkfluousandClaude Opus 4.7 d1d79f1c7c feat(energy): 电能统计切到 bi_ele_charge_record，外部数据接通
ci/woodpecker/push/woodpecker Pipeline was successful
Details 
- /api/energy/electric/overview & /electric/monthly 不再读 tab_energy_electricity_bill
- 改读 bi_ele_charge_record：kwh/fee/start_time
- 外部/我司用 vehicle_kind 区分（external/internal）
- 电能默认 customer 由 'external' 改 'lingniu'，与导入页约定一致
- ElectricDaily 移除「数据对接中…」友好空状态（外部已有数据）

ele 导入页同步收紧：
- 命中系统车辆=internal，未命中（含车牌为空）一律 external
- 移除 unknown 分类、KPI 卡、批次列、过滤按钮、UploadResult 字段
- 历史 unknown 行已 UPDATE 为 external

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 19:11:52 +08:00
kkfluousandClaude Opus 4.7 5493e27e49 feat(energy): 用 truck_id 区分外部/我司，外部数据空时给友好提示
ci/woodpecker/push/woodpecker Pipeline was successful
Details 
- 后端 customerClause 改为基于 truck_id：外部=IS NULL，我司=IS NOT NULL
- KPI 内联条件（ourYearKg/Fee、customerYearKg、lingniuBornKg/Fee）同步切换为 truck_id
- 调用方 /hydrogen/daily 与 /electric/monthly 改传 b.truck_id / truck_id
- 当前外部账单 truck_id 尚未对接，HydrogenDaily/ElectricDaily 在 customer=external 且无数据时
  改展示「数据对接中…」友好状态（插头图标 + 蓝色脉冲），替代「暂无数据」

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-29 17:52:03 +08:00
kkfluousandClaude Opus 4.7 c02c1aa62c perf(energy): add 60s TTL cache for all 4 endpoints 
Hydrogen overview was 1.8-2.0s (3 full-table aggregations on 66K rows).
With cache: cold 1 user/min eats the full query, all subsequent within
60s window return in ~10ms.

Implementation:
- New cache.ts with cached(key, loader) helper
- Per-key in-flight de-duplication: concurrent requests share one loader
- Each handler wrapped, cache key includes query params
  (e.g. "hydrogen/daily?range=last30&customer=external")
- TTL 60s as requested

Measured speedups:
- hydrogen/overview: 1.96s → 12ms (165x)
- hydrogen/daily:    270ms → 11ms (24x)
- electric/overview:  93ms →  9ms (10x)
- electric/monthly:   36ms →  9ms (4x)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-28 17:50:48 +08:00
kkfluousandClaude Opus 4.7 9a4f1945d9 feat(energy): connect to real DB (lingniu_prod) 
Replace front-end mock data with live API backed by:
- tab_energy_hydrogen_bill (66.5K rows) joined with
  tab_hydrogen_site (internal stations) and tab_outside_hydrogen_site
  (external stations, joined via inner_site_id)
- tab_energy_electricity_bill (4.4K rows, all 龙王路充电站)

New server routes (src/server/routes/energy/):
- GET /api/energy/hydrogen/overview  → KPI + Top5 站点 + 区域占比
- GET /api/energy/hydrogen/daily?range=&customer=  → 日级 + 站点级下钻
- GET /api/energy/electric/overview  → KPI + 本月柱图 (fallback to last
  available month if current month has no data)
- GET /api/energy/electric/monthly?customer=  → 6 个月分组日级表

Business rules encoded server-side:
- 客户类型: customer_id IS NULL = 羚牛承担, NOT NULL = 外部
- 时区: DATETIME 列字面值是 UTC，分组前 +8h 转成 CST
- 数据清理: hydrogen_time >= 2024-01-01 (排除 1900 年脏数据)
- 站点名 fallback: short_name → name → fixed_station_name → station_name → '未知站点'
- 区域归一化: SUBSTRING_INDEX(city, '-', -1) 取最后一段，去掉 '省'/'市'
  让 '四川省-成都市' 和 '成都市' 合并为 '成都'

Component changes:
- All 4 components (HydrogenOverview, HydrogenDaily, ElectricOverview,
  ElectricDaily) now use useEffect + fetch with loading/error states
- HydrogenDaily filtering moved to server (range + customer params)
  → drops client-side TODAY constant + isInPick switch
- ElectricOverview chart title is dynamic: shows 'YYYY-MM 每日充电'
  when fallback kicks in (current month has no data)
- mock.ts deleted

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
 2026-04-28 16:42:37 +08:00