163 Commits

Author SHA1 Message Date
SunCheng
6abc5f8b6d tmp2
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 6m47s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-02-02 11:07:49 +08:00
SunCheng
460dcd17ef tmp 2026-02-02 11:07:34 +08:00
61916dc6da fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 31s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-02-01 10:27:04 +08:00
SunCheng
704f58b1a1 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 3s
2026-01-30 10:41:19 +08:00
SunCheng
d9703d31ae 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 34s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-28 19:32:11 +08:00
SunCheng
e93c3d6bae 测试覆盖率
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 27s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-28 17:00:58 +08:00
SunCheng
3ed9cf5ebd 重构: 将 LogCleanupService 转为 Quartz Job 服务
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
- 创建 LogCleanupJob 替代 LogCleanupService (BackgroundService)
- 在 Expand.cs 中注册 LogCleanupJob (每天凌晨2点执行, 保留30天日志)
- 从 Program.cs 移除 LogCleanupService 的 HostedService 注册
- 删除 Service/LogCleanupService.cs
- 删除 Service/PeriodicBillBackgroundService.cs (已无用的重复服务)

所有后台任务现在统一通过 Quartz.NET 管理, 支持运行时控制
2026-01-28 11:19:23 +08:00
SunCheng
b71eadd4f9 重构账单查询sql
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 26s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-28 10:58:15 +08:00
SunCheng
5c9d7c5db1 样式修复
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-27 17:54:57 +08:00
SunCheng
9729ff2f82 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 1m58s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-27 17:06:35 +08:00
SunCheng
b78774bc39 优化待分类页面
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 1m55s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-27 16:46:16 +08:00
SunCheng
4aa7e82429 移除对账功能 后期从长计议
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 1m57s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-27 15:29:25 +08:00
bade93ad57 样式调整
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-25 13:27:55 +08:00
47e1ed3891 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-25 13:22:51 +08:00
SunCheng
4ff99b62c8 优化
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 39s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-23 17:14:41 +08:00
SunCheng
58627356f4 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 20s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-22 21:27:56 +08:00
SunCheng
dcbde4db23 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 25s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-22 21:03:00 +08:00
SunCheng
9e14849014 feat: 添加预算统计服务增强和日志系统改进
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
1. 新增 BudgetStatsService:将预算统计逻辑从 BudgetService 中提取为独立服务,支持月度和年度统计,包含归档数据支持和硬性预算调整算法
2. 日志系统增强:添加请求ID追踪功能,支持通过请求ID查询关联日志,新增类名筛选功能
3. 日志解析优化:修复类名解析逻辑,正确提取 SourceContext 中的类名信息
4. 代码清理:移除不需要的方法名相关代码,简化日志筛选逻辑
2026-01-22 19:07:10 +08:00
SunCheng
e2c0ab5389 构建优化 2026-01-22 13:28:24 +08:00
SunCheng
a06a75ee97 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-22 11:06:52 +08:00
SunCheng
937e8db776 fix bugs
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 28s
Docker Build & Deploy / Deploy to Production (push) Successful in 11s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-21 19:51:41 +08:00
SunCheng
64aa24c07b fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 5s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-21 18:52:31 +08:00
SunCheng
b2e903e968 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-21 16:09:38 +08:00
SunCheng
c2a27abcac 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-21 11:58:48 +08:00
SunCheng
a2bfff5790 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-20 19:56:29 +08:00
SunCheng
66cfd71ef5 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-20 19:26:36 +08:00
SunCheng
aa0bdecc50 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 50s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-20 19:19:53 +08:00
SunCheng
0708f833c8 样式调整
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 30s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-20 19:13:33 +08:00
SunCheng
0ffeb41605 重构存款预算
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 44s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 3s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-20 19:11:05 +08:00
SunCheng
44d9fbb0f6 todo
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-19 13:39:59 +08:00
SunCheng
32efbb0324 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 19s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-18 22:35:03 +08:00
SunCheng
1711ee410d fix
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 50s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-18 22:32:11 +08:00
SunCheng
b0d632dcb7 fix
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 1m19s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-18 22:29:00 +08:00
SunCheng
435efbcb90 大量的代码格式化
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 38s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-18 22:25:59 +08:00
SunCheng
9611ff2088 添加简单测试 2026-01-18 22:17:32 +08:00
SunCheng
4e2bf0da6c 大量后端代码格式化 2026-01-18 22:04:56 +08:00
SunCheng
298ce03aa6 历史预算计算
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-18 13:32:10 +08:00
SunCheng
5d6797b16a fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 25s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-18 13:06:16 +08:00
SunCheng
2ffad479ba fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-18 11:21:52 +08:00
SunCheng
9b25c62662 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 25s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-17 15:55:46 +08:00
SunCheng
1b3d01c78c fix
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 10s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-17 15:10:37 +08:00
SunCheng
0ef4b52fcc fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 39s
Docker Build & Deploy / Deploy to Production (push) Successful in 19s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-17 15:03:19 +08:00
SunCheng
2043976998 feat(预算): 添加预算趋势分析功能并优化图表展示
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 38s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
重构预算分析图表组件,添加每日/每月趋势统计功能:
1. 在Repository层添加趋势统计接口
2. 在Service层实现趋势数据计算逻辑
3. 优化前端图表展示,合并偏差分析图表
4. 改进燃尽图使用实际趋势数据
5. 调整UI样式和交互体验
2026-01-17 14:38:40 +08:00
SunCheng
3cbc868e9b fix bug
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 56s
Docker Build & Deploy / Deploy to Production (push) Successful in 13s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 3s
2026-01-17 12:33:16 +08:00
孙诚
c74ce24727 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 39s
Docker Build & Deploy / Deploy to Production (push) Successful in 12s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-16 23:18:04 +08:00
孙诚
14bbd62262 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 32s
Docker Build & Deploy / Deploy to Production (push) Successful in 13s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-16 17:52:40 +08:00
孙诚
0c95b6aa6e 发布
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 28s
Docker Build & Deploy / Deploy to Production (push) Successful in 11s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-16 15:56:53 +08:00
孙诚
f77cc57cab 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-16 12:27:00 +08:00
孙诚
59b81148ac fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 25s
Docker Build & Deploy / Deploy to Production (push) Successful in 18s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-16 12:23:02 +08:00
孙诚
04e4946f3d fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 31s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-16 12:08:11 +08:00
孙诚
319f8f7d7b 大量的代码格式化
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 1m10s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-16 11:15:44 +08:00
孙诚
9069e3dbcf 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 32s
Docker Build & Deploy / Deploy to Production (push) Successful in 13s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-15 22:10:57 +08:00
孙诚
71a8707241 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 26s
Docker Build & Deploy / Deploy to Production (push) Successful in 13s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-15 21:19:03 +08:00
孙诚
0e140548b7 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 27s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-15 20:50:14 +08:00
孙诚
12b8e4bd0e fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 26s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-15 20:31:10 +08:00
孙诚
f4f1600782 添加动态目标
All checks were successful
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
2026-01-15 20:00:41 +08:00
孙诚
caf6f3fe60 test
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 19s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-15 18:54:08 +08:00
孙诚
df3a06051b fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 17s
Docker Build & Deploy / Deploy to Production (push) Successful in 11s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-15 18:42:32 +08:00
孙诚
c80e5daf7d 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 11s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-15 18:39:04 +08:00
孙诚
ea11d72c00 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 20s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-15 18:29:53 +08:00
孙诚
9e03187a95 样式修复
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 3s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-15 17:55:37 +08:00
孙诚
667358fa0b feat(日历): 添加交易热力图组件展示每日交易统计
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 25s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
- 新增 ContributionHeatmap 组件实现类似 GitHub 贡献热力图的可视化
- 添加 getDailyStatisticsRange API 接口获取日期范围内的每日统计数据
- 调整日历页面布局以容纳热力图组件
- 热力图支持动态阈值计算和暗黑模式适配
- 交易变更时自动刷新热力图数据
2026-01-15 17:48:17 +08:00
孙诚
69298c2ffa 色彩调整
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 12s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-15 17:12:27 +08:00
孙诚
82e5c79868 优化预算进度颜色计算逻辑,支持不同类别的渐变色显示
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 20s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-15 11:08:52 +08:00
孙诚
65f7316c82 新增不记额收支
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 34s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 0s
Docker Build & Deploy / WeChat Notification (push) Successful in 3s
2026-01-15 10:53:05 +08:00
孙诚
12cf1b6323 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 11s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 0s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-14 20:24:32 +08:00
孙诚
4444f2b808 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 20s
Docker Build & Deploy / Deploy to Production (push) Successful in 11s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-14 15:59:18 +08:00
孙诚
0ccfa57d7b fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-14 12:05:20 +08:00
f2f741411b 尝试修复
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 1m3s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-14 10:46:23 +08:00
孙诚
6e7a237df9 style(views): 统一多个视图的导航栏和标签页样式
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 1m0s
Docker Build & Deploy / Deploy to Production (push) Successful in 11s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
调整多个视图的导航栏背景为透明,统一标签页的边距和样式
优化禁用状态的箭头样式,增加指针事件控制
2026-01-13 19:11:37 +08:00
孙诚
6a45f3d67d fix color
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 17s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-13 17:11:38 +08:00
孙诚
c5c3b56200 色彩调整
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-13 17:00:44 +08:00
556fc5af20 更新预算归档功能,添加归档总结和更新归档总结接口,优化预算统计逻辑,调整相关样式
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 34s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-12 22:29:39 +08:00
孙诚
03115a04ec fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 17s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-12 19:21:36 +08:00
孙诚
de4e692bce fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-12 19:19:05 +08:00
孙诚
d324d204d5 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 20s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-12 19:15:47 +08:00
孙诚
b4cb0a200e fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-12 18:53:43 +08:00
02fcf07235 更新 Web/src/styles/rich-content.css
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 18s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-12 18:15:09 +08:00
e11c1e4fc4 更新 Web/src/styles/rich-content.css
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 17s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-12 18:12:47 +08:00
孙诚
83dfa66d85 css 调整
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-12 18:00:08 +08:00
孙诚
c07c9dd07d debugger
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-12 17:56:58 +08:00
孙诚
a41c2b79af debugger
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-12 17:27:06 +08:00
孙诚
5cac4d6dde 样式调整
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-12 16:58:51 +08:00
孙诚
a8da1c6a70 提示词优化
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 11s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-12 16:20:06 +08:00
孙诚
8c7dbd24ad fix: 优化分类列表显示逻辑,简化分类视图计算
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 18s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-12 14:46:11 +08:00
孙诚
694925e326 fix tolen
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 19s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-12 14:34:58 +08:00
255c82759e 1
All checks were successful
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
2026-01-11 17:00:07 +08:00
386d211735 fix
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 2s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-11 16:51:55 +08:00
c550e95f94 fix: 设置多个视图的背景色为透明
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 2s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-11 16:50:18 +08:00
29705bbaa7 fix: 更新样式以使用新的背景颜色变量
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 30s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-11 16:46:16 +08:00
9fb25bc790 fix style
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 15s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-11 16:44:32 +08:00
ec460376c6 多个样式调整
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-11 16:33:55 +08:00
49023237e7 feat: 更新预算摘要组件以支持日期选择;在预算视图中添加日期绑定,优化数据获取逻辑
All checks were successful
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
Docker Build & Deploy / Build Docker Image (push) Successful in 17s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-11 12:41:52 +08:00
d2b2158b30 feat: 添加获取未被预算覆盖的分类统计信息接口;更新前端以展示未覆盖分类的详细信息
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-11 12:33:12 +08:00
e3ea64fb05 feat: 更新确认待确认分类的接口,支持批量确认功能;调整前端逻辑以处理选中的交易记录
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 20s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-11 12:02:20 +08:00
d9e9fa9f53 feat: 优化多个组件的高度设置,确保更好的用户体验;更新交易记录控制器以处理智能分类结果
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 28s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-11 11:21:13 +08:00
ad21d20751 feat: 更新未读消息计数的刷新频率,优化消息视图;添加分类标签显示功能,增强预算卡片的可读性
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 19s
Docker Build & Deploy / Deploy to Production (push) Successful in 13s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-10 23:01:02 +08:00
171febcfb6 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 39s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-10 18:14:10 +08:00
9aeb9c825e feat: 添加重试逻辑以增强容器启动和微信通知的可靠性
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 39s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-10 18:12:01 +08:00
f64e31b230 fix
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 40s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-10 18:09:09 +08:00
f34457a706 feat: 添加深度复制功能,优化自动分类逻辑;更新周期账单视图以显示下次执行时间
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 43s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-10 18:04:27 +08:00
6a9c879dee feat: 重构消息服务,替换消息记录服务为消息服务,更新相关依赖和逻辑
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 20s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-10 17:47:09 +08:00
b757f18765 feat: 移除预算相关的停止状态属性和相关功能,简化预算管理逻辑
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 11s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-10 17:38:22 +08:00
037bad2d9b feat: 添加待确认分类功能,支持获取和确认未分类交易记录;优化相关组件和服务
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-10 12:22:37 +08:00
50843d43ff feat: 优化预算控制器排序逻辑,修复除零错误;增强程序启动时的JWT认证配置
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 26s
Docker Build & Deploy / Deploy to Production (push) Successful in 19s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-10 10:06:39 +08:00
孙诚
76fd0d23dc feat: 更新预算服务和控制器,优化统计信息获取逻辑,增强参数验证
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 25s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-09 16:59:08 +08:00
孙诚
b5d0524868 feat: 更新交易记录和预算服务,支持按分类和日期范围筛选
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 26s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-09 16:21:03 +08:00
孙诚
2244d08b43 feat: 添加分类统计功能,支持获取月度和年度预算统计信息
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-09 15:42:59 +08:00
孙诚
b41121400d debugger
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 25s
Docker Build & Deploy / Deploy to Production (push) Successful in 12s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-09 14:03:45 +08:00
孙诚
ef4ed9fd57 feat: Implement scheduled tasks management and budget archiving functionality
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Failing after 6s
Docker Build & Deploy / Deploy to Production (push) Has been skipped
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
- Added BudgetArchiveJob for monthly budget archiving.
- Created BudgetArchive entity and BudgetArchiveRepository for managing archived budgets.
- Introduced JobController for handling job execution, pausing, and resuming.
- Developed ScheduledTasksView for displaying and managing scheduled tasks in the frontend.
- Updated PeriodicBillJob to improve scope handling.
- Enhanced OpenAiService with increased HTTP timeout.
- Added archiveBudgets API endpoint for archiving budgets by year and month.
- Refactored BudgetController to utilize new repository patterns and improved error handling.
- Introduced rich-content styles for better rendering of HTML content in Vue components.
- Updated various Vue components to support rich HTML content display.
2026-01-09 14:03:01 +08:00
孙诚
c5363efc0e feat: 移除预算摘要中的预算数量显示
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 17s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-08 20:56:02 +08:00
孙诚
b05248fc7b feat: 优化预算统计逻辑,支持跨周期统计并修复相关计算问题
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-08 16:59:30 +08:00
孙诚
343570d4bc feat: 更新预算卡片组件,添加预算描述功能并优化状态标签显示
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-08 16:03:20 +08:00
孙诚
fcd3a6eb07 修复 PWA 模式下键盘收起页面不回弹的问题
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 15s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-08 15:23:31 +08:00
孙诚
ab1d216664 feat: 优化预算视图,调整预算摘要组件位置和样式
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-08 15:16:25 +08:00
孙诚
58ee44987b 封装调整
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 25s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-08 14:41:50 +08:00
孙诚
500a6495bd 1
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 18s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-08 12:18:00 +08:00
孙诚
faa5a49553 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 30s
Docker Build & Deploy / Deploy to Production (push) Successful in 12s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
2026-01-07 20:36:58 +08:00
孙诚
aa8fc7a8b3 feat: 添加存款分类设置功能,优化预算管理界面
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 26s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-07 20:31:12 +08:00
孙诚
a1bb7ad5e1 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 15s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-07 19:57:43 +08:00
孙诚
fa1389401a feat: 添加预算类别名称更新功能,优化相关控制器逻辑
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-07 19:55:00 +08:00
孙诚
35a856c6e3 feat: 优化预算管理界面,增强预算编辑功能,添加预算删除接口
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-07 19:19:53 +08:00
孙诚
851886a601 fix notify
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 11s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
Docker Build & Deploy / WeChat Notification (push) Successful in 1s
2026-01-07 17:40:22 +08:00
孙诚
eec3702ce7 add: notify 2026-01-07 17:39:05 +08:00
孙诚
620effd1f8 feat: add budget update functionality and enhance budget management UI
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 26s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
- Implemented UpdateAsync method in BudgetController for updating budget details.
- Created UpdateBudgetDto for handling budget update requests.
- Added BudgetCard component for displaying budget information with progress tracking.
- Developed BudgetEditPopup component for creating and editing budget entries.
- Introduced BudgetSummary component for summarizing budget statistics by period.
- Enhanced budget period display logic in BudgetDto to support various timeframes.
2026-01-07 17:33:50 +08:00
孙诚
60fb0e0d8f feat: 移除预算同步相关功能,简化预算管理逻辑
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
2026-01-07 16:23:50 +08:00
孙诚
c95aa6b17b feat: 更新 Service Worker 版本管理,优化缓存策略,增加未处理更新的提示
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 15s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-07 16:07:56 +08:00
孙诚
1bd6b688c1 优化预算管理页面,移除冗余的底部安全距离元素
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 6s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-07 15:00:55 +08:00
孙诚
fcf122c806 优化预算管理页面布局,调整导航栏和内容区域,增加底部安全距离
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 14s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 0s
2026-01-07 14:36:30 +08:00
孙诚
b2339c1c5e feat: update VSCode settings for ESLint and Prettier integration
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 20s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
chore: refactor ESLint configuration for improved linting rules and performance

fix: handle push event data parsing in service worker

style: adjust tabbar item properties for better readability in App.vue

refactor: remove unused functions and improve code clarity in TransactionDetail.vue

fix: ensure consistent event handling in CalendarView.vue

style: clean up component structure and formatting in various Vue files

chore: update launch script for better command execution

feat: add ESLint configuration file for consistent code style across the project

fix: resolve issues with button click events in multiple components
2026-01-07 14:33:30 +08:00
孙诚
efdfe88155 添加预算视图统计信息,显示本周、本月和年度达成率,优化样式和布局
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-06 21:23:04 +08:00
孙诚
343c754431 重构预算管理模块,添加预算记录和服务,更新相关API,优化预算统计逻辑
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 25s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-06 21:15:02 +08:00
孙诚
0ca7f44e37 添加预算管理功能,重构账单和消息视图,优化路由和组件交互
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-06 20:55:11 +08:00
孙诚
10b02df6e2 添加消息类型枚举和相关字段,优化消息记录服务的添加方法,更新多个组件以支持新增分类对话框
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 38s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-06 13:45:39 +08:00
孙诚
baa77341bc 优化底部操作栏样式,调整布局和背景色,并在分类编辑页面添加安全距离
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
2026-01-05 19:07:10 +08:00
孙诚
826f139fad 修正提示信息,要求用户必须从分类列表中选择分类
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-05 17:13:35 +08:00
孙诚
d311918b0b 优化SQL查询语句的HTML输出样式,调整字体大小并添加边框
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 19s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-05 16:20:21 +08:00
孙诚
83d8c25aca 优化SQL查询语句的HTML输出样式,调整最大高度为80px
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-05 16:19:04 +08:00
孙诚
18f0313d01 优化生成SQL查询语句的HTML输出格式,使用JSON序列化包装内容
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-05 15:57:22 +08:00
孙诚
34c6416538 重构分类信息构建逻辑,提取为独立方法并优化代码结构
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-05 15:51:47 +08:00
孙诚
d7274cd54d 添加生成SQL查询语句的HTML格式化输出
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-05 15:35:57 +08:00
孙诚
d44cceb6e4 添加配置管理功能,包括获取和设置配置值的接口及实现
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 24s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-05 15:21:13 +08:00
孙诚
5a824dac91 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 17s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
2026-01-04 19:54:17 +08:00
孙诚
5720bac683 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 18s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-04 18:51:55 +08:00
孙诚
3ec0dbcd9b 优化交易分类选择逻辑,调整条件判断并移除高亮样式
Some checks failed
Docker Build & Deploy / Build Docker Image (push) Successful in 15s
Docker Build & Deploy / Deploy to Production (push) Failing after 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Has been skipped
2026-01-04 18:33:36 +08:00
孙诚
9ddf7e3dbd fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 18s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
2026-01-04 18:24:39 +08:00
孙诚
36126097fa 重命名 PushSubscriptionEntity 为 PushSubscription,并更新相关引用
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 0s
2026-01-04 16:59:34 +08:00
孙诚
14296d65d1 优化交易分类选择时的自动保存功能;重命名清除缓存为刷新网络并更新相关逻辑
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 15s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 2s
2026-01-04 16:52:20 +08:00
孙诚
557d44aed8 优化代码
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-04 16:43:32 +08:00
ab22325ca7 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 14s
Docker Build & Deploy / Deploy to Production (push) Successful in 5s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-03 12:05:25 +08:00
53d8470e88 优化邮件处理记录的导入来源信息,简化通知内容
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 21s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-03 12:04:26 +08:00
5c108d27df fix 构建
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
2026-01-03 11:30:51 +08:00
f45e4a02c3 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
2026-01-03 11:26:50 +08:00
82bb13c385 统一组件
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 19s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
2026-01-03 11:07:33 +08:00
f0d332a503 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 15s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
2026-01-02 19:25:40 +08:00
f5c41c8be4 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 15s
Docker Build & Deploy / Deploy to Production (push) Successful in 9s
2026-01-02 19:21:47 +08:00
9bbddfc0b1 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
2026-01-02 19:17:21 +08:00
4016e05e40 fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 14s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
2026-01-02 19:03:22 +08:00
7704a04429 修复问题
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 16s
Docker Build & Deploy / Deploy to Production (push) Successful in 6s
2026-01-02 18:58:07 +08:00
5c76e9287e fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 37s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
2026-01-02 18:51:28 +08:00
e250a7df2f feat: 添加推送通知功能,支持订阅和发送通知
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 40s
Docker Build & Deploy / Deploy to Production (push) Successful in 8s
2026-01-02 12:25:44 +08:00
a055e43451 feat: 更新智能账单解析助手的分类信息提示,增强用户体验
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 22s
Docker Build & Deploy / Deploy to Production (push) Successful in 13s
2026-01-01 21:22:58 +08:00
8c72102e87 feat: 添加分类名称更新功能,支持在交易记录中同步更新分类名称
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 23s
Docker Build & Deploy / Deploy to Production (push) Successful in 7s
2026-01-01 15:20:59 +08:00
193 changed files with 30077 additions and 5350 deletions

198
.eslintrc.js Normal file
View File

@@ -0,0 +1,198 @@
module.exports = {
root: true,
parserOptions: {
parser: 'babel-eslint',
sourceType: 'module'
},
env: {
browser: true,
node: true,
es6: true,
},
extends: ['plugin:vue/recommended', 'eslint:recommended'],
// add your custom rules here
//it is base on https://github.com/vuejs/eslint-config-vue
rules: {
"vue/max-attributes-per-line": [2, {
"singleline": 10,
// "multiline": {
// "max": 1,
// "allowFirstLine": false
// }
}],
"vue/singleline-html-element-content-newline": "off",
"vue/multiline-html-element-content-newline":"off",
"vue/name-property-casing": ["error", "PascalCase"],
"vue/no-v-html": "off",
'accessor-pairs': 2,
'arrow-spacing': [2, {
'before': true,
'after': true
}],
'block-spacing': [2, 'always'],
'brace-style': [2, '1tbs', {
'allowSingleLine': true
}],
'camelcase': [0, {
'properties': 'always'
}],
'comma-dangle': [2, 'never'],
'comma-spacing': [2, {
'before': false,
'after': true
}],
'comma-style': [2, 'last'],
'constructor-super': 2,
'curly': [2, 'multi-line'],
'dot-location': [2, 'property'],
'eol-last': 2,
'eqeqeq': ["error", "always", {"null": "ignore"}],
'generator-star-spacing': [2, {
'before': true,
'after': true
}],
'handle-callback-err': [2, '^(err|error)$'],
'indent': [2, 2, {
'SwitchCase': 1
}],
'jsx-quotes': [2, 'prefer-single'],
'key-spacing': [2, {
'beforeColon': false,
'afterColon': true
}],
'keyword-spacing': [2, {
'before': true,
'after': true
}],
'new-cap': [2, {
'newIsCap': true,
'capIsNew': false
}],
'new-parens': 2,
'no-array-constructor': 2,
'no-caller': 2,
'no-console': 'off',
'no-class-assign': 2,
'no-cond-assign': 2,
'no-const-assign': 2,
'no-control-regex': 0,
'no-delete-var': 2,
'no-dupe-args': 2,
'no-dupe-class-members': 2,
'no-dupe-keys': 2,
'no-duplicate-case': 2,
'no-empty-character-class': 2,
'no-empty-pattern': 2,
'no-eval': 2,
'no-ex-assign': 2,
'no-extend-native': 2,
'no-extra-bind': 2,
'no-extra-boolean-cast': 2,
'no-extra-parens': [2, 'functions'],
'no-fallthrough': 2,
'no-floating-decimal': 2,
'no-func-assign': 2,
'no-implied-eval': 2,
'no-inner-declarations': [2, 'functions'],
'no-invalid-regexp': 2,
'no-irregular-whitespace': 2,
'no-iterator': 2,
'no-label-var': 2,
'no-labels': [2, {
'allowLoop': false,
'allowSwitch': false
}],
'no-lone-blocks': 2,
'no-mixed-spaces-and-tabs': 2,
'no-multi-spaces': 2,
'no-multi-str': 2,
'no-multiple-empty-lines': [2, {
'max': 1
}],
'no-native-reassign': 2,
'no-negated-in-lhs': 2,
'no-new-object': 2,
'no-new-require': 2,
'no-new-symbol': 2,
'no-new-wrappers': 2,
'no-obj-calls': 2,
'no-octal': 2,
'no-octal-escape': 2,
'no-path-concat': 2,
'no-proto': 2,
'no-redeclare': 2,
'no-regex-spaces': 2,
'no-return-assign': [2, 'except-parens'],
'no-self-assign': 2,
'no-self-compare': 2,
'no-sequences': 2,
'no-shadow-restricted-names': 2,
'no-spaced-func': 2,
'no-sparse-arrays': 2,
'no-this-before-super': 2,
'no-throw-literal': 2,
'no-trailing-spaces': 2,
'no-undef': 2,
'no-undef-init': 2,
'no-unexpected-multiline': 2,
'no-unmodified-loop-condition': 2,
'no-unneeded-ternary': [2, {
'defaultAssignment': false
}],
'no-unreachable': 2,
'no-unsafe-finally': 2,
'no-unused-vars': [2, {
'vars': 'all',
'args': 'none'
}],
'no-useless-call': 2,
'no-useless-computed-key': 2,
'no-useless-constructor': 2,
'no-useless-escape': 0,
'no-whitespace-before-property': 2,
'no-with': 2,
'one-var': [2, {
'initialized': 'never'
}],
'operator-linebreak': [2, 'after', {
'overrides': {
'?': 'before',
':': 'before'
}
}],
'padded-blocks': [2, 'never'],
'quotes': [2, 'single', {
'avoidEscape': true,
'allowTemplateLiterals': true
}],
'semi': [2, 'never'],
'semi-spacing': [2, {
'before': false,
'after': true
}],
'space-before-blocks': [2, 'always'],
'space-before-function-paren': [2, 'never'],
'space-in-parens': [2, 'never'],
'space-infix-ops': 2,
'space-unary-ops': [2, {
'words': true,
'nonwords': false
}],
'spaced-comment': [2, 'always', {
'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
}],
'template-curly-spacing': [2, 'never'],
'use-isnan': 2,
'valid-typeof': 2,
'wrap-iife': [2, 'any'],
'yield-star-spacing': [2, 'both'],
'yoda': [2, 'never'],
'prefer-const': 2,
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
'object-curly-spacing': [2, 'always', {
objectsInObjects: false
}],
'array-bracket-spacing': [2, 'never']
}
}

View File

@@ -13,13 +13,64 @@ jobs:
name: Build Docker Image name: Build Docker Image
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# ✅ 使用 Gitea 兼容的代码检出方式 # 网络连接测试
- name: Test network connectivity
run: |
echo "Testing network connectivity to Gitea server..."
MAX_RETRIES=5
RETRY_DELAY=10
for i in $(seq 1 $MAX_RETRIES); do
echo "Network test attempt $i/$MAX_RETRIES"
if curl -s --connect-timeout 10 -f http://192.168.31.14:14200 > /dev/null; then
echo "✅ Gitea server is reachable"
exit 0
else
echo "❌ Network test failed, waiting $RETRY_DELAY seconds..."
sleep $RETRY_DELAY
fi
done
echo "❌ All network tests failed"
exit 1
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: https://gitea.com/actions/checkout@v3
with: # 添加重试策略
gitea-server: http://192.168.31.14:14200 continue-on-error: true
token: ${{ secrets.GITEA_TOKEN }}
ref: ${{ gitea.ref }} # 必须传递 Gitea 的 ref 参数 # 手动重试逻辑
- name: Retry checkout if failed
if: steps.checkout.outcome == 'failure'
run: |
echo "First checkout attempt failed, retrying..."
MAX_RETRIES=3
RETRY_DELAY=15
for i in $(seq 1 $MAX_RETRIES); do
echo "Retry attempt $i/$MAX_RETRIES"
# 清理可能的部分检出
rm -rf .git || true
git clean -fdx || true
# 使用git命令直接检出
git init
git remote add origin http://192.168.31.14:14200/${{ gitea.repository }}
git config http.extraHeader "Authorization: Bearer ${{ secrets.GITEA_TOKEN }}"
if git fetch --depth=1 origin "${{ gitea.ref }}"; then
git checkout FETCH_HEAD
echo "Checkout successful on retry $i"
exit 0
fi
echo "Retry $i failed, waiting $RETRY_DELAY seconds..."
sleep $RETRY_DELAY
done
echo "All checkout attempts failed"
exit 1
- name: Cleanup old containers - name: Cleanup old containers
run: | run: |
@@ -28,7 +79,7 @@ jobs:
- name: Build new image - name: Build new image
run: | run: |
RETRIES=3 RETRIES=20
DELAY=10 DELAY=10
count=0 count=0
until docker build -t $IMAGE_NAME .; do until docker build -t $IMAGE_NAME .; do
@@ -53,4 +104,76 @@ jobs:
- name: Start containers - name: Start containers
run: | run: |
docker compose -p $COMPOSE_PROJECT_NAME down docker compose -p $COMPOSE_PROJECT_NAME down
docker compose -p $COMPOSE_PROJECT_NAME up -d --build
# 添加重试逻辑
RETRIES=3
DELAY=10
count=0
until docker compose -p $COMPOSE_PROJECT_NAME up -d --build; do
count=$((count+1))
if [ $count -ge $RETRIES ]; then
echo "Deployment failed after $RETRIES attempts"
exit 1
fi
echo "Deployment failed. Retrying in $DELAY seconds... ($count/$RETRIES)"
sleep $DELAY
done
cleanup:
name: Cleanup Dangling Images
runs-on: ubuntu-latest
needs: deploy
if: always()
steps:
- name: Remove dangling images
run: |
docker rm $(docker images -f "dangling=true" -q) || true
echo "Cleanup completed."
notify:
name: WeChat Notification
runs-on: ubuntu-latest
needs: [build, deploy]
if: always()
steps:
- name: Send WeChat Notification
run: |
# 判断结果:只有 build 和 deploy 都成功才算成功
if [[ "${{ needs.build.result }}" == "success" && "${{ needs.deploy.result }}" == "success" ]]; then
MSG_TITLE="构建并部署成功"
RESULT_ICON="✅"
MSG_COLOR="info"
else
MSG_TITLE="自动部署发现异常"
RESULT_ICON="❌"
MSG_COLOR="warning"
fi
WEBHOOK_URL="https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=96f9fa23-a959-4492-ac3a-7415fae19680"
# 准备 Markdown 内容
cat <<EOF > wechat_payload.json
{
"msgtype": "markdown",
"markdown": {
"content": "### $RESULT_ICON $MSG_TITLE\n> **项目**: [${{ gitea.repository }}](${{ gitea.server_url }}/${{ gitea.repository }})\n> **状态**: <font color=\"$MSG_COLOR\">$MSG_TITLE</font>\n> **分支**: \`${{ gitea.ref_name }}\`\n> **触发者**: ${{ gitea.actor }}\n> **任务编号**: [#${{ gitea.run_number }}](${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }})\n> **构建状态**: ${{ needs.build.result || 'skipped' }}\n> **部署状态**: ${{ needs.deploy.result || 'skipped' }}\n> **提交详情**: [${{ gitea.sha }}](${{ gitea.server_url }}/${{ gitea.repository }}/commit/${{ gitea.sha }})"
}
}
EOF
# 添加重试逻辑
RETRIES=3
DELAY=5
count=0
# 使用 -f 让 curl 在 HTTP 错误时返回非零退出码
until curl -s -f -X POST "$WEBHOOK_URL" \
-H "Content-Type: application/json" \
-d @wechat_payload.json; do
count=$((count+1))
if [ $count -ge $RETRIES ]; then
echo "WeChat notification failed after $RETRIES attempts"
exit 1
fi
echo "Notification failed. Retrying in $DELAY seconds... ($count/$RETRIES)"
sleep $DELAY
done

6
.github/csharpe.prompt.md vendored Normal file
View File

@@ -0,0 +1,6 @@
# C# Developer Prompt
- 优先使用新C#语法
- 优先使用中文注释
- 优先复用已有方法
- 不要深嵌套代码
- 保持代码简洁易读

3
.gitignore vendored
View File

@@ -402,3 +402,6 @@ FodyWeavers.xsd
.idea/ .idea/
Web/dist Web/dist
# ESLint
.eslintcache
.aider*

9080
.pans/v2.pen Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,80 @@
# Decisions - Statistics Year Selection Enhancement
## [2026-01-28] Architecture Decisions
### Frontend Implementation Strategy
#### 1. Date Picker Mode Toggle
- Add a toggle switch in the date picker popup to switch between "按月" (month) and "按年" (year) modes
- When "按年" selected: use `columns-type="['year']"`
- When "按月" selected: use `columns-type="['year', 'month']` (current behavior)
#### 2. State Management
- Add `dateSelectionMode` ref: `'month'` | `'year'`
- When year-only mode: set `currentMonth = 0` to indicate full year
- Keep `currentYear` as integer (unchanged)
- Update `selectedDate` array dynamically based on mode:
- Year mode: `['YYYY']`
- Month mode: `['YYYY', 'MM']`
#### 3. Display Logic
- Nav bar title: `currentYear年` when `currentMonth === 0`, else `currentYear年currentMonth月`
- Chart titles: Update to reflect year or year-month scope
#### 4. API Calls
- Pass `month: currentMonth.value || 0` to all API calls
- Backend will handle month=0 as year-only query
### Backend Implementation Strategy
#### 1. Repository Layer Change
**File**: `Repository/TransactionRecordRepository.cs`
**Method**: `BuildQuery()` lines 81-86
```csharp
if (year.HasValue)
{
if (month.HasValue && month.Value > 0)
{
// Specific month
var dateStart = new DateTime(year.Value, month.Value, 1);
var dateEnd = dateStart.AddMonths(1);
query = query.Where(t => t.OccurredAt >= dateStart && t.OccurredAt < dateEnd);
}
else
{
// Entire year
var dateStart = new DateTime(year.Value, 1, 1);
var dateEnd = new DateTime(year.Value + 1, 1, 1);
query = query.Where(t => t.OccurredAt >= dateStart && t.OccurredAt < dateEnd);
}
}
```
#### 2. Service Layer
- No changes needed - services already pass month parameter to repository
- Services will receive month=0 for year-only queries
#### 3. API Controller
- No changes needed - already accepts year/month parameters
### Testing Strategy
#### Backend Tests
- Test year-only query returns all transactions for that year
- Test month-specific query still works
- Test edge cases: year boundaries, leap years
#### Frontend Tests
- Test toggle switches picker mode correctly
- Test year selection updates state and fetches data
- Test display updates correctly for year vs year-month
### User Experience Flow
1. User clicks date picker in nav bar
2. Popup opens with toggle: "按月 | 按年"
3. User selects mode (default: 按月 for backward compatibility)
4. User selects date(s) and confirms
5. Statistics refresh with new scope
6. Display updates to show scope (year or year-month)

View File

@@ -0,0 +1,27 @@
# Issues - Statistics Year Selection Enhancement
## [2026-01-28] Backend Repository Limitation
### Issue
`TransactionRecordRepository.BuildQuery()` requires both year AND month parameters to be present. Year-only queries (month=null or month=0) are not supported.
### Impact
- Cannot query full-year statistics from the frontend
- Current implementation only supports month-level granularity
- All statistics endpoints rely on `QueryAsync(year, month, ...)`
### Solution
Modify `BuildQuery()` method in `Repository/TransactionRecordRepository.cs` to support:
1. Year-only queries (when year provided, month is null or 0)
2. Month-specific queries (when both year and month provided - current behavior)
### Implementation Location
- File: `Repository/TransactionRecordRepository.cs`
- Method: `BuildQuery()` lines 81-86
- Also need to update service layer to handle month=0 or null
### Testing Requirements
- Test year-only query returns all transactions for that year
- Test month-specific query still works as before
- Test edge cases: leap years, year boundaries
- Verify all statistics endpoints work with year-only mode

View File

@@ -0,0 +1,181 @@
# Learnings - Statistics Year Selection Enhancement
## [2026-01-28] Initial Analysis
### Current Implementation
- **File**: `Web/src/views/StatisticsView.vue`
- **Current picker**: `columns-type="['year', 'month']` (year-month only)
- **State variables**:
- `currentYear` - integer year
- `currentMonth` - integer month (1-12)
- `selectedDate` - array `['YYYY', 'MM']` for picker
- **API calls**: All endpoints use `{ year, month }` parameters
### Vant UI Year-Only Pattern
- **Key prop**: `columns-type="['year']"`
- **Picker value**: Single-element array `['YYYY']`
- **Confirmation**: `selectedValues[0]` contains year string
### Implementation Strategy
1. Add UI toggle to switch between year-month and year-only modes
2. When year-only selected, set `currentMonth = 0` or null to indicate full year
3. Backend API already supports year-only queries (when month=0 or null)
4. Update display logic to show "YYYY年" vs "YYYY年MM月"
### API Compatibility - CRITICAL FINDING
- **Backend limitation**: `TransactionRecordRepository.BuildQuery()` (lines 81-86) requires BOTH year AND month
- Current logic: `if (year.HasValue && month.HasValue)` - year-only queries are NOT supported
- **Must modify repository** to support year-only queries:
- When year provided but month is null/0: query entire year (Jan 1 to Dec 31)
- When both year and month provided: query specific month (current behavior)
- All statistics endpoints use `QueryAsync(year, month, ...)` pattern
### Required Backend Changes
**File**: `Repository/TransactionRecordRepository.cs`
**Method**: `BuildQuery()` lines 81-86
**Change**: Modify year/month filtering logic to support year-only queries
```csharp
// Current (line 81-86):
if (year.HasValue && month.HasValue)
{
var dateStart = new DateTime(year.Value, month.Value, 1);
var dateEnd = dateStart.AddMonths(1);
query = query.Where(t => t.OccurredAt >= dateStart && t.OccurredAt < dateEnd);
}
// Needed:
if (year.HasValue)
{
if (month.HasValue && month.Value > 0)
{
// Specific month
var dateStart = new DateTime(year.Value, month.Value, 1);
var dateEnd = dateStart.AddMonths(1);
query = query.Where(t => t.OccurredAt >= dateStart && t.OccurredAt < dateEnd);
}
else
{
// Entire year
var dateStart = new DateTime(year.Value, 1, 1);
var dateEnd = new DateTime(year.Value + 1, 1, 1);
query = query.Where(t => t.OccurredAt >= dateStart && t.OccurredAt < dateEnd);
}
}
```
### Existing Patterns
- BudgetView.vue uses same year-month picker pattern
- Dayjs used for all date formatting: `dayjs().format('YYYY-MM-DD')`
- Date picker values always arrays for Vant UI
## [2026-01-28] Repository BuildQuery() Enhancement
### Implementation Completed
- **File Modified**: `Repository/TransactionRecordRepository.cs` lines 81-94
- **Change**: Updated year/month filtering logic to support year-only queries
### Logic Changes
```csharp
// Old: Required both year AND month
if (year.HasValue && month.HasValue) { ... }
// New: Support year-only queries
if (year.HasValue)
{
if (month.HasValue && month.Value > 0)
{
// 查询指定年月
var dateStart = new DateTime(year.Value, month.Value, 1);
var dateEnd = dateStart.AddMonths(1);
query = query.Where(t => t.OccurredAt >= dateStart && t.OccurredAt < dateEnd);
}
else
{
// 查询整年数据1月1日到下年1月1日
var dateStart = new DateTime(year.Value, 1, 1);
var dateEnd = new DateTime(year.Value + 1, 1, 1);
query = query.Where(t => t.OccurredAt >= dateStart && t.OccurredAt < dateEnd);
}
}
```
### Behavior
- **Month-specific** (month.HasValue && month.Value > 0): Query from 1st of month to 1st of next month
- **Year-only** (month is null or 0): Query from Jan 1 to Jan 1 of next year
- **No year provided**: No date filtering applied
### Verification
- All 14 tests pass: `dotnet test WebApi.Test/WebApi.Test.csproj`
- No breaking changes to existing functionality
- Chinese comments added for business logic clarity
### Key Pattern
- Use `month.Value > 0` check to distinguish year-only (0/null) from month-specific (1-12)
- Date range is exclusive on upper bound (`< dateEnd`) to avoid including boundary dates
## [2026-01-28] Frontend Year-Only Selection Implementation
### Changes Made
**File**: `Web/src/views/StatisticsView.vue`
#### 1. Nav Bar Title Display (Line 12)
- Updated to show "YYYY年" when `currentMonth === 0`
- Shows "YYYY年MM月" when month is selected
- Template: `{{ currentMonth === 0 ? \`${currentYear}年\` : \`${currentYear}年${currentMonth}月\` }}`
#### 2. Date Picker Popup (Lines 268-289)
- Added toggle switch using `van-tabs` component
- Two modes: "按月" (month) and "按年" (year)
- Tabs positioned above the date picker
- Dynamic `columns-type` based on selection mode:
- Year mode: `['year']`
- Month mode: `['year', 'month']`
#### 3. State Management (Line 347)
- Added `dateSelectionMode` ref: `'month'` | `'year'`
- Default: `'month'` for backward compatibility
- `currentMonth` set to `0` when year-only selected
#### 4. Confirmation Handler (Lines 532-544)
- Updated to handle both year-only and year-month modes
- When year mode: `newMonth = 0`
- When month mode: `newMonth = parseInt(selectedValues[1])`
#### 5. API Calls (All Statistics Endpoints)
- Updated all API calls to use `month: currentMonth.value || 0`
- Ensures backend receives `0` for year-only queries
- Modified functions:
- `fetchMonthlyData()` (line 574)
- `fetchCategoryData()` (lines 592, 610, 626)
- `fetchDailyData()` (line 649)
- `fetchBalanceData()` (line 672)
- `loadCategoryBills()` (line 1146)
#### 6. Mode Switching Watcher (Lines 1355-1366)
- Added `watch(dateSelectionMode)` to update `selectedDate` array
- When switching to year mode: `selectedDate = [year.toString()]`
- When switching to month mode: `selectedDate = [year, month]`
#### 7. Styling (Lines 1690-1705)
- Added `.date-picker-header` styles for tabs
- Clean, minimal design matching Vant UI conventions
- Proper spacing and background colors
### Vant UI Patterns Used
- **van-tabs**: For mode switching toggle
- **van-date-picker**: Dynamic `columns-type` prop
- **van-popup**: Container for picker and tabs
- Composition API with `watch` for reactive updates
### User Experience
1. Click nav bar date → popup opens with "按月" default
2. Switch to "按年" → picker shows only year column
3. Select year and confirm → `currentMonth = 0`
4. Nav bar shows "2025年" instead of "2025年1月"
5. All statistics refresh with year-only data
### Verification
- Build succeeds: `cd Web && pnpm build`
- No TypeScript errors
- No breaking changes to existing functionality
- Backward compatible with month-only selection

29
.sql/init_categories.sql Normal file
View File

@@ -0,0 +1,29 @@
-- 支出分类 (Type = 0)
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10001, '2026-01-01 00:00:00', 'C餐饮美食', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10002, '2026-01-01 00:00:00', 'F服饰美容', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10003, '2026-01-01 00:00:00', 'S生活日用', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10004, '2026-01-01 00:00:00', 'G交通出行', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10005, '2026-01-01 00:00:00', 'X休闲娱乐', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10006, '2026-01-01 00:00:00', 'Y医疗保健', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10007, '2026-01-01 00:00:00', 'Z住房物业', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10008, '2026-01-01 00:00:00', 'S水电煤气', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10009, '2026-01-01 00:00:00', 'T通讯物流', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10010, '2026-01-01 00:00:00', 'S学习教育', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10011, '2026-01-01 00:00:00', 'R人情往来', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10012, '2026-01-01 00:00:00', 'Q其他支出', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10013, '2026-01-01 00:00:00', 'N奶茶咖啡', 0);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (10014, '2026-01-01 00:00:00', 'D钻石福袋', 0);
-- 收入分类 (Type = 1)
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (11001, '2026-01-01 00:00:00', 'G工资薪金', 1);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (11002, '2026-01-01 00:00:00', 'J奖金补贴', 1);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (11003, '2026-01-01 00:00:00', 'L理财收益', 1);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (11004, '2026-01-01 00:00:00', 'J兼职收入', 1);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (11005, '2026-01-01 00:00:00', 'L礼金收入', 1);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (11006, '2026-01-01 00:00:00', 'Q其他收入', 1);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (11007, '2026-01-01 00:00:00', 'X闲鱼收入', 1);
-- 不记收支分类 (Type = 2)
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (12001, '2026-01-01 00:00:00', 'Z转账给自己', 2);
INSERT INTO TransactionCategory (Id, CreateTime, Name, Type) VALUES (12002, '2026-01-01 00:00:00', 'Z转账到公共', 2);

13
.vscode/settings.json vendored
View File

@@ -1,3 +1,14 @@
{ {
"vue3snippets.enable-compile-vue-file-on-did-save-code": false "vue3snippets.enable-compile-vue-file-on-did-save-code": false,
"eslint.workingDirectories": [
"./Web"
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.validate": [
"javascript",
"javascriptreact",
"vue"
]
} }

218
AGENTS.md Normal file
View File

@@ -0,0 +1,218 @@
# PROJECT KNOWLEDGE BASE - EmailBill
**Generated:** 2026-01-28
**Commit:** 5c9d7c5
**Branch:** main
## OVERVIEW
Full-stack budget tracking app with .NET 10 backend and Vue 3 frontend.
## Project Structure
```
EmailBill/
├── Common/ # Shared utilities and abstractions
├── Entity/ # Database entities (FreeSql ORM)
├── Repository/ # Data access layer
├── Service/ # Business logic layer
├── WebApi/ # ASP.NET Core Web API
├── WebApi.Test/ # Backend tests (xUnit)
└── Web/ # Vue 3 frontend (Vite + Vant UI)
```
## WHERE TO LOOK
| Task | Location | Notes |
|------|----------|-------|
| Entity definitions | Entity/ | BaseEntity pattern, FreeSql attributes |
| Data access | Repository/ | BaseRepository, GlobalUsings |
| Business logic | Service/ | Jobs, Email services, App settings |
| API endpoints | WebApi/Controllers/ | DTO patterns, REST controllers |
| Frontend views | Web/src/views/ | Vue composition API |
| API clients | Web/src/api/ | Axios-based HTTP clients |
| Tests | WebApi.Test/ | xUnit + NSubstitute + FluentAssertions |
## Build & Test Commands
### Backend (.NET 10)
```bash
# Build and run
dotnet build EmailBill.sln
dotnet run --project WebApi/WebApi.csproj
# Run all tests
dotnet test WebApi.Test/WebApi.Test.csproj
# Run single test class
dotnet test --filter "FullyQualifiedName~BudgetStatsTest"
# Run single test method
dotnet test --filter "FullyQualifiedName~BudgetStatsTest.GetCategoryStats_月度_Test"
# Clean
dotnet clean EmailBill.sln
```
### Frontend (Vue 3)
```bash
cd Web
# Setup and dev
pnpm install
pnpm dev
# Build and preview
pnpm build
pnpm preview
# Lint and format
pnpm lint # ESLint with auto-fix
pnpm format # Prettier formatting
```
## C# Code Style
**Namespaces & Imports:**
- File-scoped namespaces: `namespace Entity;`
- Global usings in `Common/GlobalUsings.cs`
- Sort using statements alphabetically
**Naming:**
- Classes/Methods: `PascalCase`
- Interfaces: `IPascalCase`
- Private fields: `_camelCase`
- Parameters/locals: `camelCase`
**Entities:**
- Inherit from `BaseEntity`
- Use `[Column]` attributes for FreeSql ORM
- IDs via Snowflake: `YitIdHelper.NextId()`
- Use XML docs (`///`) for public APIs
- **Chinese comments for business logic** (per `.github/csharpe.prompt.md`)
**Best Practices:**
- Use modern C# syntax (records, pattern matching, nullable types)
- Use `IDateTimeProvider` instead of `DateTime.Now` for testability
- Avoid deep nesting, keep code flat and readable
- Reuse utilities from `Common` project
**Example:**
```csharp
namespace Entity;
/// <summary>
/// 实体基类
/// </summary>
public abstract class BaseEntity
{
[Column(IsPrimary = true)]
public long Id { get; set; } = YitIdHelper.NextId();
public DateTime CreateTime { get; set; } = DateTime.Now;
}
```
## Vue/TypeScript Style
**Component Structure:**
```vue
<template>
<van-config-provider :theme="theme">
<div class="component-name">
<!-- Content -->
</div>
</van-config-provider>
</template>
<script setup lang="ts">
import { ref } from 'vue'
import { useMessageStore } from '@/stores/message'
const messageStore = useMessageStore()
</script>
<style scoped lang="scss">
.component-name {
padding: 16px;
}
</style>
```
**Rules:**
- Composition API with `<script setup lang="ts">`
- Import order: Vue APIs → external libs → internal modules
- Use `@/` alias for absolute imports, avoid `../../../`
- Vant UI components: `<van-*>`
- Pinia for state, Vue Router for navigation
- SCSS with BEM naming, mobile-first design
**ESLint Rules (see `Web/eslint.config.js`):**
- 2-space indentation
- Single quotes, no semicolons
- `const` over `let`, no `var`
- Always use `===` (strict equality)
- `space-before-function-paren: 'always'`
- Max 1 empty line between blocks
- Vue: multi-word component names disabled
**Prettier Rules (see `Web/.prettierrc.json`):**
- Single quotes, no semicolons
- Trailing commas: none
- Print width: 100 chars
## Testing
**Backend (xUnit + NSubstitute + FluentAssertions):**
```csharp
public class BudgetStatsTest : BaseTest
{
private readonly IBudgetRepository _repo = Substitute.For<IBudgetRepository>();
[Fact]
public async Task GetCategoryStats_月度_Test()
{
// Arrange
_repo.GetAllAsync().Returns(testData);
// Act
var result = await _service.GetCategoryStatsAsync(category, date);
// Assert
result.Month.Limit.Should().Be(2500);
}
}
```
- Arrange-Act-Assert pattern
- Constructor injection for dependencies
- Use Chinese test method names for domain clarity
**Frontend:**
- Vue Test Utils for components
- axios-mock-adapter for API mocking
## Development Workflow
1. **Before committing backend:** `dotnet test`
2. **Before committing frontend:** `pnpm lint && pnpm build`
3. **Database migrations:** Use FreeSql (check `Repository/`)
4. **API docs:** Scalar OpenAPI viewer
## Environment
**Required:**
- .NET 10 SDK
- Node.js 20.19+ or 22.12+
- pnpm
**Database:** SQLite (embedded)
**Config:**
- Backend: `appsettings.json`
- Frontend: `.env.development` / `.env.production`
## Critical Guidelines (from `.github/csharpe.prompt.md`)
- 优先使用新C#语法 (Use modern C# syntax)
- 优先使用中文注释 (Prefer Chinese comments for business logic)
- 优先复用已有方法 (Reuse existing methods)
- 不要深嵌套代码 (Avoid deep nesting)
- 保持代码简洁易读 (Keep code clean and readable)

3
Common/GlobalUsings.cs Normal file
View File

@@ -0,0 +1,3 @@
global using System.Reflection;
global using System.Text.Json;
global using Microsoft.Extensions.DependencyInjection;

View File

@@ -0,0 +1,11 @@
namespace Common;
public interface IDateTimeProvider
{
DateTime Now { get; }
}
public class DateTimeProvider : IDateTimeProvider
{
public DateTime Now => DateTime.Now;
}

View File

@@ -1,7 +1,16 @@
using System.Reflection; namespace Common;
using Microsoft.Extensions.DependencyInjection;
namespace Common; public static class TypeExtensions
{
/// <summary>
/// 深度复制对象属性到目标对象
/// </summary>
public static T? DeepClone<T>(this T source)
{
var json = JsonSerializer.Serialize(source);
return JsonSerializer.Deserialize<T>(json);
}
}
/// <summary> /// <summary>
/// 服务依赖注入扩展 /// 服务依赖注入扩展
@@ -13,6 +22,7 @@ public static class ServiceExtension
/// </summary> /// </summary>
public static IServiceCollection AddServices(this IServiceCollection services) public static IServiceCollection AddServices(this IServiceCollection services)
{ {
services.AddSingleton<IDateTimeProvider, DateTimeProvider>();
// 扫描程序集 // 扫描程序集
var serviceAssembly = Assembly.Load("Service"); var serviceAssembly = Assembly.Load("Service");
var repositoryAssembly = Assembly.Load("Repository"); var repositoryAssembly = Assembly.Load("Repository");
@@ -29,7 +39,7 @@ public static class ServiceExtension
private static void RegisterServices(IServiceCollection services, Assembly assembly) private static void RegisterServices(IServiceCollection services, Assembly assembly)
{ {
var types = assembly.GetTypes() var types = assembly.GetTypes()
.Where(t => t.IsClass && !t.IsAbstract); .Where(t => t is { IsClass: true, IsAbstract: false });
foreach (var type in types) foreach (var type in types)
{ {
@@ -59,14 +69,13 @@ public static class ServiceExtension
private static void RegisterRepositories(IServiceCollection services, Assembly assembly) private static void RegisterRepositories(IServiceCollection services, Assembly assembly)
{ {
var types = assembly.GetTypes() var types = assembly.GetTypes()
.Where(t => t.IsClass && !t.IsAbstract); .Where(t => t is { IsClass: true, IsAbstract: false });
foreach (var type in types) foreach (var type in types)
{ {
var interfaces = type.GetInterfaces() var interfaces = type.GetInterfaces()
.Where(i => i.Name.StartsWith("I") .Where(i => i.Name.StartsWith("I")
&& i.Namespace == "Repository" && i is { Namespace: "Repository", IsGenericType: false }); // 排除泛型接口如 IBaseRepository<T>
&& !i.IsGenericType); // 排除泛型接口如 IBaseRepository<T>
foreach (var @interface in interfaces) foreach (var @interface in interfaces)
{ {

View File

@@ -1,7 +1,9 @@
<Project> <Project>
<ItemGroup> <ItemGroup>
<!-- Email & MIME Libraries --> <!-- Email & MIME Libraries -->
<PackageVersion Include="FreeSql" Version="3.5.304" /> <PackageVersion Include="FreeSql" Version="3.5.305" />
<PackageVersion Include="FreeSql.Extensions.JsonMap" Version="3.5.305" />
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
<PackageVersion Include="MailKit" Version="4.14.1" /> <PackageVersion Include="MailKit" Version="4.14.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.1" /> <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.1" />
<PackageVersion Include="MimeKit" Version="4.14.0" /> <PackageVersion Include="MimeKit" Version="4.14.0" />
@@ -20,7 +22,8 @@
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" /> <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.11.9" /> <PackageVersion Include="Scalar.AspNetCore" Version="2.11.9" />
<!-- Database --> <!-- Database -->
<PackageVersion Include="FreeSql.Provider.Sqlite" Version="3.5.304" /> <PackageVersion Include="FreeSql.Provider.Sqlite" Version="3.5.305" />
<PackageVersion Include="WebPush" Version="1.0.12" />
<PackageVersion Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageVersion Include="Yitter.IdGenerator" Version="1.0.14" />
<!-- File Processing --> <!-- File Processing -->
<PackageVersion Include="CsvHelper" Version="33.0.1" /> <PackageVersion Include="CsvHelper" Version="33.0.1" />
@@ -32,5 +35,12 @@
<!-- Text Processing --> <!-- Text Processing -->
<PackageVersion Include="JiebaNet.Analyser" Version="1.0.6" /> <PackageVersion Include="JiebaNet.Analyser" Version="1.0.6" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" /> <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<!-- Testing -->
<PackageVersion Include="coverlet.collector" Version="6.0.4"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
<PackageVersion Include="xunit" Version="2.9.3"/>
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4"/>
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="FluentAssertions" Version="8.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -1,6 +1,6 @@
# 多阶段构建 Dockerfile # 多阶段构建 Dockerfile
# 第一阶段:构建前端 # 第一阶段:构建前端
FROM node:20-alpine AS frontend-build FROM node:20-slim AS frontend-build
WORKDIR /app/frontend WORKDIR /app/frontend
@@ -15,6 +15,10 @@ RUN pnpm run build
# 第二阶段:构建后端 # 第二阶段:构建后端
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS backend-build FROM mcr.microsoft.com/dotnet/sdk:10.0 AS backend-build
# 禁用遥测和减少并行度以尝试修复 exit code 134 (常见于内存受限环境下的崩溃)
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 \
DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
WORKDIR /app WORKDIR /app
# 复制解决方案文件和项目文件 # 复制解决方案文件和项目文件
@@ -27,6 +31,7 @@ COPY Entity/*.csproj ./Entity/
COPY Repository/*.csproj ./Repository/ COPY Repository/*.csproj ./Repository/
COPY Service/*.csproj ./Service/ COPY Service/*.csproj ./Service/
COPY WebApi/*.csproj ./WebApi/ COPY WebApi/*.csproj ./WebApi/
COPY WebApi.Test/*.csproj ./WebApi.Test/
# 还原依赖 # 还原依赖
RUN dotnet restore RUN dotnet restore
@@ -39,7 +44,8 @@ COPY Service/ ./Service/
COPY WebApi/ ./WebApi/ COPY WebApi/ ./WebApi/
# 构建并发布 # 构建并发布
RUN dotnet publish WebApi/WebApi.csproj -c Release -o /app/publish # 使用 -m:1 限制 CPU/内存并行度,减少容器构建崩溃风险
RUN dotnet publish WebApi/WebApi.csproj -c Release -o /app/publish --no-restore -m:1
# 将前端构建产物复制到后端的 wwwroot 目录 # 将前端构建产物复制到后端的 wwwroot 目录
COPY --from=frontend-build /app/frontend/dist /app/publish/wwwroot COPY --from=frontend-build /app/frontend/dist /app/publish/wwwroot

View File

@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csp
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Entity", "Entity\Entity.csproj", "{B1BCD944-C4F5-406E-AE66-864E4BA21522}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Entity", "Entity\Entity.csproj", "{B1BCD944-C4F5-406E-AE66-864E4BA21522}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApi.Test", "WebApi.Test\WebApi.Test.csproj", "{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -83,6 +85,18 @@ Global
{B1BCD944-C4F5-406E-AE66-864E4BA21522}.Release|x64.Build.0 = Release|Any CPU {B1BCD944-C4F5-406E-AE66-864E4BA21522}.Release|x64.Build.0 = Release|Any CPU
{B1BCD944-C4F5-406E-AE66-864E4BA21522}.Release|x86.ActiveCfg = Release|Any CPU {B1BCD944-C4F5-406E-AE66-864E4BA21522}.Release|x86.ActiveCfg = Release|Any CPU
{B1BCD944-C4F5-406E-AE66-864E4BA21522}.Release|x86.Build.0 = Release|Any CPU {B1BCD944-C4F5-406E-AE66-864E4BA21522}.Release|x86.Build.0 = Release|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Debug|x64.ActiveCfg = Debug|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Debug|x64.Build.0 = Debug|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Debug|x86.ActiveCfg = Debug|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Debug|x86.Build.0 = Debug|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Release|Any CPU.Build.0 = Release|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Release|x64.ActiveCfg = Release|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Release|x64.Build.0 = Release|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Release|x86.ActiveCfg = Release|Any CPU
{9CD457C8-A985-4DEA-9774-3B1D33CAFF51}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@@ -1,2 +1,4 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/UserDictionary/Words/=fsql/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary> <s:Boolean x:Key="/Default/UserDictionary/Words/=Ccsvc/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=fsql/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=strftime/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

44
Entity/AGENTS.md Normal file
View File

@@ -0,0 +1,44 @@
# ENTITY LAYER KNOWLEDGE BASE
**Generated:** 2026-01-28
**Parent:** EmailBill/AGENTS.md
## OVERVIEW
Database entities using FreeSql ORM with BaseEntity inheritance pattern.
## STRUCTURE
```
Entity/
├── BaseEntity.cs # Base entity with Snowflake ID
├── GlobalUsings.cs # Common imports
├── BudgetRecord.cs # Budget tracking entity
├── TransactionRecord.cs # Transaction entity
├── EmailMessage.cs # Email processing entity
└── MessageRecord.cs # Message entity
```
## WHERE TO LOOK
| Task | Location | Notes |
|------|----------|-------|
| Base entity pattern | BaseEntity.cs | Snowflake ID, audit fields |
| Budget entities | BudgetRecord.cs, BudgetArchive.cs | Budget tracking |
| Transaction entities | TransactionRecord.cs, TransactionPeriodic.cs | Financial transactions |
| Email entities | EmailMessage.cs, MessageRecord.cs | Email processing |
## CONVENTIONS
- Inherit from BaseEntity for all entities
- Use [Column] attributes for FreeSql mapping
- Snowflake IDs via YitIdHelper.NextId()
- Chinese comments for business logic
- XML docs for public APIs
## ANTI-PATTERNS (THIS LAYER)
- Never use DateTime.Now (use IDateTimeProvider)
- Don't skip BaseEntity inheritance
- Avoid complex business logic in entities
- No database queries in entity classes
## UNIQUE STYLES
- Fluent Chinese naming for business concepts
- Audit fields (CreateTime, UpdateTime) automatic
- Soft delete patterns via UpdateTime nullability

90
Entity/BudgetArchive.cs Normal file
View File

@@ -0,0 +1,90 @@
namespace Entity;
public class BudgetArchive : BaseEntity
{
/// <summary>
/// 归档目标年份
/// </summary>
public int Year { get; set; }
/// <summary>
/// 归档目标月份
/// </summary>
public int Month { get; set; }
/// <summary>
/// 归档内容
/// </summary>
[JsonMap]
public BudgetArchiveContent[] Content { get; set; } = [];
/// <summary>
/// 归档日期
/// </summary>
public DateTime ArchiveDate { get; set; } = DateTime.Now;
/// <summary>
/// 支出结余(预算 - 实际,正数表示省钱,负数表示超支)
/// </summary>
public decimal ExpenseSurplus { get; set; }
/// <summary>
/// 收入结余(实际 - 预算,正数表示超额收入,负数表示未达预期)
/// </summary>
public decimal IncomeSurplus { get; set; }
public string? Summary { get; set; }
}
public record BudgetArchiveContent
{
/// <summary>
/// 预算ID
/// </summary>
public long Id { get; set; }
/// <summary>
/// 预算名称
/// </summary>
public string Name { get; set; } = string.Empty;
/// <summary>
/// 统计周期
/// </summary>
public BudgetPeriodType Type { get; set; } = BudgetPeriodType.Month;
/// <summary>
/// 预算金额
/// </summary>
public decimal Limit { get; set; }
/// <summary>
/// 实际金额
/// </summary>
public decimal Actual { get; set; }
/// <summary>
/// 预算类别
/// </summary>
public BudgetCategory Category { get; set; }
/// <summary>
/// 相关分类 (逗号分隔的分类名称)
/// </summary>
public string[] SelectedCategories { get; set; } = [];
/// <summary>
/// 不记额预算
/// </summary>
public bool NoLimit { get; set; } = false;
/// <summary>
/// 硬性消费
/// </summary>
public bool IsMandatoryExpense { get; set; } = false;
/// <summary>
/// 描述说明
/// </summary>
public string Description { get; set; } = string.Empty;
}

75
Entity/BudgetRecord.cs Normal file
View File

@@ -0,0 +1,75 @@
namespace Entity;
/// <summary>
/// 预算管理
/// </summary>
public class BudgetRecord : BaseEntity
{
/// <summary>
/// 预算名称
/// </summary>
public string Name { get; set; } = string.Empty;
/// <summary>
/// 统计周期
/// </summary>
public BudgetPeriodType Type { get; set; } = BudgetPeriodType.Month;
/// <summary>
/// 预算金额
/// </summary>
public decimal Limit { get; set; }
/// <summary>
/// 预算类别
/// </summary>
public BudgetCategory Category { get; set; }
/// <summary>
/// 相关分类 (逗号分隔的分类名称)
/// </summary>
public string SelectedCategories { get; set; } = string.Empty;
/// <summary>
/// 开始日期
/// </summary>
public DateTime StartDate { get; set; } = DateTime.Now;
/// <summary>
/// 不记额预算(选中后该预算没有预算金额,发生的收入或支出直接在存款中加减)
/// </summary>
public bool NoLimit { get; set; } = false;
/// <summary>
/// 硬性消费固定消费如房租、水电等。当是当前年月且为硬性消费时会根据经过的天数累加Current
/// </summary>
public bool IsMandatoryExpense { get; set; } = false;
}
public enum BudgetPeriodType
{
/// <summary>
/// 月
/// </summary>
Month = 1,
/// <summary>
/// 年
/// </summary>
Year = 2
}
public enum BudgetCategory
{
/// <summary>
/// 支出
/// </summary>
Expense = 0,
/// <summary>
/// 收入
/// </summary>
Income = 1,
/// <summary>
/// 存款
/// </summary>
Savings = 2
}

31
Entity/ConfigEntity.cs Normal file
View File

@@ -0,0 +1,31 @@
namespace Entity;
/// <summary>
/// 配置实体
/// </summary>
[Table(Name = "Config")]
public class ConfigEntity : BaseEntity
{
/// <summary>
/// 配置Key
/// </summary>
public string Key { get; set; } = string.Empty;
/// <summary>
/// 配置Value
/// </summary>
public string Value { get; set; } = string.Empty;
/// <summary>
/// 配置类型
/// </summary>
public ConfigType Type { get; set; }
}
public enum ConfigType
{
Boolean,
String,
Json,
Number
}

View File

@@ -1,6 +1,4 @@
using System.Security.Cryptography; namespace Entity;
namespace Entity;
/// <summary> /// <summary>
/// 邮件消息实体 /// 邮件消息实体
@@ -39,7 +37,7 @@ public class EmailMessage : BaseEntity
public string ComputeBodyHash() public string ComputeBodyHash()
{ {
using var md5 = MD5.Create(); using var md5 = MD5.Create();
var inputBytes = System.Text.Encoding.UTF8.GetBytes(Body + HtmlBody); var inputBytes = Encoding.UTF8.GetBytes(Body + HtmlBody);
var hashBytes = md5.ComputeHash(inputBytes); var hashBytes = md5.ComputeHash(inputBytes);
return Convert.ToHexString(hashBytes); return Convert.ToHexString(hashBytes);
} }

View File

@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<ItemGroup> <ItemGroup>
<PackageReference Include="FreeSql" /> <PackageReference Include="FreeSql" />
<PackageReference Include="FreeSql.Extensions.JsonMap" />
<PackageReference Include="Yitter.IdGenerator" /> <PackageReference Include="Yitter.IdGenerator" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -1 +1,3 @@
global using FreeSql.DataAnnotations; global using FreeSql.DataAnnotations;
global using System.Security.Cryptography;
global using System.Text;

View File

@@ -1,5 +1,24 @@
namespace Entity; namespace Entity;
/// <summary>
/// 消息类型
/// </summary>
public enum MessageType
{
/// <summary>
/// 文本
/// </summary>
Text = 0,
/// <summary>
/// 跳转URL
/// </summary>
Url = 1,
/// <summary>
/// HTML内容
/// </summary>
Html = 2
}
/// <summary> /// <summary>
/// 消息实体 /// 消息实体
/// </summary> /// </summary>
@@ -15,8 +34,18 @@ public class MessageRecord : BaseEntity
/// </summary> /// </summary>
public string Content { get; set; } = string.Empty; public string Content { get; set; } = string.Empty;
/// <summary>
/// 消息类型
/// </summary>
public MessageType MessageType { get; set; } = MessageType.Text;
/// <summary> /// <summary>
/// 是否已读 /// 是否已读
/// </summary> /// </summary>
public bool IsRead { get; set; } = false; public bool IsRead { get; set; } = false;
/// <summary>
/// 跳转URL
/// </summary>
public string? Url { get; set; }
} }

View File

@@ -0,0 +1,17 @@
using System.ComponentModel.DataAnnotations;
namespace Entity;
public class PushSubscription : BaseEntity
{
[Required]
public string Endpoint { get; set; } = string.Empty;
public string? P256DH { get; set; }
public string? Auth { get; set; }
public string? UserId { get; set; } // Optional: if you have user authentication
public string? UserAgent { get; set; }
}

View File

@@ -14,4 +14,11 @@ public class TransactionCategory : BaseEntity
/// 交易类型(支出/收入) /// 交易类型(支出/收入)
/// </summary> /// </summary>
public TransactionType Type { get; set; } public TransactionType Type { get; set; }
/// <summary>
/// 图标SVG格式JSON数组存储5个图标供选择
/// 示例:["<svg>...</svg>", "<svg>...</svg>", ...]
/// </summary>
[Column(StringLength = -1)]
public string? Icon { get; set; }
} }

View File

@@ -1,4 +1,4 @@
namespace Entity; namespace Entity;
/// <summary> /// <summary>
/// 银行交易记录(由邮件解析生成) /// 银行交易记录(由邮件解析生成)
@@ -20,11 +20,6 @@ public class TransactionRecord : BaseEntity
/// </summary> /// </summary>
public decimal Amount { get; set; } public decimal Amount { get; set; }
/// <summary>
/// 退款金额
/// </summary>
public decimal RefundAmount { get; set; }
/// <summary> /// <summary>
/// 交易后余额 /// 交易后余额
/// </summary> /// </summary>
@@ -50,6 +45,16 @@ public class TransactionRecord : BaseEntity
/// </summary> /// </summary>
public string Classify { get; set; } = string.Empty; public string Classify { get; set; } = string.Empty;
/// <summary>
/// 待确认的分类AI或规则建议但尚未正式确认
/// </summary>
public string? UnconfirmedClassify { get; set; }
/// <summary>
/// 待确认的类型
/// </summary>
public TransactionType? UnconfirmedType { get; set; }
/// <summary> /// <summary>
/// 导入编号 /// 导入编号
/// </summary> /// </summary>
@@ -59,6 +64,11 @@ public class TransactionRecord : BaseEntity
/// 导入来源 /// 导入来源
/// </summary> /// </summary>
public string ImportFrom { get; set; } = string.Empty; public string ImportFrom { get; set; } = string.Empty;
/// <summary>
/// 退款金额
/// </summary>
public decimal RefundAmount { get; set; }
} }
public enum TransactionType public enum TransactionType

156
REFACTORING_SUMMARY.md Normal file
View File

@@ -0,0 +1,156 @@
# TransactionRecordRepository 重构总结
## 重构目标
简化账单仓储移除内存聚合逻辑将聚合逻辑移到Service层提高代码可测试性和可维护性。
## 主要变更
### 1. 创建新的仓储层 (TransactionRecordRepository.cs)
**简化后的接口方法:**
- `QueryAsync` - 统一的查询方法,支持多种筛选条件和分页
- `CountAsync` - 统一的计数方法
- `GetDistinctClassifyAsync` - 获取所有分类
- `GetByEmailIdAsync` - 按邮件ID查询
- `GetUnclassifiedAsync` - 获取未分类账单
- `GetClassifiedByKeywordsAsync` - 关键词查询已分类账单
- `GetUnconfirmedRecordsAsync` - 获取待确认账单
- `BatchUpdateByReasonAsync` - 批量更新分类
- `UpdateCategoryNameAsync` - 更新分类名称
- `ConfirmAllUnconfirmedAsync` - 确认待确认分类
- `ExistsByEmailMessageIdAsync` - 检查邮件是否存在
- `ExistsByImportNoAsync` - 检查导入编号是否存在
**移除的方法移到Service层**
- `GetDailyStatisticsAsync` - 日统计
- `GetDailyStatisticsByRangeAsync` - 范围日统计
- `GetMonthlyStatisticsAsync` - 月度统计
- `GetCategoryStatisticsAsync` - 分类统计
- `GetTrendStatisticsAsync` - 趋势统计
- `GetReasonGroupsAsync` - 按摘要分组统计
- `GetClassifiedByKeywordsWithScoreAsync` - 关键词匹配(带分数)
- `GetFilteredTrendStatisticsAsync` - 过滤趋势统计
- `GetAmountGroupByClassifyAsync` - 按分类分组统计
### 2. 创建统计服务层 (TransactionStatisticsService.cs)
新增 `ITransactionStatisticsService` 接口和实现,负责所有聚合统计逻辑:
**主要方法:**
- `GetDailyStatisticsAsync` - 日统计(内存聚合)
- `GetDailyStatisticsByRangeAsync` - 范围日统计(内存聚合)
- `GetMonthlyStatisticsAsync` - 月度统计(内存聚合)
- `GetCategoryStatisticsAsync` - 分类统计(内存聚合)
- `GetTrendStatisticsAsync` - 趋势统计(内存聚合)
- `GetReasonGroupsAsync` - 按摘要分组统计内存聚合解决N+1问题
- `GetClassifiedByKeywordsWithScoreAsync` - 关键词匹配(内存计算相关度)
- `GetFilteredTrendStatisticsAsync` - 过滤趋势统计(内存聚合)
- `GetAmountGroupByClassifyAsync` - 按分类分组统计(内存聚合)
### 3. 创建DTO文件 (TransactionStatisticsDto.cs)
将统计相关的DTO类从Repository移到独立文件
- `ReasonGroupDto` - 按摘要分组统计DTO
- `MonthlyStatistics` - 月度统计数据
- `CategoryStatistics` - 分类统计数据
- `TrendStatistics` - 趋势统计数据
### 4. 更新Controller (TransactionRecordController.cs)
- 注入 `ITransactionStatisticsService`
- 将所有统计方法的调用从 `transactionRepository` 改为 `transactionStatisticsService`
-`GetPagedListAsync` 改为 `QueryAsync`
-`GetTotalCountAsync` 改为 `CountAsync`
-`GetByDateRangeAsync` 改为 `QueryAsync`
-`GetUnclassifiedCountAsync` 改为 `CountAsync`
### 5. 更新Service层
**SmartHandleService:**
- 注入 `ITransactionStatisticsService`
-`GetClassifiedByKeywordsWithScoreAsync` 调用改为使用统计服务
**BudgetService:**
- 注入 `ITransactionStatisticsService`
-`GetCategoryStatisticsAsync` 调用改为使用统计服务
**BudgetStatsService:**
- 注入 `ITransactionStatisticsService`
- 将所有 `GetFilteredTrendStatisticsAsync` 调用改为使用统计服务
**BudgetSavingsService:**
- 注入 `ITransactionStatisticsService`
- 将所有 `GetAmountGroupByClassifyAsync` 调用改为使用统计服务
### 6. 更新测试文件
**BudgetStatsTest.cs:**
- 添加 `ITransactionStatisticsService` Mock
- 更新构造函数参数
- 将所有 `GetFilteredTrendStatisticsAsync` Mock调用改为使用统计服务
**BudgetSavingsTest.cs:**
- 添加 `ITransactionStatisticsService` Mock
- 更新构造函数参数
- 将所有 `GetAmountGroupByClassifyAsync` Mock调用改为使用统计服务
## 重构优势
### 1. 职责分离
- **Repository层**:只负责数据查询,返回原始数据
- **Service层**:负责业务逻辑和数据聚合
### 2. 可测试性提升
- Repository层的方法更简单易于Mock
- Service层可以独立测试聚合逻辑
- 测试时可以精确控制聚合行为
### 3. 性能优化
- 解决了 `GetReasonGroupsAsync` 中的N+1查询问题
- 将内存聚合逻辑集中管理,便于后续优化
- 减少了数据库聚合操作,避免大数据量时的性能问题
### 4. 代码可维护性
- 统一的查询接口 `QueryAsync``CountAsync`
- 减少了代码重复
- 更清晰的职责划分
### 5. 扩展性
- 新增统计功能只需在Service层添加
- Repository层保持稳定不受业务逻辑变化影响
## 测试结果
所有测试通过:
- BudgetStatsTest: 7个测试全部通过
- BudgetSavingsTest: 7个测试全部通过
- 总计: 14个测试全部通过
## 注意事项
### 1. 性能考虑
- 当前使用内存聚合,适合中小数据量
- 如果数据量很大可以考虑在Service层使用分页查询+增量聚合
- 对于需要实时聚合的场景,可以考虑缓存
### 2. 警告处理
编译时有3个未使用参数的警告
- `TransactionStatisticsService``textSegmentService` 参数未使用
- `BudgetStatsService``transactionRecordRepository` 参数未使用
- `BudgetSavingsService``transactionsRepository` 参数未使用
这些参数暂时保留,可能在未来使用,可以通过添加 `_ = parameter;` 来消除警告。
### 3. 向后兼容
- Controller的API接口保持不变
- 前端无需修改
- 数据库结构无变化
## 后续优化建议
1. **添加缓存**:对于频繁查询的统计数据,可以添加缓存机制
2. **分页聚合**:对于大数据量的聚合,可以实现分页聚合策略
3. **异步优化**:某些聚合操作可以并行执行以提高性能
4. **监控指标**:添加聚合查询的性能监控
5. **单元测试**:为 `TransactionStatisticsService` 添加专门的单元测试

46
Repository/AGENTS.md Normal file
View File

@@ -0,0 +1,46 @@
# REPOSITORY LAYER KNOWLEDGE BASE
**Generated:** 2026-01-28
**Parent:** EmailBill/AGENTS.md
## OVERVIEW
Data access layer using FreeSql with BaseRepository pattern and global usings.
## STRUCTURE
```
Repository/
├── BaseRepository.cs # Generic repository base
├── GlobalUsings.cs # Common imports
├── BudgetRepository.cs # Budget data access
├── TransactionRecordRepository.cs # Transaction data access
├── EmailMessageRepository.cs # Email data access
└── TransactionStatisticsDto.cs # Statistics DTOs
```
## WHERE TO LOOK
| Task | Location | Notes |
|------|----------|-------|
| Base patterns | BaseRepository.cs | Generic CRUD operations |
| Budget data | BudgetRepository.cs | Budget queries and updates |
| Transaction data | TransactionRecordRepository.cs | Financial data access |
| Email data | EmailMessageRepository.cs | Email processing storage |
| Statistics | TransactionStatisticsDto.cs | Data transfer objects |
## CONVENTIONS
- Inherit from BaseRepository<T> for all repositories
- Use GlobalUsings.cs for shared imports
- Async/await pattern for all database operations
- Method names: GetAllAsync, GetByIdAsync, InsertAsync, UpdateAsync
- Return domain entities, not DTOs (except in query results)
## ANTI-PATTERNS (THIS LAYER)
- Never return anonymous types from methods
- Don't expose FreeSql ISelect directly
- Avoid business logic in repositories
- No synchronous database calls
- Don't mix data access with service logic
## UNIQUE STYLES
- Generic constraints: where T : BaseEntity
- Fluent query building with FreeSql extension methods
- Paged query patterns for large datasets

View File

@@ -45,6 +45,13 @@ public interface IBaseRepository<T> where T : BaseEntity
/// 删除数据 /// 删除数据
/// </summary> /// </summary>
Task<bool> DeleteAsync(long id); Task<bool> DeleteAsync(long id);
/// <summary>
/// 执行动态SQL查询返回动态对象
/// </summary>
/// <param name="completeSql">完整的SELECT SQL语句</param>
/// <returns>动态查询结果列表</returns>
Task<List<dynamic>> ExecuteDynamicSqlAsync(string completeSql);
} }
@@ -157,4 +164,22 @@ public abstract class BaseRepository<T>(IFreeSql freeSql) : IBaseRepository<T> w
return false; return false;
} }
} }
public async Task<List<dynamic>> ExecuteDynamicSqlAsync(string completeSql)
{
var dt = await FreeSql.Ado.ExecuteDataTableAsync(completeSql);
var result = new List<dynamic>();
foreach (DataRow row in dt.Rows)
{
var expando = new ExpandoObject() as IDictionary<string, object>;
foreach (DataColumn column in dt.Columns)
{
expando[column.ColumnName] = row[column];
}
result.Add(expando);
}
return result;
}
} }

View File

@@ -0,0 +1,38 @@
namespace Repository;
public interface IBudgetArchiveRepository : IBaseRepository<BudgetArchive>
{
Task<BudgetArchive?> GetArchiveAsync(int year, int month);
Task<List<BudgetArchive>> GetListAsync(int year, int month);
Task<List<BudgetArchive>> GetArchivesByYearAsync(int year);
}
public class BudgetArchiveRepository(
IFreeSql freeSql
) : BaseRepository<BudgetArchive>(freeSql), IBudgetArchiveRepository
{
public async Task<BudgetArchive?> GetArchiveAsync(int year, int month)
{
return await FreeSql.Select<BudgetArchive>()
.Where(a => a.Year == year &&
a.Month == month)
.ToOneAsync();
}
public async Task<List<BudgetArchive>> GetListAsync(int year, int month)
{
return await FreeSql.Select<BudgetArchive>()
.Where(a => a.Year == year && a.Month == month)
.ToListAsync();
}
public async Task<List<BudgetArchive>> GetArchivesByYearAsync(int year)
{
return await FreeSql.Select<BudgetArchive>()
.Where(a => a.Year == year)
.OrderBy(a => a.Month)
.ToListAsync();
}
}

View File

@@ -0,0 +1,60 @@
namespace Repository;
public interface IBudgetRepository : IBaseRepository<BudgetRecord>
{
Task<decimal> GetCurrentAmountAsync(BudgetRecord budget, DateTime startDate, DateTime endDate);
Task UpdateBudgetCategoryNameAsync(string oldName, string newName, TransactionType type);
}
public class BudgetRepository(IFreeSql freeSql) : BaseRepository<BudgetRecord>(freeSql), IBudgetRepository
{
public async Task<decimal> GetCurrentAmountAsync(BudgetRecord budget, DateTime startDate, DateTime endDate)
{
var query = FreeSql.Select<TransactionRecord>()
.Where(t => t.OccurredAt >= startDate && t.OccurredAt <= endDate);
if (!string.IsNullOrEmpty(budget.SelectedCategories))
{
var categoryList = budget.SelectedCategories.Split(',');
query = query.Where(t => categoryList.Contains(t.Classify));
}
if (budget.Category == BudgetCategory.Expense)
{
query = query.Where(t => t.Type == TransactionType.Expense);
}
else if (budget.Category == BudgetCategory.Income)
{
query = query.Where(t => t.Type == TransactionType.Income);
}
return await query.SumAsync(t => t.Amount);
}
public async Task UpdateBudgetCategoryNameAsync(string oldName, string newName, TransactionType type)
{
var records = await FreeSql.Select<BudgetRecord>()
.Where(b => b.SelectedCategories.Contains(oldName) &&
((type == TransactionType.Expense && b.Category == BudgetCategory.Expense) ||
(type == TransactionType.Income && b.Category == BudgetCategory.Income)))
.ToListAsync();
foreach (var record in records)
{
var categories = record.SelectedCategories.Split(',').ToList();
for (var i = 0; i < categories.Count; i++)
{
if (categories[i] == oldName)
{
categories[i] = newName;
}
}
record.SelectedCategories = string.Join(',', categories);
}
await FreeSql.Update<BudgetRecord>()
.SetSource(records)
.ExecuteAffrowsAsync();
}
}

View File

@@ -0,0 +1,19 @@
namespace Repository;
public interface IConfigRepository : IBaseRepository<ConfigEntity>
{
/// <summary>
/// 根据Key获取配置
/// </summary>
Task<ConfigEntity?> GetByKeyAsync(string key);
}
public class ConfigRepository(IFreeSql freeSql) : BaseRepository<ConfigEntity>(freeSql), IConfigRepository
{
public async Task<ConfigEntity?> GetByKeyAsync(string key)
{
return await FreeSql.Select<ConfigEntity>()
.Where(c => c.Key == key)
.FirstAsync();
}
}

View File

@@ -1,5 +1,7 @@
global using Entity; global using Entity;
global using FreeSql;
global using System.Linq; global using System.Linq;
global using System.Data;
global using System.Dynamic;
global using FreeSql;

View File

@@ -0,0 +1,16 @@
namespace Repository;
public interface IPushSubscriptionRepository : IBaseRepository<PushSubscription>
{
Task<PushSubscription?> GetByEndpointAsync(string endpoint);
}
public class PushSubscriptionRepository(IFreeSql freeSql) : BaseRepository<PushSubscription>(freeSql), IPushSubscriptionRepository
{
public async Task<PushSubscription?> GetByEndpointAsync(string endpoint)
{
return await FreeSql.Select<PushSubscription>()
.Where(x => x.Endpoint == endpoint)
.FirstAsync();
}
}

View File

@@ -1,4 +1,4 @@
namespace Repository; namespace Repository;
public interface ITransactionRecordRepository : IBaseRepository<TransactionRecord> public interface ITransactionRecordRepository : IBaseRepository<TransactionRecord>
{ {
@@ -6,182 +6,102 @@ public interface ITransactionRecordRepository : IBaseRepository<TransactionRecor
Task<TransactionRecord?> ExistsByImportNoAsync(string importNo, string importFrom); Task<TransactionRecord?> ExistsByImportNoAsync(string importNo, string importFrom);
/// <summary> Task<List<TransactionRecord>> QueryAsync(
/// 分页获取交易记录列表
/// </summary>
/// <param name="pageIndex">页码从1开始</param>
/// <param name="pageSize">每页数量</param>
/// <param name="searchKeyword">搜索关键词(搜索交易摘要和分类)</param>
/// <param name="classify">筛选分类</param>
/// <param name="type">筛选交易类型</param>
/// <param name="year">筛选年份</param>
/// <param name="month">筛选月份</param>
/// <param name="reason">筛选交易摘要</param>
/// <param name="sortByAmount">是否按金额降序排列默认为false按时间降序</param>
/// <returns>交易记录列表</returns>
Task<List<TransactionRecord>> GetPagedListAsync(
int pageIndex = 1,
int pageSize = 20,
string? searchKeyword = null,
string? classify = null,
TransactionType? type = null,
int? year = null, int? year = null,
int? month = null, int? month = null,
DateTime? startDate = null,
DateTime? endDate = null,
TransactionType? type = null,
string[]? classifies = null,
string? searchKeyword = null,
string? reason = null, string? reason = null,
int pageIndex = 1,
int pageSize = int.MaxValue,
bool sortByAmount = false); bool sortByAmount = false);
/// <summary> Task<long> CountAsync(
/// 获取总数
/// </summary>
Task<long> GetTotalCountAsync(
string? searchKeyword = null,
string? classify = null,
TransactionType? type = null,
int? year = null, int? year = null,
int? month = null, int? month = null,
DateTime? startDate = null,
DateTime? endDate = null,
TransactionType? type = null,
string[]? classifies = null,
string? searchKeyword = null,
string? reason = null); string? reason = null);
/// <summary>
/// 获取所有不同的交易分类
/// </summary>
Task<List<string>> GetDistinctClassifyAsync(); Task<List<string>> GetDistinctClassifyAsync();
/// <summary>
/// 获取指定月份每天的消费统计
/// </summary>
/// <param name="year">年份</param>
/// <param name="month">月份</param>
/// <returns>每天的消费笔数和金额</returns>
Task<Dictionary<string, (int count, decimal amount)>> GetDailyStatisticsAsync(int year, int month);
/// <summary>
/// 获取指定日期范围内的交易记录
/// </summary>
/// <param name="startDate">开始日期</param>
/// <param name="endDate">结束日期</param>
/// <returns>交易记录列表</returns>
Task<List<TransactionRecord>> GetByDateRangeAsync(DateTime startDate, DateTime endDate);
/// <summary>
/// 获取指定邮件的交易记录数量
/// </summary>
/// <param name="emailMessageId">邮件ID</param>
/// <returns>交易记录数量</returns>
Task<int> GetCountByEmailIdAsync(long emailMessageId);
/// <summary>
/// 获取月度统计数据
/// </summary>
/// <param name="year">年份</param>
/// <param name="month">月份</param>
/// <returns>月度统计数据</returns>
Task<MonthlyStatistics> GetMonthlyStatisticsAsync(int year, int month);
/// <summary>
/// 获取分类统计数据
/// </summary>
/// <param name="year">年份</param>
/// <param name="month">月份</param>
/// <param name="type">交易类型0:支出, 1:收入)</param>
/// <returns>分类统计列表</returns>
Task<List<CategoryStatistics>> GetCategoryStatisticsAsync(int year, int month, TransactionType type);
/// <summary>
/// 获取多个月的趋势统计数据
/// </summary>
/// <param name="startYear">开始年份</param>
/// <param name="startMonth">开始月份</param>
/// <param name="monthCount">月份数量</param>
/// <returns>趋势统计列表</returns>
Task<List<TrendStatistics>> GetTrendStatisticsAsync(int startYear, int startMonth, int monthCount);
/// <summary>
/// 获取指定邮件的交易记录列表
/// </summary>
/// <param name="emailMessageId">邮件ID</param>
/// <returns>交易记录列表</returns>
Task<List<TransactionRecord>> GetByEmailIdAsync(long emailMessageId); Task<List<TransactionRecord>> GetByEmailIdAsync(long emailMessageId);
/// <summary> Task<int> GetCountByEmailIdAsync(long emailMessageId);
/// 获取未分类的账单数量
/// </summary>
/// <returns>未分类账单数量</returns>
Task<int> GetUnclassifiedCountAsync();
/// <summary>
/// 获取未分类的账单列表
/// </summary>
/// <param name="pageSize">每页数量</param>
/// <returns>未分类账单列表</returns>
Task<List<TransactionRecord>> GetUnclassifiedAsync(int pageSize = 10); Task<List<TransactionRecord>> GetUnclassifiedAsync(int pageSize = 10);
/// <summary>
/// 获取按交易摘要(Reason)分组的统计信息(支持分页)
/// </summary>
/// <param name="pageIndex">页码从1开始</param>
/// <param name="pageSize">每页数量</param>
/// <returns>分组统计列表和总数</returns>
Task<(List<ReasonGroupDto> list, int total)> GetReasonGroupsAsync(int pageIndex = 1, int pageSize = 20);
/// <summary>
/// 按摘要批量更新交易记录的分类
/// </summary>
/// <param name="reason">交易摘要</param>
/// <param name="type">交易类型</param>
/// <param name="classify">分类名称</param>
/// <returns>更新的记录数量</returns>
Task<int> BatchUpdateByReasonAsync(string reason, TransactionType type, string classify);
/// <summary>
/// 根据关键词查询交易记录模糊匹配Reason字段
/// </summary>
/// <param name="keyword">关键词</param>
/// <returns>匹配的交易记录列表</returns>
Task<List<TransactionRecord>> QueryByWhereAsync(string sql);
/// <summary>
/// 执行完整的SQL查询
/// </summary>
/// <param name="completeSql">完整的SELECT SQL语句</param>
/// <returns>查询结果列表</returns>
Task<List<TransactionRecord>> ExecuteRawSqlAsync(string completeSql);
/// <summary>
/// 执行动态SQL查询返回动态对象
/// </summary>
/// <param name="completeSql">完整的SELECT SQL语句</param>
/// <returns>动态查询结果列表</returns>
Task<List<dynamic>> ExecuteDynamicSqlAsync(string completeSql);
/// <summary>
/// 根据关键词查询已分类的账单(用于智能分类参考)
/// </summary>
/// <param name="keywords">关键词列表</param>
/// <param name="limit">返回结果数量限制</param>
/// <returns>已分类的账单列表</returns>
Task<List<TransactionRecord>> GetClassifiedByKeywordsAsync(List<string> keywords, int limit = 10); Task<List<TransactionRecord>> GetClassifiedByKeywordsAsync(List<string> keywords, int limit = 10);
/// <summary> Task<List<TransactionRecord>> GetUnconfirmedRecordsAsync();
/// 根据关键词查询已分类的账单,并计算相关度分数
/// </summary>
/// <param name="keywords">关键词列表</param>
/// <param name="minMatchRate">最小匹配率0.0-1.0默认0.3表示至少匹配30%的关键词</param>
/// <param name="limit">返回结果数量限制</param>
/// <returns>带相关度分数的已分类账单列表</returns>
Task<List<(TransactionRecord record, double relevanceScore)>> GetClassifiedByKeywordsWithScoreAsync(List<string> keywords, double minMatchRate = 0.3, int limit = 10);
/// <summary> Task<int> BatchUpdateByReasonAsync(string reason, TransactionType type, string classify);
/// 获取抵账候选列表
/// </summary> Task<int> UpdateCategoryNameAsync(string oldName, string newName, TransactionType type);
/// <param name="currentId">当前交易ID</param>
/// <param name="amount">当前交易金额</param> Task<int> ConfirmAllUnconfirmedAsync(long[] ids);
/// <param name="currentType">当前交易类型</param>
/// <returns>候选交易列表</returns>
Task<List<TransactionRecord>> GetCandidatesForOffsetAsync(long currentId, decimal amount, TransactionType currentType);
} }
public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<TransactionRecord>(freeSql), ITransactionRecordRepository public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<TransactionRecord>(freeSql), ITransactionRecordRepository
{ {
private ISelect<TransactionRecord> BuildQuery(
int? year = null,
int? month = null,
DateTime? startDate = null,
DateTime? endDate = null,
TransactionType? type = null,
string[]? classifies = null,
string? searchKeyword = null,
string? reason = null)
{
var query = FreeSql.Select<TransactionRecord>();
query = query.WhereIf(!string.IsNullOrWhiteSpace(searchKeyword),
t => t.Reason.Contains(searchKeyword!) ||
t.Classify.Contains(searchKeyword!) ||
t.Card.Contains(searchKeyword!) ||
t.ImportFrom.Contains(searchKeyword!))
.WhereIf(!string.IsNullOrWhiteSpace(reason),
t => t.Reason == reason);
if (classifies is { Length: > 0 })
{
var filterClassifies = classifies.Select(c => c == "未分类" ? string.Empty : c).ToList();
query = query.Where(t => filterClassifies.Contains(t.Classify));
}
query = query.WhereIf(type.HasValue, t => t.Type == type!.Value);
if (year.HasValue)
{
if (month.HasValue && month.Value > 0)
{
// 查询指定年月
var dateStart = new DateTime(year.Value, month.Value, 1);
var dateEnd = dateStart.AddMonths(1);
query = query.Where(t => t.OccurredAt >= dateStart && t.OccurredAt < dateEnd);
}
else
{
// 查询整年数据1月1日到下年1月1日
var dateStart = new DateTime(year.Value, 1, 1);
var dateEnd = new DateTime(year.Value + 1, 1, 1);
query = query.Where(t => t.OccurredAt >= dateStart && t.OccurredAt < dateEnd);
}
}
query = query.WhereIf(startDate.HasValue, t => t.OccurredAt >= startDate!.Value)
.WhereIf(endDate.HasValue, t => t.OccurredAt <= endDate!.Value);
return query;
}
public async Task<TransactionRecord?> ExistsByEmailMessageIdAsync(long emailMessageId, DateTime occurredAt) public async Task<TransactionRecord?> ExistsByEmailMessageIdAsync(long emailMessageId, DateTime occurredAt)
{ {
return await FreeSql.Select<TransactionRecord>() return await FreeSql.Select<TransactionRecord>()
@@ -196,110 +116,48 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
.FirstAsync(); .FirstAsync();
} }
public async Task<List<TransactionRecord>> GetPagedListAsync( public async Task<List<TransactionRecord>> QueryAsync(
int pageIndex = 1,
int pageSize = 20,
string? searchKeyword = null,
string? classify = null,
TransactionType? type = null,
int? year = null, int? year = null,
int? month = null, int? month = null,
DateTime? startDate = null,
DateTime? endDate = null,
TransactionType? type = null,
string[]? classifies = null,
string? searchKeyword = null,
string? reason = null, string? reason = null,
int pageIndex = 1,
int pageSize = int.MaxValue,
bool sortByAmount = false) bool sortByAmount = false)
{ {
var query = FreeSql.Select<TransactionRecord>(); var query = BuildQuery(year, month, startDate, endDate, type, classifies, searchKeyword, reason);
// 如果提供了搜索关键词,则添加搜索条件
query = query.WhereIf(!string.IsNullOrWhiteSpace(searchKeyword),
t => t.Reason.Contains(searchKeyword!) ||
t.Classify.Contains(searchKeyword!) ||
t.Card.Contains(searchKeyword!) ||
t.ImportFrom.Contains(searchKeyword!))
.WhereIf(!string.IsNullOrWhiteSpace(reason),
t => t.Reason == reason);
// 按分类筛选
if (!string.IsNullOrWhiteSpace(classify))
{
if (classify == "未分类")
{
classify = string.Empty;
}
query = query.Where(t => t.Classify == classify);
}
// 按交易类型筛选
query = query.WhereIf(type.HasValue, t => t.Type == type!.Value);
// 按年月筛选
if (year.HasValue && month.HasValue)
{
var startDate = new DateTime(year.Value, month.Value, 1);
var endDate = startDate.AddMonths(1);
query = query.Where(t => t.OccurredAt >= startDate && t.OccurredAt < endDate);
}
// 根据sortByAmount参数决定排序方式
if (sortByAmount) if (sortByAmount)
{ {
// 按金额降序排列
return await query return await query
.OrderByDescending(t => t.Amount) .OrderByDescending(t => t.Amount)
.OrderByDescending(t => t.Id) .OrderByDescending(t => t.Id)
.Page(pageIndex, pageSize) .Page(pageIndex, pageSize)
.ToListAsync(); .ToListAsync();
} }
else
{ return await query
// 按时间降序排列 .OrderByDescending(t => t.OccurredAt)
return await query .OrderByDescending(t => t.Id)
.OrderByDescending(t => t.OccurredAt) .Page(pageIndex, pageSize)
.OrderByDescending(t => t.Id) .ToListAsync();
.Page(pageIndex, pageSize)
.ToListAsync();
}
} }
public async Task<long> GetTotalCountAsync( public async Task<long> CountAsync(
string? searchKeyword = null,
string? classify = null,
TransactionType? type = null,
int? year = null, int? year = null,
int? month = null, int? month = null,
DateTime? startDate = null,
DateTime? endDate = null,
TransactionType? type = null,
string[]? classifies = null,
string? searchKeyword = null,
string? reason = null) string? reason = null)
{ {
var query = FreeSql.Select<TransactionRecord>(); var query = BuildQuery(year, month, startDate, endDate, type, classifies, searchKeyword, reason);
// 如果提供了搜索关键词,则添加搜索条件
query = query.WhereIf(!string.IsNullOrWhiteSpace(searchKeyword),
t => t.Reason.Contains(searchKeyword!) ||
t.Classify.Contains(searchKeyword!) ||
t.Card.Contains(searchKeyword!) ||
t.ImportFrom.Contains(searchKeyword!))
.WhereIf(!string.IsNullOrWhiteSpace(reason),
t => t.Reason == reason);
// 按分类筛选
if (!string.IsNullOrWhiteSpace(classify))
{
if (classify == "未分类")
{
classify = string.Empty;
}
query = query.Where(t => t.Classify == classify);
}
// 按交易类型筛选
query = query.WhereIf(type.HasValue, t => t.Type == type!.Value);
// 按年月筛选
if (year.HasValue && month.HasValue)
{
var startDate = new DateTime(year.Value, month.Value, 1);
var endDate = startDate.AddMonths(1);
query = query.Where(t => t.OccurredAt >= startDate && t.OccurredAt < endDate);
}
return await query.CountAsync(); return await query.CountAsync();
} }
@@ -311,48 +169,6 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
.ToListAsync(t => t.Classify); .ToListAsync(t => t.Classify);
} }
public async Task<Dictionary<string, (int count, decimal amount)>> GetDailyStatisticsAsync(int year, int month)
{
var startDate = new DateTime(year, month, 1);
var endDate = startDate.AddMonths(1);
var records = await FreeSql.Select<TransactionRecord>()
.Where(t => t.OccurredAt >= startDate && t.OccurredAt < endDate)
.ToListAsync();
var statistics = records
.GroupBy(t => t.OccurredAt.ToString("yyyy-MM-dd"))
.ToDictionary(
g => g.Key,
g =>
{
// 分别统计收入和支出
var income = g.Where(t => t.Type == TransactionType.Income).Sum(t => t.Amount);
var expense = g.Where(t => t.Type == TransactionType.Expense).Sum(t => t.Amount);
// 净额 = 收入 - 支出(消费大于收入时为负数)
var netAmount = income - expense;
return (count: g.Count(), amount: netAmount);
}
);
return statistics;
}
public async Task<List<TransactionRecord>> GetByDateRangeAsync(DateTime startDate, DateTime endDate)
{
return await FreeSql.Select<TransactionRecord>()
.Where(t => t.OccurredAt >= startDate && t.OccurredAt <= endDate)
.OrderBy(t => t.OccurredAt)
.ToListAsync();
}
public async Task<int> GetCountByEmailIdAsync(long emailMessageId)
{
return (int)await FreeSql.Select<TransactionRecord>()
.Where(t => t.EmailMessageId == emailMessageId)
.CountAsync();
}
public async Task<List<TransactionRecord>> GetByEmailIdAsync(long emailMessageId) public async Task<List<TransactionRecord>> GetByEmailIdAsync(long emailMessageId)
{ {
return await FreeSql.Select<TransactionRecord>() return await FreeSql.Select<TransactionRecord>()
@@ -361,10 +177,10 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
.ToListAsync(); .ToListAsync();
} }
public async Task<int> GetUnclassifiedCountAsync() public async Task<int> GetCountByEmailIdAsync(long emailMessageId)
{ {
return (int)await FreeSql.Select<TransactionRecord>() return (int)await FreeSql.Select<TransactionRecord>()
.Where(t => string.IsNullOrEmpty(t.Classify)) .Where(t => t.EmailMessageId == emailMessageId)
.CountAsync(); .CountAsync();
} }
@@ -377,224 +193,16 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
.ToListAsync(); .ToListAsync();
} }
public async Task<(List<ReasonGroupDto> list, int total)> GetReasonGroupsAsync(int pageIndex = 1, int pageSize = 20)
{
// 先按照Reason分组统计每个Reason的数量和总金额
var groups = await FreeSql.Select<TransactionRecord>()
.Where(t => !string.IsNullOrEmpty(t.Reason))
.Where(t => string.IsNullOrEmpty(t.Classify)) // 只统计未分类的
.GroupBy(t => t.Reason)
.ToListAsync(g => new
{
Reason = g.Key,
Count = g.Count(),
TotalAmount = g.Sum(g.Value.Amount)
});
// 按总金额绝对值降序排序
var sortedGroups = groups.OrderByDescending(g => Math.Abs(g.TotalAmount)).ToList();
var total = sortedGroups.Count;
// 分页
var pagedGroups = sortedGroups
.Skip((pageIndex - 1) * pageSize)
.Take(pageSize)
.ToList();
// 为每个分组获取详细信息
var result = new List<ReasonGroupDto>();
foreach (var group in pagedGroups)
{
// 获取该分组的所有记录
var records = await FreeSql.Select<TransactionRecord>()
.Where(t => t.Reason == group.Reason)
.Where(t => string.IsNullOrEmpty(t.Classify))
.ToListAsync();
if (records.Count > 0)
{
var sample = records.First();
result.Add(new ReasonGroupDto
{
Reason = group.Reason,
Count = (int)group.Count,
SampleType = sample.Type,
SampleClassify = sample.Classify ?? string.Empty,
TransactionIds = records.Select(r => r.Id).ToList(),
TotalAmount = Math.Abs(group.TotalAmount)
});
}
}
return (result, total);
}
public async Task<int> BatchUpdateByReasonAsync(string reason, TransactionType type, string classify)
{
return await FreeSql.Update<TransactionRecord>()
.Set(t => t.Type, type)
.Set(t => t.Classify, classify)
.Where(t => t.Reason == reason)
.ExecuteAffrowsAsync();
}
public async Task<List<TransactionRecord>> QueryByWhereAsync(string sql)
{
return await FreeSql.Select<TransactionRecord>()
.Where(sql)
.OrderByDescending(t => t.OccurredAt)
.ToListAsync();
}
public async Task<List<TransactionRecord>> ExecuteRawSqlAsync(string completeSql)
{
return await FreeSql.Ado.QueryAsync<TransactionRecord>(completeSql);
}
public async Task<List<dynamic>> ExecuteDynamicSqlAsync(string completeSql)
{
var dt = await FreeSql.Ado.ExecuteDataTableAsync(completeSql);
var result = new List<dynamic>();
foreach (System.Data.DataRow row in dt.Rows)
{
var expando = new System.Dynamic.ExpandoObject() as IDictionary<string, object>;
foreach (System.Data.DataColumn column in dt.Columns)
{
expando[column.ColumnName] = row[column];
}
result.Add(expando);
}
return result;
}
public async Task<MonthlyStatistics> GetMonthlyStatisticsAsync(int year, int month)
{
var startDate = new DateTime(year, month, 1);
var endDate = startDate.AddMonths(1);
var records = await FreeSql.Select<TransactionRecord>()
.Where(t => t.OccurredAt >= startDate && t.OccurredAt < endDate)
.ToListAsync();
var statistics = new MonthlyStatistics
{
Year = year,
Month = month
};
foreach (var record in records)
{
var amount = Math.Abs(record.Amount);
if (record.Type == TransactionType.Expense)
{
statistics.TotalExpense += amount;
statistics.ExpenseCount++;
if (amount > statistics.MaxExpense)
{
statistics.MaxExpense = amount;
}
}
else if (record.Type == TransactionType.Income)
{
statistics.TotalIncome += amount;
statistics.IncomeCount++;
if (amount > statistics.MaxIncome)
{
statistics.MaxIncome = amount;
}
}
}
statistics.Balance = statistics.TotalIncome - statistics.TotalExpense;
statistics.TotalCount = records.Count;
return statistics;
}
public async Task<List<CategoryStatistics>> GetCategoryStatisticsAsync(int year, int month, TransactionType type)
{
var startDate = new DateTime(year, month, 1);
var endDate = startDate.AddMonths(1);
var records = await FreeSql.Select<TransactionRecord>()
.Where(t => t.OccurredAt >= startDate && t.OccurredAt < endDate && t.Type == type)
.ToListAsync();
var categoryGroups = records
.GroupBy(t => t.Classify ?? "未分类")
.Select(g => new CategoryStatistics
{
Classify = g.Key,
Amount = g.Sum(t => Math.Abs(t.Amount)),
Count = g.Count()
})
.OrderByDescending(c => c.Amount)
.ToList();
// 计算百分比
var total = categoryGroups.Sum(c => c.Amount);
if (total > 0)
{
foreach (var category in categoryGroups)
{
category.Percent = Math.Round((category.Amount / total) * 100, 1);
}
}
return categoryGroups;
}
public async Task<List<TrendStatistics>> GetTrendStatisticsAsync(int startYear, int startMonth, int monthCount)
{
var trends = new List<TrendStatistics>();
for (int i = 0; i < monthCount; i++)
{
var targetYear = startYear;
var targetMonth = startMonth + i;
// 处理月份溢出
while (targetMonth > 12)
{
targetMonth -= 12;
targetYear++;
}
var startDate = new DateTime(targetYear, targetMonth, 1);
var endDate = startDate.AddMonths(1);
var records = await FreeSql.Select<TransactionRecord>()
.Where(t => t.OccurredAt >= startDate && t.OccurredAt < endDate)
.ToListAsync();
var expense = records.Where(t => t.Type == TransactionType.Expense).Sum(t => Math.Abs(t.Amount));
var income = records.Where(t => t.Type == TransactionType.Income).Sum(t => Math.Abs(t.Amount));
trends.Add(new TrendStatistics
{
Year = targetYear,
Month = targetMonth,
Expense = expense,
Income = income,
Balance = income - expense
});
}
return trends;
}
public async Task<List<TransactionRecord>> GetClassifiedByKeywordsAsync(List<string> keywords, int limit = 10) public async Task<List<TransactionRecord>> GetClassifiedByKeywordsAsync(List<string> keywords, int limit = 10)
{ {
if (keywords == null || keywords.Count == 0) if (keywords.Count == 0)
{ {
return new List<TransactionRecord>(); return [];
} }
var query = FreeSql.Select<TransactionRecord>() var query = FreeSql.Select<TransactionRecord>()
.Where(t => t.Classify != ""); // 只查询已分类的账单 .Where(t => t.Classify != "");
// 构建OR条件Reason包含任意一个关键词
if (keywords.Count > 0) if (keywords.Count > 0)
{ {
query = query.Where(t => keywords.Any(keyword => t.Reason.Contains(keyword))); query = query.Where(t => keywords.Any(keyword => t.Reason.Contains(keyword)));
@@ -606,135 +214,40 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
.ToListAsync(); .ToListAsync();
} }
public async Task<List<(TransactionRecord record, double relevanceScore)>> GetClassifiedByKeywordsWithScoreAsync(List<string> keywords, double minMatchRate = 0.3, int limit = 10) public async Task<List<TransactionRecord>> GetUnconfirmedRecordsAsync()
{ {
if (keywords == null || keywords.Count == 0) return await FreeSql.Select<TransactionRecord>()
{ .Where(t => t.UnconfirmedClassify != null && t.UnconfirmedClassify != "")
return new List<(TransactionRecord, double)>(); .OrderByDescending(t => t.OccurredAt)
}
// 查询所有已分类且包含任意关键词的账单
var candidates = await FreeSql.Select<TransactionRecord>()
.Where(t => t.Classify != "")
.Where(t => keywords.Any(keyword => t.Reason.Contains(keyword)))
.ToListAsync(); .ToListAsync();
// 计算每个候选账单的相关度分数
var scoredResults = candidates
.Select(record =>
{
var matchedCount = keywords.Count(keyword => record.Reason.Contains(keyword, StringComparison.OrdinalIgnoreCase));
var matchRate = (double)matchedCount / keywords.Count;
// 额外加分:完全匹配整个摘要(相似度更高)
var exactMatchBonus = keywords.Any(k => record.Reason.Equals(k, StringComparison.OrdinalIgnoreCase)) ? 0.2 : 0.0;
// 长度相似度加分:长度越接近,相关度越高
var avgKeywordLength = keywords.Average(k => k.Length);
var lengthSimilarity = 1.0 - Math.Min(1.0, Math.Abs(record.Reason.Length - avgKeywordLength) / Math.Max(record.Reason.Length, avgKeywordLength));
var lengthBonus = lengthSimilarity * 0.1;
var score = matchRate + exactMatchBonus + lengthBonus;
return (record, score);
})
.Where(x => x.score >= minMatchRate) // 过滤低相关度结果
.OrderByDescending(x => x.score) // 按相关度降序
.ThenByDescending(x => x.record.OccurredAt) // 相同分数时,按时间降序
.Take(limit)
.ToList();
return scoredResults;
} }
public async Task<List<TransactionRecord>> GetCandidatesForOffsetAsync(long currentId, decimal amount, TransactionType currentType) public async Task<int> BatchUpdateByReasonAsync(string reason, TransactionType type, string classify)
{ {
var absAmount = Math.Abs(amount); return await FreeSql.Update<TransactionRecord>()
var minAmount = absAmount - 5; .Set(t => t.Type, type)
var maxAmount = absAmount + 5; .Set(t => t.Classify, classify)
.Where(t => t.Reason == reason)
.ExecuteAffrowsAsync();
}
var list = await FreeSql.Select<TransactionRecord>() public async Task<int> UpdateCategoryNameAsync(string oldName, string newName, TransactionType type)
.Where(t => t.Id != currentId) {
.Where(t => t.Type != currentType) return await FreeSql.Update<TransactionRecord>()
.Where(t => Math.Abs(t.Amount) >= minAmount && Math.Abs(t.Amount) <= maxAmount) .Set(a => a.Classify, newName)
.Take(50) .Where(a => a.Classify == oldName && a.Type == type)
.ToListAsync(); .ExecuteAffrowsAsync();
}
return list.OrderBy(t => Math.Abs(Math.Abs(t.Amount) - absAmount)).ToList(); public async Task<int> ConfirmAllUnconfirmedAsync(long[] ids)
{
return await FreeSql.Update<TransactionRecord>()
.Set(t => t.Classify == t.UnconfirmedClassify)
.Set(t => t.Type == (t.UnconfirmedType ?? t.Type))
.Set(t => t.UnconfirmedClassify, null)
.Set(t => t.UnconfirmedType, null)
.Where(t => t.UnconfirmedClassify != null && t.UnconfirmedClassify != "")
.Where(t => ids.Contains(t.Id))
.ExecuteAffrowsAsync();
} }
} }
/// <summary>
/// 按Reason分组统计DTO
/// </summary>
public class ReasonGroupDto
{
/// <summary>
/// 交易摘要
/// </summary>
public string Reason { get; set; } = string.Empty;
/// <summary>
/// 该摘要的记录数量
/// </summary>
public int Count { get; set; }
/// <summary>
/// 示例交易类型(该分组中第一条记录的类型)
/// </summary>
public TransactionType SampleType { get; set; }
/// <summary>
/// 示例分类(该分组中第一条记录的分类)
/// </summary>
public string SampleClassify { get; set; } = string.Empty;
/// <summary>
/// 该分组的所有账单ID列表
/// </summary>
public List<long> TransactionIds { get; set; } = new();
/// <summary>
/// 该分组的总金额(绝对值)
/// </summary>
public decimal TotalAmount { get; set; }
}
/// <summary>
/// 月度统计数据
/// </summary>
public class MonthlyStatistics
{
public int Year { get; set; }
public int Month { get; set; }
public decimal TotalExpense { get; set; }
public decimal TotalIncome { get; set; }
public decimal Balance { get; set; }
public int ExpenseCount { get; set; }
public int IncomeCount { get; set; }
public int TotalCount { get; set; }
public decimal MaxExpense { get; set; }
public decimal MaxIncome { get; set; }
}
/// <summary>
/// 分类统计数据
/// </summary>
public class CategoryStatistics
{
public string Classify { get; set; } = string.Empty;
public decimal Amount { get; set; }
public int Count { get; set; }
public decimal Percent { get; set; }
}
/// <summary>
/// 趋势统计数据
/// </summary>
public class TrendStatistics
{
public int Year { get; set; }
public int Month { get; set; }
public decimal Expense { get; set; }
public decimal Income { get; set; }
public decimal Balance { get; set; }
}

View File

@@ -0,0 +1,456 @@
# TransactionRecordRepository 查询语句文档
本文档整理了所有与账单(TransactionRecord)相关的查询语句包括仓储层、服务层中的SQL查询。
## 目录
1. [TransactionRecordRepository 查询方法](#transactionrecordrepository-查询方法)
2. [其他仓储中的账单查询](#其他仓储中的账单查询)
3. [服务层中的SQL查询](#服务层中的sql查询)
4. [总结](#总结)
---
## TransactionRecordRepository 查询方法
### 1. 基础查询
#### 1.1 根据邮件ID和交易时间检查是否存在
```csharp
/// 位置: TransactionRecordRepository.cs:94-99
return await FreeSql.Select<TransactionRecord>()
.Where(t => t.EmailMessageId == emailMessageId && t.OccurredAt == occurredAt)
.FirstAsync();
```
#### 1.2 根据导入编号检查是否存在
```csharp
/// 位置: TransactionRecordRepository.cs:101-106
return await FreeSql.Select<TransactionRecord>()
.Where(t => t.ImportNo == importNo && t.ImportFrom == importFrom)
.FirstAsync();
```
---
### 2. 核心查询构建器
#### 2.1 BuildQuery() 私有方法 - 统一查询构建
```csharp
/// 位置: TransactionRecordRepository.cs:53-92
private ISelect<TransactionRecord> BuildQuery(
int? year = null,
int? month = null,
DateTime? startDate = null,
DateTime? endDate = null,
TransactionType? type = null,
string[]? classifies = null,
string? searchKeyword = null,
string? reason = null)
{
var query = FreeSql.Select<TransactionRecord>();
// 搜索关键词条件Reason/Classify/Card/ImportFrom
query = query.WhereIf(!string.IsNullOrWhiteSpace(searchKeyword),
t => t.Reason.Contains(searchKeyword!) ||
t.Classify.Contains(searchKeyword!) ||
t.Card.Contains(searchKeyword!) ||
t.ImportFrom.Contains(searchKeyword!))
.WhereIf(!string.IsNullOrWhiteSpace(reason),
t => t.Reason == reason);
// 按分类筛选(处理"未分类"特殊情况)
if (classifies is { Length: > 0 })
{
var filterClassifies = classifies.Select(c => c == "未分类" ? string.Empty : c).ToList();
query = query.Where(t => filterClassifies.Contains(t.Classify));
}
// 按交易类型筛选
query = query.WhereIf(type.HasValue, t => t.Type == type!.Value);
// 按年月筛选
if (year.HasValue && month.HasValue)
{
var dateStart = new DateTime(year.Value, month.Value, 1);
var dateEnd = dateStart.AddMonths(1);
query = query.Where(t => t.OccurredAt >= dateStart && t.OccurredAt < dateEnd);
}
// 按日期范围筛选
query = query.WhereIf(startDate.HasValue, t => t.OccurredAt >= startDate!.Value)
.WhereIf(endDate.HasValue, t => t.OccurredAt <= endDate!.Value);
return query;
}
```
---
### 3. 分页查询与统计
#### 3.1 分页获取交易记录列表
```csharp
/// 位置: TransactionRecordRepository.cs:108-137
var query = BuildQuery(year, month, startDate, endDate, type, classifies, searchKeyword, reason);
// 排序:按金额或按时间
if (sortByAmount)
{
return await query
.OrderByDescending(t => t.Amount)
.OrderByDescending(t => t.Id)
.Page(pageIndex, pageSize)
.ToListAsync();
}
return await query
.OrderByDescending(t => t.OccurredAt)
.OrderByDescending(t => t.Id)
.Page(pageIndex, pageSize)
.ToListAsync();
```
#### 3.2 获取总数(与分页查询条件相同)
```csharp
/// 位置: TransactionRecordRepository.cs:139-151
var query = BuildQuery(year, month, startDate, endDate, type, classifies, searchKeyword, reason);
return await query.CountAsync();
```
#### 3.3 获取所有不同的交易分类
```csharp
/// 位置: TransactionRecordRepository.cs:153-159
return await FreeSql.Select<TransactionRecord>()
.Where(t => !string.IsNullOrEmpty(t.Classify))
.Distinct()
.ToListAsync(t => t.Classify);
```
---
### 4. 按邮件相关查询
#### 4.1 获取指定邮件的交易记录列表
```csharp
/// 位置: TransactionRecordRepository.cs:161-167
return await FreeSql.Select<TransactionRecord>()
.Where(t => t.EmailMessageId == emailMessageId)
.OrderBy(t => t.OccurredAt)
.ToListAsync();
```
#### 4.2 获取指定邮件的交易记录数量
```csharp
/// 位置: TransactionRecordRepository.cs:169-174
return (int)await FreeSql.Select<TransactionRecord>()
.Where(t => t.EmailMessageId == emailMessageId)
.CountAsync();
```
---
### 5. 未分类账单查询
#### 5.1 获取未分类的账单列表
```csharp
/// 位置: TransactionRecordRepository.cs:176-183
return await FreeSql.Select<TransactionRecord>()
.Where(t => string.IsNullOrEmpty(t.Classify))
.OrderByDescending(t => t.OccurredAt)
.Page(1, pageSize)
.ToListAsync();
```
---
### 6. 智能分类相关查询
#### 6.1 根据关键词查询已分类的账单
```csharp
/// 位置: TransactionRecordRepository.cs:185-204
if (keywords.Count == 0)
{
return [];
}
var query = FreeSql.Select<TransactionRecord>()
.Where(t => t.Classify != "");
// 构建OR条件Reason包含任意一个关键词
if (keywords.Count > 0)
{
query = query.Where(t => keywords.Any(keyword => t.Reason.Contains(keyword)));
}
return await query
.OrderByDescending(t => t.OccurredAt)
.Limit(limit)
.ToListAsync();
```
---
### 7. 待确认分类查询
#### 7.1 获取待确认分类的账单列表
```csharp
/// 位置: TransactionRecordRepository.cs:206-212
return await FreeSql.Select<TransactionRecord>()
.Where(t => t.UnconfirmedClassify != null && t.UnconfirmedClassify != "")
.OrderByDescending(t => t.OccurredAt)
.ToListAsync();
```
---
### 8. 批量更新操作
#### 8.1 按摘要批量更新交易记录的分类
```csharp
/// 位置: TransactionRecordRepository.cs:214-221
return await FreeSql.Update<TransactionRecord>()
.Set(t => t.Type, type)
.Set(t => t.Classify, classify)
.Where(t => t.Reason == reason)
.ExecuteAffrowsAsync();
```
#### 8.2 更新分类名称
```csharp
/// 位置: TransactionRecordRepository.cs:223-229
return await FreeSql.Update<TransactionRecord>()
.Set(a => a.Classify, newName)
.Where(a => a.Classify == oldName && a.Type == type)
.ExecuteAffrowsAsync();
```
#### 8.3 确认待确认的分类
```csharp
/// 位置: TransactionRecordRepository.cs:231-241
return await FreeSql.Update<TransactionRecord>()
.Set(t => t.Classify == t.UnconfirmedClassify)
.Set(t => t.Type == (t.UnconfirmedType ?? t.Type))
.Set(t => t.UnconfirmedClassify, null)
.Set(t => t.UnconfirmedType, null)
.Where(t => t.UnconfirmedClassify != null && t.UnconfirmedClassify != "")
.Where(t => ids.Contains(t.Id))
.ExecuteAffrowsAsync();
```
---
## 其他仓储中的账单查询
### BudgetRepository
#### 1. 获取预算当前金额
```csharp
/// 位置: BudgetRepository.cs:12-33
var query = FreeSql.Select<TransactionRecord>()
.Where(t => t.OccurredAt >= startDate && t.OccurredAt <= endDate);
if (!string.IsNullOrEmpty(budget.SelectedCategories))
{
var categoryList = budget.SelectedCategories.Split(',');
query = query.Where(t => categoryList.Contains(t.Classify));
}
if (budget.Category == BudgetCategory.Expense)
{
query = query.Where(t => t.Type == TransactionType.Expense);
}
else if (budget.Category == BudgetCategory.Income)
{
query = query.Where(t => t.Type == TransactionType.Income);
}
return await query.SumAsync(t => t.Amount);
```
---
### TransactionCategoryRepository
#### 1. 检查分类是否被使用
```csharp
/// 位置: TransactionCategoryRepository.cs:53-63
var count = await FreeSql.Select<TransactionRecord>()
.Where(r => r.Classify == category.Name && r.Type == category.Type)
.CountAsync();
return count > 0;
```
---
## 服务层中的SQL查询
### SmartHandleService
#### 1. 智能分析账单 - 执行AI生成的SQL
```csharp
/// 位置: SmartHandleService.cs:351
queryResults = await transactionRepository.ExecuteDynamicSqlAsync(sqlText);
```
**说明**: 此方法接收AI生成的SQL语句并执行SQL内容由AI根据用户问题动态生成例如
```sql
SELECT
COUNT(*) AS TransactionCount,
SUM(ABS(Amount)) AS TotalAmount,
Type,
Classify
FROM TransactionRecord
WHERE OccurredAt >= '2025-01-01'
AND OccurredAt < '2026-01-01'
GROUP BY Type, Classify
ORDER BY TotalAmount DESC
```
---
### BudgetService
#### 1. 获取归档摘要 - 年度交易统计
```csharp
/// 位置: BudgetService.cs:239-252
var yearTransactions = await transactionRecordRepository.ExecuteDynamicSqlAsync(
$"""
SELECT
COUNT(*) AS TransactionCount,
SUM(ABS(Amount)) AS TotalAmount,
Type,
Classify
FROM TransactionRecord
WHERE OccurredAt >= '{year}-01-01'
AND OccurredAt < '{year + 1}-01-01'
GROUP BY Type, Classify
ORDER BY TotalAmount DESC
"""
);
```
#### 2. 获取归档摘要 - 月度交易统计
```csharp
/// 位置: BudgetService.cs:254-267
var monthYear = new DateTime(year, month, 1).AddMonths(1);
var monthTransactions = await transactionRecordRepository.ExecuteDynamicSqlAsync(
$"""
SELECT
COUNT(*) AS TransactionCount,
SUM(ABS(Amount)) AS TotalAmount,
Type,
Classify
FROM TransactionRecord
WHERE OccurredAt >= '{year}-{month:00}-01'
AND OccurredAt < '{monthYear:yyyy-MM-dd}'
GROUP BY Type, Classify
ORDER BY TotalAmount DESC
"""
);
```
---
### BudgetSavingsService
#### 1. 获取按分类分组的交易金额(用于存款预算计算)
```csharp
/// 位置: BudgetSavingsService.cs:62-65
var transactionClassify = await transactionsRepository.GetAmountGroupByClassifyAsync(
new DateTime(year, month, 1),
new DateTime(year, month, 1).AddMonths(1)
);
```
---
## 总结
### 查询方法分类
| 分类 | 方法数 | 说明 |
|------|--------|------|
| 基础查询 | 2 | 检查记录是否存在(去重) |
| 核心构建器 | 1 | BuildQuery() 私有方法,统一查询逻辑 |
| 分页查询 | 2 | 分页列表 + 总数统计 |
| 分类查询 | 1 | 获取所有不同分类 |
| 邮件相关 | 2 | 按邮件ID查询列表和数量 |
| 未分类查询 | 1 | 获取未分类账单列表 |
| 智能分类 | 1 | 关键词匹配查询 |
| 待确认分类 | 1 | 获取待确认账单列表 |
| 批量更新 | 3 | 批量更新分类和确认操作 |
| 其他仓储查询 | 2 | 预算/分类仓储中的账单查询 |
| 服务层SQL | 3 | AI生成SQL + 归档统计 |
### 关键发现
1. **简化的架构**新实现移除了复杂的统计方法专注于核心的CRUD操作和查询功能。
2. **统一的查询构建**`BuildQuery()` 私有方法第53-92行`QueryAsync()``CountAsync()` 共享使用,确保查询逻辑一致性。
3. **去重检查**`ExistsByEmailMessageIdAsync()``ExistsByImportNoAsync()` 用于防止重复导入。
4. **灵活的查询条件**:支持按年月、日期范围、交易类型、分类、关键词等多维度筛选。
5. **批量操作优化**:提供批量更新分类、确认待确认记录等高效操作。
6. **服务层SQL保持不变**AI生成SQL和归档统计等高级查询功能仍然通过 `ExecuteDynamicSqlAsync()` 实现。
### SQL查询模式
所有SQL查询都遵循以下模式
```sql
SELECT [] FROM TransactionRecord
WHERE []
ORDER BY []
LIMIT []
```
常用查询条件:
- `EmailMessageId == ? AND OccurredAt == ?` - 精确匹配去重
- `ImportNo == ? AND ImportFrom == ?` - 导入记录去重
- `Classify != ""` - 已分类记录
- `Classify == "" OR Classify IS NULL` - 未分类记录
- `UnconfirmedClassify != ""` - 待确认记录
- `Reason.Contains(?) OR Classify.Contains(?)` - 关键词搜索
### 字段说明
| 字段 | 类型 | 说明 |
|------|------|------|
| Id | bigint | 主键 |
| Card | nvarchar | 卡号 |
| Reason | nvarchar | 交易原因/摘要 |
| Amount | decimal | 交易金额(支出为负数,收入为正数) |
| OccurredAt | datetime | 交易发生时间 |
| Type | int | 交易类型0=支出, 1=收入, 2=不计入收支) |
| Classify | nvarchar | 交易分类(空字符串表示未分类) |
| EmailMessageId | bigint | 关联邮件ID |
| ImportNo | nvarchar | 导入编号 |
| ImportFrom | nvarchar | 导入来源 |
| UnconfirmedClassify | nvarchar | 待确认分类 |
| UnconfirmedType | int? | 待确认类型 |
### 接口方法总览
**ITransactionRecordRepository 接口定义17个方法**
1. `ExistsByEmailMessageIdAsync()` - 邮件去重检查
2. `ExistsByImportNoAsync()` - 导入去重检查
3. `QueryAsync()` - 分页查询(支持多维度筛选)
4. `CountAsync()` - 总数统计与QueryAsync条件相同
5. `GetDistinctClassifyAsync()` - 获取所有分类
6. `GetByEmailIdAsync()` - 按邮件ID查询记录
7. `GetCountByEmailIdAsync()` - 按邮件ID统计数量
8. `GetUnclassifiedAsync()` - 获取未分类记录
9. `GetClassifiedByKeywordsAsync()` - 关键词匹配查询
10. `GetUnconfirmedRecordsAsync()` - 获取待确认记录
11. `BatchUpdateByReasonAsync()` - 按摘要批量更新
12. `UpdateCategoryNameAsync()` - 更新分类名称
13. `ConfirmAllUnconfirmedAsync()` - 确认待确认记录
**私有辅助方法:**
- `BuildQuery()` - 统一查询构建器被QueryAsync和CountAsync使用

55
Service/AGENTS.md Normal file
View File

@@ -0,0 +1,55 @@
# SERVICE LAYER KNOWLEDGE BASE
**Generated:** 2026-01-28
**Parent:** EmailBill/AGENTS.md
## OVERVIEW
Business logic layer with job scheduling, email processing, and application services.
## STRUCTURE
```
Service/
├── GlobalUsings.cs # Common imports
├── Jobs/ # Background jobs
│ ├── BudgetArchiveJob.cs # Budget archiving
│ ├── DbBackupJob.cs # Database backups
│ ├── EmailSyncJob.cs # Email synchronization
│ └── PeriodicBillJob.cs # Periodic bill processing
├── EmailServices/ # Email processing
│ ├── EmailHandleService.cs # Email handling logic
│ ├── EmailFetchService.cs # Email fetching
│ ├── EmailSyncService.cs # Email synchronization
│ └── EmailParse/ # Email parsing services
├── AppSettingModel/ # Configuration models
├── Budget/ # Budget services
└── [Various service classes] # Core business services
```
## WHERE TO LOOK
| Task | Location | Notes |
|------|----------|-------|
| Background jobs | Jobs/ | Scheduled tasks, cron patterns |
| Email processing | EmailServices/ | Email parsing, handling, sync |
| Budget logic | Budget/ | Budget calculations, stats |
| Configuration | AppSettingModel/ | Settings models, validation |
| Core services | *.cs | Main business logic |
## CONVENTIONS
- Service classes end with "Service" suffix
- Jobs inherit from appropriate base job classes
- Use IDateTimeProvider for time operations
- Async/await for I/O operations
- Dependency injection via constructor
## ANTI-PATTERNS (THIS LAYER)
- Never access database directly (use repositories)
- Don't return domain entities to controllers (use DTOs)
- Avoid long-running operations in main thread
- No hardcoded configuration values
- Don't mix service responsibilities
## UNIQUE STYLES
- Email parsing with multiple format handlers
- Background job patterns with error handling
- Configuration models with validation attributes
- Service composition patterns

View File

@@ -1,21 +1,21 @@
using System.Net.Http.Headers; using System.Net.Http.Headers;
namespace Service; namespace Service.AI;
public interface IOpenAiService public interface IOpenAiService
{ {
Task<string?> ChatAsync(string systemPrompt, string userPrompt); Task<string?> ChatAsync(string systemPrompt, string userPrompt, int timeoutSeconds = 15);
Task<string?> ChatAsync(string prompt); Task<string?> ChatAsync(string prompt, int timeoutSeconds = 15);
IAsyncEnumerable<string> ChatStreamAsync(string systemPrompt, string userPrompt); IAsyncEnumerable<string> ChatStreamAsync(string systemPrompt, string userPrompt);
IAsyncEnumerable<string> ChatStreamAsync(string prompt); IAsyncEnumerable<string> ChatStreamAsync(string prompt);
} }
public class OpenAiService( public class OpenAiService(
IOptions<AISettings> aiSettings, IOptions<AiSettings> aiSettings,
ILogger<OpenAiService> logger ILogger<OpenAiService> logger
) : IOpenAiService ) : IOpenAiService
{ {
public async Task<string?> ChatAsync(string systemPrompt, string userPrompt) public async Task<string?> ChatAsync(string systemPrompt, string userPrompt, int timeoutSeconds = 15)
{ {
var cfg = aiSettings.Value; var cfg = aiSettings.Value;
if (string.IsNullOrWhiteSpace(cfg.Endpoint) || if (string.IsNullOrWhiteSpace(cfg.Endpoint) ||
@@ -27,7 +27,7 @@ public class OpenAiService(
} }
using var http = new HttpClient(); using var http = new HttpClient();
http.Timeout = TimeSpan.FromSeconds(15); http.Timeout = TimeSpan.FromSeconds(timeoutSeconds);
http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", cfg.Key); http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", cfg.Key);
var payload = new var payload = new
@@ -72,7 +72,7 @@ public class OpenAiService(
} }
} }
public async Task<string?> ChatAsync(string prompt) public async Task<string?> ChatAsync(string prompt, int timeoutSeconds = 15)
{ {
var cfg = aiSettings.Value; var cfg = aiSettings.Value;
if (string.IsNullOrWhiteSpace(cfg.Endpoint) || if (string.IsNullOrWhiteSpace(cfg.Endpoint) ||
@@ -84,7 +84,7 @@ public class OpenAiService(
} }
using var http = new HttpClient(); using var http = new HttpClient();
http.Timeout = TimeSpan.FromSeconds(30); http.Timeout = TimeSpan.FromSeconds(timeoutSeconds);
http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", cfg.Key); http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", cfg.Key);
var payload = new var payload = new
@@ -158,10 +158,8 @@ public class OpenAiService(
var json = JsonSerializer.Serialize(payload); var json = JsonSerializer.Serialize(payload);
using var content = new StringContent(json, Encoding.UTF8, "application/json"); using var content = new StringContent(json, Encoding.UTF8, "application/json");
using var request = new HttpRequestMessage(HttpMethod.Post, url) using var request = new HttpRequestMessage(HttpMethod.Post, url);
{ request.Content = content;
Content = content
};
using var resp = await http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); using var resp = await http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
if (!resp.IsSuccessStatusCode) if (!resp.IsSuccessStatusCode)
@@ -232,10 +230,8 @@ public class OpenAiService(
using var content = new StringContent(json, Encoding.UTF8, "application/json"); using var content = new StringContent(json, Encoding.UTF8, "application/json");
// 使用 SendAsync 来支持 HttpCompletionOption // 使用 SendAsync 来支持 HttpCompletionOption
using var request = new HttpRequestMessage(HttpMethod.Post, url) using var request = new HttpRequestMessage(HttpMethod.Post, url);
{ request.Content = content;
Content = content
};
using var resp = await http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead); using var resp = await http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
if (!resp.IsSuccessStatusCode) if (!resp.IsSuccessStatusCode)

View File

@@ -1,4 +1,6 @@
namespace Service; using Service.Transaction;
namespace Service.AI;
public interface ISmartHandleService public interface ISmartHandleService
{ {
@@ -11,10 +13,12 @@ public interface ISmartHandleService
public class SmartHandleService( public class SmartHandleService(
ITransactionRecordRepository transactionRepository, ITransactionRecordRepository transactionRepository,
ITransactionStatisticsService transactionStatisticsService,
ITextSegmentService textSegmentService, ITextSegmentService textSegmentService,
ILogger<SmartHandleService> logger, ILogger<SmartHandleService> logger,
ITransactionCategoryRepository categoryRepository, ITransactionCategoryRepository categoryRepository,
IOpenAiService openAiService IOpenAiService openAiService,
IConfigService configService
) : ISmartHandleService ) : ISmartHandleService
{ {
public async Task SmartClassifyAsync(long[] transactionIds, Action<(string, string)> chunkAction) public async Task SmartClassifyAsync(long[] transactionIds, Action<(string, string)> chunkAction)
@@ -24,6 +28,10 @@ public class SmartHandleService(
// 获取指定ID的账单作为样本 // 获取指定ID的账单作为样本
var sampleRecords = await transactionRepository.GetByIdsAsync(transactionIds); var sampleRecords = await transactionRepository.GetByIdsAsync(transactionIds);
sampleRecords = sampleRecords
.Where(x => string.IsNullOrEmpty(x.Classify))
.ToArray();
if (sampleRecords.Length == 0) if (sampleRecords.Length == 0)
{ {
// await WriteEventAsync("error", "找不到指定的账单"); // await WriteEventAsync("error", "找不到指定的账单");
@@ -56,7 +64,7 @@ public class SmartHandleService(
{ {
// 查询包含这些关键词且已分类的账单(带相关度评分) // 查询包含这些关键词且已分类的账单(带相关度评分)
// minMatchRate=0.4 表示至少匹配40%的关键词才被认为是相似的 // minMatchRate=0.4 表示至少匹配40%的关键词才被认为是相似的
var similarClassifiedWithScore = await transactionRepository.GetClassifiedByKeywordsWithScoreAsync(keywords, minMatchRate: 0.4, limit: 10); var similarClassifiedWithScore = await transactionStatisticsService.GetClassifiedByKeywordsWithScoreAsync(keywords, minMatchRate: 0.4, limit: 10);
if (similarClassifiedWithScore.Count > 0) if (similarClassifiedWithScore.Count > 0)
{ {
@@ -80,21 +88,8 @@ public class SmartHandleService(
} }
} }
// 获取所有分类
var categories = await categoryRepository.GetAllAsync();
// 构建分类信息 // 构建分类信息
var categoryInfo = new StringBuilder(); var categoryInfo = await GetCategoryInfoAsync();
foreach (var type in new[] { 0, 1, 2 })
{
var typeName = GetTypeName((TransactionType)type);
categoryInfo.AppendLine($"{typeName}: ");
var categoriesOfType = categories.Where(c => (int)c.Type == type).ToList();
foreach (var category in categoriesOfType)
{
categoryInfo.AppendLine($"- {category.Name}");
}
}
// 构建账单分组信息 // 构建账单分组信息
var billsInfo = new StringBuilder(); var billsInfo = new StringBuilder();
@@ -127,9 +122,14 @@ public class SmartHandleService(
- 使 NDJSON JSON - 使 NDJSON JSON
- JSON格式严格为{"reason": "交易摘要", "type": 0, "classify": "分类名称"} - JSON格式严格为
{
"reason": "交易摘要",
"type": Number, // 交易类型0=支出1=收入2=不计入收支
"classify": "分类名称"
}
- -
- "classify" "其他" JSON - JSON对象
JSON对象NDJSON JSON对象NDJSON
"""; """;
@@ -146,7 +146,7 @@ public class SmartHandleService(
chunkAction(("start", $"开始分类,共 {sampleRecords.Length} 条账单")); chunkAction(("start", $"开始分类,共 {sampleRecords.Length} 条账单"));
var classifyResults = new List<(string Reason, string Classify, TransactionType Type)>(); var classifyResults = new List<(string Reason, string Classify, TransactionType Type)>();
var sendedIds = new HashSet<long>(); var sentIds = new HashSet<long>();
// 将流解析逻辑提取为本地函数以减少嵌套 // 将流解析逻辑提取为本地函数以减少嵌套
void HandleResult(GroupClassifyResult? result) void HandleResult(GroupClassifyResult? result)
@@ -157,11 +157,18 @@ public class SmartHandleService(
if (group == null) return; if (group == null) return;
foreach (var id in group.Ids) foreach (var id in group.Ids)
{ {
if (sendedIds.Add(id)) if (!sentIds.Add(id))
{ {
var resultJson = JsonSerializer.Serialize(new { id, result.Classify, result.Type }); continue;
chunkAction(("data", resultJson));
} }
var resultJson = JsonSerializer.Serialize(new
{
id,
result.Classify,
result.Type
});
chunkAction(("data", resultJson));
} }
} }
@@ -191,7 +198,7 @@ public class SmartHandleService(
} }
catch (Exception exArr) catch (Exception exArr)
{ {
logger.LogDebug(exArr, "按数组解析AI返回失败回退到逐对象解析。预览: {Preview}", arrJson?.Length > 200 ? arrJson.Substring(0, 200) + "..." : arrJson); logger.LogDebug(exArr, "按数组解析AI返回失败回退到逐对象解析。预览: {Preview}", arrJson.Length > 200 ? arrJson.Substring(0, 200) + "..." : arrJson);
} }
} }
} }
@@ -252,11 +259,14 @@ public class SmartHandleService(
{ {
try try
{ {
// 构建分类信息
var categoryInfo = await GetCategoryInfoAsync();
// 第一步使用AI生成聚合SQL查询 // 第一步使用AI生成聚合SQL查询
var now = DateTime.Now; var now = DateTime.Now;
var sqlPrompt = $""" var sqlPrompt = $$"""
{now:yyyy年M月d日}{now:yyyy-MM-dd} {{now:yyyy年M月d日}}{{now:yyyy-MM-dd}}
{userInput} {{userInput}}
SQLite SQLite
TransactionRecord TransactionRecord
@@ -287,21 +297,29 @@ public class SmartHandleService(
- strftime('%Y-%m-%d', OccurredAt) - strftime('%Y-%m-%d', OccurredAt)
- 使 YEAR()MONTH()DAY() SQLite不支持 - 使 YEAR()MONTH()DAY() SQLite不支持
1 SQL会被一下DOTNET代码执行,
```C#
SELECT Classify, COUNT(*) as TransactionCount, SUM(ABS(Amount)) as TotalAmount, AVG(ABS(Amount)) as AvgAmount FROM TransactionRecord WHERE Type = 0 AND OccurredAt >= '2025-10-01' AND OccurredAt < '2026-01-01' AND (Classify LIKE '%%' OR Reason LIKE '%%' OR Reason LIKE '%%' OR Reason LIKE '%%') GROUP BY Classify ORDER BY TotalAmount DESC public async Task<List<dynamic>> ExecuteDynamicSqlAsync(string completeSql)
{
var dt = await FreeSql.Ado.ExecuteDataTableAsync(completeSql);
var result = new List<dynamic>();
2 foreach (System.Data.DataRow row in dt.Rows)
{
SELECT strftime('%Y', OccurredAt) as Year, strftime('%m', OccurredAt) as Month, COUNT(*) as TransactionCount, SUM(ABS(Amount)) as TotalAmount FROM TransactionRecord WHERE Type = 0 AND OccurredAt >= '2025-06-01' GROUP BY strftime('%Y', OccurredAt), strftime('%m', OccurredAt) ORDER BY Year, Month var expando = new System.Dynamic.ExpandoObject() as IDictionary<string, object>;
foreach (System.Data.DataColumn column in dt.Columns)
{
expando[column.ColumnName] = row[column];
}
result.Add(expando);
}
3 return result;
}
SELECT COUNT(*) as TransactionCount, SUM(ABS(Amount)) as TotalAmount, AVG(ABS(Amount)) as AvgAmount, MAX(ABS(Amount)) as MaxAmount FROM TransactionRecord WHERE Type = 0 AND OccurredAt >= '2025-12-01' AND OccurredAt < '2026-01-01' ```
4 - 使
1000 {{categoryInfo}}
SELECT OccurredAt, Classify, Reason, ABS(Amount) as Amount FROM TransactionRecord WHERE Type = 0 AND ABS(Amount) > 1000 ORDER BY Amount DESC LIMIT 50
SQL语句 SQL语句
"""; """;
@@ -318,6 +336,17 @@ public class SmartHandleService(
logger.LogInformation("AI生成的SQL: {Sql}", sqlText); logger.LogInformation("AI生成的SQL: {Sql}", sqlText);
chunkAction(
JsonSerializer.Serialize(new
{
content = $"""
<pre style="max-height: 80px; font-size: 8px; overflow-y: auto; padding: 8px; border: 1px solid #3c3c3c">
{WebUtility.HtmlEncode(sqlText)}
</pre>
"""
})
);
// 第二步执行动态SQL查询 // 第二步执行动态SQL查询
List<dynamic> queryResults; List<dynamic> queryResults;
try try
@@ -337,13 +366,18 @@ public class SmartHandleService(
var dataJson = JsonSerializer.Serialize(queryResults, new JsonSerializerOptions var dataJson = JsonSerializer.Serialize(queryResults, new JsonSerializerOptions
{ {
WriteIndented = true, WriteIndented = true,
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
}); });
var userPromptExtra = await configService.GetConfigByKeyAsync<string>("BillAnalysisPrompt");
var dataPrompt = $""" var dataPrompt = $"""
{DateTime.Now:yyyy年M月d日} {DateTime.Now:yyyy年M月d日}
{userInput} {userInput}
{userInput}
JSON格式 JSON格式
{dataJson} {dataJson}
@@ -372,6 +406,9 @@ public class SmartHandleService(
14. 14.
15. 15.
{userPromptExtra}
HTML内容markdown代码块标记 HTML内容markdown代码块标记
"""; """;
@@ -393,13 +430,72 @@ public class SmartHandleService(
} }
} }
public async Task<TransactionParseResult?> ParseOneLineBillAsync(string text)
{
// 获取所有分类
var categories = await categoryRepository.GetAllAsync();
// 构建分类信息
var categoryInfo = new StringBuilder();
foreach (var type in new[] { 0, 1, 2 })
{
var typeName = GetTypeName((TransactionType)type);
categoryInfo.AppendLine($"{typeName}: ");
var categoriesOfType = categories.Where(c => (int)c.Type == type).ToList();
foreach (var category in categoriesOfType)
{
categoryInfo.AppendLine($"- {category.Name}");
}
}
var sysPrompt = $$"""
{{categoryInfo}}
JSON
- OccurredAt: yyyy-MM-dd HH:mm:ss{{DateTime.Now:yyyy-MM-dd HH:mm:ss}}
- Amount:
- Reason: /
- Type: 0=1=2=
- Classify:
{
"OccurredAt": "2024-06-15 14:30:00",
"Amount": 150.75,
"Reason": "午餐消费",
"Type": 0,
"Classify": "餐饮"
}
JSON markdown
""";
var json = await openAiService.ChatAsync(sysPrompt, text);
if (string.IsNullOrWhiteSpace(json)) return null;
try
{
// 清理可能的 markdown 标记
json = json.Replace("```json", "").Replace("```", "").Trim();
var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
return JsonSerializer.Deserialize<TransactionParseResult>(json, options);
}
catch (Exception ex)
{
logger.LogError(ex, "解析账单失败");
return null;
}
}
/// <summary> /// <summary>
/// 查找匹配的右括号 /// 查找匹配的右括号
/// </summary> /// </summary>
private static int FindMatchingBrace(string str, int startPos) private static int FindMatchingBrace(string str, int startPos)
{ {
int braceCount = 0; var braceCount = 0;
for (int i = startPos; i < str.Length; i++) for (var i = startPos; i < str.Length; i++)
{ {
if (str[i] == '{') braceCount++; if (str[i] == '{') braceCount++;
else if (str[i] == '}') else if (str[i] == '}')
@@ -422,39 +518,25 @@ public class SmartHandleService(
}; };
} }
public async Task<TransactionParseResult?> ParseOneLineBillAsync(string text) private async Task<string> GetCategoryInfoAsync()
{ {
// 获取所有分类 // 获取所有分类
var categories = await categoryRepository.GetAllAsync(); var categories = await categoryRepository.GetAllAsync();
var categoryList = string.Join("、", categories.Select(c => $"{GetTypeName(c.Type)}-{c.Name}"));
var sysPrompt = $""" // 构建分类信息
var categoryInfo = new StringBuilder();
foreach (var type in new[] { 0, 1, 2 })
JSON
- OccurredAt: yyyy-MM-dd HH:mm:ss{DateTime.Now:yyyy-MM-dd HH:mm:ss}
- Amount:
- Reason: /
- Type: 0=1=2=
- Classify: {categoryList}""""
JSON markdown
""";
var json = await openAiService.ChatAsync(sysPrompt, text);
if (string.IsNullOrWhiteSpace(json)) return null;
try
{ {
// 清理可能的 markdown 标记 var typeName = GetTypeName((TransactionType)type);
json = json.Replace("```json", "").Replace("```", "").Trim(); categoryInfo.AppendLine($"{typeName}: ");
var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true }; var categoriesOfType = categories.Where(c => (int)c.Type == type).ToList();
return JsonSerializer.Deserialize<TransactionParseResult>(json, options); foreach (var category in categoriesOfType)
} {
catch (Exception ex) categoryInfo.AppendLine($"- {category.Name}");
{ }
logger.LogError(ex, "解析账单失败");
return null;
} }
return categoryInfo.ToString();
} }
} }
@@ -464,13 +546,13 @@ public class SmartHandleService(
public record GroupClassifyResult public record GroupClassifyResult
{ {
[JsonPropertyName("reason")] [JsonPropertyName("reason")]
public string Reason { get; set; } = string.Empty; public string Reason { get; init; } = string.Empty;
[JsonPropertyName("classify")] [JsonPropertyName("classify")]
public string? Classify { get; set; } public string? Classify { get; init; }
[JsonPropertyName("type")] [JsonPropertyName("type")]
public TransactionType Type { get; set; } public TransactionType Type { get; init; }
} }
public record TransactionParseResult(string OccurredAt, string Classify, decimal Amount, string Reason, TransactionType Type); public record TransactionParseResult(string OccurredAt, string Classify, decimal Amount, string Reason, TransactionType Type);

View File

@@ -1,8 +1,7 @@
namespace Service; using JiebaNet.Analyser;
using JiebaNet.Segmenter; using JiebaNet.Segmenter;
using JiebaNet.Analyser;
using Microsoft.Extensions.Logging; namespace Service.AI;
/// <summary> /// <summary>
/// 文本分词服务接口 /// 文本分词服务接口
@@ -78,7 +77,7 @@ public class TextSegmentService : ITextSegmentService
{ {
if (string.IsNullOrWhiteSpace(text)) if (string.IsNullOrWhiteSpace(text))
{ {
return new List<string>(); return [];
} }
try try
@@ -119,7 +118,7 @@ public class TextSegmentService : ITextSegmentService
{ {
_logger.LogError(ex, "提取关键词失败,文本: {Text}", text); _logger.LogError(ex, "提取关键词失败,文本: {Text}", text);
// 降级处理:返回原文 // 降级处理:返回原文
return new List<string> { text.Length > 10 ? text.Substring(0, 10) : text }; return [text.Length > 10 ? text.Substring(0, 10) : text];
} }
} }
@@ -127,7 +126,7 @@ public class TextSegmentService : ITextSegmentService
{ {
if (string.IsNullOrWhiteSpace(text)) if (string.IsNullOrWhiteSpace(text))
{ {
return new List<string>(); return [];
} }
try try
@@ -146,7 +145,7 @@ public class TextSegmentService : ITextSegmentService
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "分词失败,文本: {Text}", text); _logger.LogError(ex, "分词失败,文本: {Text}", text);
return new List<string> { text }; return [text];
} }
} }
} }

View File

@@ -1,6 +1,6 @@
namespace Service.AppSettingModel; namespace Service.AppSettingModel;
public class AISettings public class AiSettings
{ {
public string Endpoint { get; set; } = string.Empty; public string Endpoint { get; set; } = string.Empty;
public string Key { get; set; } = string.Empty; public string Key { get; set; } = string.Empty;

View File

@@ -0,0 +1,8 @@
namespace Service.AppSettingModel;
public class NotificationSettings
{
public string Subject { get; set; } = string.Empty;
public string PublicKey { get; set; } = string.Empty;
public string PrivateKey { get; set; } = string.Empty;
}

View File

@@ -0,0 +1,929 @@
using Service.Transaction;
namespace Service.Budget;
public interface IBudgetSavingsService
{
Task<BudgetResult> GetSavingsDtoAsync(
BudgetPeriodType periodType,
DateTime? referenceDate = null,
IEnumerable<BudgetRecord>? existingBudgets = null);
}
public class BudgetSavingsService(
IBudgetRepository budgetRepository,
IBudgetArchiveRepository budgetArchiveRepository,
ITransactionStatisticsService transactionStatisticsService,
IConfigService configService,
IDateTimeProvider dateTimeProvider
) : IBudgetSavingsService
{
public async Task<BudgetResult> GetSavingsDtoAsync(
BudgetPeriodType periodType,
DateTime? referenceDate = null,
IEnumerable<BudgetRecord>? existingBudgets = null)
{
var budgets = existingBudgets;
if (existingBudgets == null)
{
budgets = await budgetRepository.GetAllAsync();
}
if (budgets == null)
{
throw new InvalidOperationException("No budgets found.");
}
budgets = budgets
// 排序顺序 1.硬性预算 2.月度->年度 3.实际金额倒叙
.OrderBy(b => b.IsMandatoryExpense)
.ThenBy(b => b.Type)
.ThenByDescending(b => b.Limit);
var year = referenceDate?.Year ?? dateTimeProvider.Now.Year;
var month = referenceDate?.Month ?? dateTimeProvider.Now.Month;
if (periodType == BudgetPeriodType.Month)
{
return await GetForMonthAsync(budgets, year, month);
}
else if (periodType == BudgetPeriodType.Year)
{
return await GetForYearAsync(budgets, year);
}
throw new NotSupportedException($"Period type {periodType} is not supported.");
}
private async Task<BudgetResult> GetForMonthAsync(
IEnumerable<BudgetRecord> budgets,
int year,
int month)
{
var transactionClassify = await transactionStatisticsService.GetAmountGroupByClassifyAsync(
new DateTime(year, month, 1),
new DateTime(year, month, 1).AddMonths(1)
);
var monthlyIncomeItems = new List<(string name, decimal limit, decimal current, bool isMandatory)>();
var monthlyExpenseItems = new List<(string name, decimal limit, decimal current, bool isMandatory)>();
var monthlyBudgets = budgets
.Where(b => b.Type == BudgetPeriodType.Month);
foreach (var budget in monthlyBudgets)
{
var classifyList = budget.SelectedCategories.Split(',', StringSplitOptions.RemoveEmptyEntries);
decimal currentAmount = 0;
var transactionType = budget.Category switch
{
BudgetCategory.Income => TransactionType.Income,
BudgetCategory.Expense => TransactionType.Expense,
_ => throw new NotSupportedException($"Budget category {budget.Category} is not supported.")
};
foreach (var classify in classifyList)
{
// 获取分类+收入支出类型一致的金额
if (transactionClassify.TryGetValue((classify, transactionType), out var amount))
{
currentAmount += amount;
}
}
// 硬性预算 如果实际发生金额小于 应(总天数/实际天数)发生金额
// 直接取应发生金额(为了预算的准确性)
if (budget.IsMandatoryExpense && currentAmount == 0)
{
currentAmount = budget.Limit / DateTime.DaysInMonth(year, month) * dateTimeProvider.Now.Day;
}
if (budget.Category == BudgetCategory.Income)
{
monthlyIncomeItems.Add((
name: budget.Name,
limit: budget.Limit,
current: currentAmount,
isMandatory: budget.IsMandatoryExpense
));
}
else if (budget.Category == BudgetCategory.Expense)
{
monthlyExpenseItems.Add((
name: budget.Name,
limit: budget.Limit,
current: currentAmount,
isMandatory: budget.IsMandatoryExpense
));
}
}
var yearlyIncomeItems = new List<(string name, decimal limit, decimal current)>();
var yearlyExpenseItems = new List<(string name, decimal limit, decimal current)>();
var yearlyBudgets = budgets
.Where(b => b.Type == BudgetPeriodType.Year);
// 只需要考虑实际发生在本月的年度预算 因为他会影响到月度的结余情况
foreach (var budget in yearlyBudgets)
{
var classifyList = budget.SelectedCategories.Split(',', StringSplitOptions.RemoveEmptyEntries);
decimal currentAmount = 0;
var transactionType = budget.Category switch
{
BudgetCategory.Income => TransactionType.Income,
BudgetCategory.Expense => TransactionType.Expense,
_ => throw new NotSupportedException($"Budget category {budget.Category} is not supported.")
};
foreach (var classify in classifyList)
{
// 获取分类+收入支出类型一致的金额
if (transactionClassify.TryGetValue((classify, transactionType), out var amount))
{
currentAmount += amount;
}
}
if (currentAmount == 0)
{
continue;
}
if (budget.Category == BudgetCategory.Income)
{
yearlyIncomeItems.Add((
name: budget.Name,
limit: budget.Limit,
current: currentAmount
));
}
else if (budget.Category == BudgetCategory.Expense)
{
yearlyExpenseItems.Add((
name: budget.Name,
limit: budget.Limit,
current: currentAmount
));
}
}
var description = new StringBuilder();
#region
description.AppendLine("<h3>月度预算收入明细</h3>");
description.AppendLine("""
<table>
<thead>
<tr>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
""");
foreach (var item in monthlyIncomeItems)
{
description.AppendLine($"""
<tr>
<td>{item.name}</td>
<td>{item.limit:N0}</td>
<td>{(item.isMandatory ? "" : "")}</td>
</tr>
""");
}
description.AppendLine("</tbody></table>");
description.AppendLine($"""
<p>
收入合计:
<span class='income-value'>
<strong>{monthlyIncomeItems.Sum(item => item.limit):N0}</strong>
</span>
</p>
""");
description.AppendLine("<h3>月度预算支出明细</h3>");
description.AppendLine("""
<table>
<thead>
<tr>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
""");
foreach (var item in monthlyExpenseItems)
{
description.AppendLine($"""
<tr>
<td>{item.name}</td>
<td>{item.limit:N0}</td>
<td>{(item.isMandatory ? "" : "")}</td>
</tr>
""");
}
description.AppendLine("</tbody></table>");
description.AppendLine($"""
<p>
支出合计:
<span class='expense-value'>
<strong>{monthlyExpenseItems.Sum(item => item.limit):N0}</strong>
</span>
</p>
""");
#endregion
#region
if (yearlyIncomeItems.Any())
{
description.AppendLine("<h3>年度收入预算(发生在本月)</h3>");
description.AppendLine("""
<table>
<thead>
<tr>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
""");
foreach (var item in yearlyIncomeItems)
{
description.AppendLine($"""
<tr>
<td>{item.name}</td>
<td>{(item.limit == 0 ? "" : item.limit.ToString("N0"))}</td>
<td><span class='income-value'>{item.current:N0}</span></td>
</tr>
""");
}
description.AppendLine("</tbody></table>");
description.AppendLine($"""
<p>
收入合计:
<span class='income-value'>
<strong>{yearlyIncomeItems.Sum(item => item.current):N0}</strong>
</span>
</p>
""");
}
if (yearlyExpenseItems.Any())
{
description.AppendLine("<h3>年度支出预算(发生在本月)</h3>");
description.AppendLine("""
<table>
<thead>
<tr>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
""");
foreach (var item in yearlyExpenseItems)
{
description.AppendLine($"""
<tr>
<td>{item.name}</td>
<td>{(item.limit == 0 ? "" : item.limit.ToString("N0"))}</td>
<td><span class='expense-value'>{item.current:N0}</span></td>
</tr>
""");
}
description.AppendLine("</tbody></table>");
description.AppendLine($"""
<p>
支出合计:
<span class='expense-value'>
<strong>{yearlyExpenseItems.Sum(item => item.current):N0}</strong>
</span>
</p>
""");
}
#endregion
#region
description.AppendLine("<h3>存款计划结论</h3>");
var plannedIncome = monthlyIncomeItems.Sum(item => item.limit == 0 ? item.current : item.limit) + yearlyIncomeItems.Sum(item => item.current);
var plannedExpense = monthlyExpenseItems.Sum(item => item.limit == 0 ? item.current : item.limit) + yearlyExpenseItems.Sum(item => item.current);
var expectedSavings = plannedIncome - plannedExpense;
description.AppendLine($"""
<p>
计划存款:
<span class='income-value'>
<strong>{expectedSavings:N0}</strong>
</span>
=
</p>
<p>
&nbsp;&nbsp;&nbsp;&nbsp;
计划收入:
<span class='income-value'>
<strong>{monthlyIncomeItems.Sum(item => item.limit):N0}</strong>
</span>
</p>
""");
if (yearlyIncomeItems.Count > 0)
{
description.AppendLine($"""
<p>
&nbsp;&nbsp;&nbsp;&nbsp;
+ 本月发生的年度预算收入:
<span class='income-value'>
<strong>{yearlyIncomeItems.Sum(item => item.current):N0}</strong>
</span>
</p>
""");
}
description.AppendLine($"""
<p>
&nbsp;&nbsp;&nbsp;&nbsp;
- 计划支出:
<span class='expense-value'>
<strong>{monthlyExpenseItems.Sum(item => item.limit):N0}</strong>
</span>
""");
if (yearlyExpenseItems.Count > 0)
{
description.AppendLine($"""
<p>
&nbsp;&nbsp;&nbsp;&nbsp;
- 本月发生的年度预算支出:
<span class='expense-value'>
<strong>{yearlyExpenseItems.Sum(item => item.current):N0}</strong>
</span>
</p>
""");
}
description.AppendLine($"""
</p>
""");
#endregion
var savingsCategories = await configService.GetConfigByKeyAsync<string>("SavingsCategories") ?? string.Empty;
var currentActual = 0m;
if (!string.IsNullOrEmpty(savingsCategories))
{
var cats = new HashSet<string>(savingsCategories.Split(',', StringSplitOptions.RemoveEmptyEntries));
foreach (var kvp in transactionClassify)
{
if (cats.Contains(kvp.Key.Item1))
{
currentActual += kvp.Value;
}
}
}
var record = new BudgetRecord
{
Id = -2,
Name = "月度存款计划",
Type = BudgetPeriodType.Month,
Limit = expectedSavings,
Category = BudgetCategory.Savings,
SelectedCategories = savingsCategories,
StartDate = new DateTime(year, month, 1),
NoLimit = false,
IsMandatoryExpense = false,
CreateTime = dateTimeProvider.Now,
UpdateTime = dateTimeProvider.Now
};
return BudgetResult.FromEntity(
record,
currentActual,
new DateTime(year, month, 1),
description.ToString()
);
}
private async Task<BudgetResult> GetForYearAsync(
IEnumerable<BudgetRecord> budgets,
int year)
{
// 因为非当前月份的读取归档数据,这边依然是读取当前月份的数据
var currentMonth = dateTimeProvider.Now.Month;
var transactionClassify = await transactionStatisticsService.GetAmountGroupByClassifyAsync(
new DateTime(year, currentMonth, 1),
new DateTime(year, currentMonth, 1).AddMonths(1)
);
var currentMonthlyIncomeItems = new List<(long id, string name, decimal limit, int factor, decimal current, bool isMandatory)>();
var currentYearlyIncomeItems = new List<(long id, string name, decimal limit, int factor, decimal current, bool isMandatory)>();
var currentMonthlyExpenseItems = new List<(long id, string name, decimal limit, int factor, decimal current, bool isMandatory)>();
var currentYearlyExpenseItems = new List<(long id, string name, decimal limit, int factor, decimal current, bool isMandatory)>();
// 归档的预算收入支出明细
var archiveIncomeItems = new List<(long id, string name, int[] months, decimal limit, decimal current)>();
var archiveExpenseItems = new List<(long id, string name, int[] months, decimal limit, decimal current)>();
var archiveSavingsItems = new List<(long id, string name, int[] months, decimal limit, decimal current)>();
// 获取归档数据
var archives = await budgetArchiveRepository.GetArchivesByYearAsync(year);
var archiveBudgetGroups = archives
.SelectMany(a => a.Content.Select(x => (a.Month, Archive: x)))
.Where(b => b.Archive.Type == BudgetPeriodType.Month) // 因为本来就是当前年度预算的生成 ,归档无需关心年度, 以最新地为准即可
.GroupBy(b => (b.Archive.Id, b.Archive.Limit));
foreach (var archiveBudgetGroup in archiveBudgetGroups)
{
var (_, archive) = archiveBudgetGroup.First();
var archiveItems = archive.Category switch
{
BudgetCategory.Income => archiveIncomeItems,
BudgetCategory.Expense => archiveExpenseItems,
BudgetCategory.Savings => archiveSavingsItems,
_ => throw new NotSupportedException($"Category {archive.Category} is not supported.")
};
archiveItems.Add((
id: archiveBudgetGroup.Key.Id,
name: archive.Name,
months: archiveBudgetGroup.Select(x => x.Month).OrderBy(m => m).ToArray(),
limit: archiveBudgetGroup.Key.Limit,
current: archiveBudgetGroup.Sum(x => x.Archive.Actual)
));
}
// 处理当月最新地没有归档的预算
foreach (var budget in budgets)
{
var currentAmount = 0m;
var classifyList = budget.SelectedCategories.Split(',', StringSplitOptions.RemoveEmptyEntries);
var transactionType = budget.Category switch
{
BudgetCategory.Income => TransactionType.Income,
BudgetCategory.Expense => TransactionType.Expense,
_ => throw new NotSupportedException($"Budget category {budget.Category} is not supported.")
};
foreach (var classify in classifyList)
{
// 获取分类+收入支出类型一致的金额
if (transactionClassify.TryGetValue((classify, transactionType), out var amount))
{
currentAmount += amount;
}
}
// 硬性预算 如果实际发生金额小于 应(总天数/实际天数)发生金额
// 直接取应发生金额(为了预算的准确性)
if (budget.IsMandatoryExpense && currentAmount == 0)
{
currentAmount = budget.IsMandatoryExpense && currentAmount == 0
? budget.Limit / (DateTime.IsLeapYear(year) ? 366 : 365) * dateTimeProvider.Now.DayOfYear
: budget.Limit / DateTime.DaysInMonth(year, currentMonth) * dateTimeProvider.Now.Day;
}
AddOrIncCurrentItem(
budget.Id,
budget.Type,
budget.Category,
budget.Name,
budget.Limit,
budget.Type == BudgetPeriodType.Year
? 1
: 12 - currentMonth + 1,
currentAmount,
budget.IsMandatoryExpense
);
}
var description = new StringBuilder();
#region
var archiveIncomeDiff = 0m;
if (archiveIncomeItems.Any())
{
description.AppendLine("<h3>已归档收入明细</h3>");
description.AppendLine("""
<table>
<thead>
<tr>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
</tbody>
""");
// 已归档的收入
foreach (var (_, name, months, limit, current) in archiveIncomeItems)
{
description.AppendLine($"""
<tr>
<td>{name}</td>
<td>{(limit == 0 ? "" : limit.ToString("N0"))}</td>
<td>{FormatMonths(months)}</td>
<td>{limit * months.Length:N0}</td>
<td><span class='income-value'>{current:N0}</span></td>
</tr>
""");
}
description.AppendLine("</tbody></table>");
archiveIncomeDiff = archiveIncomeItems.Sum(i => i.current) - archiveIncomeItems.Sum(i => i.limit * i.months.Length);
description.AppendLine($"""
<p>
<span class="highlight">已归档收入总结: </span>
{(archiveIncomeDiff > 0 ? "超额收入" : "未达预期")}:
<span class='{(archiveIncomeDiff > 0 ? "income-value" : "expense-value")}'>
<strong>{archiveIncomeDiff:N0}</strong>
</span>
=
<span class='income-value'>
<strong>{archiveIncomeItems.Sum(i => i.limit * i.months.Length):N0}</strong>
</span>
-
:
<span class='income-value'>
<strong>{archiveIncomeItems.Sum(i => i.current):N0}</strong>
</span>
</p>
""");
}
#endregion
#region
description.AppendLine("<h3>预算收入明细</h3>");
description.AppendLine("""
<table>
<thead>
<tr>
<th></th>
<th></th>
<th>/</th>
<th></th>
</tr>
</thead>
<tbody>
""");
// 当前预算
foreach (var (_, name, limit, factor, _, _) in currentMonthlyIncomeItems)
{
description.AppendLine($"""
<tr>
<td>{name}</td>
<td>{(limit == 0 ? "" : limit.ToString("N0"))}</td>
<td>{FormatMonthsByFactor(factor)}</td>
<td>{(limit == 0 ? "不限额" : (limit * factor).ToString("N0"))}</td>
</tr>
""");
}
// 年预算
foreach (var (_, name, limit, _, _, _) in currentYearlyIncomeItems)
{
description.AppendLine($"""
<tr>
<td>{name}</td>
<td>{(limit == 0 ? "" : limit.ToString("N0"))}</td>
<td>{year}</td>
<td>{(limit == 0 ? "不限额" : limit.ToString("N0"))}</td>
</tr>
""");
}
description.AppendLine("</tbody></table>");
description.AppendLine($"""
<p>
预算收入合计:
<span class='expense-value'>
<strong>
{currentMonthlyIncomeItems.Sum(i => i.limit * i.factor)
+ currentYearlyIncomeItems.Sum(i => i.limit):N0}
</strong>
</span>
</p>
""");
#endregion
#region
var archiveExpenseDiff = 0m;
if (archiveExpenseItems.Any())
{
description.AppendLine("<h3>已归档支出明细</h3>");
description.AppendLine("""
<table>
<thead>
<tr>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
""");
// 已归档的支出
foreach (var (_, name, months, limit, current) in archiveExpenseItems)
{
description.AppendLine($"""
<tr>
<td>{name}</td>
<td>{(limit == 0 ? "" : limit.ToString("N0"))}</td>
<td>{FormatMonths(months)}</td>
<td>{limit * months.Length:N0}</td>
<td><span class='expense-value'>{current:N0}</span></td>
</tr>
""");
}
description.AppendLine("</tbody></table>");
archiveExpenseDiff = archiveExpenseItems.Sum(i => i.limit * i.months.Length) - archiveExpenseItems.Sum(i => i.current);
description.AppendLine($"""
<p>
<span class="highlight">已归档支出总结: </span>
{(archiveExpenseDiff > 0 ? "节省支出" : "超支")}:
<span class='{(archiveExpenseDiff > 0 ? "income-value" : "expense-value")}'>
<strong>{archiveExpenseDiff:N0}</strong>
</span>
=
<span class='expense-value'>
<strong>{archiveExpenseItems.Sum(i => i.limit * i.months.Length):N0}</strong>
</span>
- :
<span class='expense-value'>
<strong>{archiveExpenseItems.Sum(i => i.current):N0}</strong>
</span>
</p>
""");
}
#endregion
#region
var archiveSavingsDiff = 0m;
if (archiveSavingsItems.Any())
{
description.AppendLine("<h3>已归档存款明细</h3>");
description.AppendLine("""
<table>
<thead>
<tr>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
""");
// 已归档的存款
foreach (var (_, name, months, limit, current) in archiveSavingsItems)
{
description.AppendLine($"""
<tr>
<td>{name}</td>
<td>{(limit == 0 ? "" : limit.ToString("N0"))}</td>
<td>{FormatMonths(months)}</td>
<td>{limit * months.Length:N0}</td>
<td><span class='income-value'>{current:N0}</span></td>
</tr>
""");
}
description.AppendLine("</tbody></table>");
archiveSavingsDiff = archiveSavingsItems.Sum(i => i.current) - archiveSavingsItems.Sum(i => i.limit * i.months.Length);
description.AppendLine($"""
<p>
<span class="highlight">已归档存款总结: </span>
{(archiveSavingsDiff > 0 ? "超额存款" : "未达预期")}:
<span class='{(archiveSavingsDiff > 0 ? "income-value" : "expense-value")}'>
<strong>{archiveSavingsDiff:N0}</strong>
</span>
=
:
<span class='income-value'>
<strong>{archiveSavingsItems.Sum(i => i.current):N0}</strong>
</span>
-
:
<span class='income-value'>
<strong>{archiveSavingsItems.Sum(i => i.limit * i.months.Length):N0}</strong>
</span>
</p>
""");
}
#endregion
#region
description.AppendLine("<h3>预算支出明细</h3>");
description.AppendLine("""
<table>
<thead>
<tr>
<th></th>
<th></th>
<th>/</th>
<th></th>
</tr>
</thead>
<tbody>
""");
// 未来月预算
foreach (var (_, name, limit, factor, _, _) in currentMonthlyExpenseItems)
{
description.AppendLine($"""
<tr>
<td>{name}</td>
<td>{(limit == 0 ? "" : limit.ToString("N0"))}</td>
<td>{FormatMonthsByFactor(factor)}</td>
<td>{(limit == 0 ? "不限额" : (limit * factor).ToString("N0"))}</td>
</tr>
""");
}
// 年预算
foreach (var (_, name, limit, _, _, _) in currentYearlyExpenseItems)
{
description.AppendLine($"""
<tr>
<td>{name}</td>
<td>{(limit == 0 ? "" : limit.ToString("N0"))}</td>
<td>{year}</td>
<td>{(limit == 0 ? "不限额" : limit.ToString("N0"))}</td>
</tr>
""");
}
description.AppendLine("</tbody></table>");
// 合计
description.AppendLine($"""
<p>
支出预算合计:
<span class='expense-value'>
<strong>
{currentMonthlyExpenseItems.Sum(i => i.limit * i.factor)
+ currentYearlyExpenseItems.Sum(i => i.limit):N0}
</strong>
</span>
</p>
""");
#endregion
#region
var archiveIncomeBudget = archiveIncomeItems.Sum(i => i.limit * i.months.Length);
var archiveExpenseBudget = archiveExpenseItems.Sum(i => i.limit * i.months.Length);
// 如果有归档存款数据,直接使用;否则用收入-支出计算
var archiveSavings = archiveSavingsItems.Any()
? archiveSavingsItems.Sum(i => i.current)
: archiveIncomeBudget - archiveExpenseBudget + archiveIncomeDiff + archiveExpenseDiff;
var expectedIncome = currentMonthlyIncomeItems.Sum(i => i.limit == 0 ? i.current : i.limit * i.factor) + currentYearlyIncomeItems.Sum(i => i.isMandatory || i.limit == 0 ? i.current : i.limit);
var expectedExpense = currentMonthlyExpenseItems.Sum(i => i.limit == 0 ? i.current : i.limit * i.factor) + currentYearlyExpenseItems.Sum(i => i.isMandatory || i.limit == 0 ? i.current : i.limit);
var expectedSavings = expectedIncome - expectedExpense;
description.AppendLine("<h3>存款计划结论</h3>");
description.AppendLine($"""
<p>
<strong>归档存款:</strong>
<span class='income-value'><strong>{archiveSavings:N0}</strong></span>
=
归档收入: <span class='income-value'>{archiveIncomeBudget:N0}</span>
-
归档支出: <span class='expense-value'>{archiveExpenseBudget:N0}</span>
{(archiveIncomeDiff >= 0 ? " + " : " - ")}: <span class='{(archiveIncomeDiff >= 0 ? "income-value" : "expense-value")}'>{(archiveIncomeDiff >= 0 ? archiveIncomeDiff : -archiveIncomeDiff):N0}</span>
{(archiveExpenseDiff >= 0 ? " + 节省支出" : " - 超额支出")}: <span class='{(archiveExpenseDiff >= 0 ? "income-value" : "expense-value")}'>{(archiveExpenseDiff >= 0 ? archiveExpenseDiff : -archiveExpenseDiff):N0}</span>
</p>
<p>
<strong></strong>
<span class='income-value'><strong>{expectedSavings:N0}</strong></span>
=
: <span class='income-value'>{expectedIncome:N0}</span>
-
: <span class='expense-value'>{expectedExpense:N0}</span>
</p>
<p>
<strong></strong>
<span class='{(archiveSavings + expectedSavings > 0 ? "income-value" : "expense-value")}'>
<strong>{archiveSavings + expectedSavings:N0}</strong>
</span>
=
:
<span class='income-value'>{expectedSavings:N0}</span>
{(archiveSavings > 0 ? "+" : "-")}
:
<span class='{(archiveSavings > 0 ? "income-value" : "expense-value")}'>{Math.Abs(archiveSavings):N0}</span>
</p>
""");
#endregion
var savingsCategories = await configService.GetConfigByKeyAsync<string>("SavingsCategories") ?? string.Empty;
var currentActual = 0m;
if (!string.IsNullOrEmpty(savingsCategories))
{
var cats = new HashSet<string>(savingsCategories.Split(',', StringSplitOptions.RemoveEmptyEntries));
foreach (var kvp in transactionClassify)
{
if (cats.Contains(kvp.Key.Item1))
{
currentActual += kvp.Value;
}
}
}
var record = new BudgetRecord
{
Id = -1,
Name = "年度存款计划",
Type = BudgetPeriodType.Year,
Limit = archiveSavings + expectedSavings,
Category = BudgetCategory.Savings,
SelectedCategories = savingsCategories,
StartDate = new DateTime(year, 1, 1),
NoLimit = false,
IsMandatoryExpense = false,
CreateTime = dateTimeProvider.Now,
UpdateTime = dateTimeProvider.Now
};
return BudgetResult.FromEntity(
record,
currentActual,
new DateTime(year, 1, 1),
description.ToString()
);
void AddOrIncCurrentItem(
long id,
BudgetPeriodType periodType,
BudgetCategory category,
string name,
decimal limit,
int factor,
decimal incAmount,
bool isMandatory)
{
var current = (periodType, category) switch
{
(BudgetPeriodType.Month, BudgetCategory.Income) => currentMonthlyIncomeItems,
(BudgetPeriodType.Month, BudgetCategory.Expense) => currentMonthlyExpenseItems,
(BudgetPeriodType.Year, BudgetCategory.Income) => currentYearlyIncomeItems,
(BudgetPeriodType.Year, BudgetCategory.Expense) => currentYearlyExpenseItems,
_ => throw new NotSupportedException($"Category {category} is not supported.")
};
if (current.Any(i => i.id == id))
{
var existing = current.First(i => i.id == id);
current.Remove(existing);
current.Add((id, existing.name, existing.limit, existing.factor + factor, existing.current + incAmount, isMandatory));
}
else
{
current.Add((id, name, limit, factor, incAmount, isMandatory));
}
}
string FormatMonthsByFactor(int factor)
{
var months = factor == 12
? Enumerable.Range(1, 12).ToArray()
: Enumerable.Range(dateTimeProvider.Now.Month, factor).ToArray();
return FormatMonths(months.ToArray());
}
string FormatMonths(int[] months)
{
// 如果是连续的月份 则简化显示 1~3
Array.Sort(months);
if (months.Length >= 2)
{
var isContinuous = true;
for (var i = 1; i < months.Length; i++)
{
if (months[i] != months[i - 1] + 1)
{
isContinuous = false;
break;
}
}
if (isContinuous)
{
return $"{months.First()}~{months.Last()}月";
}
}
return string.Join(", ", months) + "月";
}
}
}

View File

@@ -0,0 +1,548 @@
using Service.AI;
using Service.Message;
using Service.Transaction;
namespace Service.Budget;
public interface IBudgetService
{
Task<List<BudgetResult>> GetListAsync(DateTime referenceDate);
Task<string> ArchiveBudgetsAsync(int year, int month);
/// <summary>
/// 获取指定分类的统计信息(月度和年度)
/// </summary>
Task<BudgetCategoryStats> GetCategoryStatsAsync(BudgetCategory category, DateTime referenceDate);
/// <summary>
/// 获取未被预算覆盖的分类统计信息
/// </summary>
Task<List<UncoveredCategoryDetail>> GetUncoveredCategoriesAsync(BudgetCategory category, DateTime? referenceDate = null);
Task<string?> GetArchiveSummaryAsync(int year, int month);
/// <summary>
/// 获取指定周期的存款预算信息
/// </summary>
Task<BudgetResult?> GetSavingsBudgetAsync(int year, int month, BudgetPeriodType type);
}
[UsedImplicitly]
public class BudgetService(
IBudgetRepository budgetRepository,
IBudgetArchiveRepository budgetArchiveRepository,
ITransactionRecordRepository transactionRecordRepository,
ITransactionStatisticsService transactionStatisticsService,
IOpenAiService openAiService,
IMessageService messageService,
ILogger<BudgetService> logger,
IBudgetSavingsService budgetSavingsService,
IDateTimeProvider dateTimeProvider,
IBudgetStatsService budgetStatsService
) : IBudgetService
{
public async Task<List<BudgetResult>> GetListAsync(DateTime referenceDate)
{
var year = referenceDate.Year;
var month = referenceDate.Month;
var isArchive = year < dateTimeProvider.Now.Year
|| (year == dateTimeProvider.Now.Year && month < dateTimeProvider.Now.Month);
if (isArchive)
{
var archive = await budgetArchiveRepository.GetArchiveAsync(year, month);
if (archive != null)
{
var (start, end) = GetPeriodRange(dateTimeProvider.Now, BudgetPeriodType.Month, referenceDate);
return [.. archive.Content.Select(c => new BudgetResult
{
Id = c.Id,
Name = c.Name,
Type = c.Type,
Limit = c.Limit,
Current = c.Actual,
Category = c.Category,
SelectedCategories = c.SelectedCategories,
NoLimit = c.NoLimit,
IsMandatoryExpense = c.IsMandatoryExpense,
Description = c.Description,
PeriodStart = start,
PeriodEnd = end,
})];
}
logger.LogWarning("获取预算列表时发现归档数据缺失Year: {Year}, Month: {Month}", year, month);
}
var budgets = await budgetRepository.GetAllAsync();
var dtos = new List<BudgetResult?>();
foreach (var budget in budgets)
{
var currentAmount = await CalculateCurrentAmountAsync(budget, referenceDate);
dtos.Add(BudgetResult.FromEntity(budget, currentAmount, referenceDate));
}
// 创造虚拟的存款预算
dtos.Add(await budgetSavingsService.GetSavingsDtoAsync(
BudgetPeriodType.Month,
referenceDate,
budgets));
dtos.Add(await budgetSavingsService.GetSavingsDtoAsync(
BudgetPeriodType.Year,
referenceDate,
budgets));
dtos = dtos
.Where(x => x != null)
.Cast<BudgetResult>()
.OrderByDescending(x => x.IsMandatoryExpense)
.ThenBy(x => x.Type)
.ThenByDescending(x => x.Current)
.ToList()!;
return [.. dtos.Where(dto => dto != null).Cast<BudgetResult>()];
}
public async Task<BudgetResult?> GetSavingsBudgetAsync(int year, int month, BudgetPeriodType type)
{
var referenceDate = new DateTime(year, month, 1);
return await budgetSavingsService.GetSavingsDtoAsync(type, referenceDate);
}
public async Task<BudgetCategoryStats> GetCategoryStatsAsync(BudgetCategory category, DateTime referenceDate)
{
return await budgetStatsService.GetCategoryStatsAsync(category, referenceDate);
}
public async Task<List<UncoveredCategoryDetail>> GetUncoveredCategoriesAsync(BudgetCategory category, DateTime? referenceDate = null)
{
var date = referenceDate ?? dateTimeProvider.Now;
var transactionType = category switch
{
BudgetCategory.Expense => TransactionType.Expense,
BudgetCategory.Income => TransactionType.Income,
_ => TransactionType.None
};
if (transactionType == TransactionType.None) return [];
// 1. 获取所有预算
var budgets = (await budgetRepository.GetAllAsync()).ToList();
var coveredCategories = budgets
.Where(b => b.Category == category)
.SelectMany(b => b.SelectedCategories.Split(',', StringSplitOptions.RemoveEmptyEntries))
.ToHashSet();
// 2. 获取分类统计
var stats = await transactionStatisticsService.GetCategoryStatisticsAsync(date.Year, date.Month, transactionType);
// 3. 过滤未覆盖的
return stats
.Where(s => !coveredCategories.Contains(s.Classify))
.Select(s => new UncoveredCategoryDetail
{
Category = s.Classify,
TransactionCount = s.Count,
TotalAmount = s.Amount
})
.OrderByDescending(x => x.TotalAmount)
.ToList();
}
public async Task<string?> GetArchiveSummaryAsync(int year, int month)
{
var archive = await budgetArchiveRepository.GetArchiveAsync(year, month);
return archive?.Summary;
}
public async Task<string> ArchiveBudgetsAsync(int year, int month)
{
var referenceDate = new DateTime(year, month, 1);
var budgets = await GetListAsync(referenceDate);
var expenseSurplus = budgets
.Where(b => b.Category == BudgetCategory.Expense && !b.NoLimit && b.Type == BudgetPeriodType.Month)
.Sum(b => b.Limit - b.Current);
var incomeSurplus = budgets
.Where(b => b.Category == BudgetCategory.Income && !b.NoLimit && b.Type == BudgetPeriodType.Month)
.Sum(b => b.Current - b.Limit);
var content = budgets.Select(b => new BudgetArchiveContent
{
Id = b.Id,
Name = b.Name,
Type = b.Type,
Limit = b.Limit,
Actual = b.Current,
Category = b.Category,
SelectedCategories = b.SelectedCategories,
NoLimit = b.NoLimit,
IsMandatoryExpense = b.IsMandatoryExpense,
Description = b.Description
}).ToArray();
var archive = await budgetArchiveRepository.GetArchiveAsync(year, month);
if (archive != null)
{
archive.Content = content;
archive.ArchiveDate = dateTimeProvider.Now;
archive.ExpenseSurplus = expenseSurplus;
archive.IncomeSurplus = incomeSurplus;
if (!await budgetArchiveRepository.UpdateAsync(archive))
{
return "更新预算归档失败";
}
}
else
{
archive = new BudgetArchive
{
Year = year,
Month = month,
Content = content,
ArchiveDate = dateTimeProvider.Now,
ExpenseSurplus = expenseSurplus,
IncomeSurplus = incomeSurplus
};
if (!await budgetArchiveRepository.AddAsync(archive))
{
return "保存预算归档失败";
}
}
_ = NotifyAsync(year, month);
return string.Empty;
}
private async Task NotifyAsync(int year, int month)
{
try
{
var archives = await budgetArchiveRepository.GetListAsync(year, month);
var archiveData = archives.SelectMany(a => a.Content.Select(c => new
{
c.Name,
Type = c.Type.ToString(),
c.Limit,
c.Actual,
Category = c.Category.ToString(),
c.SelectedCategories
})).ToList();
var yearTransactions = await transactionRecordRepository.ExecuteDynamicSqlAsync(
$"""
SELECT
COUNT(*) AS TransactionCount,
SUM(ABS(Amount)) AS TotalAmount,
Type,
Classify
FROM TransactionRecord
WHERE OccurredAt >= '{year}-01-01'
AND OccurredAt < '{year + 1}-01-01'
GROUP BY Type, Classify
ORDER BY TotalAmount DESC
"""
);
var monthYear = new DateTime(year, month, 1).AddMonths(1);
var monthTransactions = await transactionRecordRepository.ExecuteDynamicSqlAsync(
$"""
SELECT
COUNT(*) AS TransactionCount,
SUM(ABS(Amount)) AS TotalAmount,
Type,
Classify
FROM TransactionRecord
WHERE OccurredAt >= '{year}-{month:00}-01'
AND OccurredAt < '{monthYear:yyyy-MM-dd}'
GROUP BY Type, Classify
ORDER BY TotalAmount DESC
"""
);
// 分析未被预算覆盖的分类 (仅针对支出类型 Type=0)
var budgetedCategories = archiveData
.SelectMany(b => b.SelectedCategories)
.Where(c => !string.IsNullOrEmpty(c))
.Distinct()
.ToHashSet();
var uncovered = monthTransactions
.Where(t =>
{
var dict = (IDictionary<string, object>)t;
var classify = dict["Classify"].ToString() ?? "";
var type = Convert.ToInt32(dict["Type"]);
return type == 0 && !budgetedCategories.Contains(classify);
})
.ToList();
logger.LogInformation("预算执行数据{JSON}", JsonSerializer.Serialize(archiveData));
logger.LogInformation("本月消费明细{JSON}", JsonSerializer.Serialize(monthTransactions));
logger.LogInformation("全年累计消费概况{JSON}", JsonSerializer.Serialize(yearTransactions));
logger.LogInformation("未被预算覆盖的分类{JSON}", JsonSerializer.Serialize(uncovered));
var dataPrompt = $"""
报告周期:{year}年{month}月
1. 预算执行数据JSON
{JsonSerializer.Serialize(archiveData)}
2. 本月账单类目明细(按分类, JSON
{JsonSerializer.Serialize(monthTransactions)}
3. 全年累计账单类目明细(按分类, JSON
{JsonSerializer.Serialize(yearTransactions)}
4. 未被任何预算覆盖的支出分类JSON
{JsonSerializer.Serialize(uncovered)}
请生成一份专业且美观的预算执行分析报告,严格遵守以下要求:
【内容要求】
1. 概览:总结本月预算达成情况。
2. 预算详情:使用 HTML 表格展示预算执行明细(预算项、预算额、实际额、使用/达成率、状态)。
3. 超支/异常预警:重点分析超支项或支出异常的分类。
4. 消费透视:针对“未被预算覆盖的支出”提供分析建议。分析这些账单产生的合理性,并评估是否需要为其中的大额或频发分类建立新预算。
5. 改进建议:根据当前时间进度和预算完成进度,基于本月整体收入支出情况,给出下月预算调整或消费改进的专业化建议。
6. 语言风格:专业、清晰、简洁,适合财务报告阅读。
7. 如果报告月份是12月需要报告年度预算的执行情况。
【格式要求】
1. 使用HTML格式移动端H5页面风格
2. 生成清晰的报告标题(基于用户问题)
3. 使用表格展示统计数据table > thead/tbody > tr > th/td
3.1 table要求不能超过屏幕宽度尽可能简洁明了避免冗余信息
3.2 预算金额精确到整数即可实际金额精确到小数点后1位
4. 使用合适的HTML标签h2标题、h3小节、p段落、table表格、ul/li列表、strong强调
5. 支出金额用 <span class='expense-value'>金额</span> 包裹
6. 收入金额用 <span class='income-value'>金额</span> 包裹
7. 重要结论用 <span class='highlight'>内容</span> 高亮
【样式限制(重要)】
8. 不要包含 html、body、head 标签
9. 不要使用任何 style 属性或 <style> 标签
10. 不要设置 background、background-color、color 等样式属性
11. 不要使用 div 包裹大段内容
【系统信息】
当前时间:{dateTimeProvider.Now:yyyy-MM-dd HH:mm:ss}
预算归档周期:{year}年{month}月
直接输出纯净 HTML 内容,不要带有 Markdown 代码块包裹。
""";
var htmlReport = await openAiService.ChatAsync(dataPrompt);
if (!string.IsNullOrEmpty(htmlReport))
{
await messageService.AddAsync(
title: $"{year}年{month}月 - 预算归档报告",
content: htmlReport,
type: MessageType.Html,
url: "/balance?tab=message");
// 同时保存到归档总结
var first = archives.First();
first.Summary = htmlReport;
await budgetArchiveRepository.UpdateAsync(first);
}
}
catch (Exception ex)
{
logger.LogError(ex, "生成预算执行通知报告失败");
}
}
private async Task<decimal> CalculateCurrentAmountAsync(BudgetRecord budget, DateTime? now = null)
{
var referenceDate = now ?? dateTimeProvider.Now;
var (startDate, endDate) = GetPeriodRange(budget.StartDate, budget.Type, referenceDate);
var actualAmount = await budgetRepository.GetCurrentAmountAsync(budget, startDate, endDate);
// 如果是硬性消费,且是当前年当前月,则根据经过的天数累加
if (actualAmount == 0
&& budget.IsMandatoryExpense
&& referenceDate.Year == startDate.Year
&& (budget.Type == BudgetPeriodType.Year || referenceDate.Month == startDate.Month))
{
if (budget.Type == BudgetPeriodType.Month)
{
// 计算本月的天数
var daysInMonth = DateTime.DaysInMonth(referenceDate.Year, referenceDate.Month);
// 计算当前已经过的天数(包括今天)
var daysElapsed = referenceDate.Day;
// 根据预算金额和经过天数计算应累加的金额
var mandatoryAccumulation = budget.Limit * daysElapsed / daysInMonth;
// 返回实际消费和硬性消费累加中的较大值
return mandatoryAccumulation;
}
if (budget.Type == BudgetPeriodType.Year)
{
// 计算本年的天数(考虑闰年)
var daysInYear = DateTime.IsLeapYear(referenceDate.Year) ? 366 : 365;
// 计算当前已经过的天数(包括今天)
var daysElapsed = referenceDate.DayOfYear;
// 根据预算金额和经过天数计算应累加的金额
var mandatoryAccumulation = budget.Limit * daysElapsed / daysInYear;
// 返回实际消费和硬性消费累加中的较大值
return mandatoryAccumulation;
}
}
return actualAmount;
}
internal static (DateTime start, DateTime end) GetPeriodRange(DateTime startDate, BudgetPeriodType type, DateTime referenceDate)
{
DateTime start;
DateTime end;
if (type == BudgetPeriodType.Month)
{
start = new DateTime(referenceDate.Year, referenceDate.Month, 1);
end = start.AddMonths(1).AddDays(-1).AddHours(23).AddMinutes(59).AddSeconds(59);
}
else if (type == BudgetPeriodType.Year)
{
start = new DateTime(referenceDate.Year, 1, 1);
end = new DateTime(referenceDate.Year, 12, 31).AddHours(23).AddMinutes(59).AddSeconds(59);
}
else
{
start = startDate;
end = DateTime.MaxValue;
}
return (start, end);
}
}
public record BudgetResult
{
public long Id { get; set; }
public string Name { get; set; } = string.Empty;
public BudgetPeriodType Type { get; set; }
public decimal Limit { get; set; }
public decimal Current { get; set; }
public BudgetCategory Category { get; set; }
public string[] SelectedCategories { get; set; } = [];
public string StartDate { get; set; } = string.Empty;
public string Period { get; set; } = string.Empty;
public DateTime? PeriodStart { get; set; }
public DateTime? PeriodEnd { get; set; }
public bool NoLimit { get; set; }
public bool IsMandatoryExpense { get; set; }
public string Description { get; set; } = string.Empty;
public static BudgetResult FromEntity(
BudgetRecord entity,
decimal currentAmount,
DateTime referenceDate,
string description = "")
{
var date = referenceDate;
var (start, end) = BudgetService.GetPeriodRange(entity.StartDate, entity.Type, date);
return new BudgetResult
{
Id = entity.Id,
Name = entity.Name,
Type = entity.Type,
Limit = entity.Limit,
Current = currentAmount,
Category = entity.Category,
SelectedCategories = string.IsNullOrEmpty(entity.SelectedCategories)
? []
: entity.SelectedCategories.Split(','),
StartDate = entity.StartDate.ToString("yyyy-MM-dd"),
Period = entity.Type switch
{
BudgetPeriodType.Year => $"{start:yy}年",
BudgetPeriodType.Month => $"{start:yy}年第{start.Month}月",
_ => $"{start:yyyy-MM-dd} ~ {end:yyyy-MM-dd}"
},
PeriodStart = start,
PeriodEnd = end,
NoLimit = entity.NoLimit,
IsMandatoryExpense = entity.IsMandatoryExpense,
Description = description
};
}
}
/// <summary>
/// 预算统计结果 DTO
/// </summary>
public class BudgetStatsDto
{
/// <summary>
/// 统计周期类型Month/Year
/// </summary>
public BudgetPeriodType PeriodType { get; set; }
/// <summary>
/// 使用率百分比0-100
/// </summary>
public decimal Rate { get; set; }
/// <summary>
/// 实际金额
/// </summary>
public decimal Current { get; set; }
/// <summary>
/// 目标/限额金额
/// </summary>
public decimal Limit { get; set; }
/// <summary>
/// 预算项数量
/// </summary>
public int Count { get; set; }
/// <summary>
/// 每日/每月累计金额趋势(对应当前周期内的实际发生额累计值)
/// </summary>
public List<decimal?> Trend { get; set; } = [];
/// <summary>
/// HTML 格式的详细描述(罗列每个预算的额度和实际值及计算公式)
/// </summary>
public string Description { get; set; } = string.Empty;
}
/// <summary>
/// 分类统计结果
/// </summary>
public class BudgetCategoryStats
{
/// <summary>
/// 月度统计
/// </summary>
public BudgetStatsDto Month { get; set; } = new();
/// <summary>
/// 年度统计
/// </summary>
public BudgetStatsDto Year { get; set; } = new();
}
public class UncoveredCategoryDetail
{
public string Category { get; set; } = string.Empty;
public int TransactionCount { get; set; }
public decimal TotalAmount { get; set; }
}

File diff suppressed because it is too large Load Diff

77
Service/ConfigService.cs Normal file
View File

@@ -0,0 +1,77 @@
namespace Service;
public interface IConfigService
{
/// <summary>
/// 根据Key获取配置值
/// </summary>
Task<T?> GetConfigByKeyAsync<T>(string key);
/// <summary>
/// 设置配置值
/// </summary>
Task<bool> SetConfigByKeyAsync<T>(string key, T value);
}
public class ConfigService(IConfigRepository configRepository) : IConfigService
{
public async Task<T?> GetConfigByKeyAsync<T>(string key)
{
var config = await configRepository.GetByKeyAsync(key);
if (config == null || string.IsNullOrEmpty(config.Value))
{
return default;
}
return config.Type switch
{
ConfigType.Boolean => (T)(object)bool.Parse(config.Value),
ConfigType.String => (T)(object)config.Value,
ConfigType.Number => (T)Convert.ChangeType(config.Value, typeof(T)),
ConfigType.Json => JsonSerializer.Deserialize<T>(config.Value) ?? default,
_ => default
};
}
public async Task<bool> SetConfigByKeyAsync<T>(string key, T value)
{
if (value == null)
{
return false;
}
var config = await configRepository.GetByKeyAsync(key);
var type = typeof(T) switch
{
{ } t when t == typeof(bool) => ConfigType.Boolean,
{ } t when t == typeof(int)
|| t == typeof(double)
|| t == typeof(float)
|| t == typeof(decimal) => ConfigType.Number,
{ } t when t == typeof(string) => ConfigType.String,
_ => ConfigType.Json
};
var valueStr = type switch
{
ConfigType.Boolean => value.ToString()!.ToLower(),
ConfigType.Number => value.ToString()!,
ConfigType.String => value as string ?? string.Empty,
ConfigType.Json => JsonSerializer.Serialize(value),
_ => throw new InvalidOperationException("Unsupported config type")
};
if (config == null)
{
config = new ConfigEntity
{
Key = key,
Type = type,
};
return await configRepository.AddAsync(config);
}
config.Value = valueStr;
config.Type = type;
return await configRepository.UpdateAsync(config);
}
}

View File

@@ -1,4 +1,6 @@
using Service.EmailParseServices; using Service.AI;
using Service.EmailServices.EmailParse;
using Service.Message;
namespace Service.EmailServices; namespace Service.EmailServices;
@@ -21,7 +23,7 @@ public class EmailHandleService(
IEmailMessageRepository emailRepo, IEmailMessageRepository emailRepo,
ITransactionRecordRepository trxRepo, ITransactionRecordRepository trxRepo,
IEnumerable<IEmailParseServices> emailParsers, IEnumerable<IEmailParseServices> emailParsers,
IMessageRecordService messageRecordService, IMessageService messageService,
ISmartHandleService smartHandleService ISmartHandleService smartHandleService
) : IEmailHandleService ) : IEmailHandleService
{ {
@@ -62,24 +64,18 @@ public class EmailHandleService(
); );
if (parsed == null || parsed.Length == 0) if (parsed == null || parsed.Length == 0)
{ {
await messageRecordService.AddAsync( await messageService.AddAsync(
"邮件解析失败", "邮件解析失败",
$"来自 {from} 发送给 {to} 的邮件(主题:{subject})未能成功解析内容,可能格式已变更或不受支持。" $"来自 {from} 发送给 {to} 的邮件(主题:{subject})未能成功解析内容,可能格式已变更或不受支持。",
url: "/balance?tab=email"
); );
logger.LogWarning("未能成功解析邮件内容,跳过账单处理"); logger.LogWarning("未能成功解析邮件内容,跳过账单处理");
return true; return true;
} }
await messageRecordService.AddAsync(
"邮件解析成功",
$"来自 {from} 发送给 {to} 的邮件(主题:{subject})已成功解析出 {parsed.Length} 条交易记录。"
);
logger.LogInformation("成功解析邮件,共 {Count} 条交易记录", parsed.Length); logger.LogInformation("成功解析邮件,共 {Count} 条交易记录", parsed.Length);
// TODO 接入AI分类 var allSuccess = true;
// 目前已经
bool allSuccess = true;
var records = new List<TransactionRecord>(); var records = new List<TransactionRecord>();
foreach (var (card, reason, amount, balance, type, occurredAt) in parsed) foreach (var (card, reason, amount, balance, type, occurredAt) in parsed)
{ {
@@ -92,7 +88,8 @@ public class EmailHandleService(
balance, balance,
type, type,
occurredAt ?? date, occurredAt ?? date,
emailMessage.Id emailMessage.Id,
$"邮件 By {GetEmailByName(to)}"
); );
if (record == null) if (record == null)
@@ -104,7 +101,7 @@ public class EmailHandleService(
records.Add(record); records.Add(record);
} }
_ = await AnalyzeClassifyAsync(records.ToArray()); _ = AutoClassifyAsync(records.ToArray());
return allSuccess; return allSuccess;
} }
@@ -147,7 +144,7 @@ public class EmailHandleService(
logger.LogInformation("成功解析邮件,共 {Count} 条交易记录", parsed.Length); logger.LogInformation("成功解析邮件,共 {Count} 条交易记录", parsed.Length);
bool allSuccess = true; var allSuccess = true;
var records = new List<TransactionRecord>(); var records = new List<TransactionRecord>();
foreach (var (card, reason, amount, balance, type, occurredAt) in parsed) foreach (var (card, reason, amount, balance, type, occurredAt) in parsed)
{ {
@@ -160,7 +157,8 @@ public class EmailHandleService(
balance, balance,
type, type,
occurredAt ?? emailMessage.ReceivedDate, occurredAt ?? emailMessage.ReceivedDate,
emailMessage.Id emailMessage.Id,
$"邮件 By {GetEmailByName(emailMessage.To)}"
); );
if (record == null) if (record == null)
@@ -172,11 +170,53 @@ public class EmailHandleService(
records.Add(record); records.Add(record);
} }
_ = await AnalyzeClassifyAsync(records.ToArray()); _ = AutoClassifyAsync(records.ToArray());
return allSuccess; return allSuccess;
} }
private async Task AutoClassifyAsync(TransactionRecord[] records)
{
var clone = records.ToArray().DeepClone();
if (clone?.Any() != true)
{
return;
}
var analyzedList = await AnalyzeClassifyAsync(clone);
foreach (var analyzed in analyzedList)
{
var record = records.FirstOrDefault(r => r.Id == analyzed.Id);
if (record == null)
{
continue;
}
record.UnconfirmedClassify = analyzed.Classify;
record.UnconfirmedType = analyzed.Type;
record.Classify = string.Empty;
}
await trxRepo.UpdateRangeAsync(records);
// 消息
await messageService.AddAsync(
"交易记录待确认分类",
$"共有 {records.Length} 条交易记录待确认分类,请点击前往确认。",
MessageType.Url,
"/unconfirmed-classification"
);
}
private string GetEmailByName(string to)
{
return emailSettings.Value.SmtpList.FirstOrDefault(s => s.Email == to)?.Name ?? to;
}
private async Task<EmailMessage?> SaveEmailAsync( private async Task<EmailMessage?> SaveEmailAsync(
string to, string to,
string from, string from,
@@ -241,7 +281,8 @@ public class EmailHandleService(
decimal balance, decimal balance,
TransactionType type, TransactionType type,
DateTime occurredAt, DateTime occurredAt,
long emailMessageId long emailMessageId,
string importFrom
) )
{ {
// 根据 emailMessageId 检查是否已存在记录:存在则更新,否则新增 // 根据 emailMessageId 检查是否已存在记录:存在则更新,否则新增
@@ -279,7 +320,7 @@ public class EmailHandleService(
Type = type, Type = type,
OccurredAt = occurredAt, OccurredAt = occurredAt,
EmailMessageId = emailMessageId, EmailMessageId = emailMessageId,
ImportFrom = $"邮件" ImportFrom = importFrom
}; };
var inserted = await trxRepo.AddAsync(trx); var inserted = await trxRepo.AddAsync(trx);

View File

@@ -1,4 +1,6 @@
namespace Service.EmailParseServices; using Service.AI;
namespace Service.EmailServices.EmailParse;
public class EmailParseForm95555( public class EmailParseForm95555(
ILogger<EmailParseForm95555> logger, ILogger<EmailParseForm95555> logger,
@@ -26,7 +28,7 @@ public class EmailParseForm95555(
return true; return true;
} }
public override async Task<( public override Task<(
string card, string card,
string reason, string reason,
decimal amount, decimal amount,
@@ -51,7 +53,7 @@ public class EmailParseForm95555(
if (matches.Count <= 0) if (matches.Count <= 0)
{ {
logger.LogWarning("未能从招商银行邮件内容中解析出交易信息"); logger.LogWarning("未能从招商银行邮件内容中解析出交易信息");
return []; return Task.FromResult<(string card, string reason, decimal amount, decimal balance, TransactionType type, DateTime? occurredAt)[]>([]);
} }
var results = new List<( var results = new List<(
@@ -70,7 +72,7 @@ public class EmailParseForm95555(
var balanceStr = match.Groups["balance"].Value; var balanceStr = match.Groups["balance"].Value;
var typeStr = match.Groups["type"].Value; var typeStr = match.Groups["type"].Value;
var reason = match.Groups["reason"].Value; var reason = match.Groups["reason"].Value;
if(string.IsNullOrEmpty(reason)) if (string.IsNullOrEmpty(reason))
{ {
reason = typeStr; reason = typeStr;
} }
@@ -85,7 +87,7 @@ public class EmailParseForm95555(
results.Add((card, reason, amount, balance, type, occurredAt)); results.Add((card, reason, amount, balance, type, occurredAt));
} }
} }
return results.ToArray(); return Task.FromResult(results.ToArray());
} }
private DateTime? ParseOccurredAt(string value) private DateTime? ParseOccurredAt(string value)

View File

@@ -1,12 +1,19 @@
using HtmlAgilityPack; using HtmlAgilityPack;
using Service.AI;
// ReSharper disable ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
// ReSharper disable ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
namespace Service.EmailParseServices; namespace Service.EmailServices.EmailParse;
public class EmailParseFormCCSVC( [UsedImplicitly]
ILogger<EmailParseFormCCSVC> logger, public partial class EmailParseFormCcsvc(
ILogger<EmailParseFormCcsvc> logger,
IOpenAiService openAiService IOpenAiService openAiService
) : EmailParseServicesBase(logger, openAiService) ) : EmailParseServicesBase(logger, openAiService)
{ {
[GeneratedRegex("<.*?>")]
private static partial Regex HtmlRegex();
public override bool CanParse(string from, string subject, string body) public override bool CanParse(string from, string subject, string body)
{ {
if (!from.Contains("ccsvc@message.cmbchina.com")) if (!from.Contains("ccsvc@message.cmbchina.com"))
@@ -20,12 +27,7 @@ public class EmailParseFormCCSVC(
} }
// 必须包含HTML标签 // 必须包含HTML标签
if (!Regex.IsMatch(body, "<.*?>")) return HtmlRegex().IsMatch(body);
{
return false;
}
return true;
} }
public override async Task<( public override async Task<(
@@ -47,7 +49,7 @@ public class EmailParseFormCCSVC(
if (dateNode == null) if (dateNode == null)
{ {
logger.LogWarning("Date node not found"); logger.LogWarning("Date node not found");
return Array.Empty<(string, string, decimal, decimal, TransactionType, DateTime?)>(); return [];
} }
var dateText = dateNode.InnerText.Trim(); var dateText = dateNode.InnerText.Trim();
@@ -56,7 +58,7 @@ public class EmailParseFormCCSVC(
if (!dateMatch.Success || !DateTime.TryParse(dateMatch.Value, out var date)) if (!dateMatch.Success || !DateTime.TryParse(dateMatch.Value, out var date))
{ {
logger.LogWarning("Failed to parse date from: {DateText}", dateText); logger.LogWarning("Failed to parse date from: {DateText}", dateText);
return Array.Empty<(string, string, decimal, decimal, TransactionType, DateTime?)>(); return [];
} }
// 2. Get Balance (Available Limit) // 2. Get Balance (Available Limit)
@@ -90,6 +92,7 @@ public class EmailParseFormCCSVC(
{ {
foreach (var node in transactionNodes) foreach (var node in transactionNodes)
{ {
var card = "";
try try
{ {
// Time // Time
@@ -122,30 +125,23 @@ public class EmailParseFormCCSVC(
descText = HtmlEntity.DeEntitize(descText).Replace((char)160, ' ').Trim(); descText = HtmlEntity.DeEntitize(descText).Replace((char)160, ' ').Trim();
// Parse Description: "尾号4390 消费 财付通-luckincoffee瑞幸咖啡" // Parse Description: "尾号4390 消费 财付通-luckincoffee瑞幸咖啡"
var parts = descText.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); var parts = descText.Split([' '], StringSplitOptions.RemoveEmptyEntries);
string card = ""; var reason = descText;
string reason = descText; TransactionType type;
TransactionType type = TransactionType.Expense;
if (parts.Length > 0 && parts[0].StartsWith("尾号")) if (parts.Length > 0 && parts[0].StartsWith("尾号"))
{ {
card = parts[0].Replace("尾号", ""); card = parts[0].Replace("尾号", "");
} }
if (parts.Length > 1)
{
var typeStr = parts[1];
type = DetermineTransactionType(typeStr, reason, amount);
}
if (parts.Length > 2) if (parts.Length > 2)
{ {
reason = string.Join(" ", parts.Skip(2)); reason = string.Join(" ", parts.Skip(2));
} }
// 招商信用卡特殊,消费金额为正数,退款为负数 // 招商信用卡特殊,消费金额为正数,退款为负数
if(amount > 0) if (amount > 0)
{ {
type = TransactionType.Expense; type = TransactionType.Expense;
} }

View File

@@ -1,4 +1,6 @@
namespace Service.EmailParseServices; using Service.AI;
namespace Service.EmailServices.EmailParse;
public interface IEmailParseServices public interface IEmailParseServices
{ {
@@ -45,7 +47,7 @@ public abstract class EmailParseServicesBase(
// AI兜底 // AI兜底
result = await ParseByAiAsync(emailContent) ?? []; result = await ParseByAiAsync(emailContent) ?? [];
if(result.Length == 0) if (result.Length == 0)
{ {
logger.LogWarning("AI解析邮件内容也未能提取到任何交易记录"); logger.LogWarning("AI解析邮件内容也未能提取到任何交易记录");
} }
@@ -148,19 +150,19 @@ public abstract class EmailParseServicesBase(
private (string card, string reason, decimal amount, decimal balance, TransactionType type, DateTime? occurredAt)? ParseSingleRecord(JsonElement obj) private (string card, string reason, decimal amount, decimal balance, TransactionType type, DateTime? occurredAt)? ParseSingleRecord(JsonElement obj)
{ {
string card = obj.TryGetProperty("card", out var pCard) ? pCard.GetString() ?? string.Empty : string.Empty; var card = obj.TryGetProperty("card", out var pCard) ? pCard.GetString() ?? string.Empty : string.Empty;
string reason = obj.TryGetProperty("reason", out var pReason) ? pReason.GetString() ?? string.Empty : string.Empty; var reason = obj.TryGetProperty("reason", out var pReason) ? pReason.GetString() ?? string.Empty : string.Empty;
string typeStr = obj.TryGetProperty("type", out var pType) ? pType.GetString() ?? string.Empty : string.Empty; var typeStr = obj.TryGetProperty("type", out var pType) ? pType.GetString() ?? string.Empty : string.Empty;
string occurredAtStr = obj.TryGetProperty("occurredAt", out var pOccurredAt) ? pOccurredAt.GetString() ?? string.Empty : string.Empty; var occurredAtStr = obj.TryGetProperty("occurredAt", out var pOccurredAt) ? pOccurredAt.GetString() ?? string.Empty : string.Empty;
decimal amount = 0m; var amount = 0m;
if (obj.TryGetProperty("amount", out var pAmount)) if (obj.TryGetProperty("amount", out var pAmount))
{ {
if (pAmount.ValueKind == JsonValueKind.Number && pAmount.TryGetDecimal(out var d)) amount = d; if (pAmount.ValueKind == JsonValueKind.Number && pAmount.TryGetDecimal(out var d)) amount = d;
else if (pAmount.ValueKind == JsonValueKind.String && decimal.TryParse(pAmount.GetString(), NumberStyles.Any, CultureInfo.InvariantCulture, out var ds)) amount = ds; else if (pAmount.ValueKind == JsonValueKind.String && decimal.TryParse(pAmount.GetString(), NumberStyles.Any, CultureInfo.InvariantCulture, out var ds)) amount = ds;
} }
decimal balance = 0m; var balance = 0m;
if (obj.TryGetProperty("balance", out var pBalance)) if (obj.TryGetProperty("balance", out var pBalance))
{ {
if (pBalance.ValueKind == JsonValueKind.Number && pBalance.TryGetDecimal(out var d2)) balance = d2; if (pBalance.ValueKind == JsonValueKind.Number && pBalance.TryGetDecimal(out var d2)) balance = d2;
@@ -173,7 +175,7 @@ public abstract class EmailParseServicesBase(
} }
var occurredAt = (DateTime?)null; var occurredAt = (DateTime?)null;
if(DateTime.TryParse(occurredAtStr, out var occurredAtValue)) if (DateTime.TryParse(occurredAtStr, out var occurredAtValue))
{ {
occurredAt = occurredAtValue; occurredAt = occurredAtValue;
} }
@@ -201,7 +203,7 @@ public abstract class EmailParseServicesBase(
// 收入关键词 // 收入关键词
string[] incomeKeywords = string[] incomeKeywords =
{ [
"工资", "奖金", "退款", "工资", "奖金", "退款",
"返现", "收入", "转入", "返现", "收入", "转入",
"存入", "利息", "分红", "存入", "利息", "分红",
@@ -233,13 +235,13 @@ public abstract class EmailParseServicesBase(
// 存取类 // 存取类
"现金存入", "柜台存入", "ATM存入", "现金存入", "柜台存入", "ATM存入",
"他人转入", "他人汇入" "他人转入", "他人汇入"
}; ];
if (incomeKeywords.Any(k => lowerReason.Contains(k))) if (incomeKeywords.Any(k => lowerReason.Contains(k)))
return TransactionType.Income; return TransactionType.Income;
// 支出关键词 // 支出关键词
string[] expenseKeywords = string[] expenseKeywords =
{ [
"消费", "支付", "购买", "消费", "支付", "购买",
"转出", "取款", "支出", "转出", "取款", "支出",
"扣款", "缴费", "付款", "扣款", "缴费", "付款",
@@ -269,7 +271,7 @@ public abstract class EmailParseServicesBase(
// 信用卡/花呗等场景 // 信用卡/花呗等场景
"信用卡还款", "花呗还款", "白条还款", "信用卡还款", "花呗还款", "白条还款",
"分期还款", "账单还款", "自动还款" "分期还款", "账单还款", "自动还款"
}; ];
if (expenseKeywords.Any(k => lowerReason.Contains(k))) if (expenseKeywords.Any(k => lowerReason.Contains(k)))
return TransactionType.Expense; return TransactionType.Expense;

View File

@@ -182,6 +182,7 @@ public class EmailSyncService(
var unreadMessages = await emailFetchService.FetchUnreadMessagesAsync(); var unreadMessages = await emailFetchService.FetchUnreadMessagesAsync();
logger.LogInformation("邮箱 {Email} 获取到 {MessageCount} 封未读邮件", email, unreadMessages.Count); logger.LogInformation("邮箱 {Email} 获取到 {MessageCount} 封未读邮件", email, unreadMessages.Count);
// ReSharper disable once UnusedVariable
foreach (var (message, uid) in unreadMessages) foreach (var (message, uid) in unreadMessages)
{ {
try try
@@ -198,12 +199,12 @@ public class EmailSyncService(
message.TextBody ?? message.HtmlBody ?? string.Empty message.TextBody ?? message.HtmlBody ?? string.Empty
) || (DateTime.Now - message.Date.DateTime > TimeSpan.FromDays(3))) ) || (DateTime.Now - message.Date.DateTime > TimeSpan.FromDays(3)))
{ {
#if DEBUG #if DEBUG
logger.LogDebug("DEBUG 模式下,跳过标记已读步骤"); logger.LogDebug("DEBUG 模式下,跳过标记已读步骤");
#else #else
// 标记邮件为已读 // 标记邮件为已读
await emailFetchService.MarkAsReadAsync(uid); await emailFetchService.MarkAsReadAsync(uid);
#endif #endif
} }
} }
catch (Exception ex) catch (Exception ex)

View File

@@ -7,8 +7,12 @@ global using System.Globalization;
global using System.Text; global using System.Text;
global using System.Text.Json; global using System.Text.Json;
global using Entity; global using Entity;
global using FreeSql;
global using System.Linq; global using System.Linq;
global using Service.AppSettingModel; global using Service.AppSettingModel;
global using System.Text.Json.Serialization; global using System.Text.Json.Serialization;
global using System.Text.Json.Nodes; global using System.Text.Json.Nodes;
global using Microsoft.Extensions.Configuration;
global using Common;
global using System.Net;
global using System.Text.Encodings.Web;
global using JetBrains.Annotations;

View File

@@ -133,7 +133,7 @@ public class ImportService(
return DateTime.MinValue; return DateTime.MinValue;
} }
foreach (var format in DateTimeFormats) foreach (var format in _dateTimeFormats)
{ {
if (DateTime.TryParseExact( if (DateTime.TryParseExact(
row[key], row[key],
@@ -283,12 +283,12 @@ public class ImportService(
DateTime GetDateTimeValue(IDictionary<string, string> row, string key) DateTime GetDateTimeValue(IDictionary<string, string> row, string key)
{ {
if(!row.ContainsKey(key)) if (!row.ContainsKey(key))
{ {
return DateTime.MinValue; return DateTime.MinValue;
} }
foreach (var format in DateTimeFormats) foreach (var format in _dateTimeFormats)
{ {
if (DateTime.TryParseExact( if (DateTime.TryParseExact(
row[key], row[key],
@@ -358,14 +358,13 @@ public class ImportService(
{ {
return await ParseCsvAsync(file); return await ParseCsvAsync(file);
} }
else if (fileExtension == ".xlsx" || fileExtension == ".xls")
if (fileExtension == ".xlsx" || fileExtension == ".xls")
{ {
return await ParseExcelAsync(file); return await ParseExcelAsync(file);
} }
else
{ throw new NotSupportedException("不支持的文件格式");
throw new NotSupportedException("不支持的文件格式");
}
} }
private async Task<IDictionary<string, string>[]> ParseCsvAsync(MemoryStream file) private async Task<IDictionary<string, string>[]> ParseCsvAsync(MemoryStream file)
@@ -388,7 +387,7 @@ public class ImportService(
if (headers == null || headers.Length == 0) if (headers == null || headers.Length == 0)
{ {
return Array.Empty<IDictionary<string, string>>(); return [];
} }
var result = new List<IDictionary<string, string>>(); var result = new List<IDictionary<string, string>>();
@@ -420,7 +419,7 @@ public class ImportService(
if (worksheet == null || worksheet.Dimension == null) if (worksheet == null || worksheet.Dimension == null)
{ {
return Array.Empty<IDictionary<string, string>>(); return [];
} }
var rowCount = worksheet.Dimension.End.Row; var rowCount = worksheet.Dimension.End.Row;
@@ -428,12 +427,12 @@ public class ImportService(
if (rowCount < 2) if (rowCount < 2)
{ {
return Array.Empty<IDictionary<string, string>>(); return [];
} }
// 读取表头(第一行) // 读取表头(第一行)
var headers = new List<string>(); var headers = new List<string>();
for (int col = 1; col <= colCount; col++) for (var col = 1; col <= colCount; col++)
{ {
var header = worksheet.Cells[1, col].Text?.Trim() ?? string.Empty; var header = worksheet.Cells[1, col].Text?.Trim() ?? string.Empty;
headers.Add(header); headers.Add(header);
@@ -442,10 +441,10 @@ public class ImportService(
var result = new List<IDictionary<string, string>>(); var result = new List<IDictionary<string, string>>();
// 读取数据行(从第二行开始) // 读取数据行(从第二行开始)
for (int row = 2; row <= rowCount; row++) for (var row = 2; row <= rowCount; row++)
{ {
var rowData = new Dictionary<string, string>(); var rowData = new Dictionary<string, string>();
for (int col = 1; col <= colCount; col++) for (var col = 1; col <= colCount; col++)
{ {
var header = headers[col - 1]; var header = headers[col - 1];
var value = worksheet.Cells[row, col].Text?.Trim() ?? string.Empty; var value = worksheet.Cells[row, col].Text?.Trim() ?? string.Empty;
@@ -458,7 +457,7 @@ public class ImportService(
return await Task.FromResult(result.ToArray()); return await Task.FromResult(result.ToArray());
} }
private static string[] DateTimeFormats = private static string[] _dateTimeFormats =
[ [
"yyyy-MM-dd", "yyyy-MM-dd",
"yyyy-MM-dd HH", "yyyy-MM-dd HH",

View File

@@ -0,0 +1,45 @@
using Quartz;
using Service.Budget;
namespace Service.Jobs;
/// <summary>
/// 预算归档定时任务
/// </summary>
[DisallowConcurrentExecution]
public class BudgetArchiveJob(
IServiceProvider serviceProvider,
ILogger<BudgetArchiveJob> logger) : IJob
{
public async Task Execute(IJobExecutionContext context)
{
try
{
logger.LogInformation("开始执行预算归档任务");
// 每个月1号执行归档上个月的数据
var targetDate = DateTime.Now.AddMonths(-1);
var year = targetDate.Year;
var month = targetDate.Month;
using var scope = serviceProvider.CreateScope();
var budgetService = scope.ServiceProvider.GetRequiredService<IBudgetService>();
// 归档月度数据
var result = await budgetService.ArchiveBudgetsAsync(year, month);
if (string.IsNullOrEmpty(result))
{
logger.LogInformation("归档 {Year}年{Month}月 预算任务执行成功", year, month);
}
else
{
logger.LogWarning("归档 {Year}年{Month}月 预算任务提示: {Result}", year, month, result);
}
}
catch (Exception ex)
{
logger.LogError(ex, "预算归档任务执行出错");
}
}
}

View File

@@ -0,0 +1,150 @@
using Quartz;
using Service.AI;
namespace Service.Jobs;
/// <summary>
/// 分类图标生成定时任务
/// 每10分钟扫描一次为没有图标的分类生成 5 个 SVG 图标
/// </summary>
public class CategoryIconGenerationJob(
ITransactionCategoryRepository categoryRepository,
IOpenAiService openAiService,
ILogger<CategoryIconGenerationJob> logger) : IJob
{
private static readonly SemaphoreSlim _semaphore = new(1, 1);
public async Task Execute(IJobExecutionContext context)
{
// 尝试获取锁,如果失败则跳过本次执行
if (!await _semaphore.WaitAsync(0))
{
logger.LogInformation("上一个分类图标生成任务尚未完成,跳过本次执行");
return;
}
try
{
logger.LogInformation("开始执行分类图标生成任务");
// 查询所有分类,然后过滤出没有图标的
var allCategories = await categoryRepository.GetAllAsync();
var categoriesWithoutIcon = allCategories
.Where(c => string.IsNullOrEmpty(c.Icon))
.ToList();
if (categoriesWithoutIcon.Count == 0)
{
logger.LogInformation("所有分类都已有图标,跳过本次任务");
return;
}
logger.LogInformation("发现 {Count} 个分类没有图标,开始生成", categoriesWithoutIcon.Count);
// 为每个分类生成图标
foreach (var category in categoriesWithoutIcon)
{
try
{
await GenerateIconsForCategoryAsync(category);
}
catch (Exception ex)
{
logger.LogError(ex, "为分类 {CategoryName}(ID:{CategoryId}) 生成图标失败",
category.Name, category.Id);
}
}
logger.LogInformation("分类图标生成任务执行完成");
}
catch (Exception ex)
{
logger.LogError(ex, "分类图标生成任务执行出错");
throw;
}
finally
{
_semaphore.Release();
}
}
/// <summary>
/// 为单个分类生成 5 个 SVG 图标
/// </summary>
private async Task GenerateIconsForCategoryAsync(TransactionCategory category)
{
logger.LogInformation("正在为分类 {CategoryName}(ID:{CategoryId}) 生成图标",
category.Name, category.Id);
var typeText = category.Type == TransactionType.Expense ? "支出" : "收入";
var systemPrompt = """
SVG
5 SVG
1. 24x24viewBox="0 0 24 24"
2. 使
- 使 <linearGradient> <radialGradient>
- 使
-
3. 5
- 1使
- 2线
- 33D使
- 4
- 5线
4.
-
-
-
5.
6. JSON 5 SVG
SVG gradient
""";
var userPrompt = $"""
分类名称:{category.Name}
分类类型:{typeText}
请为这个分类生成 5 个精美的、风格各异的彩色 SVG 图标。
确保每个图标都有独特的视觉特征,不会与其他图标混淆。
返回格式(纯 JSON 数组,无其他内容):
["<svg>...</svg>", "<svg>...</svg>", "<svg>...</svg>", "<svg>...</svg>", "<svg>...</svg>"]
""";
var response = await openAiService.ChatAsync(systemPrompt, userPrompt, timeoutSeconds: 60 * 10);
if (string.IsNullOrWhiteSpace(response))
{
logger.LogWarning("AI 未返回有效的图标数据,分类: {CategoryName}", category.Name);
return;
}
// 验证返回的是有效的 JSON 数组
try
{
var icons = JsonSerializer.Deserialize<List<string>>(response);
if (icons == null || icons.Count != 5)
{
logger.LogWarning("AI 返回的图标数量不正确期望5个分类: {CategoryName}", category.Name);
return;
}
// 保存图标到数据库
category.Icon = response;
await categoryRepository.UpdateAsync(category);
logger.LogInformation("成功为分类 {CategoryName}(ID:{CategoryId}) 生成并保存了 5 个图标",
category.Name, category.Id);
}
catch (JsonException ex)
{
logger.LogError(ex, "解析 AI 返回的图标数据失败,分类: {CategoryName},响应内容: {Response}",
category.Name, response);
}
}
}

View File

@@ -0,0 +1,70 @@
using Microsoft.Extensions.Hosting;
using Quartz;
namespace Service.Jobs;
/// <summary>
/// 数据库备份任务
/// </summary>
public class DbBackupJob(
IHostEnvironment env,
ILogger<DbBackupJob> logger) : IJob
{
public Task Execute(IJobExecutionContext context)
{
try
{
logger.LogInformation("开始执行数据库备份任务");
// 数据库文件路径 (基于 appsettings.json 中的配置: database/EmailBill.db)
var dbPath = Path.Combine(env.ContentRootPath, "database", "EmailBill.db");
var backupDir = Path.Combine(env.ContentRootPath, "database", "backups");
if (!File.Exists(dbPath))
{
logger.LogWarning("数据库文件不存在,跳过备份: {Path}", dbPath);
return Task.CompletedTask;
}
if (!Directory.Exists(backupDir))
{
Directory.CreateDirectory(backupDir);
}
// 创建备份
var backupFileName = $"EmailBill_backup_{DateTime.Now:yyyyMMdd}.db";
var backupPath = Path.Combine(backupDir, backupFileName);
File.Copy(dbPath, backupPath, true);
logger.LogInformation("数据库备份成功: {Path}", backupPath);
// 清理旧备份 (保留最近20个)
var files = new DirectoryInfo(backupDir).GetFiles("EmailBill_backup_*.db")
.OrderByDescending(f => f.LastWriteTime) // 使用 LastWriteTime 排序
.ToList();
if (files.Count > 20)
{
var filesToDelete = files.Skip(20);
foreach (var file in filesToDelete)
{
try
{
file.Delete();
logger.LogInformation("删除过期备份: {Name}", file.Name);
}
catch (Exception ex)
{
logger.LogError(ex, "删除过期备份失败: {Name}", file.Name);
}
}
}
}
catch (Exception ex)
{
logger.LogError(ex, "数据库备份任务执行失败");
}
return Task.CompletedTask;
}
}

View File

@@ -127,6 +127,7 @@ public class EmailSyncJob(
var unreadMessages = await emailFetchService.FetchUnreadMessagesAsync(); var unreadMessages = await emailFetchService.FetchUnreadMessagesAsync();
logger.LogInformation("邮箱 {Email} 获取到 {MessageCount} 封未读邮件", email, unreadMessages.Count); logger.LogInformation("邮箱 {Email} 获取到 {MessageCount} 封未读邮件", email, unreadMessages.Count);
// ReSharper disable once UnusedVariable
foreach (var (message, uid) in unreadMessages) foreach (var (message, uid) in unreadMessages)
{ {
try try
@@ -143,12 +144,12 @@ public class EmailSyncJob(
message.TextBody ?? message.HtmlBody ?? string.Empty message.TextBody ?? message.HtmlBody ?? string.Empty
) || (DateTime.Now - message.Date.DateTime > TimeSpan.FromDays(3))) ) || (DateTime.Now - message.Date.DateTime > TimeSpan.FromDays(3)))
{ {
#if DEBUG #if DEBUG
logger.LogDebug("DEBUG 模式下,跳过标记已读步骤"); logger.LogDebug("DEBUG 模式下,跳过标记已读步骤");
#else #else
// 标记邮件为已读 // 标记邮件为已读
await emailFetchService.MarkAsReadAsync(uid); await emailFetchService.MarkAsReadAsync(uid);
#endif #endif
} }
} }
catch (Exception ex) catch (Exception ex)

View File

@@ -0,0 +1,78 @@
using Quartz;
namespace Service.Jobs;
/// <summary>
/// 日志清理定时任务
/// </summary>
[DisallowConcurrentExecution]
public class LogCleanupJob(ILogger<LogCleanupJob> logger) : IJob
{
private const int RetentionDays = 30; // 保留30天的日志
public Task Execute(IJobExecutionContext context)
{
try
{
logger.LogInformation("开始执行日志清理任务");
var logDirectory = Path.Combine(Directory.GetCurrentDirectory(), "logs");
if (!Directory.Exists(logDirectory))
{
logger.LogWarning("日志目录不存在: {LogDirectory}", logDirectory);
return Task.CompletedTask;
}
var cutoffDate = DateTime.Now.AddDays(-RetentionDays);
var logFiles = Directory.GetFiles(logDirectory, "log-*.txt");
var deletedCount = 0;
foreach (var logFile in logFiles)
{
try
{
var fileName = Path.GetFileNameWithoutExtension(logFile);
var dateStr = fileName.Replace("log-", "");
// 尝试解析日期 (格式: yyyyMMdd)
if (DateTime.TryParseExact(dateStr, "yyyyMMdd",
CultureInfo.InvariantCulture,
DateTimeStyles.None,
out var logDate))
{
if (logDate < cutoffDate)
{
File.Delete(logFile);
deletedCount++;
logger.LogInformation("已删除过期日志文件: {LogFile} (日期: {LogDate})",
Path.GetFileName(logFile), logDate.ToString("yyyy-MM-dd"));
}
}
}
catch (Exception ex)
{
logger.LogError(ex, "删除日志文件失败: {LogFile}", logFile);
}
}
if (deletedCount > 0)
{
logger.LogInformation("日志清理完成,共删除 {DeletedCount} 个过期日志文件(保留 {RetentionDays} 天)",
deletedCount, RetentionDays);
}
else
{
logger.LogDebug("没有需要清理的过期日志文件");
}
logger.LogInformation("日志清理任务执行完成");
}
catch (Exception ex)
{
logger.LogError(ex, "日志清理任务执行出错");
throw; // 让 Quartz 知道任务失败
}
return Task.CompletedTask;
}
}

View File

@@ -1,4 +1,5 @@
using Quartz; using Quartz;
using Service.Transaction;
namespace Service.Jobs; namespace Service.Jobs;
@@ -17,11 +18,9 @@ public class PeriodicBillJob(
logger.LogInformation("开始执行周期性账单检查任务"); logger.LogInformation("开始执行周期性账单检查任务");
// 执行周期性账单检查 // 执行周期性账单检查
using (var scope = serviceProvider.CreateScope()) using var scope = serviceProvider.CreateScope();
{ var periodicService = scope.ServiceProvider.GetRequiredService<ITransactionPeriodicService>();
var periodicService = scope.ServiceProvider.GetRequiredService<ITransactionPeriodicService>(); await periodicService.ExecutePeriodicBillsAsync();
await periodicService.ExecutePeriodicBillsAsync();
}
logger.LogInformation("周期性账单检查任务执行完成"); logger.LogInformation("周期性账单检查任务执行完成");
} }

View File

@@ -1,106 +0,0 @@
using Microsoft.Extensions.Hosting;
namespace Service;
/// <summary>
/// 日志清理后台服务
/// </summary>
public class LogCleanupService(ILogger<LogCleanupService> logger) : BackgroundService
{
private readonly TimeSpan _checkInterval = TimeSpan.FromHours(24); // 每24小时检查一次
private const int RetentionDays = 30; // 保留30天的日志
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
logger.LogInformation("日志清理服务已启动");
// 启动时立即执行一次清理
await CleanupOldLogsAsync();
// 定期清理
while (!stoppingToken.IsCancellationRequested)
{
try
{
await Task.Delay(_checkInterval, stoppingToken);
await CleanupOldLogsAsync();
}
catch (OperationCanceledException)
{
// 服务正在停止
break;
}
catch (Exception ex)
{
logger.LogError(ex, "清理日志时发生错误");
}
}
logger.LogInformation("日志清理服务已停止");
}
/// <summary>
/// 清理过期的日志文件
/// </summary>
private async Task CleanupOldLogsAsync()
{
await Task.Run(() =>
{
try
{
var logDirectory = Path.Combine(Directory.GetCurrentDirectory(), "logs");
if (!Directory.Exists(logDirectory))
{
logger.LogWarning("日志目录不存在: {LogDirectory}", logDirectory);
return;
}
var cutoffDate = DateTime.Now.AddDays(-RetentionDays);
var logFiles = Directory.GetFiles(logDirectory, "log-*.txt");
var deletedCount = 0;
foreach (var logFile in logFiles)
{
try
{
var fileName = Path.GetFileNameWithoutExtension(logFile);
var dateStr = fileName.Replace("log-", "");
// 尝试解析日期 (格式: yyyyMMdd)
if (DateTime.TryParseExact(dateStr, "yyyyMMdd",
System.Globalization.CultureInfo.InvariantCulture,
System.Globalization.DateTimeStyles.None,
out var logDate))
{
if (logDate < cutoffDate)
{
File.Delete(logFile);
deletedCount++;
logger.LogInformation("已删除过期日志文件: {LogFile} (日期: {LogDate})",
Path.GetFileName(logFile), logDate.ToString("yyyy-MM-dd"));
}
}
}
catch (Exception ex)
{
logger.LogError(ex, "删除日志文件失败: {LogFile}", logFile);
}
}
if (deletedCount > 0)
{
logger.LogInformation("日志清理完成,共删除 {DeletedCount} 个过期日志文件(保留 {RetentionDays} 天)",
deletedCount, RetentionDays);
}
else
{
logger.LogDebug("没有需要清理的过期日志文件");
}
}
catch (Exception ex)
{
logger.LogError(ex, "清理日志过程中发生错误");
}
});
}
}

View File

@@ -1,18 +1,18 @@
namespace Service; namespace Service.Message;
public interface IMessageRecordService public interface IMessageService
{ {
Task<(IEnumerable<MessageRecord> List, long Total)> GetPagedListAsync(int pageIndex, int pageSize); Task<(IEnumerable<MessageRecord> List, long Total)> GetPagedListAsync(int pageIndex, int pageSize);
Task<MessageRecord?> GetByIdAsync(long id); Task<MessageRecord?> GetByIdAsync(long id);
Task<bool> AddAsync(MessageRecord message); Task<bool> AddAsync(MessageRecord message);
Task<bool> AddAsync(string title, string content); Task<bool> AddAsync(string title, string content, MessageType type = MessageType.Text, string? url = null);
Task<bool> MarkAsReadAsync(long id); Task<bool> MarkAsReadAsync(long id);
Task<bool> MarkAllAsReadAsync(); Task<bool> MarkAllAsReadAsync();
Task<bool> DeleteAsync(long id); Task<bool> DeleteAsync(long id);
Task<long> GetUnreadCountAsync(); Task<long> GetUnreadCountAsync();
} }
public class MessageRecordService(IMessageRecordRepository messageRepo) : IMessageRecordService public class MessageService(IMessageRecordRepository messageRepo, INotificationService notificationService) : IMessageService
{ {
public async Task<(IEnumerable<MessageRecord> List, long Total)> GetPagedListAsync(int pageIndex, int pageSize) public async Task<(IEnumerable<MessageRecord> List, long Total)> GetPagedListAsync(int pageIndex, int pageSize)
{ {
@@ -29,15 +29,27 @@ public class MessageRecordService(IMessageRecordRepository messageRepo) : IMessa
return await messageRepo.AddAsync(message); return await messageRepo.AddAsync(message);
} }
public async Task<bool> AddAsync(string title, string content) public async Task<bool> AddAsync(
string title,
string content,
MessageType type = MessageType.Text,
string? url = null
)
{ {
var message = new MessageRecord var message = new MessageRecord
{ {
Title = title, Title = title,
Content = content, Content = content,
MessageType = type,
Url = url,
IsRead = false IsRead = false
}; };
return await messageRepo.AddAsync(message); var result = await messageRepo.AddAsync(message);
if (result)
{
await notificationService.SendNotificationAsync(title, url);
}
return result;
} }
public async Task<bool> MarkAsReadAsync(long id) public async Task<bool> MarkAsReadAsync(long id)

View File

@@ -0,0 +1,94 @@
using WebPush;
using PushSubscription = Entity.PushSubscription;
namespace Service.Message;
public interface INotificationService
{
Task<string> GetVapidPublicKeyAsync();
Task SubscribeAsync(PushSubscription subscription);
Task SendNotificationAsync(string message, string? url = null);
}
public class NotificationService(
IPushSubscriptionRepository subscriptionRepo,
IConfiguration configuration,
ILogger<NotificationService> logger) : INotificationService
{
private NotificationSettings GetSettings()
{
var settings = configuration.GetSection("NotificationSettings").Get<NotificationSettings>();
if (settings == null)
{
// Fallback or throw. For now, let's return empty to avoid crashing if not configured,
// but logging error is better.
logger.LogWarning("NotificationSettings not configured");
return new NotificationSettings();
}
return settings;
}
public Task<string> GetVapidPublicKeyAsync()
{
return Task.FromResult(GetSettings().PublicKey);
}
public async Task SubscribeAsync(PushSubscription subscription)
{
var existing = await subscriptionRepo.GetByEndpointAsync(subscription.Endpoint);
if (existing != null)
{
existing.P256DH = subscription.P256DH;
existing.Auth = subscription.Auth;
existing.UpdateTime = DateTime.Now;
await subscriptionRepo.UpdateAsync(existing);
}
else
{
await subscriptionRepo.AddAsync(subscription);
}
}
public async Task SendNotificationAsync(string message, string? url = null)
{
var settings = GetSettings();
if (string.IsNullOrEmpty(settings.PublicKey) || string.IsNullOrEmpty(settings.PrivateKey))
{
logger.LogWarning("VAPID keys not configured, skipping notification");
return;
}
var vapidDetails = new VapidDetails(settings.Subject, settings.PublicKey, settings.PrivateKey);
var webPushClient = new WebPushClient();
var subscriptions = await subscriptionRepo.GetAllAsync();
var payload = JsonSerializer.Serialize(new
{
title = "System Notification",
body = message,
url = url ?? "/",
icon = "/pwa-192x192.png"
});
foreach (var sub in subscriptions)
{
try
{
var pushSubscription = new WebPush.PushSubscription(sub.Endpoint, sub.P256DH, sub.Auth);
await webPushClient.SendNotificationAsync(pushSubscription, payload, vapidDetails);
}
catch (WebPushException ex)
{
if (ex.StatusCode == HttpStatusCode.Gone || ex.StatusCode == HttpStatusCode.NotFound)
{
await subscriptionRepo.DeleteAsync(sub.Id);
}
logger.LogError(ex, "Error sending push notification to {Endpoint}", sub.Endpoint);
}
catch (Exception ex)
{
logger.LogError(ex, "Error sending push notification to {Endpoint}", sub.Endpoint);
}
}
}
}

View File

@@ -1,61 +0,0 @@
using Microsoft.Extensions.Hosting;
namespace Service;
/// <summary>
/// 周期性账单后台服务
/// </summary>
public class PeriodicBillBackgroundService(
IServiceProvider serviceProvider,
ILogger<PeriodicBillBackgroundService> logger
) : BackgroundService
{
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
logger.LogInformation("周期性账单后台服务已启动");
while (!stoppingToken.IsCancellationRequested)
{
try
{
var now = DateTime.Now;
// 计算下次执行时间每天早上6点
var nextRun = now.Date.AddHours(6);
if (now >= nextRun)
{
nextRun = nextRun.AddDays(1);
}
var delay = nextRun - now;
logger.LogInformation("下次执行周期性账单检查时间: {NextRun}, 延迟: {Delay}",
nextRun.ToString("yyyy-MM-dd HH:mm:ss"), delay);
await Task.Delay(delay, stoppingToken);
if (stoppingToken.IsCancellationRequested)
break;
// 执行周期性账单检查
using (var scope = serviceProvider.CreateScope())
{
var periodicService = scope.ServiceProvider.GetRequiredService<ITransactionPeriodicService>();
await periodicService.ExecutePeriodicBillsAsync();
}
}
catch (OperationCanceledException)
{
logger.LogInformation("周期性账单后台服务已取消");
break;
}
catch (Exception ex)
{
logger.LogError(ex, "周期性账单后台服务执行出错");
// 出错后等待1小时再重试
await Task.Delay(TimeSpan.FromHours(1), stoppingToken);
}
}
logger.LogInformation("周期性账单后台服务已停止");
}
}

View File

@@ -5,6 +5,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations" />
<PackageReference Include="MailKit" /> <PackageReference Include="MailKit" />
<PackageReference Include="MimeKit" /> <PackageReference Include="MimeKit" />
<PackageReference Include="Microsoft.Extensions.Configuration" /> <PackageReference Include="Microsoft.Extensions.Configuration" />
@@ -21,6 +22,7 @@
<PackageReference Include="Quartz.Extensions.Hosting" /> <PackageReference Include="Quartz.Extensions.Hosting" />
<PackageReference Include="JiebaNet.Analyser" /> <PackageReference Include="JiebaNet.Analyser" />
<PackageReference Include="Newtonsoft.Json" /> <PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="WebPush" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -1,4 +1,4 @@
namespace Service; namespace Service.Transaction;
/// <summary> /// <summary>
/// 周期性账单服务接口 /// 周期性账单服务接口
@@ -108,6 +108,11 @@ public class TransactionPeriodicService(
/// </summary> /// </summary>
private bool ShouldExecuteToday(TransactionPeriodic bill) private bool ShouldExecuteToday(TransactionPeriodic bill)
{ {
if (!bill.IsEnabled)
{
return false;
}
var today = DateTime.Today; var today = DateTime.Today;
// 如果从未执行过,需要执行 // 如果从未执行过,需要执行
@@ -144,7 +149,7 @@ public class TransactionPeriodicService(
var dayOfWeek = (int)today.DayOfWeek; // 0=Sunday, 1=Monday, ..., 6=Saturday var dayOfWeek = (int)today.DayOfWeek; // 0=Sunday, 1=Monday, ..., 6=Saturday
var executeDays = config.Split(',', StringSplitOptions.RemoveEmptyEntries) var executeDays = config.Split(',', StringSplitOptions.RemoveEmptyEntries)
.Select(d => int.TryParse(d.Trim(), out var day) ? day : -1) .Select(d => int.TryParse(d.Trim(), out var day) ? day : -1)
.Where(d => d >= 0 && d <= 6) .Where(d => d is >= 0 and <= 6)
.ToList(); .ToList();
return executeDays.Contains(dayOfWeek); return executeDays.Contains(dayOfWeek);
@@ -160,9 +165,16 @@ public class TransactionPeriodicService(
var executeDays = config.Split(',', StringSplitOptions.RemoveEmptyEntries) var executeDays = config.Split(',', StringSplitOptions.RemoveEmptyEntries)
.Select(d => int.TryParse(d.Trim(), out var day) ? day : -1) .Select(d => int.TryParse(d.Trim(), out var day) ? day : -1)
.Where(d => d >= 1 && d <= 31) .Where(d => d is >= 1 and <= 31)
.ToList(); .ToList();
// 如果当前为月末,且配置中有大于当月天数的日期,则也执行
var daysInMonth = DateTime.DaysInMonth(today.Year, today.Month);
if (today.Day == daysInMonth && executeDays.Any(d => d > daysInMonth))
{
return true;
}
return executeDays.Contains(today.Day); return executeDays.Contains(today.Day);
} }
@@ -175,7 +187,7 @@ public class TransactionPeriodicService(
return false; return false;
// 计算当前是本季度的第几天 // 计算当前是本季度的第几天
var quarterStartMonth = ((today.Month - 1) / 3) * 3 + 1; var quarterStartMonth = (today.Month - 1) / 3 * 3 + 1;
var quarterStart = new DateTime(today.Year, quarterStartMonth, 1); var quarterStart = new DateTime(today.Year, quarterStartMonth, 1);
var daysSinceQuarterStart = (today - quarterStart).Days + 1; var daysSinceQuarterStart = (today - quarterStart).Days + 1;
@@ -216,7 +228,7 @@ public class TransactionPeriodicService(
var executeDays = config.Split(',', StringSplitOptions.RemoveEmptyEntries) var executeDays = config.Split(',', StringSplitOptions.RemoveEmptyEntries)
.Select(d => int.TryParse(d.Trim(), out var day) ? day : -1) .Select(d => int.TryParse(d.Trim(), out var day) ? day : -1)
.Where(d => d >= 0 && d <= 6) .Where(d => d is >= 0 and <= 6)
.OrderBy(d => d) .OrderBy(d => d)
.ToList(); .ToList();
@@ -246,7 +258,7 @@ public class TransactionPeriodicService(
var executeDays = config.Split(',', StringSplitOptions.RemoveEmptyEntries) var executeDays = config.Split(',', StringSplitOptions.RemoveEmptyEntries)
.Select(d => int.TryParse(d.Trim(), out var day) ? day : -1) .Select(d => int.TryParse(d.Trim(), out var day) ? day : -1)
.Where(d => d >= 1 && d <= 31) .Where(d => d is >= 1 and <= 31)
.OrderBy(d => d) .OrderBy(d => d)
.ToList(); .ToList();

View File

@@ -0,0 +1,350 @@
namespace Service.Transaction;
public interface ITransactionStatisticsService
{
Task<Dictionary<string, (int count, decimal expense, decimal income, decimal saving)>> GetDailyStatisticsAsync(int year, int month, string? savingClassify = null);
Task<Dictionary<string, (int count, decimal expense, decimal income, decimal saving)>> GetDailyStatisticsByRangeAsync(DateTime startDate, DateTime endDate, string? savingClassify = null);
Task<MonthlyStatistics> GetMonthlyStatisticsAsync(int year, int month);
Task<List<CategoryStatistics>> GetCategoryStatisticsAsync(int year, int month, TransactionType type);
Task<List<TrendStatistics>> GetTrendStatisticsAsync(int startYear, int startMonth, int monthCount);
Task<(List<ReasonGroupDto> list, int total)> GetReasonGroupsAsync(int pageIndex = 1, int pageSize = 20);
Task<List<(TransactionRecord record, double relevanceScore)>> GetClassifiedByKeywordsWithScoreAsync(List<string> keywords, double minMatchRate = 0.3, int limit = 10);
Task<Dictionary<DateTime, decimal>> GetFilteredTrendStatisticsAsync(
DateTime startDate,
DateTime endDate,
TransactionType type,
IEnumerable<string> classifies,
bool groupByMonth = false);
Task<Dictionary<(string, TransactionType), decimal>> GetAmountGroupByClassifyAsync(DateTime startTime, DateTime endTime);
}
public class TransactionStatisticsService(
ITransactionRecordRepository transactionRepository
) : ITransactionStatisticsService
{
public async Task<Dictionary<string, (int count, decimal expense, decimal income, decimal saving)>> GetDailyStatisticsAsync(int year, int month, string? savingClassify = null)
{
// 当 month=0 时,表示查询整年数据
DateTime startDate;
DateTime endDate;
if (month == 0)
{
// 查询整年1月1日至12月31日
startDate = new DateTime(year, 1, 1);
endDate = new DateTime(year, 12, 31).AddDays(1); // 包含12月31日
}
else
{
// 查询指定月份
startDate = new DateTime(year, month, 1);
endDate = startDate.AddMonths(1);
}
return await GetDailyStatisticsByRangeAsync(startDate, endDate, savingClassify);
}
public async Task<Dictionary<string, (int count, decimal expense, decimal income, decimal saving)>> GetDailyStatisticsByRangeAsync(DateTime startDate, DateTime endDate, string? savingClassify = null)
{
var records = await transactionRepository.QueryAsync(
startDate: startDate,
endDate: endDate,
pageSize: int.MaxValue);
return records
.GroupBy(t => t.OccurredAt.ToString("yyyy-MM-dd"))
.ToDictionary(
g => g.Key,
g =>
{
var income = g.Where(t => t.Type == TransactionType.Income).Sum(t => Math.Abs(t.Amount));
var expense = g.Where(t => t.Type == TransactionType.Expense).Sum(t => Math.Abs(t.Amount));
var saving = 0m;
if (!string.IsNullOrEmpty(savingClassify))
{
saving = g.Where(t => savingClassify.Split(',').Contains(t.Classify)).Sum(t => Math.Abs(t.Amount));
}
return (count: g.Count(), expense, income, saving);
}
);
}
public async Task<MonthlyStatistics> GetMonthlyStatisticsAsync(int year, int month)
{
var records = await transactionRepository.QueryAsync(
year: year,
month: month,
pageSize: int.MaxValue);
var statistics = new MonthlyStatistics
{
Year = year,
Month = month
};
foreach (var record in records)
{
var amount = Math.Abs(record.Amount);
if (record.Type == TransactionType.Expense)
{
statistics.TotalExpense += amount;
statistics.ExpenseCount++;
}
else if (record.Type == TransactionType.Income)
{
statistics.TotalIncome += amount;
statistics.IncomeCount++;
}
}
statistics.Balance = statistics.TotalIncome - statistics.TotalExpense;
statistics.TotalCount = records.Count;
return statistics;
}
public async Task<List<CategoryStatistics>> GetCategoryStatisticsAsync(int year, int month, TransactionType type)
{
var records = await transactionRepository.QueryAsync(
year: year,
month: month,
type: type,
pageSize: int.MaxValue);
var categoryGroups = records
.GroupBy(t => t.Classify)
.Select(g => new CategoryStatistics
{
Classify = g.Key,
Amount = g.Sum(t => Math.Abs(t.Amount)),
Count = g.Count()
})
.OrderByDescending(c => c.Amount)
.ToList();
var total = categoryGroups.Sum(c => c.Amount);
if (total > 0)
{
foreach (var category in categoryGroups)
{
category.Percent = Math.Round((category.Amount / total) * 100, 1);
}
}
return categoryGroups;
}
public async Task<List<TrendStatistics>> GetTrendStatisticsAsync(int startYear, int startMonth, int monthCount)
{
var trends = new List<TrendStatistics>();
for (var i = 0; i < monthCount; i++)
{
var targetYear = startYear;
var targetMonth = startMonth + i;
while (targetMonth > 12)
{
targetMonth -= 12;
targetYear++;
}
var records = await transactionRepository.QueryAsync(
year: targetYear,
month: targetMonth,
pageSize: int.MaxValue);
var expense = records.Where(t => t.Type == TransactionType.Expense).Sum(t => Math.Abs(t.Amount));
var income = records.Where(t => t.Type == TransactionType.Income).Sum(t => Math.Abs(t.Amount));
trends.Add(new TrendStatistics
{
Year = targetYear,
Month = targetMonth,
Expense = expense,
Income = income,
Balance = income - expense
});
}
return trends;
}
public async Task<(List<ReasonGroupDto> list, int total)> GetReasonGroupsAsync(int pageIndex = 1, int pageSize = 20)
{
var records = await transactionRepository.QueryAsync(
pageSize: int.MaxValue);
var unclassifiedRecords = records
.Where(t => !string.IsNullOrEmpty(t.Reason) && string.IsNullOrEmpty(t.Classify))
.GroupBy(t => t.Reason)
.Select(g => new
{
Reason = g.Key,
Count = g.Count(),
TotalAmount = g.Sum(r => r.Amount),
SampleType = g.First().Type,
SampleClassify = g.First().Classify,
TransactionIds = g.Select(r => r.Id).ToList()
})
.OrderByDescending(g => Math.Abs(g.TotalAmount))
.ToList();
var total = unclassifiedRecords.Count;
var pagedGroups = unclassifiedRecords
.Skip((pageIndex - 1) * pageSize)
.Take(pageSize)
.Select(g => new ReasonGroupDto
{
Reason = g.Reason,
Count = g.Count,
SampleType = g.SampleType,
SampleClassify = g.SampleClassify,
TransactionIds = g.TransactionIds,
TotalAmount = Math.Abs(g.TotalAmount)
})
.ToList();
return (pagedGroups, total);
}
public async Task<List<(TransactionRecord record, double relevanceScore)>> GetClassifiedByKeywordsWithScoreAsync(List<string> keywords, double minMatchRate = 0.3, int limit = 10)
{
if (keywords.Count == 0)
{
return [];
}
var candidates = await transactionRepository.GetClassifiedByKeywordsAsync(keywords, limit: int.MaxValue);
var scoredResults = candidates
.Select(record =>
{
var matchedCount = keywords.Count(keyword => record.Reason.Contains(keyword, StringComparison.OrdinalIgnoreCase));
var matchRate = (double)matchedCount / keywords.Count;
var exactMatchBonus = keywords.Any(k => record.Reason.Equals(k, StringComparison.OrdinalIgnoreCase)) ? 0.2 : 0.0;
var avgKeywordLength = keywords.Average(k => k.Length);
var lengthSimilarity = 1.0 - Math.Min(1.0, Math.Abs(record.Reason.Length - avgKeywordLength) / Math.Max(record.Reason.Length, avgKeywordLength));
var lengthBonus = lengthSimilarity * 0.1;
var score = matchRate + exactMatchBonus + lengthBonus;
return (record, score);
})
.Where(x => x.score >= minMatchRate)
.OrderByDescending(x => x.score)
.ThenByDescending(x => x.record.OccurredAt)
.Take(limit)
.ToList();
return scoredResults;
}
public async Task<Dictionary<DateTime, decimal>> GetFilteredTrendStatisticsAsync(
DateTime startDate,
DateTime endDate,
TransactionType type,
IEnumerable<string> classifies,
bool groupByMonth = false)
{
var records = await transactionRepository.QueryAsync(
startDate: startDate,
endDate: endDate,
type: type,
classifies: classifies.ToArray(),
pageSize: int.MaxValue);
if (groupByMonth)
{
return records
.GroupBy(t => new DateTime(t.OccurredAt.Year, t.OccurredAt.Month, 1))
.ToDictionary(g => g.Key, g => g.Sum(x => Math.Abs(x.Amount)));
}
return records
.GroupBy(t => t.OccurredAt.Date)
.ToDictionary(g => g.Key, g => g.Sum(x => Math.Abs(x.Amount)));
}
public async Task<Dictionary<(string, TransactionType), decimal>> GetAmountGroupByClassifyAsync(DateTime startTime, DateTime endTime)
{
var records = await transactionRepository.QueryAsync(
startDate: startTime,
endDate: endTime,
pageSize: int.MaxValue);
return records
.GroupBy(t => new { t.Classify, t.Type })
.ToDictionary(g => (g.Key.Classify, g.Key.Type), g => g.Sum(t => t.Amount));
}
}
public record ReasonGroupDto
{
public string Reason { get; set; } = string.Empty;
public int Count { get; set; }
public TransactionType SampleType { get; set; }
public string SampleClassify { get; set; } = string.Empty;
public List<long> TransactionIds { get; set; } = [];
public decimal TotalAmount { get; set; }
}
public record MonthlyStatistics
{
public int Year { get; set; }
public int Month { get; set; }
public decimal TotalExpense { get; set; }
public decimal TotalIncome { get; set; }
public decimal Balance { get; set; }
public int ExpenseCount { get; set; }
public int IncomeCount { get; set; }
public int TotalCount { get; set; }
}
public record CategoryStatistics
{
public string Classify { get; set; } = string.Empty;
public decimal Amount { get; set; }
public int Count { get; set; }
public decimal Percent { get; set; }
}
public record TrendStatistics
{
public int Year { get; set; }
public int Month { get; set; }
public decimal Expense { get; set; }
public decimal Income { get; set; }
public decimal Balance { get; set; }
}

File diff suppressed because one or more lines are too long

2
Web/.gitignore vendored
View File

@@ -400,3 +400,5 @@ FodyWeavers.xsd
.idea/ .idea/
# ESLint
.eslintcache

View File

@@ -2,5 +2,6 @@
"$schema": "https://json.schemastore.org/prettierrc", "$schema": "https://json.schemastore.org/prettierrc",
"semi": false, "semi": false,
"singleQuote": true, "singleQuote": true,
"printWidth": 100 "printWidth": 100,
"trailingComma": "none"
} }

View File

@@ -6,8 +6,31 @@
"package.json": "package-lock.json, pnpm*, .yarnrc*, yarn*, .eslint*, eslint*, .oxlint*, oxlint*, .prettier*, prettier*, .editorconfig" "package.json": "package-lock.json, pnpm*, .yarnrc*, yarn*, .eslint*, eslint*, .oxlint*, oxlint*, .prettier*, prettier*, .editorconfig"
}, },
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"source.fixAll": "explicit" "source.fixAll": "explicit",
"source.fixAll.eslint": "explicit"
}, },
"editor.formatOnSave": true, "editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode",
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"eslint.validate": [
"javascript",
"javascriptreact",
"vue"
],
"eslint.format.enable": false,
"prettier.documentSelectors": [
"**/*.vue",
"**/*.js",
"**/*.jsx",
"**/*.css",
"**/*.html"
]
} }

View File

@@ -1 +0,0 @@

View File

@@ -1,44 +0,0 @@
# email-bill
This template should help get you started developing with Vue 3 in Vite.
## Recommended IDE Setup
[VS Code](https://code.visualstudio.com/) + [Vue (Official)](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur).
## Recommended Browser Setup
- Chromium-based browsers (Chrome, Edge, Brave, etc.):
- [Vue.js devtools](https://chromewebstore.google.com/detail/vuejs-devtools/nhdogjmejiglipccpnnnanhbledajbpd)
- [Turn on Custom Object Formatter in Chrome DevTools](http://bit.ly/object-formatters)
- Firefox:
- [Vue.js devtools](https://addons.mozilla.org/en-US/firefox/addon/vue-js-devtools/)
- [Turn on Custom Object Formatter in Firefox DevTools](https://fxdx.dev/firefox-devtools-custom-object-formatters/)
## Customize configuration
See [Vite Configuration Reference](https://vite.dev/config/).
## Project Setup
```sh
pnpm install
```
### Compile and Hot-Reload for Development
```sh
pnpm dev
```
### Compile and Minify for Production
```sh
pnpm build
```
### Lint with [ESLint](https://eslint.org/)
```sh
pnpm lint
```

View File

@@ -1,26 +1,82 @@
import { defineConfig, globalIgnores } from 'eslint/config' import js from '@eslint/js'
import globals from 'globals' import globals from 'globals'
import js from '@eslint/js'
import pluginVue from 'eslint-plugin-vue' import pluginVue from 'eslint-plugin-vue'
import skipFormatting from '@vue/eslint-config-prettier/skip-formatting'
export default defineConfig([ export default [
{ {
name: 'app/files-to-lint', ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**', '**/node_modules/**', '.nuxt/**']
files: ['**/*.{js,mjs,jsx,vue}'],
}, },
// Load Vue recommended rules first (sets up parser etc.)
...pluginVue.configs['flat/recommended'],
globalIgnores(['**/dist/**', '**/dist-ssr/**', '**/coverage/**']), // General Configuration for all JS/Vue files
{ {
files: ['**/*.{js,mjs,jsx,vue}'],
languageOptions: { languageOptions: {
globals: { globals: {
...globals.browser, ...globals.browser
}, },
ecmaVersion: 'latest',
sourceType: 'module'
}, },
rules: {
// Import standard JS recommended rules
...js.configs.recommended.rules,
// --- Logic & Best Practices ---
'no-unused-vars': ['warn', {
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
caughtErrorsIgnorePattern: '^_'
}],
'no-undef': 'error',
'no-console': ['warn', { allow: ['warn', 'error', 'info'] }],
'no-debugger': 'warn',
'eqeqeq': ['error', 'always', { null: 'ignore' }],
'curly': ['error', 'all'],
'prefer-const': 'warn',
'no-var': 'error',
// --- Formatting & Style (User requested warnings) ---
'indent': ['error', 2, { SwitchCase: 1 }],
'quotes': ['error', 'single', { avoidEscape: true }],
'semi': ['error', 'never'],
'comma-dangle': ['error', 'never'],
'no-trailing-spaces': 'error',
'no-multiple-empty-lines': ['error', { max: 1 }],
'space-before-function-paren': ['error', 'always'],
'object-curly-spacing': ['error', 'always'],
'array-bracket-spacing': ['error', 'never']
}
}, },
js.configs.recommended, // Vue Specific Overrides
...pluginVue.configs['flat/essential'], {
skipFormatting, files: ['**/*.vue'],
]) rules: {
'vue/multi-word-component-names': 'off',
'vue/no-v-html': 'warn',
// Turn off standard indent for Vue files to avoid conflicts with vue/html-indent
// or script indentation issues. Vue plugin handles this better.
'indent': 'off',
// Ensure Vue's own indentation rules are active (they are in 'recommended' but let's be explicit if needed)
'vue/html-indent': ['error', 2],
'vue/script-indent': ['error', 2, {
baseIndent: 0,
switchCase: 1,
ignores: []
}]
}
},
// Service Worker specific globals
{
files: ['**/service-worker.js', '**/src/registerServiceWorker.js'],
languageOptions: {
globals: {
...globals.serviceworker
}
}
}
]

View File

@@ -1,6 +1,6 @@
{ {
"name": "email-bill", "name": "email-bill",
"version": "0.0.0", "version": "1.0.0",
"private": true, "private": true,
"type": "module", "type": "module",
"engines": { "engines": {
@@ -11,11 +11,12 @@
"build": "vite build", "build": "vite build",
"preview": "vite preview", "preview": "vite preview",
"lint": "eslint . --fix --cache", "lint": "eslint . --fix --cache",
"format": "prettier --write --experimental-cli src/" "format": "prettier --write src/"
}, },
"dependencies": { "dependencies": {
"axios": "^1.13.2", "axios": "^1.13.2",
"dayjs": "^1.11.19", "dayjs": "^1.11.19",
"echarts": "^6.0.0",
"pinia": "^3.0.4", "pinia": "^3.0.4",
"vant": "^4.9.22", "vant": "^4.9.22",
"vue": "^3.5.25", "vue": "^3.5.25",

23
Web/pnpm-lock.yaml generated
View File

@@ -14,6 +14,9 @@ importers:
dayjs: dayjs:
specifier: ^1.11.19 specifier: ^1.11.19
version: 1.11.19 version: 1.11.19
echarts:
specifier: ^6.0.0
version: 6.0.0
pinia: pinia:
specifier: ^3.0.4 specifier: ^3.0.4
version: 3.0.4(vue@3.5.26) version: 3.0.4(vue@3.5.26)
@@ -787,6 +790,9 @@ packages:
resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
echarts@6.0.0:
resolution: {integrity: sha512-Tte/grDQRiETQP4xz3iZWSvoHrkCQtwqd6hs+mifXcjrCuo2iKWbajFObuLJVBlDIJlOzgQPd1hsaKt/3+OMkQ==}
electron-to-chromium@1.5.267: electron-to-chromium@1.5.267:
resolution: {integrity: sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==} resolution: {integrity: sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==}
@@ -1296,6 +1302,9 @@ packages:
resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==} resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
engines: {node: '>=6'} engines: {node: '>=6'}
tslib@2.3.0:
resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
type-check@0.4.0: type-check@0.4.0:
resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
engines: {node: '>= 0.8.0'} engines: {node: '>= 0.8.0'}
@@ -1435,6 +1444,9 @@ packages:
resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
engines: {node: '>=10'} engines: {node: '>=10'}
zrender@6.0.0:
resolution: {integrity: sha512-41dFXEEXuJpNecuUQq6JlbybmnHaqqpGlbH1yxnA5V9MMP4SbohSVZsJIwz+zdjQXSSlR1Vc34EgH1zxyTDvhg==}
snapshots: snapshots:
'@babel/code-frame@7.27.1': '@babel/code-frame@7.27.1':
@@ -2131,6 +2143,11 @@ snapshots:
es-errors: 1.3.0 es-errors: 1.3.0
gopd: 1.2.0 gopd: 1.2.0
echarts@6.0.0:
dependencies:
tslib: 2.3.0
zrender: 6.0.0
electron-to-chromium@1.5.267: {} electron-to-chromium@1.5.267: {}
entities@7.0.0: {} entities@7.0.0: {}
@@ -2611,6 +2628,8 @@ snapshots:
totalist@3.0.1: {} totalist@3.0.1: {}
tslib@2.3.0: {}
type-check@0.4.0: type-check@0.4.0:
dependencies: dependencies:
prelude-ls: 1.2.1 prelude-ls: 1.2.1
@@ -2744,3 +2763,7 @@ snapshots:
yallist@3.1.1: {} yallist@3.1.1: {}
yocto-queue@0.1.0: {} yocto-queue@0.1.0: {}
zrender@6.0.0:
dependencies:
tslib: 2.3.0

View File

@@ -3,7 +3,7 @@
"short_name": "账单", "short_name": "账单",
"description": "个人账单管理与邮件解析", "description": "个人账单管理与邮件解析",
"start_url": "/", "start_url": "/",
"display": "minimal-ui", "display": "standalone",
"background_color": "#ffffff", "background_color": "#ffffff",
"theme_color": "#1989fa", "theme_color": "#1989fa",
"orientation": "portrait-primary", "orientation": "portrait-primary",

View File

@@ -1,49 +1,56 @@
const CACHE_NAME = 'emailbill-v1'; const VERSION = '1.0.0' // Build Time: 2026-01-07 15:59:36
const CACHE_NAME = `emailbill-${VERSION}`
const urlsToCache = [ const urlsToCache = [
'/', '/',
'/index.html', '/index.html',
'/favicon.ico', '/favicon.ico',
'/manifest.json' '/manifest.json'
]; ]
// 安装 Service Worker // 安装 Service Worker
self.addEventListener('install', (event) => { self.addEventListener('install', (event) => {
console.log('[Service Worker] 安装中...'); console.log('[Service Worker] 安装中...')
event.waitUntil( event.waitUntil(
caches.open(CACHE_NAME) caches.open(CACHE_NAME)
.then((cache) => { .then((cache) => {
console.log('[Service Worker] 缓存文件'); console.log('[Service Worker] 缓存文件')
return cache.addAll(urlsToCache); return cache.addAll(urlsToCache)
}) })
.then(() => self.skipWaiting()) )
); })
});
// 监听跳过等待消息
self.addEventListener('message', (event) => {
if (event.data && event.data.type === 'SKIP_WAITING') {
self.skipWaiting()
}
})
// 激活 Service Worker // 激活 Service Worker
self.addEventListener('activate', (event) => { self.addEventListener('activate', (event) => {
console.log('[Service Worker] 激活中...'); console.log('[Service Worker] 激活中...')
event.waitUntil( event.waitUntil(
caches.keys().then((cacheNames) => { caches.keys().then((cacheNames) => {
return Promise.all( return Promise.all(
cacheNames.map((cacheName) => { cacheNames.map((cacheName) => {
if (cacheName !== CACHE_NAME) { if (cacheName !== CACHE_NAME) {
console.log('[Service Worker] 删除旧缓存:', cacheName); console.log('[Service Worker] 删除旧缓存:', cacheName)
return caches.delete(cacheName); return caches.delete(cacheName)
} }
}) })
); )
}).then(() => self.clients.claim()) }).then(() => self.clients.claim())
); )
}); })
// 拦截请求 // 拦截请求
self.addEventListener('fetch', (event) => { self.addEventListener('fetch', (event) => {
const { request } = event; const { request } = event
const url = new URL(request.url); const url = new URL(request.url)
// 跳过跨域请求 // 跳过跨域请求
if (url.origin !== location.origin) { if (url.origin !== location.origin) {
return; return
} }
// API请求使用网络优先策略 // API请求使用网络优先策略
@@ -51,91 +58,136 @@ self.addEventListener('fetch', (event) => {
event.respondWith( event.respondWith(
fetch(request) fetch(request)
.then((response) => { .then((response) => {
// 克隆响应以便缓存 // 只针对成功的GET请求进行缓存
const responseClone = response.clone(); if (request.method === 'GET' && response.status === 200) {
caches.open(CACHE_NAME).then((cache) => { const responseClone = response.clone()
cache.put(request, responseClone); caches.open(CACHE_NAME).then((cache) => {
}); cache.put(request, responseClone)
return response; })
}
return response
}) })
.catch(() => { .catch(() => {
// 网络失败时尝试从缓存获取 // 网络失败时尝试从缓存获取
return caches.match(request); return caches.match(request)
}) })
); )
return; return
} }
// 静态资源使用缓存优先策略 // 页面请求使用网络优先策略,确保能获取到最新的 index.html
if (request.mode === 'navigate') {
event.respondWith(
fetch(request)
.then((response) => {
const responseClone = response.clone()
caches.open(CACHE_NAME).then((cache) => {
cache.put(request, responseClone)
})
return response
})
.catch(() => {
return caches.match('/index.html') || caches.match(request)
})
)
return
}
// 其他静态资源使用缓存优先策略
event.respondWith( event.respondWith(
caches.match(request) caches.match(request)
.then((response) => { .then((response) => {
if (response) { if (response) {
return response; return response
} }
return fetch(request).then((response) => { return fetch(request).then((response) => {
// 检查是否是有效响应 // 检查是否是有效响应
if (!response || response.status !== 200 || response.type !== 'basic') { if (!response || response.status !== 200 || response.type !== 'basic') {
return response; return response
} }
const responseClone = response.clone(); const responseClone = response.clone()
caches.open(CACHE_NAME).then((cache) => { caches.open(CACHE_NAME).then((cache) => {
cache.put(request, responseClone); cache.put(request, responseClone)
}); })
return response; return response
}); })
}) })
.catch(() => { .catch(() => {
// 返回离线页面或默认内容 // 返回离线页面或默认内容
if (request.destination === 'document') { if (request.destination === 'document') {
return caches.match('/index.html'); return caches.match('/index.html')
} }
}) })
); )
}); })
// 后台同步 // 后台同步
self.addEventListener('sync', (event) => { self.addEventListener('sync', (event) => {
console.log('[Service Worker] 后台同步:', event.tag); console.log('[Service Worker] 后台同步:', event.tag)
if (event.tag === 'sync-data') { if (event.tag === 'sync-data') {
event.waitUntil(syncData()); event.waitUntil(syncData())
} }
}); })
// 推送通知 // 推送通知
self.addEventListener('push', (event) => { self.addEventListener('push', (event) => {
console.log('[Service Worker] 收到推送消息'); console.log('[Service Worker] 收到推送消息')
let data = { title: '账单管理', body: '您有新的消息', url: '/', icon: '/icons/icon-192x192.png' }
if (event.data) {
try {
const json = event.data.json()
data = { ...data, ...json }
} catch {
data.body = event.data.text()
}
}
const options = { const options = {
body: event.data ? event.data.text() : '您有新的账单消息', body: data.body,
icon: '/icons/icon-192x192.png', icon: data.icon,
badge: '/icons/icon-72x72.png', badge: '/icons/icon-72x72.png',
vibrate: [200, 100, 200], vibrate: [200, 100, 200],
tag: 'emailbill-notification', tag: 'emailbill-notification',
requireInteraction: false requireInteraction: false,
}; data: { url: data.url }
}
event.waitUntil( event.waitUntil(
self.registration.showNotification('账单管理', options) self.registration.showNotification(data.title, options)
); )
}); })
// 通知点击 // 通知点击
self.addEventListener('notificationclick', (event) => { self.addEventListener('notificationclick', (event) => {
console.log('[Service Worker] 通知被点击'); console.log('[Service Worker] 通知被点击')
event.notification.close(); event.notification.close()
const urlToOpen = event.notification.data?.url || '/'
event.waitUntil( event.waitUntil(
clients.openWindow('/') clients.matchAll({ type: 'window', includeUncontrolled: true }).then((windowClients) => {
); // 如果已经打开了该 URL则聚焦
}); for (let i = 0; i < windowClients.length; i++) {
const client = windowClients[i]
if (client.url === urlToOpen && 'focus' in client) {
return client.focus()
}
}
// 否则打开新窗口
if (clients.openWindow) {
return clients.openWindow(urlToOpen)
}
})
)
})
// 数据同步函数 // 数据同步函数
async function syncData() { async function syncData () {
try { try {
// 这里添加需要同步的逻辑 // 这里添加需要同步的逻辑
console.log('[Service Worker] 执行数据同步'); console.log('[Service Worker] 执行数据同步')
} catch (error) { } catch (error) {
console.error('[Service Worker] 同步失败:', error); console.error('[Service Worker] 同步失败:', error)
} }
} }

View File

@@ -1,25 +1,70 @@
<template> <template>
<van-config-provider :theme="theme" class="app-provider"> <van-config-provider
:theme="theme"
class="app-provider"
>
<div class="app-root"> <div class="app-root">
<RouterView /> <RouterView />
<van-tabbar v-model="active" v-show="showTabbar"> <van-tabbar
<van-tabbar-item name="ccalendar" icon="notes" to="/calendar"> v-show="showTabbar"
v-model="active"
>
<van-tabbar-item
name="ccalendar"
icon="notes"
to="/calendar"
>
日历 日历
</van-tabbar-item> </van-tabbar-item>
<van-tabbar-item name="statistics" icon="chart-trending-o" to="/" @click="handleTabClick('/statistics')"> <van-tabbar-item
name="statistics"
icon="chart-trending-o"
to="/"
@click="handleTabClick('/statistics')"
>
统计 统计
</van-tabbar-item> </van-tabbar-item>
<van-tabbar-item name="balance" icon="balance-list" to="/balance" @click="handleTabClick('/balance')"> <van-tabbar-item
name="balance"
icon="balance-list"
:to="messageStore.unreadCount > 0 ? '/balance?tab=message' : '/balance'"
:badge="messageStore.unreadCount || null"
@click="handleTabClick('/balance')"
>
账单 账单
</van-tabbar-item> </van-tabbar-item>
<van-tabbar-item name="message" icon="comment" to="/message" @click="handleTabClick('/message')" :badge="messageStore.unreadCount || null"> <van-tabbar-item
消息 name="budget"
icon="bill-o"
to="/budget"
@click="handleTabClick('/budget')"
>
预算
</van-tabbar-item> </van-tabbar-item>
<van-tabbar-item name="setting" icon="setting" to="/setting"> <van-tabbar-item
name="setting"
icon="setting"
to="/setting"
>
设置 设置
</van-tabbar-item> </van-tabbar-item>
</van-tabbar> </van-tabbar>
<GlobalAddBill @success="handleAddTransactionSuccess"/> <GlobalAddBill
v-if="isShowAddBill"
@success="handleAddTransactionSuccess"
/>
<div
v-if="needRefresh"
class="update-toast"
@click="updateServiceWorker"
>
<van-icon
name="upgrade"
class="update-icon"
/>
<span>新版本可用点击刷新</span>
</div>
</div> </div>
</van-config-provider> </van-config-provider>
</template> </template>
@@ -29,24 +74,37 @@ import { RouterView, useRoute } from 'vue-router'
import { ref, onMounted, onUnmounted, computed, watch } from 'vue' import { ref, onMounted, onUnmounted, computed, watch } from 'vue'
import { useMessageStore } from '@/stores/message' import { useMessageStore } from '@/stores/message'
import GlobalAddBill from '@/components/Global/GlobalAddBill.vue' import GlobalAddBill from '@/components/Global/GlobalAddBill.vue'
import { needRefresh, updateServiceWorker } from './registerServiceWorker'
import '@/styles/common.css' import '@/styles/common.css'
const messageStore = useMessageStore() const messageStore = useMessageStore()
const updateVh = () => { const updateVh = () => {
// 获取真实的视口高度PWA 模式下准确)
const vh = window.innerHeight const vh = window.innerHeight
// 设置 CSS 变量,让所有组件使用准确的视口高度
document.documentElement.style.setProperty('--vh', `${vh}px`) document.documentElement.style.setProperty('--vh', `${vh}px`)
} }
// 修复 PWA 模式下键盘收起页面不回弹的问题
const handleFocusOut = () => {
if (/(iPhone|iPad|iPod|iOS|Android)/i.test(navigator.userAgent)) {
// 延迟一小段时间执行,确保键盘收起动作已开始
setTimeout(() => {
// 强制回到顶部
window.scrollTo(0, 0)
// 同时也触发一次高度更新
updateVh()
}, 100)
}
}
onMounted(() => { onMounted(() => {
updateVh() updateVh()
window.addEventListener('resize', updateVh) window.addEventListener('resize', updateVh)
// 监听 iOS Safari 视口变化
if (window.visualViewport) { if (window.visualViewport) {
window.visualViewport.addEventListener('resize', updateVh) window.visualViewport.addEventListener('resize', updateVh)
} }
// 注册全局失去焦点监听
document.addEventListener('focusout', handleFocusOut)
}) })
onUnmounted(() => { onUnmounted(() => {
@@ -54,16 +112,21 @@ onUnmounted(() => {
if (window.visualViewport) { if (window.visualViewport) {
window.visualViewport.removeEventListener('resize', updateVh) window.visualViewport.removeEventListener('resize', updateVh)
} }
// 销毁监听
document.removeEventListener('focusout', handleFocusOut)
}) })
const route = useRoute() const route = useRoute()
// 根据路由判断是否显示Tabbar // 根据路由判断是否显示Tabbar
const showTabbar = computed(() => { const showTabbar = computed(() => {
return route.path === '/' || return (
route.path === '/' ||
route.path === '/calendar' || route.path === '/calendar' ||
route.path === '/message' || route.path === '/message' ||
route.path === '/setting' || route.path === '/setting' ||
route.path === '/balance' route.path === '/balance' ||
route.path === '/budget'
)
}) })
const active = ref('') const active = ref('')
@@ -79,16 +142,24 @@ const updateTheme = () => {
let mediaQuery let mediaQuery
onMounted(() => { onMounted(() => {
updateTheme() updateTheme()
messageStore.updateUnreadCount()
mediaQuery = window.matchMedia('(prefers-color-scheme: dark)') mediaQuery = window.matchMedia('(prefers-color-scheme: dark)')
mediaQuery.addEventListener('change', updateTheme) mediaQuery.addEventListener('change', updateTheme)
setActive(route.path) setActive(route.path)
}) })
setInterval(() => {
messageStore.updateUnreadCount()
}, 60 * 1000) // 每60秒更新一次未读消息数
// 监听路由变化调整 // 监听路由变化调整
watch(() => route.path, (newPath) => { watch(
setActive(newPath) () => route.path,
}) (newPath) => {
setActive(newPath)
messageStore.updateUnreadCount()
}
)
const setActive = (path) => { const setActive = (path) => {
active.value = (() => { active.value = (() => {
@@ -96,18 +167,22 @@ const setActive = (path) => {
case '/calendar': case '/calendar':
return 'ccalendar' return 'ccalendar'
case '/balance': case '/balance':
return 'balance'
case '/message': case '/message':
return 'message' return 'balance'
case '/setting': case '/setting':
return 'setting' return 'setting'
case '/budget':
return 'budget'
default: default:
return 'statistics' return 'statistics'
} }
})() })()
console.log(active.value, path)
} }
const isShowAddBill = computed(() => {
return route.path === '/' || route.path === '/balance' || route.path === '/message' || route.path === '/calendar'
})
onUnmounted(() => { onUnmounted(() => {
if (mediaQuery) { if (mediaQuery) {
mediaQuery.removeEventListener('change', updateTheme) mediaQuery.removeEventListener('change', updateTheme)
@@ -126,7 +201,6 @@ const handleAddTransactionSuccess = () => {
const event = new Event('transactions-changed') const event = new Event('transactions-changed')
window.dispatchEvent(event) window.dispatchEvent(event)
} }
</script> </script>
<style scoped> <style scoped>
@@ -176,4 +250,31 @@ const handleAddTransactionSuccess = () => {
font-size: 12px; font-size: 12px;
pointer-events: auto; pointer-events: auto;
} }
.update-toast {
position: fixed;
bottom: 80px;
left: 50%;
transform: translateX(-50%);
background-color: var(--van-primary-color);
color: white;
padding: 10px 20px;
border-radius: 24px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
z-index: 2000;
display: flex;
align-items: center;
gap: 8px;
font-size: 14px;
cursor: pointer;
transition: all 0.3s ease;
}
.update-toast:active {
transform: translateX(-50%) scale(0.95);
}
.update-icon {
font-size: 18px;
}
</style> </style>

59
Web/src/api/AGENTS.md Normal file
View File

@@ -0,0 +1,59 @@
# API CLIENTS KNOWLEDGE BASE
**Generated:** 2026-01-28
**Parent:** EmailBill/AGENTS.md
## OVERVIEW
Axios-based HTTP client modules for backend API integration with request/response interceptors.
## STRUCTURE
```
Web/src/api/
├── request.js # Base HTTP client setup
├── auth.js # Authentication API
├── budget.js # Budget management API
├── transactionRecord.js # Transaction CRUD API
├── transactionCategory.js # Category management
├── transactionPeriodic.js # Periodic transactions
├── statistics.js # Analytics API
├── message.js # Message API
├── notification.js # Push notifications
├── emailRecord.js # Email records
├── config.js # Configuration API
├── billImport.js # Bill import
├── log.js # Application logs
└── job.js # Background job management
```
## WHERE TO LOOK
| Task | Location | Notes |
|------|----------|-------|
| Base HTTP setup | request.js | Axios interceptors, error handling |
| Authentication | auth.js | Login, token management |
| Budget data | budget.js | Budget CRUD, statistics |
| Transactions | transactionRecord.js | Transaction operations |
| Categories | transactionCategory.js | Category management |
| Statistics | statistics.js | Analytics, reports |
| Notifications | notification.js | Push subscription handling |
## CONVENTIONS
- All functions return Promises with async/await
- Error handling via try/catch with user messages
- HTTP methods: get, post, put, delete mapping to REST
- Request/response data transformation
- Token-based authentication via headers
- Consistent error message format
## ANTI-PATTERNS (THIS LAYER)
- Never fetch directly without going through these modules
- Don't hardcode API endpoints (use environment variables)
- Avoid synchronous operations
- Don't duplicate request logic across components
- No business logic in API clients
## UNIQUE STYLES
- Chinese error messages for user feedback
- Automatic token refresh handling
- Request/response logging for debugging
- Paged query patterns for list endpoints
- File upload handling for imports

View File

@@ -1,5 +1,6 @@
import axios from 'axios' import axios from 'axios'
import { showToast } from 'vant' import { showToast } from 'vant'
import { useAuthStore } from '@/stores/auth'
/** /**
* 账单导入相关 API * 账单导入相关 API
@@ -21,48 +22,51 @@ export const uploadBillFile = (file, type) => {
method: 'post', method: 'post',
data: formData, data: formData,
headers: { headers: {
'Content-Type': 'multipart/form-data' 'Content-Type': 'multipart/form-data',
Authorization: `Bearer ${useAuthStore().token || ''}`
}, },
timeout: 60000 // 文件上传增加超时时间 timeout: 60000 // 文件上传增加超时时间
}).then(response => { })
const { data } = response .then((response) => {
const { data } = response
if (data.success === false) { if (data.success === false) {
showToast(data.message || '上传失败') showToast(data.message || '上传失败')
return Promise.reject(new Error(data.message || '上传失败')) return Promise.reject(new Error(data.message || '上传失败'))
}
return data
}).catch(error => {
console.error('上传错误:', error)
if (error.response) {
const { status, data } = error.response
let message = '上传失败'
switch (status) {
case 400:
message = data?.message || '请求参数错误'
break
case 401:
message = '未授权,请先登录'
break
case 403:
message = '没有权限'
break
case 413:
message = '文件过大'
break
case 500:
message = '服务器错误'
break
} }
showToast(message) return data
return Promise.reject(new Error(message)) })
} .catch((error) => {
console.error('上传错误:', error)
showToast('网络错误,请检查网络连接') if (error.response) {
return Promise.reject(error) const { status, data } = error.response
}) let message = '上传失败'
switch (status) {
case 400:
message = data?.message || '请求参数错误'
break
case 401:
message = '未授权,请先登录'
break
case 403:
message = '没有权限'
break
case 413:
message = '文件过大'
break
case 500:
message = '服务器错误'
break
}
showToast(message)
return Promise.reject(new Error(message))
}
showToast('网络错误,请检查网络连接')
return Promise.reject(error)
})
} }

111
Web/src/api/budget.js Normal file
View File

@@ -0,0 +1,111 @@
import request from './request'
/**
* 获取预算列表
* @param {string} referenceDate 参考日期 (可选)
*/
export function getBudgetList (referenceDate) {
return request({
url: '/Budget/GetList',
method: 'get',
params: { referenceDate }
})
}
/**
* 创建预算
* @param {object} data 预算数据
*/
export function createBudget (data) {
return request({
url: '/Budget/Create',
method: 'post',
data
})
}
/**
* 更新预算
* @param {object} data 预算数据
*/
export function updateBudget (data) {
return request({
url: '/Budget/Update',
method: 'post',
data
})
}
/**
* 删除预算
* @param {number} id 预算ID
*/
export function deleteBudget (id) {
return request({
url: `/Budget/DeleteById/${id}`,
method: 'delete'
})
}
/**
* 获取分类统计信息(月度和年度)
* @param {string} category 分类 (Expense/Income/Savings)
* @param {string} referenceDate 参考日期 (可选)
*/
export function getCategoryStats (category, referenceDate) {
return request({
url: '/Budget/GetCategoryStats',
method: 'get',
params: { category, referenceDate }
})
}
/**
* 获取未被预算覆盖的分类统计信息
* @param {number} category 预算分类
* @param {string} referenceDate 参考日期
*/
export function getUncoveredCategories (category, referenceDate) {
return request({
url: '/Budget/GetUncoveredCategories',
method: 'get',
params: { category, referenceDate }
})
}
/**
* 获取归档总结
* @param {string} referenceDate 参考日期
*/
export function getArchiveSummary (referenceDate) {
return request({
url: '/Budget/GetArchiveSummary',
method: 'get',
params: { referenceDate }
})
}
/**
* 更新归档总结
* @param {object} data 数据 { referenceDate, summary }
*/
export function updateArchiveSummary (data) {
return request({
url: '/Budget/UpdateArchiveSummary',
method: 'post',
data
})
}
/**
* 获取指定周期的存款预算信息
* @param {number} year 年份
* @param {number} month 月份
* @param {number} type 周期类型 (1:Month, 2:Year)
*/
export function getSavingsBudget (year, month, type) {
return request({
url: '/Budget/GetSavingsBudget',
method: 'get',
params: { year, month, type }
})
}

28
Web/src/api/config.js Normal file
View File

@@ -0,0 +1,28 @@
import request from './request'
/**
* 获取配置值
* @param {string} key - 配置的key
* @returns {Promise<{success: boolean, data: string}>}
*/
export const getConfig = (key) => {
return request({
url: '/Config/GetConfig',
method: 'get',
params: { key }
})
}
/**
* 设置配置值
* @param {string} key - 配置的key
* @param {string} value - 配置的值
* @returns {Promise<{success: boolean}>}
*/
export const setConfig = (key, value) => {
return request({
url: '/Config/SetConfig',
method: 'post',
params: { key, value }
})
}

View File

@@ -37,7 +37,7 @@ export const getEmailDetail = (id) => {
*/ */
export const deleteEmail = (id) => { export const deleteEmail = (id) => {
return request({ return request({
url: `/EmailMessage/DeleteById`, url: '/EmailMessage/DeleteById',
method: 'post', method: 'post',
params: { id } params: { id }
}) })
@@ -50,7 +50,7 @@ export const deleteEmail = (id) => {
*/ */
export const refreshTransactionRecords = (id) => { export const refreshTransactionRecords = (id) => {
return request({ return request({
url: `/EmailMessage/RefreshTransactionRecords`, url: '/EmailMessage/RefreshTransactionRecords',
method: 'post', method: 'post',
params: { id } params: { id }
}) })
@@ -62,7 +62,7 @@ export const refreshTransactionRecords = (id) => {
*/ */
export const syncEmails = () => { export const syncEmails = () => {
return request({ return request({
url: `/EmailMessage/SyncEmails`, url: '/EmailMessage/SyncEmails',
method: 'post' method: 'post'
}) })
} }

32
Web/src/api/job.js Normal file
View File

@@ -0,0 +1,32 @@
import request from '@/api/request'
export function getJobs () {
return request({
url: '/Job/GetJobs',
method: 'get'
})
}
export function executeJob (jobName) {
return request({
url: '/Job/Execute',
method: 'post',
data: { jobName }
})
}
export function pauseJob (jobName) {
return request({
url: '/Job/Pause',
method: 'post',
data: { jobName }
})
}
export function resumeJob (jobName) {
return request({
url: '/Job/Resume',
method: 'post',
data: { jobName }
})
}

View File

@@ -1,4 +1,4 @@
import request from './request' import request from './request'
/** /**
* 日志相关 API * 日志相关 API
@@ -12,6 +12,7 @@
* @param {string} [params.searchKeyword] - 搜索关键词 * @param {string} [params.searchKeyword] - 搜索关键词
* @param {string} [params.logLevel] - 日志级别 * @param {string} [params.logLevel] - 日志级别
* @param {string} [params.date] - 日期 (yyyyMMdd) * @param {string} [params.date] - 日期 (yyyyMMdd)
* @param {string} [params.className] - 类名
* @returns {Promise<{success: boolean, data: Array, total: number}>} * @returns {Promise<{success: boolean, data: Array, total: number}>}
*/ */
export const getLogList = (params = {}) => { export const getLogList = (params = {}) => {
@@ -32,3 +33,34 @@ export const getAvailableDates = () => {
method: 'get' method: 'get'
}) })
} }
/**
* 获取可用的类名列表
* @param {Object} params - 查询参数
* @param {string} [params.date] - 日期 (yyyyMMdd)
* @returns {Promise<{success: boolean, data: Array}>}
*/
export const getAvailableClassNames = (params = {}) => {
return request({
url: '/Log/GetAvailableClassNames',
method: 'get',
params
})
}
/**
* 根据请求ID查询关联日志
* @param {Object} params - 查询参数
* @param {string} params.requestId - 请求ID
* @param {number} [params.pageIndex=1] - 页码
* @param {number} [params.pageSize=50] - 每页条数
* @param {string} [params.date] - 日期 (yyyyMMdd)
* @returns {Promise<{success: boolean, data: Array, total: number}>}
*/
export const getLogsByRequestId = (params = {}) => {
return request({
url: '/Log/GetLogsByRequestId',
method: 'get',
params
})
}

View File

@@ -0,0 +1,24 @@
import request from './request'
export function getVapidPublicKey () {
return request({
url: '/Notification/GetVapidPublicKey',
method: 'get'
})
}
export function subscribe (data) {
return request({
url: '/Notification/Subscribe',
method: 'post',
data
})
}
export function testNotification (message) {
return request({
url: '/Notification/TestNotification',
method: 'post',
params: { message }
})
}

View File

@@ -1,4 +1,4 @@
import axios from 'axios' import axios from 'axios'
import { showToast } from 'vant' import { showToast } from 'vant'
import { useAuthStore } from '@/stores/auth' import { useAuthStore } from '@/stores/auth'
import router from '@/router' import router from '@/router'
@@ -12,17 +12,31 @@ const request = axios.create({
} }
}) })
// 生成请求ID
const generateRequestId = () => {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
const r = Math.random() * 16 | 0
const v = c === 'x' ? r : (r & 0x3 | 0x8)
return v.toString(16)
})
}
// 请求拦截器 // 请求拦截器
request.interceptors.request.use( request.interceptors.request.use(
config => { (config) => {
// 添加 token 认证信息 // 添加 token 认证信息
const authStore = useAuthStore() const authStore = useAuthStore()
if (authStore.token) { if (authStore.token) {
config.headers.Authorization = `Bearer ${authStore.token}` config.headers.Authorization = `Bearer ${authStore.token}`
} }
// 添加请求ID
const requestId = generateRequestId()
config.headers['X-Request-ID'] = requestId
return config return config
}, },
error => { (error) => {
console.error('请求错误:', error) console.error('请求错误:', error)
return Promise.reject(error) return Promise.reject(error)
} }
@@ -30,7 +44,7 @@ request.interceptors.request.use(
// 响应拦截器 // 响应拦截器
request.interceptors.response.use( request.interceptors.response.use(
response => { (response) => {
const { data } = response const { data } = response
// 统一处理业务错误 // 统一处理业务错误
@@ -41,7 +55,7 @@ request.interceptors.response.use(
return data return data
}, },
error => { (error) => {
console.error('响应错误:', error) console.error('响应错误:', error)
// 统一处理 HTTP 错误 // 统一处理 HTTP 错误
@@ -53,13 +67,17 @@ request.interceptors.response.use(
case 400: case 400:
message = data?.message || '请求参数错误' message = data?.message || '请求参数错误'
break break
case 401: case 401: {
message = '未授权,请重新登录' message = '未授权,请重新登录'
// 清除登录状态并跳转到登录页 // 清除登录状态并跳转到登录页
const authStore = useAuthStore() const authStore = useAuthStore()
authStore.logout() authStore.logout()
router.push({ name: 'login', query: { redirect: router.currentRoute.value.fullPath } }) router.push({
name: 'login',
query: { redirect: router.currentRoute.value.fullPath }
})
break break
}
case 403: case 403:
message = '拒绝访问' message = '拒绝访问'
break break

View File

@@ -1,4 +1,4 @@
import request from './request' import request from './request'
/** /**
* 统计相关 API * 统计相关 API
@@ -17,8 +17,6 @@
* @returns {Object} data.expenseCount - 支出笔数 * @returns {Object} data.expenseCount - 支出笔数
* @returns {Object} data.incomeCount - 收入笔数 * @returns {Object} data.incomeCount - 收入笔数
* @returns {Object} data.totalCount - 总笔数 * @returns {Object} data.totalCount - 总笔数
* @returns {Object} data.maxExpense - 最大单笔支出
* @returns {Object} data.maxIncome - 最大单笔收入
*/ */
export const getMonthlyStatistics = (params) => { export const getMonthlyStatistics = (params) => {
return request({ return request({
@@ -88,3 +86,21 @@ export const getDailyStatistics = (params) => {
params params
}) })
} }
/**
* 获取累积余额统计数据(用于余额卡片)
* @param {Object} params - 查询参数
* @param {number} params.year - 年份
* @param {number} params.month - 月份
* @returns {Promise<{success: boolean, data: Array}>}
* @returns {Array} data - 每日累积余额列表
* @returns {string} data[].date - 日期
* @returns {number} data[].cumulativeBalance - 累积余额
*/
export const getBalanceStatistics = (params) => {
return request({
url: '/TransactionRecord/GetBalanceStatistics',
method: 'get',
params
})
}

View File

@@ -76,3 +76,30 @@ export const batchCreateCategories = (dataList) => {
data: dataList data: dataList
}) })
} }
/**
* 为指定分类生成新的SVG图标
* @param {number} categoryId - 分类ID
* @returns {Promise<{success: boolean, data: string}>} 返回生成的SVG内容
*/
export const generateIcon = (categoryId) => {
return request({
url: '/TransactionCategory/GenerateIcon',
method: 'post',
data: { categoryId }
})
}
/**
* 更新分类的选中图标索引
* @param {number} categoryId - 分类ID
* @param {number} selectedIndex - 选中的图标索引
* @returns {Promise<{success: boolean}>}
*/
export const updateSelectedIcon = (categoryId, selectedIndex) => {
return request({
url: '/TransactionCategory/UpdateSelectedIcon',
method: 'post',
data: { categoryId, selectedIndex }
})
}

View File

@@ -79,7 +79,7 @@ export const updatePeriodic = (data) => {
*/ */
export const deletePeriodic = (id) => { export const deletePeriodic = (id) => {
return request({ return request({
url: `/TransactionPeriodic/DeleteById`, url: '/TransactionPeriodic/DeleteById',
method: 'post', method: 'post',
params: { id } params: { id }
}) })

View File

@@ -1,4 +1,4 @@
import request from './request' import request from './request'
/** /**
* 交易记录相关 API * 交易记录相关 API
@@ -19,6 +19,29 @@ export const getTransactionList = (params = {}) => {
}) })
} }
/**
* 获取待确认分类的交易记录列表
* @returns {Promise<{success: boolean, data: Array}>}
*/
export const getUnconfirmedTransactionList = () => {
return request({
url: '/TransactionRecord/GetUnconfirmedList',
method: 'get'
})
}
/**
* 全部确认待确认的交易分类
* @returns {Promise<{success: boolean, data: number}>}
*/
export const confirmAllUnconfirmed = (ids) => {
return request({
url: '/TransactionRecord/ConfirmAllUnconfirmed',
method: 'post',
data: { ids }
})
}
/** /**
* 根据ID获取交易记录详情 * 根据ID获取交易记录详情
* @param {number} id - 交易记录ID * @param {number} id - 交易记录ID
@@ -59,6 +82,7 @@ export const createTransaction = (data) => {
* @param {number} data.balance - 交易后余额 * @param {number} data.balance - 交易后余额
* @param {number} data.type - 交易类型 (0:支出, 1:收入, 2:不计入收支) * @param {number} data.type - 交易类型 (0:支出, 1:收入, 2:不计入收支)
* @param {string} data.classify - 交易分类 * @param {string} data.classify - 交易分类
* @param {string} [data.occurredAt] - 交易时间
* @returns {Promise<{success: boolean}>} * @returns {Promise<{success: boolean}>}
*/ */
export const updateTransaction = (data) => { export const updateTransaction = (data) => {
@@ -76,7 +100,7 @@ export const updateTransaction = (data) => {
*/ */
export const deleteTransaction = (id) => { export const deleteTransaction = (id) => {
return request({ return request({
url: `/TransactionRecord/DeleteById`, url: '/TransactionRecord/DeleteById',
method: 'post', method: 'post',
params: { id } params: { id }
}) })
@@ -95,7 +119,6 @@ export const getTransactionsByDate = (date) => {
}) })
} }
// 注意分类相关的API已迁移到 transactionCategory.js // 注意分类相关的API已迁移到 transactionCategory.js
// 请使用 getCategoryList 等新接口 // 请使用 getCategoryList 等新接口
@@ -137,7 +160,7 @@ export const smartClassify = (transactionIds = []) => {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': `Bearer ${token}` Authorization: `Bearer ${token}`
}, },
body: JSON.stringify({ transactionIds }) body: JSON.stringify({ transactionIds })
}) })
@@ -201,32 +224,6 @@ export const nlpAnalysis = (userInput) => {
}) })
} }
/**
* 获取抵账候选列表
* @param {number} id - 当前交易ID
* @returns {Promise<{success: boolean, data: Array}>}
*/
export const getCandidatesForOffset = (id) => {
return request({
url: `/TransactionRecord/GetCandidatesForOffset/${id}`,
method: 'get'
})
}
/**
* 抵账(删除两笔交易)
* @param {number} id1 - 交易ID 1
* @param {number} id2 - 交易ID 2
* @returns {Promise<{success: boolean}>}
*/
export const offsetTransactions = (id1, id2) => {
return request({
url: '/TransactionRecord/OffsetTransactions',
method: 'post',
data: { id1, id2 }
})
}
/** /**
* 一句话录账解析 * 一句话录账解析
* @param {string} text - 用户输入的自然语言文本 * @param {string} text - 用户输入的自然语言文本

View File

@@ -1,55 +1,75 @@
/* color palette from <https://github.com/vuejs/theme> */ /* color palette from <https://github.com/vuejs/theme> */
/*
Most variables are replaced by Vant CSS variables.
Keeping only what's necessary or mapping to Vant.
*/
:root { :root {
--vt-c-white: #ffffff; --van-danger-color: rgb(255, 107, 107) !important; /* 覆盖默认的深红色 #ee0a24 */
--vt-c-white-soft: #f8f8f8; --color-background: var(--van-background);
--vt-c-white-mute: #f2f2f2; --color-background-soft: var(--van-background-2);
--color-background-mute: var(--van-gray-1);
--vt-c-black: #181818; --color-border: var(--van-border-color);
--vt-c-black-soft: #222222; --color-border-hover: var(--van-gray-5);
--vt-c-black-mute: #282828;
--vt-c-indigo: #2c3e50; --color-heading: var(--van-text-color);
--color-text: var(--van-text-color);
--vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
--vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
--vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
--vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
--vt-c-text-light-1: var(--vt-c-indigo);
--vt-c-text-light-2: rgba(60, 60, 60, 0.66);
--vt-c-text-dark-1: var(--vt-c-white);
--vt-c-text-dark-2: rgba(235, 235, 235, 0.64);
}
/* semantic color variables for this project */
:root {
--color-background: var(--vt-c-white);
--color-background-soft: var(--vt-c-white-soft);
--color-background-mute: var(--vt-c-white-mute);
--color-border: var(--vt-c-divider-light-2);
--color-border-hover: var(--vt-c-divider-light-1);
--color-heading: var(--vt-c-text-light-1);
--color-text: var(--vt-c-text-light-1);
--section-gap: 160px; --section-gap: 160px;
/* Chart Colors */
--chart-color-1: #ff6b6b;
--chart-color-2: #4ecdc4;
--chart-color-3: #45b7d1;
--chart-color-4: #ffa07a;
--chart-color-5: #98d8c8;
--chart-color-6: #f7dc6f;
--chart-color-7: #bb8fce;
--chart-color-8: #85c1e2;
--chart-color-9: #f8b88b;
--chart-color-10: #aab7b8;
--chart-color-11: #ff8ed4;
--chart-color-12: #67e6dc;
--chart-color-13: #5b8dee;
--chart-color-14: #c9b1ff;
--chart-color-15: #7bdff2;
/* Status Colors for Charts */
--chart-success: #52c41a;
--chart-warning: #faad14;
--chart-danger: #f5222d;
--chart-primary: #1890ff;
--chart-shadow: rgba(0, 138, 255, 0.45);
--chart-axis: #e6ebf8;
--chart-split: #eee;
--chart-text-muted: #999;
/* Heatmap Colors - Light Mode */
--heatmap-level-0: var(--van-gray-2);
--heatmap-level-1: #9be9a8;
--heatmap-level-2: #40c463;
--heatmap-level-3: #30a14e;
--heatmap-level-4: #216e39;
} }
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {
:root { :root {
--color-background: var(--vt-c-black); --chart-axis: #333;
--color-background-soft: var(--vt-c-black-soft); --chart-split: #333;
--color-background-mute: var(--vt-c-black-mute); --chart-text-muted: #666;
--color-border: var(--vt-c-divider-dark-2); /* Heatmap Colors - Dark Mode (GitHub Style) */
--color-border-hover: var(--vt-c-divider-dark-1); --heatmap-level-0: var(--van-gray-2);
--heatmap-level-1: #9be9a8;
--color-heading: var(--vt-c-text-dark-1); --heatmap-level-2: #40c463;
--color-text: var(--vt-c-text-dark-2); --heatmap-level-3: #30a14e;
--heatmap-level-4: #216e39;
} }
} }
/* Removed manual dark mode media query as Vant handles it */
*, *,
*::before, *::before,
*::after { *::after {
@@ -60,14 +80,13 @@
body { body {
min-height: 100vh; min-height: 100vh;
color: var(--color-text); color: var(--van-text-color);
background: var(--color-background); background: var(--van-background);
transition: transition:
color 0.5s, color 0.5s,
background-color 0.5s; background-color 0.5s;
line-height: 1.6; line-height: 1.6;
font-family: font-family:
Inter,
-apple-system, -apple-system,
BlinkMacSystemFont, BlinkMacSystemFont,
'Segoe UI', 'Segoe UI',

View File

@@ -1,7 +1,8 @@
@import './base.css'; @import './base.css';
/* 禁用页面弹性缩放和橡皮筋效果 */ /* 禁用页面弹性缩放和橡皮筋效果 */
html, body { html,
body {
overscroll-behavior: none; overscroll-behavior: none;
overscroll-behavior-y: none; overscroll-behavior-y: none;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
@@ -57,7 +58,9 @@ a,
} }
} }
html, body, #app { html,
body,
#app {
margin: 0; margin: 0;
padding: 0; padding: 0;
height: 100%; height: 100%;

184
Web/src/assets/theme.css Normal file
View File

@@ -0,0 +1,184 @@
/**
* EmailBill 主题系统 - 根据 v2.pen 设计稿
* 用于保持整个应用色彩和布局一致性
*/
:root {
/* ============ 颜色变量 - 浅色主题 ============ */
/* 背景色 */
--bg-primary: #FFFFFF;
--bg-secondary: #F6F7F8;
--bg-tertiary: #F3F4F6;
--bg-button: #F5F5F5;
/* 文字颜色 */
--text-primary: #1A1A1A;
--text-secondary: #6B7280;
--text-tertiary: #9CA3AF;
/* 强调色 */
--accent-primary: #FF6B6B;
--accent-danger: #EF4444;
--accent-warning: #D97706;
--accent-warning-bg: #FFFBEB;
--accent-success: #22C55E;
--accent-success-bg: #F0FDF4;
--accent-info: #6366F1;
--accent-info-bg: #E0E7FF;
/* 图标色 */
--icon-star: #FF6B6B;
--icon-coffee: #FCD34D;
/* ============ 布局变量 ============ */
/* 间距 */
--spacing-xs: 2px;
--spacing-sm: 4px;
--spacing-md: 8px
--spacing-lg: 12px;
--spacing-xl: 16px;
--spacing-2xl: 20px;
--spacing-3xl: 24px;
/* 圆角 */
--radius-sm: 12px;
--radius-md: 16px;
--radius-lg: 20px;
--radius-full: 22px;
/* 字体大小 */
--font-xs: 9px;
--font-sm: 11px;
--font-base: 12px;
--font-md: 13px;
--font-lg: 15px;
--font-xl: 18px;
--font-2xl: 24px;
--font-3xl: 32px;
/* 字体粗细 */
--font-medium: 500;
--font-semibold: 600;
--font-bold: 700;
--font-extrabold: 800;
/* 字体 */
--font-primary: 'DM Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
--font-display: 'Bricolage Grotesque', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
/* 阴影 (可选) */
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
--shadow-md: 0 4px 6px rgba(0, 0, 0, 0.05);
--shadow-lg: 0 10px 15px rgba(0, 0, 0, 0.05);
}
/* ============ 深色主题 ============ */
[data-theme="dark"] {
/* 背景色 */
--bg-primary: #09090B;
--bg-secondary: #18181b;
--bg-tertiary: #27272a;
--bg-button: #27272a;
/* 文字颜色 */
--text-primary: #f4f4f5;
--text-secondary: #a1a1aa;
--text-tertiary: #71717a;
/* 强调色 (深色主题调整) */
--accent-primary: #FF6B6B;
--accent-danger: #f87171;
--accent-warning: #fbbf24;
--accent-warning-bg: #451a03;
--accent-success: #4ade80;
--accent-success-bg: #064e3b;
--accent-info: #818cf8;
--accent-info-bg: #312e81;
/* 图标色 (深色主题) */
--icon-star: #FF6B6B;
--icon-coffee: #FCD34D;
}
/* ============ 通用工具类 ============ */
/* 文字 */
.text-primary {
color: var(--text-primary);
}
.text-secondary {
color: var(--text-secondary);
}
.text-tertiary {
color: var(--text-tertiary);
}
.text-danger {
color: var(--accent-danger);
}
/* 背景 */
.bg-primary {
background-color: var(--bg-primary);
}
.bg-secondary {
background-color: var(--bg-secondary);
}
.bg-tertiary {
background-color: var(--bg-tertiary);
}
/* 布局容器 */
.container-fluid {
width: 100%;
max-width: 402px;
margin: 0 auto;
}
/* Flex 布局 */
.flex {
display: flex;
}
.flex-col {
flex-direction: column;
}
.items-center {
align-items: center;
}
.justify-between {
justify-content: space-between;
}
.justify-center {
justify-content: center;
}
/* 间距 */
.gap-xs { gap: var(--spacing-xs); }
.gap-sm { gap: var(--spacing-sm); }
.gap-md { gap: var(--spacing-md); }
.gap-lg { gap: var(--spacing-lg); }
.gap-xl { gap: var(--spacing-xl); }
.gap-2xl { gap: var(--spacing-2xl); }
.gap-3xl { gap: var(--spacing-3xl); }
/* 内边距 */
.p-sm { padding: var(--spacing-md); }
.p-md { padding: var(--spacing-xl); }
.p-lg { padding: var(--spacing-2xl); }
.p-xl { padding: var(--spacing-3xl); }
/* 圆角 */
.rounded-sm { border-radius: var(--radius-sm); }
.rounded-md { border-radius: var(--radius-md); }
.rounded-lg { border-radius: var(--radius-lg); }
.rounded-full { border-radius: var(--radius-full); }

View File

@@ -0,0 +1,46 @@
<template>
<van-dialog
v-model:show="show"
title="新增交易分类"
show-cancel-button
@confirm="handleConfirm"
>
<van-field
v-model="classifyName"
placeholder="请输入新的交易分类"
/>
</van-dialog>
</template>
<script setup>
import { ref } from 'vue'
import { showToast } from 'vant'
const emit = defineEmits(['confirm'])
const show = ref(false)
const classifyName = ref('')
// 打开弹窗
const open = () => {
classifyName.value = ''
show.value = true
}
// 确认
const handleConfirm = () => {
if (!classifyName.value.trim()) {
showToast('请输入分类名称')
return
}
emit('confirm', classifyName.value.trim())
show.value = false
classifyName.value = ''
}
// 暴露方法给父组件
defineExpose({
open
})
</script>

View File

@@ -6,8 +6,12 @@
<van-field label="时间"> <van-field label="时间">
<template #input> <template #input>
<div style="display: flex; gap: 16px"> <div style="display: flex; gap: 16px">
<div @click="showDatePicker = true">{{ form.date }}</div> <div @click="showDatePicker = true">
<div @click="showTimePicker = true">{{ form.time }}</div> {{ form.date }}
</div>
<div @click="showTimePicker = true">
{{ form.time }}
</div>
</div> </div>
</template> </template>
</van-field> </van-field>
@@ -34,67 +38,71 @@
/> />
<!-- 交易类型 --> <!-- 交易类型 -->
<van-field name="type" label="类型"> <van-field
name="type"
label="类型"
>
<template #input> <template #input>
<van-radio-group v-model="form.type" direction="horizontal"> <van-radio-group
<van-radio :name="0">支出</van-radio> v-model="form.type"
<van-radio :name="1">收入</van-radio> direction="horizontal"
<van-radio :name="2">不计</van-radio> @change="handleTypeChange"
>
<van-radio :name="0">
支出
</van-radio>
<van-radio :name="1">
收入
</van-radio>
<van-radio :name="2">
不计
</van-radio>
</van-radio-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
<!-- 分类 --> <!-- 分类 -->
<van-field name="category" label="分类"> <van-field
name="category"
label="分类"
>
<template #input> <template #input>
<span v-if="!categoryName" style="color: #c8c9cc;">请选择分类</span> <span
v-if="!categoryName"
style="color: var(--van-text-color-3)"
>请选择分类</span>
<span v-else>{{ categoryName }}</span> <span v-else>{{ categoryName }}</span>
</template> </template>
</van-field> </van-field>
<!-- 分类按钮网格 --> <!-- 分类选择组件 -->
<div class="classify-buttons"> <ClassifySelector
<van-button v-model="categoryName"
type="success" :type="form.type"
size="small" />
class="classify-btn"
@click="showAddClassify = true"
>
+ 新增
</van-button>
<van-button
v-for="item in categoryList"
:key="item.id"
:type="categoryName === item.name ? 'primary' : 'default'"
size="small"
class="classify-btn"
@click="selectClassify(item)"
>
{{ item.name }}
</van-button>
</div>
</van-cell-group> </van-cell-group>
<div class="actions"> <div class="actions">
<van-button round block type="primary" native-type="submit" :loading="loading"> <van-button
round
block
type="primary"
native-type="submit"
:loading="loading"
>
{{ submitText }} {{ submitText }}
</van-button> </van-button>
<slot name="actions"></slot> <slot name="actions" />
</div> </div>
</van-form> </van-form>
<!-- 新增分类对话框 -->
<van-dialog
v-model:show="showAddClassify"
title="新增交易分类"
show-cancel-button
@confirm="addNewClassify"
>
<van-field v-model="newClassify" placeholder="请输入新的交易分类" />
</van-dialog>
<!-- 日期选择弹窗 --> <!-- 日期选择弹窗 -->
<van-popup v-model:show="showDatePicker" position="bottom" round> <van-popup
v-model:show="showDatePicker"
position="bottom"
round
teleport="body"
>
<van-date-picker <van-date-picker
v-model="currentDate" v-model="currentDate"
title="选择日期" title="选择日期"
@@ -104,7 +112,12 @@
</van-popup> </van-popup>
<!-- 时间选择弹窗 --> <!-- 时间选择弹窗 -->
<van-popup v-model:show="showTimePicker" position="bottom" round> <van-popup
v-model:show="showTimePicker"
position="bottom"
round
teleport="body"
>
<van-time-picker <van-time-picker
v-model="currentTime" v-model="currentTime"
title="选择时间" title="选择时间"
@@ -116,10 +129,10 @@
</template> </template>
<script setup> <script setup>
import { ref, onMounted, watch, toRefs } from 'vue' import { ref, onMounted, watch, nextTick } from 'vue'
import { showToast } from 'vant' import { showToast } from 'vant'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import { getCategoryList, createCategory } from '@/api/transactionCategory' import ClassifySelector from '@/components/ClassifySelector.vue'
const props = defineProps({ const props = defineProps({
initialData: { initialData: {
@@ -142,30 +155,26 @@ const emit = defineEmits(['submit'])
const form = ref({ const form = ref({
type: 0, // 0: 支出, 1: 收入, 2: 不计 type: 0, // 0: 支出, 1: 收入, 2: 不计
amount: '', amount: '',
categoryId: null,
date: dayjs().format('YYYY-MM-DD'), date: dayjs().format('YYYY-MM-DD'),
time: dayjs().format('HH:mm'), time: dayjs().format('HH:mm'),
note: '' note: ''
}) })
const categoryName = ref('') const categoryName = ref('')
const isSyncing = ref(false)
// 弹窗控制 // 弹窗控制
const showDatePicker = ref(false) const showDatePicker = ref(false)
const showTimePicker = ref(false) const showTimePicker = ref(false)
const showAddClassify = ref(false)
const newClassify = ref('')
// 选择器数据 // 日期时间临时变量 (Vant DatePicker 需要数组 or 特定格式)
const categoryList = ref([])
// 日期时间临时变量 (Vant DatePicker 需要数组或特定格式)
const currentDate = ref(dayjs().format('YYYY-MM-DD').split('-')) const currentDate = ref(dayjs().format('YYYY-MM-DD').split('-'))
const currentTime = ref(dayjs().format('HH:mm').split(':')) const currentTime = ref(dayjs().format('HH:mm').split(':'))
// 初始化数据 // 初始化数据
const initForm = async () => { const initForm = async () => {
if (props.initialData) { if (props.initialData) {
isSyncing.value = true
const { occurredAt, amount, reason, type, classify } = props.initialData const { occurredAt, amount, reason, type, classify } = props.initialData
if (occurredAt) { if (occurredAt) {
@@ -176,32 +185,24 @@ const initForm = async () => {
currentTime.value = form.value.time.split(':') currentTime.value = form.value.time.split(':')
} }
if (amount !== undefined) form.value.amount = amount if (amount !== undefined) {
if (reason !== undefined) form.value.note = reason form.value.amount = amount
if (type !== undefined) form.value.type = type
// 加载分类列表
await loadClassifyList(form.value.type)
// 如果有传入分类名称,尝试匹配
if (classify) {
const found = categoryList.value.find(c => c.name === classify)
if (found) {
selectClassify(found)
} else {
// 如果没找到对应分类但有分类名称可能需要特殊处理或者就显示名称但不关联ID
// 这里暂时只显示名称ID为空或者需要自动创建
// 按照原有逻辑,后端需要分类名称,所以这里只要设置 categoryName 即可
// 但是 ManualBillAdd 原逻辑是需要 categoryId 的。
// 不过 createTransaction 接口传的是 classify (name)。
// 让我们看 ManualBillAdd 的 handleSave:
// classify: categoryName.value
// 所以只要 categoryName 有值就行。
categoryName.value = classify
}
} }
} else { if (reason !== undefined) {
await loadClassifyList(form.value.type) form.value.note = reason
}
if (type !== undefined) {
form.value.type = type
}
// 如果有传入分类名称,尝试设置
if (classify) {
categoryName.value = classify
}
nextTick(() => {
isSyncing.value = false
})
} }
} }
@@ -210,96 +211,17 @@ onMounted(() => {
}) })
// 监听 initialData 变化 (例如重新解析后) // 监听 initialData 变化 (例如重新解析后)
watch(() => props.initialData, () => { watch(
initForm() () => props.initialData,
}, { deep: true }) () => {
initForm()
// 监听交易类型变化,重新加载分类 },
watch(() => form.value.type, (newVal) => { { deep: true }
// 如果是初始化过程中导致的类型变化,可能不需要清空分类(如果已经匹配好了) )
// 但如果是用户手动切换,应该清空
// 这里简单处理:如果是用户切换,通常需要重新选择。
// 为了避免初始化时的冲突,可以在 initForm 里处理好。
// 这里主要响应用户操作。
// 只有当当前分类不属于新类型时才清空?或者总是清空?
// 原逻辑是总是清空。
// 但是如果是 initForm 引起的,我们不希望清空。
// 暂时保持原逻辑,但在 initForm 里调用 loadClassifyList 后再设置 categoryName
// 简单的做法:在 watch 内部判断是否正在初始化?比较麻烦。
// 或者:只在用户点击 radio 时触发?
// watch 是最稳妥的,但要注意 initForm 里的顺序。
// 在 initForm 里,我们先设置 type这会触发 watch。
// 所以 initForm 里的 loadClassifyList 可能会被 watch 里的覆盖。
// 让我们调整一下策略:
// 不在 watch 里加载,而是由 radio change 事件触发?
// 或者在 watch 里判断,如果 categoryName 已经有值且符合当前类型(这个很难判断),就不清空。
// 实际上initForm 里设置 type 后watch 会执行。
// watch 会清空 categoryName。
// 所以 initForm 里设置 type 后,再设置 categoryName 是没用的,除非 watch 是异步的或者我们在 nextTick 设置。
// 让我们修改 watch 逻辑,或者在 initForm 里处理。
// 更好的方式:
// 移除 watch改为在 radio group 上 @change="handleTypeChange"
})
const handleTypeChange = (newType) => { const handleTypeChange = (newType) => {
categoryName.value = '' if (!isSyncing.value) {
form.value.categoryId = null categoryName.value = ''
loadClassifyList(newType)
}
const loadClassifyList = async (type = null) => {
try {
const response = await getCategoryList(type)
if (response.success) {
categoryList.value = response.data || []
}
} catch (error) {
console.error('加载分类列表出错:', error)
}
}
const selectClassify = (item) => {
categoryName.value = item.name
form.value.categoryId = item.id
}
const addNewClassify = async () => {
if (!newClassify.value.trim()) {
showToast('请输入分类名称')
return
}
try {
const name = newClassify.value.trim()
// 调用API创建分类
const response = await createCategory({
name: name,
type: form.value.type
})
if (response.success) {
showToast('分类创建成功')
const newId = response.data
// 重新加载分类列表
await loadClassifyList(form.value.type)
// 选中新创建的分类
categoryName.value = name
form.value.categoryId = newId
} else {
showToast(response.message || '创建分类失败')
}
} catch (error) {
console.error('创建分类出错:', error)
showToast('创建分类失败')
} finally {
newClassify.value = ''
showAddClassify.value = false
} }
} }

View File

@@ -1,6 +1,10 @@
<template> <template>
<div> <div>
<div class="input-section" v-if="!parseResult" style="margin: 12px 12px 0 16px;"> <div
v-if="!parseResult"
class="input-section"
style="margin: 12px 12px 0 16px"
>
<van-field <van-field
v-model="text" v-model="text"
type="textarea" type="textarea"
@@ -14,16 +18,19 @@
type="primary" type="primary"
round round
block block
@click="handleParse"
:loading="parsing" :loading="parsing"
:disabled="!text.trim()" :disabled="!text.trim()"
@click="handleParse"
> >
智能解析 智能解析
</van-button> </van-button>
</div> </div>
</div> </div>
<div v-if="parseResult" class="result-section"> <div
v-if="parseResult"
class="result-section"
>
<BillForm <BillForm
:initial-data="parseResult" :initial-data="parseResult"
:loading="saving" :loading="saving"
@@ -35,8 +42,8 @@
plain plain
round round
block block
@click="parseResult = null"
class="mt-2" class="mt-2"
@click="parseResult = null"
> >
重新输入 重新输入
</van-button> </van-button>
@@ -60,14 +67,16 @@ const saving = ref(false)
const parseResult = ref(null) const parseResult = ref(null)
const handleParse = async () => { const handleParse = async () => {
if (!text.value.trim()) return if (!text.value.trim()) {
return
}
parsing.value = true parsing.value = true
parseResult.value = null parseResult.value = null
try { try {
const res = await parseOneLine(text.value) const res = await parseOneLine(text.value)
if(!res.success){ if (!res.success) {
throw new Error(res.message || '解析失败') throw new Error(res.message || '解析失败')
} }
@@ -121,6 +130,6 @@ const handleSave = async (payload) => {
margin-bottom: 16px; margin-bottom: 16px;
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
border: 1px solid #ebedf0; border: 1px solid var(--van-border-color);
} }
</style> </style>

Some files were not shown because too many files have changed in this diff Show More