Compare commits
3 Commits
63aaaf39c5
...
maf
| Author | SHA1 | Date | |
|---|---|---|---|
|
f6e20df2be | ||
|
|
1de451c54d | ||
|
|
db61f70335 |
@@ -13,64 +13,13 @@ 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: https://gitea.com/actions/checkout@v3
|
uses: https://gitea.com/actions/checkout@v3
|
||||||
# 添加重试策略
|
with:
|
||||||
continue-on-error: true
|
gitea-server: http://192.168.31.14:14200
|
||||||
|
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: |
|
||||||
@@ -79,7 +28,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Build new image
|
- name: Build new image
|
||||||
run: |
|
run: |
|
||||||
RETRIES=20
|
RETRIES=3
|
||||||
DELAY=10
|
DELAY=10
|
||||||
count=0
|
count=0
|
||||||
until docker build -t $IMAGE_NAME .; do
|
until docker build -t $IMAGE_NAME .; do
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -404,4 +404,3 @@ FodyWeavers.xsd
|
|||||||
Web/dist
|
Web/dist
|
||||||
# ESLint
|
# ESLint
|
||||||
.eslintcache
|
.eslintcache
|
||||||
.aider*
|
|
||||||
|
|||||||
@@ -1,201 +0,0 @@
|
|||||||
---
|
|
||||||
name: bug-fix
|
|
||||||
description: Bug诊断与修复技能 - 强调交互式确认和影响分析
|
|
||||||
tags:
|
|
||||||
- bug-fix
|
|
||||||
- debugging
|
|
||||||
- troubleshooting
|
|
||||||
- interactive
|
|
||||||
version: 1.0.1
|
|
||||||
---
|
|
||||||
|
|
||||||
# Bug修复技能
|
|
||||||
|
|
||||||
## 技能概述
|
|
||||||
|
|
||||||
专门用于诊断和修复项目中的bug，强调谨慎的分析流程和充分的交互式确认，确保修复的准确性和完整性，避免引入新的问题或破坏现有功能。
|
|
||||||
|
|
||||||
## ⚠️ 强制交互规则（MUST FOLLOW）
|
|
||||||
|
|
||||||
**遇到需要用户确认的情况时，必须立即调用 `question` 工具：**
|
|
||||||
|
|
||||||
❌ **禁止**："我需要向用户确认..."、"请用户回答..."、"在Plan模式下建议先询问..."
|
|
||||||
✅ **必须**：直接调用工具，不要描述或延迟
|
|
||||||
|
|
||||||
**调用格式**：
|
|
||||||
```javascript
|
|
||||||
question({
|
|
||||||
header: "问题确认",
|
|
||||||
questions: [{
|
|
||||||
question: "具体触发场景是什么？",
|
|
||||||
options: ["新增时", "修改时", "批量导入时", "定时任务时", "其他"]
|
|
||||||
}]
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
**规则**：
|
|
||||||
- 每次最多 **3个问题**
|
|
||||||
- 每个问题 **3-6个选项**（穷举常见情况 + "其他"兜底）
|
|
||||||
- 用户通过**上下键导航**选择
|
|
||||||
- 适用于**所有模式**（Build/Plan）
|
|
||||||
|
|
||||||
## 执行原则
|
|
||||||
|
|
||||||
### 1. 充分理解问题（必要时交互确认）
|
|
||||||
|
|
||||||
**触发条件**：
|
|
||||||
- 用户对bug的描述含糊不清
|
|
||||||
- 问题复现步骤不完整
|
|
||||||
- 预期行为与实际行为表述存在歧义
|
|
||||||
- 涉及多个可能的问题根因
|
|
||||||
|
|
||||||
**执行策略**：
|
|
||||||
- ✅ **立即调用 `question` 工具**（不要描述，直接执行）
|
|
||||||
- ✅ **暂停其他操作**，不要基于假设进行修复
|
|
||||||
- ✅ 澄清：错误现象、触发条件、预期行为、是否有日志
|
|
||||||
|
|
||||||
### 2. 风险评估与影响分析（必要时交互确认）
|
|
||||||
|
|
||||||
**触发条件**：
|
|
||||||
- 发现潜在的边界情况用户未提及
|
|
||||||
- 代码修改可能影响其他功能模块
|
|
||||||
- 存在多种修复方案，各有利弊
|
|
||||||
- 发现可能的性能、安全或兼容性隐患
|
|
||||||
|
|
||||||
**执行策略**：
|
|
||||||
- ✅ 代码分析后，**不要直接修改代码**
|
|
||||||
- ✅ 报告潜在问题：影响范围、边界情况、测试场景、数据迁移需求
|
|
||||||
- ✅ **使用 `question` 工具**让用户选择方案或确认风险
|
|
||||||
|
|
||||||
### 3. 关联代码检查（必要时交互确认）
|
|
||||||
|
|
||||||
**触发条件**：
|
|
||||||
- 发现多个位置存在相似的代码逻辑
|
|
||||||
- 修复需要同步更新多个文件
|
|
||||||
- 存在可能依赖该bug行为的代码（反模式）
|
|
||||||
- 发现测试用例可能基于错误行为编写
|
|
||||||
|
|
||||||
**执行策略**：
|
|
||||||
- ✅ 使用代码搜索工具查找相似逻辑和调用链
|
|
||||||
- ✅ 报告关联代码：是否需要同步修复、依赖关系、测试更新
|
|
||||||
- ✅ **使用 `question` 工具**让用户确认修复范围
|
|
||||||
|
|
||||||
## 修复流程
|
|
||||||
|
|
||||||
### 阶段1: 问题诊断
|
|
||||||
1. 阅读用户的bug描述
|
|
||||||
2. 定位相关代码文件（使用 semantic_search, grep_search）
|
|
||||||
3. 分析代码逻辑和调用链
|
|
||||||
4. **触发点1**: 如有不明确之处 → **立即调用 `question` 工具**（不要描述计划）
|
|
||||||
|
|
||||||
### 阶段2: 根因分析
|
|
||||||
1. 确定bug的根本原因
|
|
||||||
2. 识别影响范围和边界情况
|
|
||||||
3. **触发点2**: 发现用户未考虑的问题 → **立即调用 `question` 工具**
|
|
||||||
|
|
||||||
### 阶段3: 方案设计
|
|
||||||
1. 设计修复方案
|
|
||||||
2. 评估方案的影响和风险
|
|
||||||
3. 查找相似代码和依赖关系
|
|
||||||
4. **触发点3**: 可能影响其他逻辑 → **立即调用 `question` 工具**
|
|
||||||
|
|
||||||
### 阶段4: 实施修复
|
|
||||||
1. 获得用户最终确认后执行代码修改
|
|
||||||
2. 使用 `multi_replace_string_in_file` 批量修改
|
|
||||||
3. 确保修改的原子性和一致性
|
|
||||||
|
|
||||||
### 阶段5: 验证建议
|
|
||||||
提示用户执行：单元测试（`dotnet test`）、手动测试场景、回归测试
|
|
||||||
|
|
||||||
## 反模式与成功标准
|
|
||||||
|
|
||||||
❌ **不要**在未明确理解问题的情况下猜测修复
|
|
||||||
❌ **不要**在未评估影响范围的情况下直接修改代码
|
|
||||||
❌ **不要**假设用户已考虑所有边界情况
|
|
||||||
❌ **不要**在发现关联逻辑时仅修复单个位置
|
|
||||||
❌ **不要**跳过风险通知直接实施有争议的修复方案
|
|
||||||
❌ **不要**修改代码后不提供验证建议
|
|
||||||
❌ **不要**描述"我会询问用户..."而不调用 `question` 工具
|
|
||||||
❌ **不要**列出问题清单让用户自行回答
|
|
||||||
❌ **不要**在Plan模式下说"如果用户确认..."而不执行工具调用
|
|
||||||
|
|
||||||
## 成功标准
|
|
||||||
|
|
||||||
✅ 用户明确确认问题理解无误（通过 `question` 工具获取）
|
|
||||||
✅ 所有潜在风险和影响已向用户说明（通过 `question` 工具确认）
|
|
||||||
✅ 修复方案获得用户明确同意（通过 `question` 工具选择）
|
|
||||||
✅ 相似逻辑和关联代码已同步处理（如适用）
|
|
||||||
✅ 提供了完整的验证和测试建议
|
|
||||||
|
|
||||||
## 示例工作流
|
|
||||||
|
|
||||||
```
|
|
||||||
用户: "策略计算结果不对，加价逻辑有问题"
|
|
||||||
|
|
||||||
Agent:
|
|
||||||
[阶段1 - 问题诊断]
|
|
||||||
我需要确认几个细节：
|
|
||||||
1. 具体是哪种类型的策略计算不对？（机票、动态加价、固定加价？）
|
|
||||||
2. 能否提供一个具体的测试用例输入和错误输出？
|
|
||||||
3. 预期的正确输出是什么？
|
|
||||||
|
|
||||||
用户: "动态加价，百分比计算错误，应该是基准价×10%，但实际是×100%"
|
|
||||||
|
|
||||||
Agent:
|
|
||||||
[阶段2 - 根因分析]
|
|
||||||
已定位到问题：
|
|
||||||
- 位置: src/Domain.Service/Services/AgentService.cs:234
|
|
||||||
- 原因: 百分比未除以100
|
|
||||||
|
|
||||||
[阶段3 - 方案设计]
|
|
||||||
⚠️ 发现以下需要确认的点：
|
|
||||||
|
|
||||||
1. **关联代码**: 在 PolicyService.cs 中发现相似的百分比计算（3处），
|
|
||||||
是否也存在相同问题？
|
|
||||||
|
|
||||||
2. **单元测试**: UnitTestPolicy.cs:67 的断言值为100%，可能基于错误行为，
|
|
||||||
修复后需要更新测试
|
|
||||||
|
|
||||||
3. **前端影响**: 如果历史数据按错误逻辑存储，前端展示需要迁移脚本吗？
|
|
||||||
|
|
||||||
请确认是否需要一并处理这些关联问题？
|
|
||||||
|
|
||||||
用户: "是的，PolicyService 也需要修复，测试用例也要改，历史数据没有存储"
|
|
||||||
|
|
||||||
Agent:
|
|
||||||
[阶段4 - 实施修复]
|
|
||||||
好的，我将修复以下位置：
|
|
||||||
1. AgentService.cs:234
|
|
||||||
2. PolicyService.cs:156, 178, 201
|
|
||||||
3. UnitTestPolicy.cs:67
|
|
||||||
|
|
||||||
[执行代码修改...]
|
|
||||||
|
|
||||||
[阶段5 - 验证建议]
|
|
||||||
修复完成！建议验证：
|
|
||||||
1. 运行单元测试: dotnet test
|
|
||||||
2. 手动测试场景:
|
|
||||||
- 输入基准价1000，加价10%，期望结果1100
|
|
||||||
- 验证策略列表API返回正确百分比
|
|
||||||
3. 回归测试: 检查其他类型策略未受影响
|
|
||||||
```
|
|
||||||
|
|
||||||
## 适用场景
|
|
||||||
|
|
||||||
- ✅ 逻辑错误修复
|
|
||||||
- ✅ 空指针异常修复
|
|
||||||
- ✅ 数据计算错误
|
|
||||||
- ✅ API行为异常
|
|
||||||
- ✅ 性能问题修复
|
|
||||||
- ✅ 边界条件处理
|
|
||||||
|
|
||||||
## 相关技能
|
|
||||||
|
|
||||||
- `refactor`: 重构优化（非bug修复）
|
|
||||||
- `feature`: 新功能开发
|
|
||||||
- `test`: 测试用例编写
|
|
||||||
|
|
||||||
## 核心约束（必须遵守）
|
|
||||||
1. **禁止开放式提问** - 所有需要用户输入的场景，必须提供选项列表
|
|
||||||
2. 每次交互最多提出5个问题，避免信息过载
|
|
||||||
3. 选项设计要穷举常见情况，并保留"其他"兜底选项
|
|
||||||
@@ -1,465 +0,0 @@
|
|||||||
---
|
|
||||||
name: code-refactoring
|
|
||||||
description: 代码重构技能 - 强调保持功能不变的前提下优化代码结构，充分理解需求和交互式确认
|
|
||||||
tags:
|
|
||||||
- refactoring
|
|
||||||
- code-quality
|
|
||||||
- clean-code
|
|
||||||
- interactive
|
|
||||||
version: 1.0.0
|
|
||||||
---
|
|
||||||
|
|
||||||
# 代码重构技能
|
|
||||||
|
|
||||||
## 技能概述
|
|
||||||
|
|
||||||
专门用于在**不改变现有功能逻辑**的前提下优化代码结构，包括：
|
|
||||||
- 抽取公共方法、组件和工具类
|
|
||||||
- 消除重复代码（DRY原则）
|
|
||||||
- 移除无用代码（死代码、注释代码、未使用的依赖）
|
|
||||||
- 改善代码可读性和可维护性
|
|
||||||
- 优化代码结构和命名规范
|
|
||||||
|
|
||||||
## ⚠️ 核心原则（MUST FOLLOW）
|
|
||||||
|
|
||||||
### 1. 功能不变保证
|
|
||||||
**禁止在重构过程中改变功能行为！**
|
|
||||||
- ✅ 重构前后的输入输出必须完全一致
|
|
||||||
- ✅ 重构前后的副作用必须一致（数据库操作、文件IO、日志等）
|
|
||||||
- ✅ 重构不应改变性能特征（除非明确以性能优化为目标）
|
|
||||||
- ❌ 严禁"顺便"添加新功能或修复bug
|
|
||||||
|
|
||||||
### 2. 充分理解需求
|
|
||||||
**禁止根据模糊的需求开始重构！**
|
|
||||||
- ✅ 彻底理解重构的目标和范围
|
|
||||||
- ✅ 识别需求中的模糊点和二义性
|
|
||||||
- ✅ 使用 `question` 工具获取明确的用户意图
|
|
||||||
- ❌ 不要基于假设进行重构
|
|
||||||
|
|
||||||
### 3. 先确认再动手
|
|
||||||
**禁止未经用户确认就直接修改代码！**
|
|
||||||
- ✅ 先列出所有修改点和影响范围
|
|
||||||
- ✅ 使用 `question` 工具让用户确认重构方案
|
|
||||||
- ✅ 获得明确的同意后再执行修改
|
|
||||||
- ❌ 不要边分析边修改
|
|
||||||
|
|
||||||
## ⚠️ 强制交互规则（MUST FOLLOW）
|
|
||||||
|
|
||||||
**遇到需要用户确认的情况时，必须立即调用 `question` 工具：**
|
|
||||||
|
|
||||||
❌ **禁止**："我需要向用户确认..."、"建议向用户询问..."、"在执行前应该确认..."
|
|
||||||
✅ **必须**：直接调用 `question` 工具，不要描述或延迟
|
|
||||||
|
|
||||||
**调用格式**：
|
|
||||||
```javascript
|
|
||||||
question({
|
|
||||||
header: "重构确认",
|
|
||||||
questions: [{
|
|
||||||
question: "是否要将重复的验证逻辑抽取到公共方法中？",
|
|
||||||
options: ["是，抽取到工具类", "是，抽取到基类", "否，保持现状", "其他"]
|
|
||||||
}]
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
**规则**：
|
|
||||||
- 每次最多 **3个问题**
|
|
||||||
- 每个问题 **3-6个选项**（穷举常见情况 + "其他"兜底）
|
|
||||||
- 用户通过**上下键导航**选择
|
|
||||||
- 适用于**所有阶段**（需求理解、方案确认、风险评估）
|
|
||||||
|
|
||||||
## 重构流程
|
|
||||||
|
|
||||||
### 阶段1: 需求理解（必须交互确认）
|
|
||||||
|
|
||||||
#### 1.1 理解重构目标
|
|
||||||
**获取用户意图**：
|
|
||||||
- 用户想重构什么？（文件、模块、类、方法）
|
|
||||||
- 重构的原因是什么？（代码重复、难以维护、命名不清晰、结构混乱）
|
|
||||||
- 期望达到什么效果？（提高复用性、提升可读性、简化逻辑、统一规范）
|
|
||||||
|
|
||||||
**触发 `question` 工具的场景**：
|
|
||||||
- 用户只说"重构这个文件"但未说明具体问题
|
|
||||||
- 用户提到"优化"但没有明确优化方向
|
|
||||||
- 用户的需求包含多个可能的重构方向
|
|
||||||
- 重构范围不明确（单个文件 vs 整个模块）
|
|
||||||
|
|
||||||
**示例问题**：
|
|
||||||
```javascript
|
|
||||||
question({
|
|
||||||
header: "明确重构目标",
|
|
||||||
questions: [
|
|
||||||
{
|
|
||||||
question: "您主要关注哪方面的重构？",
|
|
||||||
options: [
|
|
||||||
"抽取重复代码",
|
|
||||||
"改善命名和结构",
|
|
||||||
"移除无用代码",
|
|
||||||
"提取公共组件/方法",
|
|
||||||
"全面优化"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
question: "重构范围是？",
|
|
||||||
options: [
|
|
||||||
"仅当前文件",
|
|
||||||
"当前模块（相关的几个文件）",
|
|
||||||
"整个项目",
|
|
||||||
"让我分析后建议"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 1.2 识别约束条件
|
|
||||||
**必须明确的约束**：
|
|
||||||
- 是否有不能改动的接口或API（对外暴露的）
|
|
||||||
- 是否有特殊的性能要求
|
|
||||||
- 是否需要保持特定的代码风格
|
|
||||||
- 是否有测试覆盖（如有，重构后测试必须通过）
|
|
||||||
|
|
||||||
**触发 `question` 工具的场景**：
|
|
||||||
- 发现公开API可能需要调整
|
|
||||||
- 代码涉及性能敏感的操作
|
|
||||||
- 存在多种重构方式，各有权衡
|
|
||||||
- 不确定某些代码是否仍在使用
|
|
||||||
|
|
||||||
**示例问题**：
|
|
||||||
```javascript
|
|
||||||
question({
|
|
||||||
header: "重构约束确认",
|
|
||||||
questions: [
|
|
||||||
{
|
|
||||||
question: "发现 `ProcessData` 方法被多个外部模块调用，重构时：",
|
|
||||||
options: [
|
|
||||||
"保持方法签名不变，仅优化内部实现",
|
|
||||||
"可以修改方法签名，我会同步更新调用方",
|
|
||||||
"先告诉我影响范围，我再决定",
|
|
||||||
"其他"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 1.3 理解代码上下文
|
|
||||||
**分析现有代码**：
|
|
||||||
- 使用 `semantic_search` 查找相关代码
|
|
||||||
- 使用 `grep_search` 查找重复模式
|
|
||||||
- 使用 `list_code_usages` 分析调用关系
|
|
||||||
- 阅读相关文件理解业务逻辑
|
|
||||||
|
|
||||||
**注意事项**：
|
|
||||||
- 不要在分析阶段进行任何修改
|
|
||||||
- 记录发现的问题点和重构机会
|
|
||||||
- 识别可能的风险和边界情况
|
|
||||||
|
|
||||||
### 阶段2: 方案设计（必须交互确认）
|
|
||||||
|
|
||||||
#### 2.1 列出重构点
|
|
||||||
**详细列出每个修改点**：
|
|
||||||
- 修改的文件和位置
|
|
||||||
- 修改的具体内容（前后对比）
|
|
||||||
- 修改的原因和收益
|
|
||||||
- 可能的影响范围
|
|
||||||
|
|
||||||
**示例格式**：
|
|
||||||
```
|
|
||||||
## 重构点清单
|
|
||||||
|
|
||||||
### 1. 抽取重复的数据验证逻辑
|
|
||||||
**位置**: TransactionController.cs (L45-L60, L120-L135)
|
|
||||||
**操作**: 将重复的金额验证逻辑抽取到 ValidationHelper.ValidateAmount()
|
|
||||||
**原因**: 两处代码完全相同，违反DRY原则
|
|
||||||
**影响**: 无，纯内部优化
|
|
||||||
|
|
||||||
### 2. 移除未使用的导入和变量
|
|
||||||
**位置**: BudgetService.cs (L5, L23)
|
|
||||||
**操作**: 删除 `using System.Text.RegularExpressions;` 和未使用的 `_tempValue` 字段
|
|
||||||
**原因**: 死代码，增加维护负担
|
|
||||||
**影响**: 无
|
|
||||||
|
|
||||||
### 3. 重命名方法提高可读性
|
|
||||||
**位置**: DataProcessor.cs (L89)
|
|
||||||
**操作**: `DoWork()` → `ProcessTransactionData()`
|
|
||||||
**原因**: 原名称不够清晰，无法表达具体功能
|
|
||||||
**影响**: 4个调用点需要同步更新
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 2.2 评估风险和影响
|
|
||||||
**必须分析的风险**：
|
|
||||||
- 是否影响公开API
|
|
||||||
- 是否影响性能
|
|
||||||
- 是否影响测试
|
|
||||||
- 是否涉及数据迁移
|
|
||||||
- 是否存在隐藏的依赖关系
|
|
||||||
|
|
||||||
**触发 `question` 工具的场景**：
|
|
||||||
- 发现重构会影响多个模块
|
|
||||||
- 存在潜在的兼容性问题
|
|
||||||
- 有多种实现方式可选
|
|
||||||
- 需要在代码质量和改动风险间权衡
|
|
||||||
|
|
||||||
**示例问题**：
|
|
||||||
```javascript
|
|
||||||
question({
|
|
||||||
header: "重构方案确认",
|
|
||||||
questions: [
|
|
||||||
{
|
|
||||||
question: "发现3处重复的日期格式化代码，建议：",
|
|
||||||
options: [
|
|
||||||
"抽取到工具类（Common项目）",
|
|
||||||
"抽取到当前服务的私有方法",
|
|
||||||
"保留重复（代码简单，抽取收益小）",
|
|
||||||
"让我看看代码再决定"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
question: "重构会影响4个controller和2个service，是否继续？",
|
|
||||||
options: [
|
|
||||||
"是，一次性全部重构",
|
|
||||||
"否，先重构影响小的部分",
|
|
||||||
"告诉我每个的影响详情",
|
|
||||||
"其他"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 2.3 提交方案供确认
|
|
||||||
**必须向用户展示**：
|
|
||||||
1. 完整的重构点清单（如2.1格式）
|
|
||||||
2. 风险评估和影响分析
|
|
||||||
3. 建议的执行顺序
|
|
||||||
4. 预计改动的文件数量
|
|
||||||
|
|
||||||
**必须调用 `question` 工具获得最终确认**：
|
|
||||||
```javascript
|
|
||||||
question({
|
|
||||||
header: "最终确认",
|
|
||||||
questions: [{
|
|
||||||
question: "我已列出所有重构点和影响分析，是否开始执行？",
|
|
||||||
options: [
|
|
||||||
"是，按计划执行",
|
|
||||||
"需要调整部分重构点",
|
|
||||||
"取消重构",
|
|
||||||
"其他问题"
|
|
||||||
]
|
|
||||||
}]
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
**重要**：
|
|
||||||
- ❌ 不要在得到明确的"是，按计划执行"之前修改任何代码
|
|
||||||
- ❌ 不要假设用户会同意
|
|
||||||
- ✅ 如用户选择"需要调整"，返回阶段1重新理解需求
|
|
||||||
|
|
||||||
### 阶段3: 执行重构
|
|
||||||
|
|
||||||
#### 3.1 执行原则
|
|
||||||
- **小步快跑**: 一次完成一个重构点，不要多个同时进行
|
|
||||||
- **频繁验证**: 每完成一个点就运行测试或构建验证
|
|
||||||
- **保持可逆**: 确保随时可以回滚
|
|
||||||
- **记录进度**: 使用 `manage_todo_list` 跟踪进度
|
|
||||||
|
|
||||||
#### 3.2 执行步骤
|
|
||||||
1. **创建TODO清单**:
|
|
||||||
```javascript
|
|
||||||
manage_todo_list({
|
|
||||||
todoList: [
|
|
||||||
{
|
|
||||||
id: 1,
|
|
||||||
title: "抽取重复验证逻辑到ValidationHelper",
|
|
||||||
description: "TransactionController.cs L45-L60, L120-L135",
|
|
||||||
status: "not-started"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 2,
|
|
||||||
title: "移除BudgetService.cs中的未使用导入",
|
|
||||||
description: "删除using System.Text.RegularExpressions",
|
|
||||||
status: "not-started"
|
|
||||||
},
|
|
||||||
// ... 更多任务
|
|
||||||
]
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **逐个执行**:
|
|
||||||
- 标记任务为 `in-progress`
|
|
||||||
- 使用 `multi_replace_string_in_file` 或 `replace_string_in_file` 修改代码
|
|
||||||
- 运行测试验证: `dotnet test` 或 `pnpm test`
|
|
||||||
- 标记任务为 `completed`
|
|
||||||
- 继续下一个
|
|
||||||
|
|
||||||
3. **验证每个步骤**:
|
|
||||||
- 后端重构后运行: `dotnet build && dotnet test`
|
|
||||||
- 前端重构后运行: `pnpm lint && pnpm build`
|
|
||||||
- 确保没有引入编译错误或测试失败
|
|
||||||
|
|
||||||
#### 3.3 异常处理
|
|
||||||
**如果遇到预期外的问题**：
|
|
||||||
- ✅ 立即停止后续重构
|
|
||||||
- ✅ 报告问题详情
|
|
||||||
- ✅ 调用 `question` 工具询问如何处理
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
question({
|
|
||||||
header: "重构遇到问题",
|
|
||||||
questions: [{
|
|
||||||
question: "抽取方法后发现测试 `TestValidation` 失败了，如何处理？",
|
|
||||||
options: [
|
|
||||||
"回滚这个改动",
|
|
||||||
"修复测试用例",
|
|
||||||
"暂停，我来看看",
|
|
||||||
"继续其他重构点"
|
|
||||||
]
|
|
||||||
}]
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
### 阶段4: 验证和总结
|
|
||||||
|
|
||||||
#### 4.1 全面验证
|
|
||||||
**必须执行的验证**：
|
|
||||||
- 所有单元测试通过
|
|
||||||
- 项目成功构建
|
|
||||||
- Lint检查通过
|
|
||||||
- 关键功能手动验证（如适用）
|
|
||||||
|
|
||||||
**验证命令**：
|
|
||||||
```bash
|
|
||||||
# 后端
|
|
||||||
dotnet clean
|
|
||||||
dotnet build EmailBill.sln
|
|
||||||
dotnet test WebApi.Test/WebApi.Test.csproj
|
|
||||||
|
|
||||||
# 前端
|
|
||||||
cd Web
|
|
||||||
pnpm lint
|
|
||||||
pnpm build
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 4.2 总结报告
|
|
||||||
**提供清晰的总结**：
|
|
||||||
```
|
|
||||||
## 重构完成总结
|
|
||||||
|
|
||||||
### ✅ 已完成的重构
|
|
||||||
1. 抽取重复验证逻辑 (ValidationHelper.cs)
|
|
||||||
- 消除了 3 处重复代码
|
|
||||||
- 减少代码行数 45 行
|
|
||||||
|
|
||||||
2. 移除未使用的导入和变量
|
|
||||||
- BudgetService.cs: 移除 2 个未使用的 using
|
|
||||||
- TransactionController.cs: 移除 1 个未使用字段
|
|
||||||
|
|
||||||
3. 改善方法命名
|
|
||||||
- DoWork → ProcessTransactionData (4 处调用点已更新)
|
|
||||||
- Calculate → CalculateMonthlyBudget (2 处调用点已更新)
|
|
||||||
|
|
||||||
### 📊 重构影响
|
|
||||||
- 修改文件数: 6
|
|
||||||
- 新增文件数: 1 (ValidationHelper.cs)
|
|
||||||
- 删除代码行数: 78
|
|
||||||
- 新增代码行数: 42
|
|
||||||
- 净减少代码: 36 行
|
|
||||||
|
|
||||||
### ✅ 验证结果
|
|
||||||
- ✓ 所有测试通过 (23/23)
|
|
||||||
- ✓ 项目构建成功
|
|
||||||
- ✓ Lint检查通过
|
|
||||||
- ✓ 功能验证正常
|
|
||||||
|
|
||||||
### 📝 建议的后续工作
|
|
||||||
- 考虑为 ValidationHelper 添加单元测试
|
|
||||||
- 可以进一步重构 DataProcessor 类的其他方法
|
|
||||||
```
|
|
||||||
|
|
||||||
## 常见重构模式
|
|
||||||
|
|
||||||
### 1. 抽取公共方法
|
|
||||||
**识别标准**: 代码块在多处重复出现（≥2次）
|
|
||||||
**操作**:
|
|
||||||
- 创建独立方法或工具类
|
|
||||||
- 保持方法签名简洁明确
|
|
||||||
- 添加必要的注释和文档
|
|
||||||
|
|
||||||
### 2. 抽取公共组件
|
|
||||||
**识别标准**: UI组件或业务逻辑在多个视图/页面重复
|
|
||||||
**操作**:
|
|
||||||
- 创建可复用组件（Vue组件、Service类等）
|
|
||||||
- 使用Props/参数传递可变部分
|
|
||||||
- 确保组件职责单一
|
|
||||||
|
|
||||||
### 3. 移除死代码
|
|
||||||
**识别标准**:
|
|
||||||
- 未被调用的方法
|
|
||||||
- 未被使用的变量、导入、依赖
|
|
||||||
- 注释掉的代码
|
|
||||||
**操作**:
|
|
||||||
- 使用 `list_code_usages` 确认真正未使用
|
|
||||||
- 谨慎删除（可能有隐式调用）
|
|
||||||
- 使用Git历史作为备份
|
|
||||||
|
|
||||||
### 4. 改善命名
|
|
||||||
**识别标准**:
|
|
||||||
- 名称不能表达意图（如 `DoWork`, `Process`, `temp`）
|
|
||||||
- 名称与实际功能不符
|
|
||||||
- 违反命名规范
|
|
||||||
**操作**:
|
|
||||||
- 使用 `list_code_usages` 找到所有使用点
|
|
||||||
- 使用 `multi_replace_string_in_file` 批量更新
|
|
||||||
- 确保命名符合项目规范（见AGENTS.md）
|
|
||||||
|
|
||||||
### 5. 简化复杂逻辑
|
|
||||||
**识别标准**:
|
|
||||||
- 深层嵌套（>3层）
|
|
||||||
- 过长方法（>50行）
|
|
||||||
- 复杂条件判断
|
|
||||||
**操作**:
|
|
||||||
- 早返回模式（guard clauses）
|
|
||||||
- 拆分子方法
|
|
||||||
- 使用策略模式或查表法
|
|
||||||
|
|
||||||
## 注意事项
|
|
||||||
|
|
||||||
### ❌ 不要做
|
|
||||||
- 在重构中添加新功能
|
|
||||||
- 在重构中修复bug（除非bug是重构导致的）
|
|
||||||
- 未经确认就大范围修改
|
|
||||||
- 改变公开API而不考虑兼容性
|
|
||||||
- 跳过测试验证
|
|
||||||
|
|
||||||
### ✅ 要做
|
|
||||||
- 保持每次重构的范围可控
|
|
||||||
- 频繁提交代码（每完成一个重构点提交一次）
|
|
||||||
- 确保测试覆盖率不降低
|
|
||||||
- 保持代码风格一致
|
|
||||||
- 记录重构的原因和收益
|
|
||||||
|
|
||||||
## 项目特定规范
|
|
||||||
|
|
||||||
### C# 代码重构
|
|
||||||
- 遵循 `AGENTS.md` 中的 C# 代码风格
|
|
||||||
- 使用 file-scoped namespace
|
|
||||||
- 公共方法使用 XML 注释
|
|
||||||
- 业务逻辑使用中文注释
|
|
||||||
- 工具方法考虑放入 `Common` 项目
|
|
||||||
|
|
||||||
### Vue/TypeScript 代码重构
|
|
||||||
- 使用 Composition API
|
|
||||||
- 组件放入 `src/components`
|
|
||||||
- 遵循 ESLint 和 Prettier 规则
|
|
||||||
- 使用 `@/` 别名避免相对路径
|
|
||||||
- 提取的组件使用 Vant UI 风格
|
|
||||||
|
|
||||||
## 总结
|
|
||||||
|
|
||||||
代码重构是一个**谨慎的、迭代的、需要充分确认的**过程。核心要点：
|
|
||||||
|
|
||||||
1. **理解先于行动** - 彻底理解需求和约束
|
|
||||||
2. **交互式确认** - 使用 `question` 工具消除歧义
|
|
||||||
3. **计划后执行** - 列出修改点并获得确认
|
|
||||||
4. **小步快跑** - 逐个完成重构点，频繁验证
|
|
||||||
5. **功能不变** - 始终确保行为一致性
|
|
||||||
@@ -1,765 +0,0 @@
|
|||||||
---
|
|
||||||
name: pancli-design
|
|
||||||
description: 专业的设计技能，用于使用 pancli (pencil tools) 创建现代化、一致的 EmailBill 移动端 UI 设计
|
|
||||||
license: MIT
|
|
||||||
compatibility: Requires pencil_* tools (batch_design, batch_get, etc.)
|
|
||||||
metadata:
|
|
||||||
author: EmailBill Design Team
|
|
||||||
version: "2.0.0"
|
|
||||||
generatedBy: opencode
|
|
||||||
lastUpdated: "2026-02-03"
|
|
||||||
source: ".pans/v2.pen 日历设计 (亮色/暗色)"
|
|
||||||
---
|
|
||||||
|
|
||||||
# pancli-design - EmailBill UI 设计系统
|
|
||||||
|
|
||||||
> 专业的设计技能，用于使用 pancli (pencil tools) 创建现代化、一致的移动端 UI 设计。
|
|
||||||
|
|
||||||
## 何时使用此技能
|
|
||||||
|
|
||||||
**总是使用此技能当:**
|
|
||||||
- 使用 pancli 创建新的 UI 界面或组件
|
|
||||||
- 修改现有的 .pen 设计文件
|
|
||||||
- 处理亮色/暗色主题设计
|
|
||||||
- 为 EmailBill 项目设计移动端优先的界面
|
|
||||||
|
|
||||||
**触发条件:**
|
|
||||||
- 用户提到 "画设计图"、"设计"、"UI"、"界面"、"pancli"、".pen"
|
|
||||||
- 任务涉及 `pencil_*` 工具
|
|
||||||
- 创建视觉原型或模型
|
|
||||||
|
|
||||||
## 核心设计原则
|
|
||||||
|
|
||||||
### 1. 现代移动端优先设计
|
|
||||||
|
|
||||||
**核心规范:**
|
|
||||||
- 移动视口: 375px 宽度 (iPhone SE 基准)
|
|
||||||
- 安全区域: 尊重 iOS/Android 安全区域边距
|
|
||||||
- 交互元素最小触摸目标: 44x44px
|
|
||||||
- 间距基于 8px 网格: 4px, 8px, 12px, 16px, 24px, 32px
|
|
||||||
- 卡片阴影: `0 2px 12px rgba(0,0,0,0.08)` (亮色模式)
|
|
||||||
|
|
||||||
**反 AI 设计痕迹检查清单:**
|
|
||||||
- ❌ 使用 "Dashboard", "Lorem Ipsum" 等通用占位符
|
|
||||||
- ❌ 使用过饱和的颜色或生硬的渐变
|
|
||||||
- ❌ 使用装饰性字体 (Comic Sans, Papyrus)
|
|
||||||
- ✅ 使用代码库中的真实中文业务术语
|
|
||||||
- ✅ 使用克制的配色和柔和的阴影
|
|
||||||
- ✅ 使用专业的系统字体
|
|
||||||
|
|
||||||
### 2. 统一色彩系统
|
|
||||||
|
|
||||||
**色彩分层:**
|
|
||||||
- **背景层**: 页面背景 → 卡片背景 → 强调背景 (三层递进)
|
|
||||||
- **文本层**: 主文本 → 次要文本 → 三级文本 (三级层次)
|
|
||||||
- **语义色**: 红色(支出/危险) → 黄色(警告) → 绿色(收入/成功) → 蓝色(主操作/信息)
|
|
||||||
|
|
||||||
**颜色使用规则:**
|
|
||||||
- 始终使用语义颜色变量，避免硬编码十六进制值
|
|
||||||
- 支出/负数统一使用红色 `#FF6B6B`，收入/正数使用绿色系
|
|
||||||
- 主操作按钮统一使用蓝色 `#3B82F6`
|
|
||||||
- 避免纯黑 (#000000) 或纯白 (#FFFFFF) 文本，使用柔和的色调
|
|
||||||
- 暗色模式下减少阴影强度或完全移除
|
|
||||||
- 详细色值参见文末"快速参考"表格
|
|
||||||
|
|
||||||
### 3. 排版系统
|
|
||||||
|
|
||||||
**字体栈:**
|
|
||||||
- **标题**: `'Bricolage Grotesque'` - 用于大数值、章节标题
|
|
||||||
- **正文**: `'DM Sans'` - 用于界面文本、说明
|
|
||||||
- **数字**: `'DIN Alternate'` - 用于金额、数据显示
|
|
||||||
- **备选**: `-apple-system, 'PingFang SC'` - 系统默认字体
|
|
||||||
|
|
||||||
**排版原则:**
|
|
||||||
- 使用真实中文业务术语，避免 Lorem Ipsum
|
|
||||||
- 行高: 1.4-1.6 保证可读性
|
|
||||||
- 数字数据使用等宽字体 (tabular-nums)
|
|
||||||
- 字号遵循比例系统，避免任意数值
|
|
||||||
- 详细字号比例参见文末"快速参考"表格
|
|
||||||
|
|
||||||
### 4. 组件库
|
|
||||||
|
|
||||||
**设计原则:**
|
|
||||||
- 所有尺寸和间距基于 8px 网格系统
|
|
||||||
- 圆角: 12px (小按钮), 16px/20px (卡片), 22px/28px (圆形按钮)
|
|
||||||
- 交互元素最小触摸目标: 44x44px
|
|
||||||
- 详细组件规格参见文末"快速参考"表格
|
|
||||||
|
|
||||||
**卡片设计 (基于 statsCard, tCard):**
|
|
||||||
```
|
|
||||||
统计卡片 (大卡片):
|
|
||||||
- 背景: #F6F7F8 (亮色), #18181B (暗色)
|
|
||||||
- 内边距: 20px
|
|
||||||
- 圆角: 20px
|
|
||||||
- 间距: 12px (元素之间)
|
|
||||||
- 布局: 垂直
|
|
||||||
|
|
||||||
交易卡片 (列表卡片):
|
|
||||||
- 背景: #F6F7F8 (亮色), #18181B (暗色)
|
|
||||||
- 内边距: 16px
|
|
||||||
- 圆角: 16px
|
|
||||||
- 间距: 14px (水平元素)
|
|
||||||
- 高度: 自适应内容
|
|
||||||
```
|
|
||||||
|
|
||||||
**按钮 (基于实际设计):**
|
|
||||||
```
|
|
||||||
图标按钮 (通知按钮):
|
|
||||||
- 尺寸: 44x44px
|
|
||||||
- 圆角: 22px (完全圆形)
|
|
||||||
- 背景: #F5F5F5 (亮色), #27272A (暗色)
|
|
||||||
- 图标大小: 20px
|
|
||||||
|
|
||||||
标签按钮:
|
|
||||||
- 内边距: 6px 10px / 6px 12px
|
|
||||||
- 圆角: 12px
|
|
||||||
- 字体: DM Sans 13px/500
|
|
||||||
- 颜色:
|
|
||||||
- 温暖色: #FFFBEB (亮色), #451A03 (暗色)
|
|
||||||
- 绿色: #F0FDF4 (亮色), #064E3B (暗色)
|
|
||||||
- 蓝色: #E0E7FF (亮色), #312E81 (暗色)
|
|
||||||
|
|
||||||
悬浮按钮 (FAB):
|
|
||||||
- 尺寸: 56x56px
|
|
||||||
- 圆角: 28px
|
|
||||||
- 背景: #3B82F6
|
|
||||||
- 描边: 4px 白色边框
|
|
||||||
- 阴影: 提升效果
|
|
||||||
```
|
|
||||||
|
|
||||||
**图标与文字:**
|
|
||||||
```
|
|
||||||
图标容器:
|
|
||||||
- 尺寸: 44x44px
|
|
||||||
- 圆角: 22px
|
|
||||||
- 背景: #FFFFFF (亮色), #27272A (暗色)
|
|
||||||
- 图标: 20px (lucide 字体)
|
|
||||||
- 颜色: #FF6B6B (星标), #FCD34D (咖啡)
|
|
||||||
|
|
||||||
章节标题:
|
|
||||||
- 字体: Bricolage Grotesque 18px/700
|
|
||||||
- 颜色: #1A1A1A (亮色), #F4F4F5 (暗色)
|
|
||||||
|
|
||||||
大数值:
|
|
||||||
- 字体: Bricolage Grotesque 32px/800
|
|
||||||
- 颜色: #1A1A1A (亮色), #F4F4F5 (暗色)
|
|
||||||
```
|
|
||||||
|
|
||||||
**布局模式 (基于 Calendar 结构):**
|
|
||||||
```
|
|
||||||
页面容器: 402px (设计视口), 垂直布局, 24px 内边距
|
|
||||||
头部区域: 水平布局, 两端对齐, 8px 24px 内边距
|
|
||||||
内容区域: 垂直布局, 24px 内边距, 12-16px 间距
|
|
||||||
```
|
|
||||||
|
|
||||||
**关键布局原则:**
|
|
||||||
- 遵循 Flex 容器模式 (见下方"5. 布局模式")
|
|
||||||
- 导航栏背景必须透明 (`:deep(.van-nav-bar) { background: transparent !important; }`)
|
|
||||||
- 尊重安全区域 (`env(safe-area-inset-bottom)`)
|
|
||||||
|
|
||||||
### 5. 布局模式
|
|
||||||
|
|
||||||
**页面结构 (Flex 容器):**
|
|
||||||
```
|
|
||||||
.page-container-flex:
|
|
||||||
- display: flex
|
|
||||||
- flex-direction: column
|
|
||||||
- height: 100%
|
|
||||||
- overflow: hidden
|
|
||||||
|
|
||||||
结构:
|
|
||||||
1. van-nav-bar (固定高度)
|
|
||||||
2. van-tabs 或 sticky-header
|
|
||||||
3. scroll-content (flex: 1, overflow-y: auto)
|
|
||||||
4. bottom-button 或 van-tabbar (固定)
|
|
||||||
```
|
|
||||||
|
|
||||||
**导航栏背景透明化 (项目标准模式):**
|
|
||||||
```css
|
|
||||||
/* 所有页面统一设置 */
|
|
||||||
:deep(.van-nav-bar) {
|
|
||||||
background: transparent !important;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
**关键要求:**
|
|
||||||
- 页面容器必须有明确的背景色
|
|
||||||
- 必须使用 `:deep()` 选择器覆盖 Vant 样式
|
|
||||||
- 必须添加 `!important` 标记
|
|
||||||
- 在 `<style scoped>` 块中添加此规则
|
|
||||||
|
|
||||||
**安全区域处理:**
|
|
||||||
```css
|
|
||||||
/* iPhone 刘海底部内边距 */
|
|
||||||
padding-bottom: env(safe-area-inset-bottom, 0px);
|
|
||||||
|
|
||||||
/* 状态栏顶部内边距 */
|
|
||||||
padding-top: max(0px, calc(env(safe-area-inset-top, 0px) * 0.75));
|
|
||||||
```
|
|
||||||
|
|
||||||
**固定元素:**
|
|
||||||
```css
|
|
||||||
.sticky-header {
|
|
||||||
position: sticky;
|
|
||||||
top: 0;
|
|
||||||
z-index: 10;
|
|
||||||
background: var(--van-background-2);
|
|
||||||
border-radius: 12px;
|
|
||||||
box-shadow: 0 2px 8px rgba(0,0,0,0.04);
|
|
||||||
margin: 12px;
|
|
||||||
padding: 12px 16px;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 6. 交互模式
|
|
||||||
|
|
||||||
**触摸反馈:**
|
|
||||||
- 激活状态: 点击时 scale(0.95)
|
|
||||||
- 涟漪效果: 使用 Vant 内置触摸反馈
|
|
||||||
- 悬停状态: 12% 透明度叠加 (网页端)
|
|
||||||
|
|
||||||
**加载状态:**
|
|
||||||
```
|
|
||||||
van-pull-refresh:
|
|
||||||
- 用于顶层可滚动内容
|
|
||||||
- 最小高度: calc(100vh - nav - tabbar)
|
|
||||||
|
|
||||||
van-loading:
|
|
||||||
- 容器内居中
|
|
||||||
- 尺寸: 内联 24px, 页面 32px
|
|
||||||
```
|
|
||||||
|
|
||||||
**空状态:**
|
|
||||||
```
|
|
||||||
van-empty:
|
|
||||||
- 图标: 60px 大小
|
|
||||||
- 描述: 14px, var(--van-text-color-2)
|
|
||||||
- 内边距: 垂直 48px
|
|
||||||
```
|
|
||||||
|
|
||||||
**悬浮操作:**
|
|
||||||
```
|
|
||||||
van-floating-bubble:
|
|
||||||
- 图标大小: 24px
|
|
||||||
- 位置: 右下角, 距底部 100px (避开 tabbar)
|
|
||||||
- 磁吸: 贴靠 x 轴边缘
|
|
||||||
```
|
|
||||||
|
|
||||||
### 7. 数据可视化
|
|
||||||
|
|
||||||
**预算进度条:**
|
|
||||||
```
|
|
||||||
渐变逻辑:
|
|
||||||
支出 (0% → 100%):
|
|
||||||
- 0%: #40a9ff (安全蓝)
|
|
||||||
- 40%: #36cfc9 (青色过渡)
|
|
||||||
- 70%: #faad14 (警告黄)
|
|
||||||
- 100%: #ff4d4f (危险红)
|
|
||||||
|
|
||||||
收入 (0% → 100%):
|
|
||||||
- 0%: #f5222d (深红 - 未开始)
|
|
||||||
- 45%: #ffcccc (浅红)
|
|
||||||
- 50%: #f0f2f5 (中性灰)
|
|
||||||
- 55%: #bae7ff (浅蓝)
|
|
||||||
- 100%: #1890ff (深蓝 - 达成)
|
|
||||||
```
|
|
||||||
|
|
||||||
**金额显示:**
|
|
||||||
```css
|
|
||||||
.amount {
|
|
||||||
font-family: 'DIN Alternate', system-ui;
|
|
||||||
font-weight: 600;
|
|
||||||
font-variant-numeric: tabular-nums;
|
|
||||||
}
|
|
||||||
|
|
||||||
.expense { color: var(--van-danger-color); }
|
|
||||||
.income { color: var(--van-success-color); }
|
|
||||||
```
|
|
||||||
|
|
||||||
**图表 (如果使用):**
|
|
||||||
- 折线图: 2px 笔画, 圆角连接
|
|
||||||
- 柱状图: 8px 圆角, 4px 间距
|
|
||||||
- 颜色: 使用语义色阶
|
|
||||||
- 网格线: 1px, 8% 透明度
|
|
||||||
|
|
||||||
### 8. 主题切换 (亮色/暗色)
|
|
||||||
|
|
||||||
**实现策略:**
|
|
||||||
```javascript
|
|
||||||
// 自动检测系统偏好
|
|
||||||
const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches
|
|
||||||
theme.value = isDark ? 'dark' : 'light'
|
|
||||||
document.documentElement.setAttribute('data-theme', theme.value)
|
|
||||||
```
|
|
||||||
|
|
||||||
**设计文件要求:**
|
|
||||||
- **必须同时创建亮色和暗色变体**
|
|
||||||
- 使用 Vant 的主题变量 (自动切换)
|
|
||||||
- 测试对比度: WCAG AA 最低标准 (文本 4.5:1)
|
|
||||||
- 暗色模式适配:
|
|
||||||
- 减少卡片阴影至 0 2px 8px rgba(0,0,0,0.24)
|
|
||||||
- 增加边框对比度
|
|
||||||
- 白色文本柔化至 #e5e5e5
|
|
||||||
|
|
||||||
**pancli 工作流:**
|
|
||||||
```
|
|
||||||
1. 先创建亮色主题设计
|
|
||||||
2. 复制帧用于暗色模式
|
|
||||||
3. 使用 replace_all_matching_properties 批量更新:
|
|
||||||
- 背景颜色
|
|
||||||
- 文本颜色
|
|
||||||
- 边框颜色
|
|
||||||
4. 手动调整阴影和叠加
|
|
||||||
5. 命名帧: "[屏幕名称] - Light" / "[屏幕名称] - Dark"
|
|
||||||
```
|
|
||||||
|
|
||||||
### 9. 命名约定
|
|
||||||
|
|
||||||
**帧名称:**
|
|
||||||
```
|
|
||||||
格式: [模块] - [屏幕] - [变体]
|
|
||||||
|
|
||||||
示例:
|
|
||||||
✅ Budget - List View - Light
|
|
||||||
✅ Budget - Edit Dialog - Dark
|
|
||||||
✅ Transaction - Card Component
|
|
||||||
✅ Statistics - Chart Section
|
|
||||||
|
|
||||||
❌ Screen1
|
|
||||||
❌ Frame_Copy_2
|
|
||||||
❌ New Design
|
|
||||||
```
|
|
||||||
|
|
||||||
**组件层级:**
|
|
||||||
```
|
|
||||||
可复用组件:
|
|
||||||
- 前缀 "Component/"
|
|
||||||
- 示例: "Component/BudgetCard"
|
|
||||||
|
|
||||||
屏幕:
|
|
||||||
- 按模块分组
|
|
||||||
- 示例: "Budget/ListView", "Budget/EditForm"
|
|
||||||
```
|
|
||||||
|
|
||||||
### 10. 质量检查清单
|
|
||||||
|
|
||||||
**设计完成前必检项:**
|
|
||||||
- [ ] 同时创建亮色和暗色主题
|
|
||||||
- [ ] 使用真实中文业务术语 (无占位文本)
|
|
||||||
- [ ] 交互元素 ≥ 44x44px
|
|
||||||
- [ ] 间距遵循 8px 网格
|
|
||||||
- [ ] 使用语义颜色变量 (非硬编码)
|
|
||||||
- [ ] 导航栏背景透明 (`:deep(.van-nav-bar)`)
|
|
||||||
- [ ] 帧命名: 模块-屏幕-变体 格式
|
|
||||||
- [ ] 可复用组件标记 `reusable: true`
|
|
||||||
- [ ] 两种主题截图验证
|
|
||||||
|
|
||||||
**无障碍标准:**
|
|
||||||
- [ ] 正文对比度 ≥ 4.5:1
|
|
||||||
- [ ] 大文本对比度 ≥ 3:1 (18px+)
|
|
||||||
- [ ] 触摸目标间距 ≥ 8px
|
|
||||||
|
|
||||||
## PANCLI 工作流程
|
|
||||||
|
|
||||||
### 阶段 1: 设置与风格选择
|
|
||||||
|
|
||||||
```typescript
|
|
||||||
// 1. 获取编辑器状态
|
|
||||||
pencil_get_editor_state(include_schema: true)
|
|
||||||
|
|
||||||
// 2. 获取设计指南
|
|
||||||
pencil_get_guidelines(topic: "landing-page") // 或 "design-system"
|
|
||||||
|
|
||||||
// 3. 选择合适的风格指南
|
|
||||||
pencil_get_style_guide_tags() // 获取可用标签
|
|
||||||
|
|
||||||
// 4. 使用标签获取风格指南
|
|
||||||
pencil_get_style_guide(tags: [
|
|
||||||
"mobile", // 必需
|
|
||||||
"webapp", // 类应用界面
|
|
||||||
"modern", // 简洁, 现代
|
|
||||||
"minimal", // 避免杂乱
|
|
||||||
"professional", // 商业环境
|
|
||||||
"blue", // 主色提示
|
|
||||||
"fintech" // 如果可用
|
|
||||||
])
|
|
||||||
```
|
|
||||||
|
|
||||||
### 阶段 2: 创建亮色主题设计
|
|
||||||
|
|
||||||
```typescript
|
|
||||||
// 5. 读取现有组件 (如果有)
|
|
||||||
pencil_batch_get(
|
|
||||||
filePath: "designs/emailbill.pen",
|
|
||||||
patterns: [{ reusable: true }],
|
|
||||||
readDepth: 2
|
|
||||||
)
|
|
||||||
|
|
||||||
// 6. 创建亮色主题屏幕
|
|
||||||
pencil_batch_design(
|
|
||||||
filePath: "designs/emailbill.pen",
|
|
||||||
operations: `
|
|
||||||
screen=I(document, {
|
|
||||||
type: "frame",
|
|
||||||
name: "Budget - List View - Light",
|
|
||||||
width: 375,
|
|
||||||
height: 812,
|
|
||||||
fill: "#FFFFFF",
|
|
||||||
layout: "vertical",
|
|
||||||
placeholder: true
|
|
||||||
})
|
|
||||||
|
|
||||||
navbar=I(screen, {
|
|
||||||
type: "frame",
|
|
||||||
name: "Navbar",
|
|
||||||
width: "fill_container",
|
|
||||||
height: 44,
|
|
||||||
fill: "transparent",
|
|
||||||
layout: "horizontal",
|
|
||||||
padding: [12, 16, 12, 16]
|
|
||||||
})
|
|
||||||
|
|
||||||
title=I(navbar, {
|
|
||||||
type: "text",
|
|
||||||
content: "预算管理",
|
|
||||||
fontSize: 16,
|
|
||||||
fontWeight: "600",
|
|
||||||
textColor: "#1A1A1A"
|
|
||||||
})
|
|
||||||
|
|
||||||
// ... 更多操作
|
|
||||||
`
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
### 阶段 3: 创建暗色主题变体
|
|
||||||
|
|
||||||
```typescript
|
|
||||||
// 7. 复制亮色主题帧
|
|
||||||
pencil_batch_design(
|
|
||||||
operations: `
|
|
||||||
darkScreen=C("light-screen-id", document, {
|
|
||||||
name: "Budget - List View - Dark",
|
|
||||||
positionDirection: "right",
|
|
||||||
positionPadding: 48
|
|
||||||
})
|
|
||||||
`
|
|
||||||
)
|
|
||||||
|
|
||||||
// 8. 批量替换暗色主题颜色
|
|
||||||
pencil_replace_all_matching_properties(
|
|
||||||
parents: ["dark-screen-id"],
|
|
||||||
properties: {
|
|
||||||
fillColor: [
|
|
||||||
{ from: "#FFFFFF", to: "#09090B" }, // 页面背景
|
|
||||||
{ from: "#F6F7F8", to: "#18181B" }, // 卡片背景
|
|
||||||
{ from: "#F5F5F5", to: "#27272A" } // 边框
|
|
||||||
],
|
|
||||||
textColor: [
|
|
||||||
{ from: "#1A1A1A", to: "#F4F4F5" }, // 主文本
|
|
||||||
{ from: "#6B7280", to: "#A1A1AA" }, // 次要
|
|
||||||
{ from: "#9CA3AF", to: "#71717A" } // 三级
|
|
||||||
]
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
// 9. 手动调整暗色模式阴影 (如需要)
|
|
||||||
pencil_batch_design(
|
|
||||||
operations: `
|
|
||||||
U("dark-card-id", {
|
|
||||||
shadow: {
|
|
||||||
x: 0,
|
|
||||||
y: 2,
|
|
||||||
blur: 8,
|
|
||||||
color: "rgba(0,0,0,0.24)"
|
|
||||||
}
|
|
||||||
})
|
|
||||||
`
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
### 阶段 4: 验证
|
|
||||||
|
|
||||||
```typescript
|
|
||||||
// 10. 对两种主题截图
|
|
||||||
pencil_get_screenshot(nodeId: "light-screen-id")
|
|
||||||
pencil_get_screenshot(nodeId: "dark-screen-id")
|
|
||||||
|
|
||||||
// 11. 检查布局问题
|
|
||||||
pencil_snapshot_layout(
|
|
||||||
parentId: "light-screen-id",
|
|
||||||
problemsOnly: true
|
|
||||||
)
|
|
||||||
|
|
||||||
// 12. 验证所有唯一属性
|
|
||||||
pencil_search_all_unique_properties(
|
|
||||||
parents: ["light-screen-id"],
|
|
||||||
properties: ["fillColor", "textColor", "fontSize"]
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
## 代码库实际示例
|
|
||||||
|
|
||||||
### 示例 1: 预算卡片组件
|
|
||||||
|
|
||||||
```
|
|
||||||
组件结构:
|
|
||||||
BudgetCard (375x120px)
|
|
||||||
├─ CardBackground (#ffffff, 16px 圆角, 阴影)
|
|
||||||
├─ HeaderRow (水平布局)
|
|
||||||
│ ├─ CategoryName (16px, 600 粗细)
|
|
||||||
│ └─ PeriodLabel (12px, 次要颜色)
|
|
||||||
├─ ProgressBar (基于比例渐变)
|
|
||||||
│ └─ ProgressFill (高度: 8px, 圆角: 4px)
|
|
||||||
├─ AmountRow (水平布局, 两端对齐)
|
|
||||||
│ ├─ CurrentAmount (DIN, 18px, 危险色)
|
|
||||||
│ ├─ LimitAmount (DIN, 14px, 次要)
|
|
||||||
│ └─ RemainingAmount (DIN, 14px, 成功色)
|
|
||||||
└─ FooterActions (可选, 储蓄按钮)
|
|
||||||
```
|
|
||||||
|
|
||||||
**pancli 实现:**
|
|
||||||
```typescript
|
|
||||||
card=I(parent, {
|
|
||||||
type: "frame",
|
|
||||||
name: "BudgetCard",
|
|
||||||
width: "fill_container",
|
|
||||||
height: 120,
|
|
||||||
fill: "#ffffff",
|
|
||||||
cornerRadius: [16, 16, 16, 16],
|
|
||||||
shadow: { x: 0, y: 2, blur: 12, color: "rgba(0,0,0,0.08)" },
|
|
||||||
stroke: { color: "#ebedf0", thickness: 1 },
|
|
||||||
padding: [16, 16, 16, 16],
|
|
||||||
layout: "vertical",
|
|
||||||
gap: 12,
|
|
||||||
placeholder: true
|
|
||||||
})
|
|
||||||
|
|
||||||
header=I(card, {
|
|
||||||
type: "frame",
|
|
||||||
layout: "horizontal",
|
|
||||||
width: "fill_container",
|
|
||||||
height: "hug_contents"
|
|
||||||
})
|
|
||||||
|
|
||||||
categoryName=I(header, {
|
|
||||||
type: "text",
|
|
||||||
content: "日常开销",
|
|
||||||
fontSize: 16,
|
|
||||||
fontWeight: "600",
|
|
||||||
textColor: "#323233"
|
|
||||||
})
|
|
||||||
|
|
||||||
// 带渐变的进度条
|
|
||||||
progressBar=I(card, {
|
|
||||||
type: "frame",
|
|
||||||
width: "fill_container",
|
|
||||||
height: 8,
|
|
||||||
fill: "#f0f0f0",
|
|
||||||
cornerRadius: [4, 4, 4, 4]
|
|
||||||
})
|
|
||||||
|
|
||||||
progressFill=I(progressBar, {
|
|
||||||
type: "frame",
|
|
||||||
width: "75%", // 75% 进度示例
|
|
||||||
height: 8,
|
|
||||||
fill: "linear-gradient(90deg, #40a9ff 0%, #faad14 100%)",
|
|
||||||
cornerRadius: [4, 4, 4, 4]
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
### 示例 2: 带日期选择器的固定头部
|
|
||||||
|
|
||||||
```
|
|
||||||
固定头部模式 (来自 BudgetView):
|
|
||||||
├─ 位置: sticky, top: 0
|
|
||||||
├─ 背景: var(--van-background-2)
|
|
||||||
├─ 圆角: 12px
|
|
||||||
├─ 阴影: 0 2px 8px rgba(0,0,0,0.04)
|
|
||||||
├─ 内边距: 12px 16px
|
|
||||||
├─ 内容: "2024年1月" + 下拉箭头图标
|
|
||||||
```
|
|
||||||
|
|
||||||
### 示例 3: 滑动删除列表项
|
|
||||||
|
|
||||||
```
|
|
||||||
van-swipe-cell 模式:
|
|
||||||
├─ 内容: BudgetCard 组件
|
|
||||||
├─ 右侧操作: 删除按钮
|
|
||||||
│ ├─ 宽度: 60px
|
|
||||||
│ ├─ 背景: var(--van-danger-color)
|
|
||||||
│ ├─ 文本: "删除"
|
|
||||||
│ └─ 全高 (100%)
|
|
||||||
```
|
|
||||||
|
|
||||||
## 避免的反模式
|
|
||||||
|
|
||||||
**❌ 不要这样做:**
|
|
||||||
```
|
|
||||||
// 通用 AI 生成内容
|
|
||||||
title=I(navbar, {
|
|
||||||
type: "text",
|
|
||||||
content: "Dashboard", // ❌ 使用 "预算管理" 代替
|
|
||||||
fontSize: 20, // ❌ 按字号比例使用 16px
|
|
||||||
fontWeight: "bold" // ❌ 使用数字值 600
|
|
||||||
})
|
|
||||||
|
|
||||||
// 不一致的间距
|
|
||||||
card=I(parent, {
|
|
||||||
padding: [15, 13, 17, 14] // ❌ 使用 8px 网格: [16, 16, 16, 16]
|
|
||||||
})
|
|
||||||
|
|
||||||
// 硬编码颜色而非语义
|
|
||||||
amount=I(card, {
|
|
||||||
textColor: "#ff0000" // ❌ 使用 var(--van-danger-color) 或 "#ee0a24"
|
|
||||||
})
|
|
||||||
|
|
||||||
// 缺少暗色模式
|
|
||||||
// ❌ 只创建亮色主题没有暗色变体
|
|
||||||
|
|
||||||
// 糟糕的命名
|
|
||||||
frame=I(document, {
|
|
||||||
name: "Frame_123" // ❌ 使用 "Budget - List View - Light"
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
**✅ 应该这样做:**
|
|
||||||
```typescript
|
|
||||||
// 真实业务术语
|
|
||||||
title=I(navbar, {
|
|
||||||
type: "text",
|
|
||||||
content: "预算管理",
|
|
||||||
fontSize: 16,
|
|
||||||
fontWeight: "600",
|
|
||||||
textColor: "#323233"
|
|
||||||
})
|
|
||||||
|
|
||||||
// 一致的 8px 网格间距
|
|
||||||
card=I(parent, {
|
|
||||||
padding: [16, 16, 16, 16],
|
|
||||||
gap: 12
|
|
||||||
})
|
|
||||||
|
|
||||||
// 语义颜色变量
|
|
||||||
amount=I(card, {
|
|
||||||
textColor: "#ee0a24", // 一致的危险色
|
|
||||||
fontFamily: "DIN Alternate"
|
|
||||||
})
|
|
||||||
|
|
||||||
// 总是创建两种主题
|
|
||||||
lightScreen=I(document, { name: "Budget - List - Light" })
|
|
||||||
darkScreen=C(lightScreen, document, {
|
|
||||||
name: "Budget - List - Dark",
|
|
||||||
positionDirection: "right"
|
|
||||||
})
|
|
||||||
|
|
||||||
// 清晰的描述性名称
|
|
||||||
card=I(parent, {
|
|
||||||
name: "BudgetCard",
|
|
||||||
reusable: true
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
## 委派与任务管理
|
|
||||||
|
|
||||||
**使用此技能时:**
|
|
||||||
|
|
||||||
```typescript
|
|
||||||
// 委派设计任务时加载此技能
|
|
||||||
delegate_task(
|
|
||||||
category: "visual-engineering",
|
|
||||||
load_skills: ["pancli-design", "frontend-ui-ux"],
|
|
||||||
description: "创建预算列表屏幕设计",
|
|
||||||
prompt: `
|
|
||||||
任务: 为 EmailBill 应用创建移动端预算列表屏幕设计
|
|
||||||
|
|
||||||
预期结果:
|
|
||||||
- 375x812px 亮色主题设计
|
|
||||||
- 暗色主题变体 (复制并适配)
|
|
||||||
- 可复用的 BudgetCard 组件
|
|
||||||
- 两种主题的截图验证
|
|
||||||
|
|
||||||
必需工具:
|
|
||||||
- pencil_get_style_guide_tags
|
|
||||||
- pencil_get_style_guide
|
|
||||||
- pencil_batch_design
|
|
||||||
- pencil_batch_get
|
|
||||||
- pencil_replace_all_matching_properties
|
|
||||||
- pencil_get_screenshot
|
|
||||||
|
|
||||||
必须做:
|
|
||||||
- 严格遵循 pancli-design 技能指南
|
|
||||||
- 使用真实中文业务术语 (预算, 账单, 分类)
|
|
||||||
- 创建亮色和暗色两种主题
|
|
||||||
- 使用 8px 网格间距系统
|
|
||||||
- 遵循 Vant UI 组件模式
|
|
||||||
- 使用 模块-屏幕-变体 格式命名帧
|
|
||||||
- 使用语义颜色变量
|
|
||||||
- 数字显示应用 DIN Alternate
|
|
||||||
- 导航栏背景必须设置为透明 (:deep(.van-nav-bar) { background: transparent !important; })
|
|
||||||
- 截图验证
|
|
||||||
|
|
||||||
不得做:
|
|
||||||
- 使用 Lorem Ipsum 或占位文本
|
|
||||||
- 只创建亮色主题没有暗色变体
|
|
||||||
- 使用任意间距 (必须遵循 8px 网格)
|
|
||||||
- 硬编码颜色 (使用语义变量)
|
|
||||||
- 使用通用 "Dashboard" 标签
|
|
||||||
- 跳过截图验证
|
|
||||||
- 创建名为 "Frame_1", "Copy" 等的帧
|
|
||||||
|
|
||||||
上下文:
|
|
||||||
- 移动视口: 375px 宽度
|
|
||||||
- 设计系统: 基于 Vant UI
|
|
||||||
- 配色方案: #1989fa 主色, #ee0a24 危险, #07c160 成功
|
|
||||||
- 字体: 中文系统默认, 数字 DIN Alternate
|
|
||||||
- designs/emailbill.pen 中的现有组件 (用 batch_get 检查)
|
|
||||||
`,
|
|
||||||
run_in_background: false
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
## 快速参考
|
|
||||||
|
|
||||||
**颜色面板 (基于实际 v2.pen 设计):**
|
|
||||||
|
|
||||||
| 名称 | 亮色 | 暗色 | 用途 |
|
|
||||||
|------|------|------|------|
|
|
||||||
| 页面背景 | #FFFFFF | #09090B | 页面背景 |
|
|
||||||
| 卡片背景 | #F6F7F8 | #18181B | 卡片表面 |
|
|
||||||
| 强调背景 | #F5F5F5 | #27272A | 按钮, 图标容器 |
|
|
||||||
| 主文本 | #1A1A1A | #F4F4F5 | 主要文本 |
|
|
||||||
| 次要文本 | #6B7280 | #A1A1AA | 次要文本 |
|
|
||||||
| 三级文本 | #9CA3AF | #71717A | 三级文本 |
|
|
||||||
| 主色 | #3B82F6 | #3B82F6 | 操作, FAB |
|
|
||||||
| 红色 | #FF6B6B | #FF6B6B | 支出, 警告 |
|
|
||||||
| 黄色 | #FCD34D | #FCD34D | 警告 |
|
|
||||||
| 绿色 | #F0FDF4 | #064E3B | 收入标签 |
|
|
||||||
| 蓝色 | #E0E7FF | #312E81 | 信息标签 |
|
|
||||||
|
|
||||||
**排版比例:**
|
|
||||||
|
|
||||||
| 用途 | 字体 | 大小 | 粗细 |
|
|
||||||
|------|------|------|------|
|
|
||||||
| 大数值 | Bricolage Grotesque | 32px | 800 |
|
|
||||||
| 页面标题 | DM Sans | 24px | 500 |
|
|
||||||
| 章节标题 | Bricolage Grotesque | 18px | 700 |
|
|
||||||
| 正文 | DM Sans | 15px | 600 |
|
|
||||||
| 说明 | DM Sans | 13px | 500 |
|
|
||||||
| 微型标签 | DM Sans | 12px | 600 |
|
|
||||||
|
|
||||||
**组件规格:**
|
|
||||||
|
|
||||||
- **容器内边距**: 24px (主区域), 20px (卡片), 16px (小卡片)
|
|
||||||
- **间距比例**: 2px, 4px, 8px, 12px, 14px, 16px
|
|
||||||
- **圆角**: 12px (标签), 16px/20px (卡片), 22px/28px (圆形按钮)
|
|
||||||
- **图标**: 20px
|
|
||||||
- **图标按钮**: 44x44px
|
|
||||||
- **FAB 按钮**: 56x56px
|
|
||||||
- **触摸目标**: 最小 44x44px
|
|
||||||
- **设计视口**: 402px 宽度
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**版本:** 2.0.0
|
|
||||||
**最后更新:** 2026-02-04
|
|
||||||
**维护者:** EmailBill 设计团队
|
|
||||||
File diff suppressed because it is too large
Load Diff
9208
.pans/v2.pen
9208
.pans/v2.pen
File diff suppressed because it is too large
Load Diff
@@ -1,325 +0,0 @@
|
|||||||
|
|
||||||
## Vue 3 Composition API Research - Modular Architecture Best Practices
|
|
||||||
|
|
||||||
### 研究日期: 2026-02-03
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1. 官方 Vue 3 组件组织原则
|
|
||||||
|
|
||||||
### 1.1 Composables 用于代码组织
|
|
||||||
来源: Vue 官方文档 - https://vuejs.org/guide/reusability/composables
|
|
||||||
|
|
||||||
**核心原则:**
|
|
||||||
- Composables 不仅用于复用,也用于**代码组织**
|
|
||||||
- 当组件变得过于复杂时,应该将逻辑按**关注点分离**提取到更小的函数中
|
|
||||||
- 可以将提取的 composables 视为**组件级别的服务**,它们可以相互通信
|
|
||||||
|
|
||||||
**官方示例模式:**
|
|
||||||
```vue
|
|
||||||
<script setup>
|
|
||||||
import { useFeatureA } from './featureA.js'
|
|
||||||
import { useFeatureB } from './featureB.js'
|
|
||||||
import { useFeatureC } from './featureC.js'
|
|
||||||
|
|
||||||
const { foo, bar } = useFeatureA()
|
|
||||||
const { baz } = useFeatureB(foo)
|
|
||||||
const { qux } = useFeatureC(baz)
|
|
||||||
</script>
|
|
||||||
```
|
|
||||||
|
|
||||||
**关键洞察:**
|
|
||||||
- Composables 应返回**普通对象**包含多个 refs,保持响应式
|
|
||||||
- 避免返回 reactive 对象,因为解构会失去响应性
|
|
||||||
- Composables 可以接收其他 composables 的返回值作为参数
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. 代码分割与懒加载
|
|
||||||
|
|
||||||
### 2.1 defineAsyncComponent 用于模块懒加载
|
|
||||||
来源: Vue 官方文档 - https://github.com/vuejs/docs/blob/main/src/guide/best-practices/performance.md
|
|
||||||
|
|
||||||
**适用场景:**
|
|
||||||
- 将大型组件树分割成独立的 chunks
|
|
||||||
- 仅在组件渲染时才加载,改善初始加载时间
|
|
||||||
|
|
||||||
```js
|
|
||||||
import { defineAsyncComponent } from 'vue'
|
|
||||||
|
|
||||||
// Foo.vue 及其依赖被单独打包成一个 chunk
|
|
||||||
// 只有在组件被渲染时才会按需获取
|
|
||||||
const Foo = defineAsyncComponent(() => import('./Foo.vue'))
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2.2 动态导入用于 JS 代码分割
|
|
||||||
```js
|
|
||||||
// lazy.js 及其依赖会被分割成单独的 chunk
|
|
||||||
// 只在 loadLazy() 被调用时才加载
|
|
||||||
function loadLazy() {
|
|
||||||
return import('./lazy.js')
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. 真实世界的模块化架构模式
|
|
||||||
|
|
||||||
### 3.1 Dashboard 模块化架构 - 成功案例
|
|
||||||
|
|
||||||
**案例 1: Soybean Admin (MIT License)**
|
|
||||||
来源: https://github.com/soybeanjs/soybean-admin/blob/main/src/views/home/index.vue
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { computed } from 'vue';
|
|
||||||
import { useAppStore } from '@/store/modules/app';
|
|
||||||
import HeaderBanner from './modules/header-banner.vue';
|
|
||||||
import CardData from './modules/card-data.vue';
|
|
||||||
import LineChart from './modules/line-chart.vue';
|
|
||||||
import PieChart from './modules/pie-chart.vue';
|
|
||||||
import ProjectNews from './modules/project-news.vue';
|
|
||||||
import CreativityBanner from './modules/creativity-banner.vue';
|
|
||||||
|
|
||||||
const appStore = useAppStore();
|
|
||||||
const gap = computed(() => (appStore.isMobile ? 0 : 16));
|
|
||||||
</script>
|
|
||||||
```
|
|
||||||
|
|
||||||
**架构特点:**
|
|
||||||
- Index.vue 作为**容器组件**,只负责布局和响应式计算
|
|
||||||
- 每个 modules/*.vue 是**独立的功能模块**
|
|
||||||
- 模块命名清晰: header-banner, card-data, line-chart 等
|
|
||||||
- 使用 Pinia store 进行状态共享
|
|
||||||
|
|
||||||
**案例 2: Art Design Pro (MIT License)**
|
|
||||||
来源: https://github.com/Daymychen/art-design-pro/blob/main/src/views/dashboard/ecommerce/index.vue
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<script setup lang="ts">
|
|
||||||
import Banner from './modules/banner.vue'
|
|
||||||
import TotalOrderVolume from './modules/total-order-volume.vue'
|
|
||||||
import TotalProducts from './modules/total-products.vue'
|
|
||||||
import SalesTrend from './modules/sales-trend.vue'
|
|
||||||
import SalesClassification from './modules/sales-classification.vue'
|
|
||||||
import TransactionList from './modules/transaction-list.vue'
|
|
||||||
import HotCommodity from './modules/hot-commodity.vue'
|
|
||||||
import RecentTransaction from './modules/recent-transaction.vue'
|
|
||||||
import AnnualSales from './modules/annual-sales.vue'
|
|
||||||
import ProductSales from './modules/product-sales.vue'
|
|
||||||
import SalesGrowth from './modules/sales-growth.vue'
|
|
||||||
import CartConversionRate from './modules/cart-conversion-rate.vue'
|
|
||||||
import HotProductsList from './modules/hot-products-list.vue'
|
|
||||||
|
|
||||||
defineOptions({ name: 'Ecommerce' })
|
|
||||||
</script>
|
|
||||||
```
|
|
||||||
|
|
||||||
**架构特点:**
|
|
||||||
- 电商 dashboard 包含 13 个独立模块
|
|
||||||
- 每个模块代表一个业务功能卡片
|
|
||||||
- Index.vue **不传递数据**,模块自治
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. 模块间通信模式
|
|
||||||
|
|
||||||
### 4.1 defineEmits 用于子到父通信
|
|
||||||
来源: Vue 核心仓库 - https://github.com/vuejs/core/blob/main/packages/runtime-core/src/apiSetupHelpers.ts
|
|
||||||
|
|
||||||
**TypeScript 类型声明模式:**
|
|
||||||
```ts
|
|
||||||
const emit = defineEmits<{
|
|
||||||
'update:modelValue': [value: string];
|
|
||||||
'change': [event: Event];
|
|
||||||
'custom-event': [payload: CustomPayload];
|
|
||||||
}>();
|
|
||||||
```
|
|
||||||
|
|
||||||
**Runtime 声明模式:**
|
|
||||||
```js
|
|
||||||
const emit = defineEmits(['change', 'update'])
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4.2 Props 模式 - 数据传递 vs 自取数据
|
|
||||||
|
|
||||||
**案例研究: Halo CMS (GPL-3.0)**
|
|
||||||
来源: https://github.com/halo-dev/halo/blob/main/ui/console-src/modules/system/users/components/GrantPermissionModal.vue
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { computed, onMounted, ref } from "vue";
|
|
||||||
import { useI18n } from "vue-i18n";
|
|
||||||
import { useFetchRoles, useFetchRoleTemplates } from "../composables/use-role";
|
|
||||||
|
|
||||||
const props = withDefaults(
|
|
||||||
defineProps<{
|
|
||||||
user?: User;
|
|
||||||
}>(),
|
|
||||||
{
|
|
||||||
user: undefined,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
const emit = defineEmits<{
|
|
||||||
(event: "close"): void;
|
|
||||||
}>();
|
|
||||||
|
|
||||||
// 模块自己获取数据
|
|
||||||
onMounted(async () => {
|
|
||||||
await fetchRoles();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
```
|
|
||||||
|
|
||||||
**模式总结:**
|
|
||||||
- **Props 传递身份标识** (如 user ID),而非完整数据
|
|
||||||
- **模块自己获取详细数据** (通过 composables)
|
|
||||||
- 这样保持模块的**高内聚低耦合**
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. 何时模块应该自取数据 vs 接收 Props
|
|
||||||
|
|
||||||
### 5.1 自取数据的场景
|
|
||||||
- 模块是**独立的业务单元**(如日历、统计卡片)
|
|
||||||
- 数据获取逻辑属于模块内部关注点
|
|
||||||
- 模块需要**定期刷新**或**重新加载**数据
|
|
||||||
- 多个平行模块各自管理自己的状态
|
|
||||||
|
|
||||||
**示例:**
|
|
||||||
```vue
|
|
||||||
<!-- 统计卡片模块 - 自己获取数据 -->
|
|
||||||
<script setup lang="ts">
|
|
||||||
const { data, loading } = useBudgetStats()
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
loadStats()
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
```
|
|
||||||
|
|
||||||
### 5.2 接收 Props 的场景
|
|
||||||
- 模块是**展示组件**(Presentational Component)
|
|
||||||
- 父组件需要**协调多个子组件**的数据
|
|
||||||
- 数据来源于**全局状态管理**(如 Pinia store)
|
|
||||||
- 需要在父组件层面做**数据聚合或转换**
|
|
||||||
|
|
||||||
**示例:**
|
|
||||||
```vue
|
|
||||||
<!-- 数据展示组件 - 接收 props -->
|
|
||||||
<script setup lang="ts">
|
|
||||||
const props = defineProps<{
|
|
||||||
stats: BudgetStats
|
|
||||||
loading: boolean
|
|
||||||
}>()
|
|
||||||
</script>
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 6. TypeScript vs JavaScript 在 Vue 3 项目中
|
|
||||||
|
|
||||||
### 6.1 EmailBill 项目的选择
|
|
||||||
**当前状况:**
|
|
||||||
- ESLint 配置中禁用了 TypeScript 规则
|
|
||||||
- 使用 `<script setup lang="ts">` 但不强制类型检查
|
|
||||||
- 轻量级类型提示,不追求严格类型安全
|
|
||||||
|
|
||||||
**何时避免 TypeScript:**
|
|
||||||
- 小型项目,团队更熟悉 JavaScript
|
|
||||||
- 快速原型开发
|
|
||||||
- 避免 TypeScript 配置和类型定义的复杂度
|
|
||||||
- 保持构建速度和开发体验的流畅
|
|
||||||
|
|
||||||
**何时使用 TypeScript:**
|
|
||||||
- 大型团队协作
|
|
||||||
- 复杂的状态管理和数据流
|
|
||||||
- 需要严格的 API 契约
|
|
||||||
- 长期维护的企业级应用
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 7. 模块化架构的最佳实践总结
|
|
||||||
|
|
||||||
### 7.1 目录结构推荐
|
|
||||||
```
|
|
||||||
views/
|
|
||||||
calendar/
|
|
||||||
Index.vue # 容器组件,布局和协调
|
|
||||||
modules/
|
|
||||||
CalendarView.vue # 日历展示模块(自取数据)
|
|
||||||
MonthlyStats.vue # 月度统计模块(自取数据)
|
|
||||||
QuickActions.vue # 快捷操作模块(事件驱动)
|
|
||||||
composables/
|
|
||||||
useCalendarData.ts # 日历数据获取逻辑
|
|
||||||
useMonthlyStats.ts # 统计数据获取逻辑
|
|
||||||
```
|
|
||||||
|
|
||||||
### 7.2 组件职责划分
|
|
||||||
|
|
||||||
**Index.vue (容器组件):**
|
|
||||||
- 布局管理和响应式设计
|
|
||||||
- 协调模块间的通信(如果需要)
|
|
||||||
- 全局状态初始化
|
|
||||||
- **不应包含业务逻辑**
|
|
||||||
|
|
||||||
**modules/*.vue (功能模块):**
|
|
||||||
- 独立的业务功能单元
|
|
||||||
- 自己管理数据获取和状态
|
|
||||||
- 通过 emits 向父组件通信
|
|
||||||
- 高内聚,低耦合
|
|
||||||
|
|
||||||
**composables/*.ts (可复用逻辑):**
|
|
||||||
- 数据获取逻辑
|
|
||||||
- 业务规则计算
|
|
||||||
- 状态管理辅助
|
|
||||||
- 可在多个组件间共享
|
|
||||||
|
|
||||||
### 7.3 通信模式推荐
|
|
||||||
|
|
||||||
**模块向上通信 (Child → Parent):**
|
|
||||||
```ts
|
|
||||||
const emit = defineEmits<{
|
|
||||||
'date-changed': [date: Date]
|
|
||||||
'item-clicked': [item: CalendarItem]
|
|
||||||
}>()
|
|
||||||
```
|
|
||||||
|
|
||||||
**模块间通信 (Sibling ↔ Sibling):**
|
|
||||||
- 通过**父组件中转**事件
|
|
||||||
- 或使用**全局事件总线**(如 mitt)
|
|
||||||
- 或使用**Pinia store** 共享状态
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 8. 关键洞察和建议
|
|
||||||
|
|
||||||
### 8.1 高内聚模块设计
|
|
||||||
- 每个模块应该是**自治的**,包含自己的数据获取、状态管理和事件处理
|
|
||||||
- Index.vue 应该是**轻量级的协调者**,而非数据的中央枢纽
|
|
||||||
|
|
||||||
### 8.2 Props vs 自取数据的平衡
|
|
||||||
- **身份标识和配置通过 props** (如 userId, date, theme)
|
|
||||||
- **业务数据通过模块自取** (如 stats, calendar items)
|
|
||||||
|
|
||||||
### 8.3 避免过度抽象
|
|
||||||
- 不要为了复用而复用
|
|
||||||
- 优先考虑**代码的清晰度**而非极致的 DRY
|
|
||||||
- Composables 应该解决**真实的重复问题**,而非预测性的抽象
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 9. 参考资源
|
|
||||||
|
|
||||||
**官方文档:**
|
|
||||||
- Vue 3 Composables: https://vuejs.org/guide/reusability/composables
|
|
||||||
- Vue 3 Performance: https://github.com/vuejs/docs/blob/main/src/guide/best-practices/performance.md
|
|
||||||
- Vue 3 State Management: https://vuejs.org/guide/scaling-up/state-management
|
|
||||||
|
|
||||||
**真实项目参考:**
|
|
||||||
- Soybean Admin: https://github.com/soybeanjs/soybean-admin (MIT)
|
|
||||||
- Art Design Pro: https://github.com/Daymychen/art-design-pro (MIT)
|
|
||||||
- Halo CMS: https://github.com/halo-dev/halo (GPL-3.0)
|
|
||||||
- DataEase: https://github.com/dataease/dataease (GPL-3.0)
|
|
||||||
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
# Calendar V2 数据加载修复 - 决策记录
|
|
||||||
|
|
||||||
## 2026-02-04 修复决策
|
|
||||||
|
|
||||||
### 问题确认
|
|
||||||
用户报告："日历v2中当前月份的日历矩阵中并没有加载当前月份的消费数据"
|
|
||||||
|
|
||||||
### 根因分析
|
|
||||||
1. `Web/src/views/calendarV2/modules/Calendar.vue` 的 `fetchAllRelevantMonthsData` 函数
|
|
||||||
2. 第 144 行在调用 API 时传递的 `month` 参数格式错误
|
|
||||||
3. JavaScript Date 的 month 是 0-11，但后端 API 期望 1-12
|
|
||||||
4. 上月和下月数据正常，因为代码中已有 `+1` 转换
|
|
||||||
|
|
||||||
### 修复方案
|
|
||||||
**选择：** 在第 144 行添加 `+1` 转换，与上月/下月处理保持一致
|
|
||||||
|
|
||||||
**理由：**
|
|
||||||
- 最小化修改范围（仅1行代码 + 1行注释）
|
|
||||||
- 保持代码一致性（三个月份处理逻辑统一）
|
|
||||||
- 不影响其他功能模块
|
|
||||||
- 符合现有的API约定
|
|
||||||
|
|
||||||
**拒绝的方案：**
|
|
||||||
- ❌ 修改后端 API 接受 0-11 格式 - 会破坏现有其他调用方
|
|
||||||
- ❌ 修改 `fetchDailyStats` 函数内部转换 - 会影响所有调用处
|
|
||||||
- ❌ 使用 watch 监听并重新加载 - 增加不必要的复杂度
|
|
||||||
|
|
||||||
### 代码变更
|
|
||||||
```diff
|
|
||||||
- const promises = [fetchDailyStats(year, month)]
|
|
||||||
+ // JavaScript Date.month 是 0-11，但后端 API 期望 1-12
|
|
||||||
+ const promises = [fetchDailyStats(year, month + 1)]
|
|
||||||
```
|
|
||||||
|
|
||||||
### 验证结果
|
|
||||||
✅ 代码审查通过
|
|
||||||
✅ ESLint 检查通过（0 errors）
|
|
||||||
✅ 逻辑一致性确认（当前月、上月、下月都使用 +1）
|
|
||||||
|
|
||||||
### 影响范围
|
|
||||||
- **修改文件：** 仅 `Web/src/views/calendarV2/modules/Calendar.vue`
|
|
||||||
- **影响功能：** 日历v2 当前月份数据加载
|
|
||||||
- **用户可见变化：** 当前月份的日期单元格将正确显示消费金额
|
|
||||||
- **副作用：** 无
|
|
||||||
@@ -1,165 +0,0 @@
|
|||||||
# Calendar V2 数据加载修复 - 学习笔记
|
|
||||||
|
|
||||||
## 2026-02-04 初始分析
|
|
||||||
|
|
||||||
### 问题根因
|
|
||||||
- `Web/src/views/calendarV2/modules/Calendar.vue` 第 144 行
|
|
||||||
- `fetchAllRelevantMonthsData` 函数在加载当前月数据时，传递的 `month` 参数是 JavaScript Date 的月份（0-11）
|
|
||||||
- 但后端 API `GetDailyStatistics` 期望的是 1-12 格式
|
|
||||||
- 上月和下月数据加载正确，因为代码中有 `prevMonth + 1` 和 `nextMonth + 1`
|
|
||||||
- **当前月数据加载失败，导致日历矩阵中没有当前月的消费数据**
|
|
||||||
|
|
||||||
### API 约定
|
|
||||||
- 后端 API: `WebApi/Controllers/TransactionRecordController.cs` 的 `GetDailyStatisticsAsync`
|
|
||||||
- 参数格式: `year` (完整年份), `month` (1-12)
|
|
||||||
- 前端 API: `Web/src/api/statistics.js` 的 `getDailyStatistics`
|
|
||||||
|
|
||||||
### 相关代码位置
|
|
||||||
- 问题文件: `Web/src/views/calendarV2/modules/Calendar.vue`
|
|
||||||
- 问题函数: `fetchAllRelevantMonthsData` (第 120-164 行)
|
|
||||||
- 问题行: 第 144 行 `const promises = [fetchDailyStats(year, month)]`
|
|
||||||
- 正确格式应该是: `const promises = [fetchDailyStats(year, month + 1)]`
|
|
||||||
|
|
||||||
|
|
||||||
## 2026-02-04 修复完成
|
|
||||||
|
|
||||||
### 修改内容
|
|
||||||
- 文件: `Web/src/views/calendarV2/modules/Calendar.vue`
|
|
||||||
- 行号: 第 144 行
|
|
||||||
- 修改前: `const promises = [fetchDailyStats(year, month)]`
|
|
||||||
- 修改后: `const promises = [fetchDailyStats(year, month + 1)]`
|
|
||||||
- 新增注释: "// JavaScript Date.month 是 0-11，但后端 API 期望 1-12"
|
|
||||||
|
|
||||||
### 验证结果
|
|
||||||
- ✅ 代码风格检查通过 (`pnpm lint`)
|
|
||||||
- ✅ 仅有项目已存在的 40 个警告，无新增错误
|
|
||||||
- ✅ 上月和下月加载逻辑保持不变（第 149 和 155 行已正确）
|
|
||||||
- ✅ 与上月、下月的处理方式保持一致
|
|
||||||
|
|
||||||
### 修复逻辑验证
|
|
||||||
- 当前月: `month + 1` (例如: JavaScript 1 月 → API 2 月)
|
|
||||||
- 上个月: `prevMonth + 1` (已有逻辑，正确)
|
|
||||||
- 下个月: `nextMonth + 1` (已有逻辑，正确)
|
|
||||||
- 三者逻辑统一，符合后端 API 约定
|
|
||||||
|
|
||||||
### 后续建议
|
|
||||||
- 前端测试: 切换到不同月份，确认日历矩阵中的消费数据正确显示
|
|
||||||
- 边界测试: 特别测试 1 月（跨年上月）和 12 月（跨年下月）的数据加载
|
|
||||||
|
|
||||||
|
|
||||||
## 2026-02-04 浏览器验证测试
|
|
||||||
|
|
||||||
### 测试环境
|
|
||||||
- Vue Dev Server: http://localhost:5175 (运行中)
|
|
||||||
- 测试工具: 由于 Playwright chrome 安装超时，采用手动浏览器测试
|
|
||||||
|
|
||||||
### 手动测试步骤
|
|
||||||
1. 打开浏览器访问 http://localhost:5175
|
|
||||||
2. 导航到日历 v2 页面（路径: /calendar 或 /calendarV2）
|
|
||||||
3. 检查当前月份（2026年2月）的日期单元格
|
|
||||||
4. 验证有消费记录的日期是否显示金额
|
|
||||||
5. 切换到其他月份，验证数据加载是否正常
|
|
||||||
|
|
||||||
### 预期结果
|
|
||||||
- **修复前**: 当前月份（2月）的日历单元格不显示消费金额，因为传递了错误的月份参数（2 而非 3）
|
|
||||||
- **修复后**: 当前月份的日历单元格应正确显示消费金额，因为现在传递正确的参数（month + 1）
|
|
||||||
|
|
||||||
### 技术备注
|
|
||||||
- Playwright MCP 在 Windows 环境下 chrome 安装需要较长时间
|
|
||||||
- 建议使用已安装的浏览器进行手动验证
|
|
||||||
- 修复的核心逻辑已通过代码审查和 lint 检查确认正确
|
|
||||||
|
|
||||||
### 验证要点
|
|
||||||
✅ 第 144 行已修改为 `month + 1`
|
|
||||||
✅ 与第 149、155 行的 prevMonth+1 和 nextMonth+1 逻辑一致
|
|
||||||
✅ 符合后端 API 的 1-12 月份格式要求
|
|
||||||
✅ 代码注释已添加，说明转换原因
|
|
||||||
|
|
||||||
|
|
||||||
### 手动验证清单
|
|
||||||
|
|
||||||
请在浏览器中完成以下验证：
|
|
||||||
|
|
||||||
- [ ] 访问 http://localhost:5175 确认应用正常启动
|
|
||||||
- [ ] 定位日历 v2 页面入口（可能在导航栏或底部 Tab）
|
|
||||||
- [ ] 进入日历页面后，观察当前月份（2026年2月）的日期单元格
|
|
||||||
- [ ] 确认有消费记录的日期在单元格底部显示金额（非零、非空）
|
|
||||||
- [ ] 切换到上一个月（1月），验证数据显示正常
|
|
||||||
- [ ] 切换到下一个月（3月），验证数据显示正常
|
|
||||||
- [ ] 检查控制台是否有 API 错误（按 F12 查看 Console 和 Network 标签）
|
|
||||||
- [ ] 确认 API 请求的 month 参数为 1-12 格式（Network 标签中查看 `GetDailyStatistics` 请求）
|
|
||||||
|
|
||||||
### 成功标准
|
|
||||||
1. 当前月份日历单元格显示消费金额
|
|
||||||
2. 无 API 请求失败或参数错误
|
|
||||||
3. 上月/下月数据加载正常
|
|
||||||
4. month 参数在 Network 请求中为正确的 1-12 格式
|
|
||||||
|
|
||||||
|
|
||||||
## 验证状态总结
|
|
||||||
|
|
||||||
### 自动化测试状态
|
|
||||||
❌ Playwright 浏览器自动化测试失败
|
|
||||||
- 原因: Chrome 安装失败（可能是网络或权限问题）
|
|
||||||
- 错误信息: "Failed to install chrome"
|
|
||||||
|
|
||||||
### 代码验证状态
|
|
||||||
✅ 代码修复已完成并验证
|
|
||||||
- 修改位置: `Web/src/views/calendarV2/modules/Calendar.vue` 第 145 行
|
|
||||||
- 修改内容: `month` → `month + 1`
|
|
||||||
- Lint 检查: 通过（无新增错误）
|
|
||||||
- 逻辑审查: 与上月/下月处理一致
|
|
||||||
|
|
||||||
### 下一步操作
|
|
||||||
由于自动化测试环境问题，建议进行以下操作之一：
|
|
||||||
1. **手动浏览器测试**: 按照上述清单在实际浏览器中验证
|
|
||||||
2. **开发环境测试**: 在开发机器上运行 dev server 并手动测试
|
|
||||||
3. **使用已安装的浏览器**: 如果系统有 Chrome/Edge/Firefox，直接访问 http://localhost:5175
|
|
||||||
|
|
||||||
### 修复信心评估
|
|
||||||
✅ 高信心 - 基于以下原因：
|
|
||||||
1. 问题根因明确：月份参数格式不匹配
|
|
||||||
2. 修复逻辑简单：添加 +1 转换
|
|
||||||
3. 与现有代码一致：上月和下月已使用相同模式
|
|
||||||
4. 代码审查通过：符合项目规范
|
|
||||||
5. API 约定清晰：后端期望 1-12 格式
|
|
||||||
|
|
||||||
|
|
||||||
## 代码修复最终确认
|
|
||||||
|
|
||||||
### 修改已应用
|
|
||||||
文件: `Web/src/views/calendarV2/modules/Calendar.vue`
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
// 第 144-145 行（已修复）
|
|
||||||
// JavaScript Date.month 是 0-11，但后端 API 期望 1-12
|
|
||||||
const promises = [fetchDailyStats(year, month + 1)]
|
|
||||||
```
|
|
||||||
|
|
||||||
### 逻辑一致性验证
|
|
||||||
三个月份加载逻辑统一：
|
|
||||||
- 当前月: `month + 1` ✅ (第 145 行)
|
|
||||||
- 上个月: `prevMonth + 1` ✅ (第 150 行)
|
|
||||||
- 下个月: `nextMonth + 1` ✅ (第 156 行)
|
|
||||||
|
|
||||||
### 修复影响范围
|
|
||||||
- 仅影响当前月份的数据加载
|
|
||||||
- 不影响上月和下月数据（已正确）
|
|
||||||
- 不影响其他视图或组件
|
|
||||||
|
|
||||||
### 浏览器验证限制
|
|
||||||
由于 Playwright Chrome 安装失败，无法完成自动化截图验证。
|
|
||||||
但代码逻辑已通过以下方式确认：
|
|
||||||
1. ✅ 代码审查：修改符合预期
|
|
||||||
2. ✅ Lint 检查：无新增错误
|
|
||||||
3. ✅ 逻辑分析：与已有正确代码保持一致
|
|
||||||
4. ✅ API 约定：符合后端期望格式
|
|
||||||
|
|
||||||
### 建议的验证方式
|
|
||||||
在有浏览器环境的开发机器上：
|
|
||||||
1. 启动 dev server: `cd Web && pnpm dev`
|
|
||||||
2. 打开浏览器访问应用
|
|
||||||
3. 进入日历 v2 页面
|
|
||||||
4. 检查当前月份（2026年2月）的日期单元格是否显示消费金额
|
|
||||||
5. 打开开发者工具检查 Network 请求，确认 month 参数为 2（而非 1）
|
|
||||||
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
# Date Navigation Implementation Learnings
|
|
||||||
|
|
||||||
## Implementation Details
|
|
||||||
- Added left/right arrow navigation to both `StatisticsView.vue` and `BudgetView.vue`
|
|
||||||
- Used `<van-icon name="arrow-left" />` and `<van-icon name="arrow" />` for directional arrows
|
|
||||||
- Text center remains clickable for date picker popup
|
|
||||||
- Arrows use `@click.stop` to prevent event propagation
|
|
||||||
|
|
||||||
## StatisticsView.vue
|
|
||||||
- `navigateDate(direction)` method handles both month and year modes
|
|
||||||
- Month mode: handles year boundaries (Jan -> Dec of previous year, Dec -> Jan of next year)
|
|
||||||
- Year mode: increments/decrements year directly
|
|
||||||
- Resets `showAllExpense` state on navigation
|
|
||||||
|
|
||||||
## BudgetView.vue
|
|
||||||
- `navigateDate(direction)` uses native Date object manipulation
|
|
||||||
- `setMonth()` automatically handles month/year boundaries
|
|
||||||
- Updates `selectedDate` ref which triggers data fetching via watcher
|
|
||||||
|
|
||||||
## Styling
|
|
||||||
- Added `.nav-date-picker` with flex layout and 12px gap
|
|
||||||
- `.nav-date-text` for clickable center text
|
|
||||||
- `.nav-arrow` with 8px horizontal padding for touch-friendly targets
|
|
||||||
- Active state opacity transition for visual feedback
|
|
||||||
- Arrow font size: 18px for clear visibility
|
|
||||||
|
|
||||||
## Key Decisions
|
|
||||||
- Used `@click.stop` on arrows to prevent opening date picker
|
|
||||||
- Centered layout preserved (van-nav-bar default behavior)
|
|
||||||
- Consistent styling across both views
|
|
||||||
- Touch-friendly padding for mobile UX
|
|
||||||
|
|
||||||
## Verification
|
|
||||||
- ESLint: No new errors introduced
|
|
||||||
- Build: Successful compilation
|
|
||||||
- Date math: Correctly handles month/year boundaries
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
No previous issues.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Use Vant UI icons for navigation.
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
# 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)
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
# 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
|
|
||||||
@@ -1,181 +0,0 @@
|
|||||||
# 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
|
|
||||||
218
AGENTS.md
218
AGENTS.md
@@ -1,218 +0,0 @@
|
|||||||
# 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)
|
|
||||||
@@ -1,604 +0,0 @@
|
|||||||
# CalendarV2 页面功能验证报告
|
|
||||||
|
|
||||||
**验证时间**: 2026-02-03
|
|
||||||
**验证地址**: http://localhost:5173/calendar-v2
|
|
||||||
**状态**: ⚠️ 需要人工验证（自动化工具安装失败）
|
|
||||||
|
|
||||||
## 执行摘要
|
|
||||||
|
|
||||||
由于网络问题无法安装 Playwright/Puppeteer 浏览器驱动，我通过**源代码分析**和**架构审查**完成了验证准备工作。以下是基于代码分析的验证清单和手动验证指南。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📋 验证清单（基于代码分析）
|
|
||||||
|
|
||||||
### ✅ 1. 页面路由配置
|
|
||||||
**状态**: 已验证
|
|
||||||
- **路由路径**: `/calendar-v2`
|
|
||||||
- **组件文件**: `Web/src/views/calendarV2/Calendar.vue`
|
|
||||||
- **权限要求**: `requiresAuth: true`
|
|
||||||
- **Keep-alive**: 支持（组件名称: `CalendarV2`）
|
|
||||||
|
|
||||||
### ✅ 2. 组件架构
|
|
||||||
**状态**: 已验证
|
|
||||||
CalendarV2 采用模块化设计，由三个独立子模块组成：
|
|
||||||
|
|
||||||
1. **CalendarModule** (`modules/Calendar.vue`)
|
|
||||||
- 负责日历网格显示
|
|
||||||
- 独立调用 API: `getDailyStatistics`、`getBudgetList`
|
|
||||||
- 支持触摸滑动切换月份
|
|
||||||
- 显示每日金额和预算超支标记
|
|
||||||
|
|
||||||
2. **StatsModule** (`modules/Stats.vue`)
|
|
||||||
- 显示选中日期的统计信息
|
|
||||||
- 独立调用 API（需要确认具体实现）
|
|
||||||
- 显示当日支出/收入金额
|
|
||||||
|
|
||||||
3. **TransactionListModule** (`modules/TransactionList.vue`)
|
|
||||||
- 显示选中日期的交易记录列表
|
|
||||||
- 独立调用 API（需要确认具体实现）
|
|
||||||
- 支持空状态显示
|
|
||||||
- 包含 Smart 按钮跳转到智能分类
|
|
||||||
|
|
||||||
**关键架构特性**:
|
|
||||||
- ✅ 各模块**独立查询数据**（不通过 props 传递数据）
|
|
||||||
- ✅ 通过 `selectedDate` prop 触发子模块重新查询
|
|
||||||
- ✅ 支持下拉刷新（`van-pull-refresh`）
|
|
||||||
- ✅ 全局事件监听（`transactions-changed`）自动刷新
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔍 功能点验证（需要手动确认）
|
|
||||||
|
|
||||||
### 1. 日历显示功能
|
|
||||||
|
|
||||||
#### 1.1 日历网格
|
|
||||||
**代码位置**: `calendarV2/modules/Calendar.vue` L10-L62
|
|
||||||
- ✅ 7列网格布局（星期一到星期日）
|
|
||||||
- ✅ 星期标题显示：`['一', '二', '三', '四', '五', '六', '日']`
|
|
||||||
- ✅ 月份标题：格式 `${year}年${month}月`（L99-103）
|
|
||||||
- ✅ 今天日期高亮：CSS class `day-today`
|
|
||||||
- ✅ 有数据的日期显示金额：`day-amount`
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 网格是否正确渲染
|
|
||||||
- [ ] 星期标题是否对齐
|
|
||||||
- [ ] 月份标题是否显示在头部
|
|
||||||
- [ ] 今天日期是否有特殊样式
|
|
||||||
- [ ] 有交易的日期是否显示金额
|
|
||||||
|
|
||||||
#### 1.2 数据加载
|
|
||||||
**API 调用**: `getDailyStatistics({ year, month })` (L92)
|
|
||||||
- ✅ 获取月度每日统计
|
|
||||||
- ✅ 构建 `statsMap`（日期 -> {count, expense, income, income}）
|
|
||||||
- ✅ 获取预算数据 `dailyBudget`
|
|
||||||
- ✅ 计算是否超支：`day.isOverLimit`
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 页面加载时是否调用 API
|
|
||||||
- [ ] 控制台 Network 标签查看请求：`/TransactionRecord/GetDailyStatistics?year=2026&month=2`
|
|
||||||
- [ ] 响应数据格式是否正确
|
|
||||||
- [ ] 日期金额是否正确显示
|
|
||||||
|
|
||||||
### 2. 日期选择功能
|
|
||||||
|
|
||||||
**代码位置**: `Calendar.vue` L114-136
|
|
||||||
- ✅ 点击日期单元格触发 `onDayClick`
|
|
||||||
- ✅ 更新 `selectedDate`
|
|
||||||
- ✅ 如果点击其他月份日期，自动切换月份
|
|
||||||
- ✅ 选中日期添加 CSS class `day-selected`
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 点击日期后是否有选中样式（背景色变化）
|
|
||||||
- [ ] 下方统计卡片是否显示该日期的标题（如"2026年2月3日"）
|
|
||||||
- [ ] 统计卡片是否显示当日支出和收入
|
|
||||||
- [ ] 交易列表是否刷新
|
|
||||||
|
|
||||||
### 3. 月份切换功能
|
|
||||||
|
|
||||||
#### 3.1 按钮导航
|
|
||||||
**代码位置**: `Calendar.vue` L5-23, L162-198
|
|
||||||
- ✅ 左箭头按钮：`@click="changeMonth(-1)"`
|
|
||||||
- ✅ 右箭头按钮：`@click="changeMonth(1)"`
|
|
||||||
- ✅ 防止切换到未来月份（L174-177）
|
|
||||||
- ✅ 滑动动画：`slideDirection` + Transition
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 点击左箭头，切换到上一月
|
|
||||||
- [ ] 点击右箭头，切换到下一月
|
|
||||||
- [ ] 切换到当前月后，右箭头是否禁用并提示"已经是最后一个月了"
|
|
||||||
- [ ] 月份标题是否更新
|
|
||||||
- [ ] 是否有滑动动画效果
|
|
||||||
|
|
||||||
#### 3.2 触摸滑动
|
|
||||||
**代码位置**: `Calendar.vue` L200-252
|
|
||||||
- ✅ `onTouchStart`/`onTouchMove`/`onTouchEnd`
|
|
||||||
- ✅ 最小滑动距离：50px
|
|
||||||
- ✅ 向左滑动 → 下一月
|
|
||||||
- ✅ 向右滑动 → 上一月
|
|
||||||
- ✅ 阻止垂直滚动冲突（L223-228）
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 在日历区域向左滑动，是否切换到下一月
|
|
||||||
- [ ] 在日历区域向右滑动，是否切换到上一月
|
|
||||||
- [ ] 滑动距离太短是否不触发切换
|
|
||||||
- [ ] 垂直滚动是否不受影响
|
|
||||||
|
|
||||||
### 4. 统计模块 (StatsModule)
|
|
||||||
|
|
||||||
**代码位置**: `calendarV2/modules/Stats.vue`（需要读取文件确认）
|
|
||||||
**Props**: `selectedDate`
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 选中日期后，统计卡片是否显示
|
|
||||||
- [ ] 显示格式：`2026年X月X日`
|
|
||||||
- [ ] 显示当日支出金额
|
|
||||||
- [ ] 显示当日收入金额
|
|
||||||
- [ ] 数据是否来自独立 API 调用（不是 props 传递）
|
|
||||||
|
|
||||||
### 5. 交易列表模块 (TransactionListModule)
|
|
||||||
|
|
||||||
**代码位置**: `calendarV2/modules/TransactionList.vue`（需要读取文件确认）
|
|
||||||
**Props**: `selectedDate`
|
|
||||||
**Events**: `@transaction-click`, `@smart-click`
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 选中日期后，交易列表是否显示
|
|
||||||
- [ ] 如果有交易，是否显示交易卡片（名称、时间、金额、图标）
|
|
||||||
- [ ] 如果无交易，是否显示空状态提示
|
|
||||||
- [ ] 交易数量徽章是否显示（"X Items"）
|
|
||||||
- [ ] 点击交易卡片是否跳转到详情页
|
|
||||||
- [ ] 点击 Smart 按钮是否跳转到智能分类页面
|
|
||||||
|
|
||||||
### 6. 其他功能
|
|
||||||
|
|
||||||
#### 6.1 通知按钮
|
|
||||||
**代码位置**: `Calendar.vue` L24-30, L146-149
|
|
||||||
- ✅ 点击跳转到 `/message` 路由
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 通知图标（bell）是否显示在右上角
|
|
||||||
- [ ] 点击是否跳转到消息页面
|
|
||||||
|
|
||||||
#### 6.2 下拉刷新
|
|
||||||
**代码位置**: `Calendar.vue` L36-39, L261-275
|
|
||||||
- ✅ 使用 `van-pull-refresh` 组件
|
|
||||||
- ✅ 触发 `onRefresh` 方法
|
|
||||||
- ✅ 显示 Toast 提示
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 下拉页面是否触发刷新
|
|
||||||
- [ ] 刷新时是否显示加载动画
|
|
||||||
- [ ] 刷新后数据是否更新
|
|
||||||
- [ ] 是否显示"刷新成功"提示
|
|
||||||
|
|
||||||
#### 6.3 全局事件监听
|
|
||||||
**代码位置**: `Calendar.vue` L254-259, L277-281
|
|
||||||
- ✅ 监听 `transactions-changed` 事件
|
|
||||||
- ✅ 触发子组件刷新
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 从其他页面添加账单后返回，数据是否自动刷新
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔌 API 依赖验证
|
|
||||||
|
|
||||||
### 关键 API 端点
|
|
||||||
|
|
||||||
1. **获取每日统计**
|
|
||||||
```
|
|
||||||
GET /TransactionRecord/GetDailyStatistics?year=2026&month=2
|
|
||||||
```
|
|
||||||
- 返回格式: `{ success: true, data: [{ date: '2026-02-01', count: 5, expense: 1200, income: 3000 }] }`
|
|
||||||
|
|
||||||
2. **获取预算列表**
|
|
||||||
```
|
|
||||||
GET /Budget/List
|
|
||||||
```
|
|
||||||
- 用于计算每日预算和超支判断
|
|
||||||
|
|
||||||
3. **其他 API**（需要确认 StatsModule 和 TransactionListModule 的实现）
|
|
||||||
- 可能调用 `/TransactionRecord/GetList`
|
|
||||||
- 可能调用其他统计接口
|
|
||||||
|
|
||||||
**需要验证**:
|
|
||||||
- [ ] 浏览器开发者工具 Network 标签查看所有 API 请求
|
|
||||||
- [ ] 确认响应状态码为 200
|
|
||||||
- [ ] 确认响应数据格式正确
|
|
||||||
- [ ] 确认错误处理（网络错误、API 错误）
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🎯 手动验证步骤
|
|
||||||
|
|
||||||
### 步骤 1: 导航到页面
|
|
||||||
1. 打开浏览器访问 `http://localhost:5173`
|
|
||||||
2. 如果需要登录，输入凭据
|
|
||||||
3. 导航到 `/calendar-v2` 或在界面中找到 CalendarV2 入口
|
|
||||||
4. 确认页面加载成功
|
|
||||||
|
|
||||||
### 步骤 2: 基础显示验证
|
|
||||||
1. ✓ 检查日历网格是否显示（7列）
|
|
||||||
2. ✓ 检查星期标题（一、二、三、四、五、六、日）
|
|
||||||
3. ✓ 检查月份标题（2026年2月）
|
|
||||||
4. ✓ 检查今天日期是否高亮
|
|
||||||
5. ✓ 检查有交易的日期是否显示金额
|
|
||||||
|
|
||||||
### 步骤 3: 交互功能验证
|
|
||||||
1. ✓ 点击一个日期，检查：
|
|
||||||
- 日期是否被选中（背景变化）
|
|
||||||
- 下方是否显示统计卡片
|
|
||||||
- 统计卡片是否显示正确日期
|
|
||||||
- 交易列表是否刷新
|
|
||||||
2. ✓ 点击左箭头按钮，检查：
|
|
||||||
- 是否切换到上一月
|
|
||||||
- 月份标题是否更新
|
|
||||||
- 是否有动画效果
|
|
||||||
3. ✓ 点击右箭头按钮，检查：
|
|
||||||
- 是否切换到下一月
|
|
||||||
- 如果当前是本月，是否提示"已经是最后一个月了"
|
|
||||||
4. ✓ 在日历区域滑动，检查：
|
|
||||||
- 向左滑动是否切换到下一月
|
|
||||||
- 向右滑动是否切换到上一月
|
|
||||||
|
|
||||||
### 步骤 4: 数据加载验证
|
|
||||||
1. ✓ 打开浏览器开发者工具（F12）
|
|
||||||
2. ✓ 切换到 Network 标签
|
|
||||||
3. ✓ 刷新页面，检查以下请求：
|
|
||||||
- `/TransactionRecord/GetDailyStatistics`
|
|
||||||
- `/Budget/List`
|
|
||||||
- 其他统计相关请求
|
|
||||||
4. ✓ 点击请求查看响应数据是否正确
|
|
||||||
|
|
||||||
### 步骤 5: 边界情况验证
|
|
||||||
1. ✓ 尝试切换到很早的月份（如 2020年1月）
|
|
||||||
2. ✓ 尝试切换到当前月份的下一月（应被阻止）
|
|
||||||
3. ✓ 点击其他月份的日期（应自动切换月份）
|
|
||||||
4. ✓ 下拉页面触发刷新
|
|
||||||
|
|
||||||
### 步骤 6: 其他功能验证
|
|
||||||
1. ✓ 点击通知图标，检查是否跳转到消息页面
|
|
||||||
2. ✓ 如果有交易，点击 Smart 按钮，检查是否跳转到智能分类页面
|
|
||||||
3. ✓ 点击交易卡片，检查是否跳转到详情页
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ⚠️ 潜在问题点
|
|
||||||
|
|
||||||
### 1. 子模块实现未完全确认
|
|
||||||
**风险**: 中等
|
|
||||||
- StatsModule 和 TransactionListModule 的具体实现未读取
|
|
||||||
- 需要确认这两个模块是否正确调用 API
|
|
||||||
- 需要确认数据显示逻辑
|
|
||||||
|
|
||||||
**建议**: 读取以下文件进行确认
|
|
||||||
- `Web/src/views/calendarV2/modules/Stats.vue`
|
|
||||||
- `Web/src/views/calendarV2/modules/TransactionList.vue`
|
|
||||||
|
|
||||||
### 2. API 错误处理
|
|
||||||
**风险**: 低
|
|
||||||
- 代码中有 try-catch 包裹
|
|
||||||
- 需要验证网络错误时的用户提示
|
|
||||||
|
|
||||||
**建议**: 模拟网络错误（关闭后端服务）验证错误提示
|
|
||||||
|
|
||||||
### 3. 性能问题
|
|
||||||
**风险**: 低
|
|
||||||
- 每次切换月份会重新渲染整个日历
|
|
||||||
- 触摸滑动可能在低端设备上卡顿
|
|
||||||
|
|
||||||
**建议**: 在移动设备上测试流畅度
|
|
||||||
|
|
||||||
### 4. 样式问题
|
|
||||||
**风险**: 低
|
|
||||||
- CSS 变量依赖 `theme.css`
|
|
||||||
- 需要验证深色模式下的显示效果
|
|
||||||
|
|
||||||
**建议**: 切换主题验证
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📸 建议截图位置
|
|
||||||
|
|
||||||
由于无法自动生成截图，建议手动截图以下场景：
|
|
||||||
|
|
||||||
1. **初始加载状态**: 首次进入 CalendarV2 页面
|
|
||||||
2. **日期选中状态**: 点击某个日期后的显示
|
|
||||||
3. **月份切换**: 切换到上一月/下一月后的显示
|
|
||||||
4. **交易列表**: 有交易数据的日期选中状态
|
|
||||||
5. **空状态**: 无交易数据的日期选中状态
|
|
||||||
6. **下拉刷新**: 下拉刷新时的加载动画
|
|
||||||
7. **网络错误**: API 调用失败时的错误提示
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ 结论
|
|
||||||
|
|
||||||
### 代码质量评估
|
|
||||||
- ✅ **架构设计良好**: 模块化清晰，职责分离
|
|
||||||
- ✅ **数据独立性**: 各模块独立查询 API，符合需求
|
|
||||||
- ✅ **交互完整**: 支持点击、滑动、刷新等多种交互
|
|
||||||
- ✅ **错误处理**: 有基础的 try-catch 和用户提示
|
|
||||||
|
|
||||||
### 需要手动验证的项目
|
|
||||||
由于自动化工具安装失败，以下项目需要**人工验证**：
|
|
||||||
1. ✓ 页面实际渲染效果
|
|
||||||
2. ✓ 交互动画流畅度
|
|
||||||
3. ✓ API 数据加载正确性
|
|
||||||
4. ✓ 错误场景处理
|
|
||||||
5. ✓ 移动端触摸体验
|
|
||||||
|
|
||||||
### 下一步行动
|
|
||||||
1. **立即执行**: 按照上述手动验证步骤逐项检查
|
|
||||||
2. **后续优化**: 配置 Playwright 环境以支持自动化测试
|
|
||||||
3. **补充文档**: 将手动验证结果记录到 notepad
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**报告生成时间**: 2026-02-03
|
|
||||||
**验证工具**: 源代码审查 + 手动验证指南
|
|
||||||
**建议**: 安装 Playwright 后重新执行自动化验证
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📊 完整模块分析（已补充）
|
|
||||||
|
|
||||||
### ✅ StatsModule 实现确认
|
|
||||||
**文件**: `Web/src/views/calendarV2/modules/Stats.vue`
|
|
||||||
|
|
||||||
**API 调用**:
|
|
||||||
- `getTransactionsByDate(dateKey)` - 独立调用 API 获取当日交易
|
|
||||||
- **端点**: `GET /TransactionRecord/GetByDate?date=2026-02-03`
|
|
||||||
|
|
||||||
**功能实现**:
|
|
||||||
- ✅ 显示选中日期（`2026年2月3日`格式）
|
|
||||||
- ✅ 计算当日支出：过滤 `type === 0` 的交易
|
|
||||||
- ✅ 计算当日收入：过滤 `type === 1` 的交易
|
|
||||||
- ✅ 根据是否为今天显示不同文本（"今日支出" vs "当日支出"）
|
|
||||||
- ✅ 支持加载状态（loading）
|
|
||||||
|
|
||||||
**数据流向**:
|
|
||||||
```
|
|
||||||
selectedDate (prop 变化)
|
|
||||||
→ watch 触发
|
|
||||||
→ fetchDayStats()
|
|
||||||
→ getTransactionsByDate(API)
|
|
||||||
→ 计算 expense/income
|
|
||||||
→ 显示在卡片
|
|
||||||
```
|
|
||||||
|
|
||||||
### ✅ TransactionListModule 实现确认
|
|
||||||
**文件**: `Web/src/views/calendarV2/modules/TransactionList.vue`
|
|
||||||
|
|
||||||
**API 调用**:
|
|
||||||
- `getTransactionsByDate(dateKey)` - 独立调用 API 获取当日交易
|
|
||||||
- **端点**: `GET /TransactionRecord/GetByDate?date=2026-02-03`
|
|
||||||
|
|
||||||
**功能实现**:
|
|
||||||
- ✅ 显示交易数量徽章（`${count} Items`）
|
|
||||||
- ✅ Smart 按钮（fire 图标 + "Smart" 文本）
|
|
||||||
- ✅ 加载状态（`van-loading` 组件）
|
|
||||||
- ✅ 空状态提示（"当天暂无交易记录" + "轻松享受无消费的一天 ✨"）
|
|
||||||
- ✅ 交易卡片列表：
|
|
||||||
- 图标（根据分类映射：餐饮→food, 购物→shopping, 交通→transport 等）
|
|
||||||
- 交易名称（txn.reason）
|
|
||||||
- 时间（HH:MM 格式）
|
|
||||||
- 分类标签（tag-income/tag-expense）
|
|
||||||
- 金额（+/- 格式）
|
|
||||||
- ✅ 点击交易卡片触发 `transactionClick` 事件
|
|
||||||
- ✅ 点击 Smart 按钮触发 `smartClick` 事件
|
|
||||||
|
|
||||||
**数据流向**:
|
|
||||||
```
|
|
||||||
selectedDate (prop 变化)
|
|
||||||
→ watch 触发
|
|
||||||
→ fetchDayTransactions()
|
|
||||||
→ getTransactionsByDate(API)
|
|
||||||
→ 转换格式（图标、颜色、金额符号）
|
|
||||||
→ 显示列表/空状态
|
|
||||||
```
|
|
||||||
|
|
||||||
### 🔌 API 端点总结
|
|
||||||
|
|
||||||
CalendarV2 页面总共调用 **3 个 API 端点**：
|
|
||||||
|
|
||||||
1. **CalendarModule**:
|
|
||||||
- `GET /TransactionRecord/GetDailyStatistics?year=2026&month=2` - 获取月度每日统计
|
|
||||||
- `GET /Budget/List` - 获取预算列表（用于计算超支）
|
|
||||||
|
|
||||||
2. **StatsModule**:
|
|
||||||
- `GET /TransactionRecord/GetByDate?date=2026-02-03` - 获取当日交易（计算收支）
|
|
||||||
|
|
||||||
3. **TransactionListModule**:
|
|
||||||
- `GET /TransactionRecord/GetByDate?date=2026-02-03` - 获取当日交易（显示列表）
|
|
||||||
|
|
||||||
**注意**: StatsModule 和 TransactionListModule 调用**相同的 API**，但处理逻辑不同：
|
|
||||||
- StatsModule: 汇总计算支出/收入总额
|
|
||||||
- TransactionListModule: 格式化展示交易列表
|
|
||||||
|
|
||||||
**优化建议**: 考虑在父组件调用一次 API，通过 props 传递数据给两个子模块，避免重复请求。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ 最终验证清单（完整版）
|
|
||||||
|
|
||||||
### 1. 页面导航 ✅
|
|
||||||
- [ ] 访问 `http://localhost:5173/calendar-v2` 成功加载
|
|
||||||
- [ ] 路由权限检查（如需登录）
|
|
||||||
- [ ] 页面标题显示正确
|
|
||||||
|
|
||||||
### 2. 日历模块 (CalendarModule) ✅
|
|
||||||
- [ ] **网格布局**: 7列星期布局
|
|
||||||
- [ ] **星期标题**: 一、二、三、四、五、六、日
|
|
||||||
- [ ] **月份标题**: 2026年2月（格式正确）
|
|
||||||
- [ ] **今天高亮**: 今天日期有特殊样式 (day-today)
|
|
||||||
- [ ] **日期金额**: 有交易的日期显示金额
|
|
||||||
- [ ] **超支标记**: 超过预算的日期有红色标记 (day-over-limit)
|
|
||||||
- [ ] **其他月份日期**: 灰色显示 (day-other-month)
|
|
||||||
- [ ] **API 调用**: Network 中看到 GetDailyStatistics 请求
|
|
||||||
- [ ] **API 调用**: Network 中看到 Budget/List 请求
|
|
||||||
|
|
||||||
### 3. 日期选择功能 ✅
|
|
||||||
- [ ] **点击日期**: 日期被选中（背景色变化 day-selected）
|
|
||||||
- [ ] **统计卡片**: 显示选中日期标题（2026年X月X日）
|
|
||||||
- [ ] **交易列表**: 刷新显示该日期的交易
|
|
||||||
- [ ] **跨月点击**: 点击其他月份日期自动切换月份
|
|
||||||
|
|
||||||
### 4. 月份切换功能 ✅
|
|
||||||
- [ ] **左箭头**: 切换到上一月，月份标题更新
|
|
||||||
- [ ] **右箭头**: 切换到下一月，月份标题更新
|
|
||||||
- [ ] **限制**: 当前月时右箭头提示"已经是最后一个月了"
|
|
||||||
- [ ] **动画**: 切换时有滑动动画效果
|
|
||||||
- [ ] **向左滑动**: 手指在日历区域向左滑动切换到下一月
|
|
||||||
- [ ] **向右滑动**: 手指在日历区域向右滑动切换到上一月
|
|
||||||
- [ ] **滑动距离**: 滑动距离< 50px 不触发切换
|
|
||||||
|
|
||||||
### 5. 统计模块 (StatsModule) ✅
|
|
||||||
- [ ] **日期标题**: 显示"2026年X月X日"
|
|
||||||
- [ ] **今日文本**: 今天显示"今日支出/收入"，其他显示"当日支出/收入"
|
|
||||||
- [ ] **支出金额**: 显示红色金额（¥XXX.XX）
|
|
||||||
- [ ] **收入金额**: 显示绿色金额（¥XXX.XX）
|
|
||||||
- [ ] **分隔线**: 支出和收入之间有竖线分隔
|
|
||||||
- [ ] **API 调用**: Network 中看到 GetByDate 请求
|
|
||||||
- [ ] **数据准确**: 金额与交易列表匹配
|
|
||||||
|
|
||||||
### 6. 交易列表模块 (TransactionListModule) ✅
|
|
||||||
- [ ] **标题**: 显示"交易记录"
|
|
||||||
- [ ] **数量徽章**: 显示"X Items"（绿色背景）
|
|
||||||
- [ ] **Smart 按钮**: 显示火焰图标 + "Smart" 文字（蓝色背景）
|
|
||||||
- [ ] **加载状态**: 加载时显示 loading 动画
|
|
||||||
- [ ] **空状态**: 无交易时显示空状态提示和表情
|
|
||||||
- [ ] **交易卡片**: 显示图标、名称、时间、分类标签、金额
|
|
||||||
- [ ] **图标映射**: 餐饮→食物图标, 购物→购物图标等
|
|
||||||
- [ ] **金额符号**: 支出显示"-", 收入显示"+"
|
|
||||||
- [ ] **点击交易**: 点击卡片跳转到详情页
|
|
||||||
- [ ] **点击 Smart**: 点击按钮跳转到智能分类页面
|
|
||||||
|
|
||||||
### 7. 其他功能 ✅
|
|
||||||
- [ ] **通知按钮**: 右上角铃铛图标，点击跳转到 /message
|
|
||||||
- [ ] **下拉刷新**: 下拉触发刷新，显示"刷新成功" toast
|
|
||||||
- [ ] **全局事件**: 从其他页面添加账单后返回数据自动刷新
|
|
||||||
|
|
||||||
### 8. 错误处理 ✅
|
|
||||||
- [ ] **网络错误**: API 调用失败时有错误提示
|
|
||||||
- [ ] **空数据**: 无数据时显示友好提示
|
|
||||||
- [ ] **超时处理**: 请求超时有相应处理
|
|
||||||
|
|
||||||
### 9. 性能和体验 ✅
|
|
||||||
- [ ] **首屏加载**: 页面加载速度 < 2秒
|
|
||||||
- [ ] **动画流畅**: 切换月份动画不卡顿
|
|
||||||
- [ ] **滑动流畅**: 触摸滑动响应灵敏
|
|
||||||
- [ ] **交互反馈**: 点击有视觉反馈（opacity 变化）
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🎯 关键验证点（优先级排序）
|
|
||||||
|
|
||||||
### P0 - 核心功能（必须验证）
|
|
||||||
1. ✅ 日历网格正确显示
|
|
||||||
2. ✅ 日期选择和统计卡片联动
|
|
||||||
3. ✅ 交易列表正确加载
|
|
||||||
4. ✅ 月份切换功能正常
|
|
||||||
5. ✅ 各模块独立调用 API（不是 props 传递）
|
|
||||||
|
|
||||||
### P1 - 重要功能（应该验证）
|
|
||||||
6. ✅ 触摸滑动切换月份
|
|
||||||
7. ✅ 下拉刷新
|
|
||||||
8. ✅ 通知和 Smart 按钮跳转
|
|
||||||
9. ✅ 空状态显示
|
|
||||||
10. ✅ 超支标记显示
|
|
||||||
|
|
||||||
### P2 - 边界情况（建议验证）
|
|
||||||
11. ✅ 网络错误处理
|
|
||||||
12. ✅ 跨月日期点击
|
|
||||||
13. ✅ 防止切换到未来月份
|
|
||||||
14. ✅ 深色模式显示
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📝 验证步骤（快速版）
|
|
||||||
|
|
||||||
### 5分钟快速验证
|
|
||||||
1. 访问 `/calendar-v2`，截图初始状态
|
|
||||||
2. 打开开发者工具 Network 标签
|
|
||||||
3. 点击一个日期，确认：
|
|
||||||
- 统计卡片显示
|
|
||||||
- 交易列表显示
|
|
||||||
- API 请求正常（GetDailyStatistics, GetByDate x2）
|
|
||||||
4. 点击左右箭头切换月份，确认动画和数据刷新
|
|
||||||
5. 在日历区域左右滑动，确认切换月份
|
|
||||||
6. 下拉页面，确认刷新提示
|
|
||||||
|
|
||||||
### 15分钟完整验证
|
|
||||||
在快速验证基础上增加：
|
|
||||||
7. 点击通知图标，确认跳转到消息页面
|
|
||||||
8. 点击 Smart 按钮，确认跳转到智能分类页面
|
|
||||||
9. 点击交易卡片（如果有），确认跳转到详情页
|
|
||||||
10. 尝试切换到很早的月份（如2020年）
|
|
||||||
11. 尝试切换到当前月的下一月（应被阻止）
|
|
||||||
12. 检查空状态显示（选择无交易的日期）
|
|
||||||
13. 关闭后端服务，检查错误提示
|
|
||||||
14. 切换深色模式，检查样式
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🐛 已知潜在问题
|
|
||||||
|
|
||||||
### 1. API 重复调用
|
|
||||||
**问题**: StatsModule 和 TransactionListModule 调用相同的 API (`GetByDate`)
|
|
||||||
**影响**: 每次选择日期会发送 2 个相同的请求
|
|
||||||
**建议**: 在父组件调用一次，通过 props 传递给子模块
|
|
||||||
|
|
||||||
### 2. 内存泄漏风险
|
|
||||||
**问题**: 全局事件监听器可能未正确清理
|
|
||||||
**检查**: `onBeforeUnmount` 已正确调用 `removeEventListener`
|
|
||||||
**状态**: ✅ 已正确实现
|
|
||||||
|
|
||||||
### 3. 触摸滑动冲突
|
|
||||||
**问题**: 触摸滑动可能与页面滚动冲突
|
|
||||||
**缓解**: 代码中已有 `e.preventDefault()` 处理
|
|
||||||
**状态**: ✅ 已处理
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📊 API 依赖关系图
|
|
||||||
|
|
||||||
```
|
|
||||||
CalendarV2
|
|
||||||
│
|
|
||||||
├─ CalendarModule
|
|
||||||
│ ├─ GET /TransactionRecord/GetDailyStatistics (月度统计)
|
|
||||||
│ └─ GET /Budget/List (预算数据)
|
|
||||||
│
|
|
||||||
├─ StatsModule
|
|
||||||
│ └─ GET /TransactionRecord/GetByDate (当日交易 → 计算收支)
|
|
||||||
│
|
|
||||||
└─ TransactionListModule
|
|
||||||
└─ GET /TransactionRecord/GetByDate (当日交易 → 显示列表)
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 总结
|
|
||||||
|
|
||||||
### ✅ 代码质量：优秀
|
|
||||||
- 模块化设计清晰
|
|
||||||
- 数据独立查询（符合需求）
|
|
||||||
- 错误处理完善
|
|
||||||
- 交互体验良好
|
|
||||||
|
|
||||||
### ⚠️ 优化建议
|
|
||||||
1. **合并重复 API 调用** - StatsModule 和 TransactionListModule 可共享数据
|
|
||||||
2. **添加骨架屏** - 首次加载时显示骨架屏提升体验
|
|
||||||
3. **虚拟滚动** - 如果交易列表很长，考虑虚拟滚动
|
|
||||||
|
|
||||||
### ✅ 验证结论
|
|
||||||
基于源代码分析，CalendarV2 页面功能完整，实现正确，满足需求文档要求。各模块**确实独立调用 API**，不依赖父组件传递数据。
|
|
||||||
|
|
||||||
**建议**: 执行上述手动验证清单，使用浏览器开发者工具确认 API 调用和数据流向。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**最终更新时间**: 2026-02-03
|
|
||||||
**分析状态**: ✅ 完成（包含所有子模块分析）
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
global using System.Reflection;
|
|
||||||
global using System.Text.Json;
|
|
||||||
global using Microsoft.Extensions.DependencyInjection;
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
namespace Common;
|
|
||||||
|
|
||||||
public interface IDateTimeProvider
|
|
||||||
{
|
|
||||||
DateTime Now { get; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class DateTimeProvider : IDateTimeProvider
|
|
||||||
{
|
|
||||||
public DateTime Now => DateTime.Now;
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
namespace Common;
|
using System.Reflection;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
|
||||||
|
namespace Common;
|
||||||
|
|
||||||
public static class TypeExtensions
|
public static class TypeExtensions
|
||||||
{
|
{
|
||||||
@@ -7,8 +10,8 @@ public static class TypeExtensions
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static T? DeepClone<T>(this T source)
|
public static T? DeepClone<T>(this T source)
|
||||||
{
|
{
|
||||||
var json = JsonSerializer.Serialize(source);
|
var json = System.Text.Json.JsonSerializer.Serialize(source);
|
||||||
return JsonSerializer.Deserialize<T>(json);
|
return System.Text.Json.JsonSerializer.Deserialize<T>(json);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,7 +25,6 @@ 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");
|
||||||
@@ -39,7 +41,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 is { IsClass: true, IsAbstract: false });
|
.Where(t => t.IsClass && !t.IsAbstract);
|
||||||
|
|
||||||
foreach (var type in types)
|
foreach (var type in types)
|
||||||
{
|
{
|
||||||
@@ -48,20 +50,9 @@ public static class ServiceExtension
|
|||||||
|
|
||||||
foreach (var @interface in interfaces)
|
foreach (var @interface in interfaces)
|
||||||
{
|
{
|
||||||
// EmailBackgroundService 必须是 Singleton（后台服务），其他服务可用 Transient
|
// 其他 Services 用 Singleton
|
||||||
if (type.Name == "EmailBackgroundService")
|
|
||||||
{
|
|
||||||
services.AddSingleton(@interface, type);
|
services.AddSingleton(@interface, type);
|
||||||
}
|
Console.WriteLine($"✓ 注册 Service: {@interface.Name} -> {type.Name}");
|
||||||
else if (type.Name == "EmailFetchService")
|
|
||||||
{
|
|
||||||
// EmailFetchService 用 Transient，避免连接冲突
|
|
||||||
services.AddTransient(@interface, type);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
services.AddSingleton(@interface, type);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -69,18 +60,19 @@ 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 is { IsClass: true, IsAbstract: false });
|
.Where(t => t.IsClass && !t.IsAbstract);
|
||||||
|
|
||||||
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 is { Namespace: "Repository", IsGenericType: false }); // 排除泛型接口如 IBaseRepository<T>
|
&& i.Namespace == "Repository"
|
||||||
|
&& !i.IsGenericType); // 排除泛型接口如 IBaseRepository<T>
|
||||||
|
|
||||||
foreach (var @interface in interfaces)
|
foreach (var @interface in interfaces)
|
||||||
{
|
{
|
||||||
services.AddSingleton(@interface, type);
|
services.AddSingleton(@interface, type);
|
||||||
Console.WriteLine($"注册 Repository: {@interface.Name} -> {type.Name}");
|
Console.WriteLine($"✓ 注册 Repository: {@interface.Name} -> {type.Name}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Email & MIME Libraries -->
|
<!-- Email & MIME Libraries -->
|
||||||
<PackageVersion Include="FreeSql" Version="3.5.305" />
|
<PackageVersion Include="FreeSql" Version="3.5.304" />
|
||||||
<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.Agents.AI" Version="1.0.0-preview.260108.1" />
|
||||||
|
<PackageVersion Include="Microsoft.Agents.AI.DevUI" Version="1.0.0-preview.260108.1" />
|
||||||
|
<PackageVersion Include="Microsoft.Agents.AI.Hosting" Version="1.0.0-preview.260108.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" />
|
||||||
<!-- Dependency Injection & Configuration -->
|
<!-- Dependency Injection & Configuration -->
|
||||||
@@ -22,7 +23,7 @@
|
|||||||
<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.305" />
|
<PackageVersion Include="FreeSql.Provider.Sqlite" Version="3.5.304" />
|
||||||
<PackageVersion Include="WebPush" Version="1.0.12" />
|
<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 -->
|
||||||
@@ -35,12 +36,6 @@
|
|||||||
<!-- 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="Microsoft.Extensions.AI" Version="10.1.1" />
|
||||||
<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>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
# 多阶段构建 Dockerfile
|
# 多阶段构建 Dockerfile
|
||||||
# 第一阶段：构建前端
|
# 第一阶段：构建前端
|
||||||
FROM node:20-slim AS frontend-build
|
FROM node:20-alpine AS frontend-build
|
||||||
|
|
||||||
WORKDIR /app/frontend
|
WORKDIR /app/frontend
|
||||||
|
|
||||||
@@ -31,7 +31,6 @@ 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
|
||||||
@@ -44,8 +43,9 @@ COPY Service/ ./Service/
|
|||||||
COPY WebApi/ ./WebApi/
|
COPY WebApi/ ./WebApi/
|
||||||
|
|
||||||
# 构建并发布
|
# 构建并发布
|
||||||
# 使用 /m:1 限制 CPU/内存并行度，减少容器构建崩溃风险
|
# 使用 -m:1 限制 CPU/内存并行度，减少容器构建崩溃风险
|
||||||
RUN dotnet publish WebApi/WebApi.csproj -c Release -o /app/publish --no-restore /m:1
|
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
|
||||||
|
|
||||||
|
|||||||
@@ -13,8 +13,6 @@ 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
|
||||||
@@ -85,18 +83,6 @@ 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
|
||||||
|
|||||||
@@ -1,4 +1,2 @@
|
|||||||
<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/=Ccsvc/@EntryIndexedValue">True</s:Boolean>
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=fsql/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
|
||||||
<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>
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
# 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
|
|
||||||
@@ -2,6 +2,31 @@
|
|||||||
|
|
||||||
public class BudgetArchive : BaseEntity
|
public class BudgetArchive : BaseEntity
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 预算Id
|
||||||
|
/// </summary>
|
||||||
|
public long BudgetId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 预算周期类型
|
||||||
|
/// </summary>
|
||||||
|
public BudgetPeriodType BudgetType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 预算金额
|
||||||
|
/// </summary>
|
||||||
|
public decimal BudgetedAmount { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 周期内实际发生金额
|
||||||
|
/// </summary>
|
||||||
|
public decimal RealizedAmount { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 详细描述
|
||||||
|
/// </summary>
|
||||||
|
public string? Description { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 归档目标年份
|
/// 归档目标年份
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -12,79 +37,8 @@ public class BudgetArchive : BaseEntity
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public int Month { get; set; }
|
public int Month { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 归档内容
|
|
||||||
/// </summary>
|
|
||||||
[JsonMap]
|
|
||||||
public BudgetArchiveContent[] Content { get; set; } = [];
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 归档日期
|
/// 归档日期
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime ArchiveDate { get; set; } = DateTime.Now;
|
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;
|
|
||||||
}
|
}
|
||||||
@@ -34,16 +34,6 @@ public class BudgetRecord : BaseEntity
|
|||||||
/// 开始日期
|
/// 开始日期
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime StartDate { get; set; } = DateTime.Now;
|
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
|
public enum BudgetPeriodType
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
namespace Entity;
|
using System.Security.Cryptography;
|
||||||
|
|
||||||
|
namespace Entity;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 邮件消息实体
|
/// 邮件消息实体
|
||||||
@@ -37,7 +39,7 @@ public class EmailMessage : BaseEntity
|
|||||||
public string ComputeBodyHash()
|
public string ComputeBodyHash()
|
||||||
{
|
{
|
||||||
using var md5 = MD5.Create();
|
using var md5 = MD5.Create();
|
||||||
var inputBytes = Encoding.UTF8.GetBytes(Body + HtmlBody);
|
var inputBytes = System.Text.Encoding.UTF8.GetBytes(Body + HtmlBody);
|
||||||
var hashBytes = md5.ComputeHash(inputBytes);
|
var hashBytes = md5.ComputeHash(inputBytes);
|
||||||
return Convert.ToHexString(hashBytes);
|
return Convert.ToHexString(hashBytes);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
<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>
|
||||||
|
|||||||
@@ -1,3 +1 @@
|
|||||||
global using FreeSql.DataAnnotations;
|
global using FreeSql.DataAnnotations;
|
||||||
global using System.Security.Cryptography;
|
|
||||||
global using System.Text;
|
|
||||||
@@ -14,11 +14,4 @@ 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; }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace Entity;
|
namespace Entity;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 银行交易记录（由邮件解析生成）
|
/// 银行交易记录（由邮件解析生成）
|
||||||
@@ -20,6 +20,11 @@ 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>
|
||||||
@@ -64,11 +69,6 @@ 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
|
||||||
|
|||||||
@@ -1,156 +0,0 @@
|
|||||||
# 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` 添加专门的单元测试
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
# 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
|
|
||||||
@@ -170,10 +170,10 @@ public abstract class BaseRepository<T>(IFreeSql freeSql) : IBaseRepository<T> w
|
|||||||
var dt = await FreeSql.Ado.ExecuteDataTableAsync(completeSql);
|
var dt = await FreeSql.Ado.ExecuteDataTableAsync(completeSql);
|
||||||
var result = new List<dynamic>();
|
var result = new List<dynamic>();
|
||||||
|
|
||||||
foreach (DataRow row in dt.Rows)
|
foreach (System.Data.DataRow row in dt.Rows)
|
||||||
{
|
{
|
||||||
var expando = new ExpandoObject() as IDictionary<string, object>;
|
var expando = new System.Dynamic.ExpandoObject() as IDictionary<string, object>;
|
||||||
foreach (DataColumn column in dt.Columns)
|
foreach (System.Data.DataColumn column in dt.Columns)
|
||||||
{
|
{
|
||||||
expando[column.ColumnName] = row[column];
|
expando[column.ColumnName] = row[column];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,21 +2,19 @@
|
|||||||
|
|
||||||
public interface IBudgetArchiveRepository : IBaseRepository<BudgetArchive>
|
public interface IBudgetArchiveRepository : IBaseRepository<BudgetArchive>
|
||||||
{
|
{
|
||||||
Task<BudgetArchive?> GetArchiveAsync(int year, int month);
|
Task<BudgetArchive?> GetArchiveAsync(long budgetId, int year, int month);
|
||||||
|
|
||||||
Task<List<BudgetArchive>> GetListAsync(int year, int month);
|
Task<List<BudgetArchive>> GetListAsync(int year, int month);
|
||||||
|
|
||||||
Task<List<BudgetArchive>> GetArchivesByYearAsync(int year);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class BudgetArchiveRepository(
|
public class BudgetArchiveRepository(
|
||||||
IFreeSql freeSql
|
IFreeSql freeSql
|
||||||
) : BaseRepository<BudgetArchive>(freeSql), IBudgetArchiveRepository
|
) : BaseRepository<BudgetArchive>(freeSql), IBudgetArchiveRepository
|
||||||
{
|
{
|
||||||
public async Task<BudgetArchive?> GetArchiveAsync(int year, int month)
|
public async Task<BudgetArchive?> GetArchiveAsync(long budgetId, int year, int month)
|
||||||
{
|
{
|
||||||
return await FreeSql.Select<BudgetArchive>()
|
return await FreeSql.Select<BudgetArchive>()
|
||||||
.Where(a => a.Year == year &&
|
.Where(a => a.BudgetId == budgetId &&
|
||||||
|
a.Year == year &&
|
||||||
a.Month == month)
|
a.Month == month)
|
||||||
.ToOneAsync();
|
.ToOneAsync();
|
||||||
}
|
}
|
||||||
@@ -24,15 +22,13 @@ public class BudgetArchiveRepository(
|
|||||||
public async Task<List<BudgetArchive>> GetListAsync(int year, int month)
|
public async Task<List<BudgetArchive>> GetListAsync(int year, int month)
|
||||||
{
|
{
|
||||||
return await FreeSql.Select<BudgetArchive>()
|
return await FreeSql.Select<BudgetArchive>()
|
||||||
.Where(a => a.Year == year && a.Month == month)
|
.Where(
|
||||||
.ToListAsync();
|
a => a.BudgetType == BudgetPeriodType.Month &&
|
||||||
}
|
a.Year == year &&
|
||||||
|
a.Month == month ||
|
||||||
public async Task<List<BudgetArchive>> GetArchivesByYearAsync(int year)
|
a.BudgetType == BudgetPeriodType.Year &&
|
||||||
{
|
a.Year == year
|
||||||
return await FreeSql.Select<BudgetArchive>()
|
)
|
||||||
.Where(a => a.Year == year)
|
|
||||||
.OrderBy(a => a.Month)
|
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -28,6 +28,10 @@ public class BudgetRepository(IFreeSql freeSql) : BaseRepository<BudgetRecord>(f
|
|||||||
{
|
{
|
||||||
query = query.Where(t => t.Type == TransactionType.Income);
|
query = query.Where(t => t.Type == TransactionType.Income);
|
||||||
}
|
}
|
||||||
|
else if (budget.Category == BudgetCategory.Savings)
|
||||||
|
{
|
||||||
|
query = query.Where(t => t.Type == TransactionType.None);
|
||||||
|
}
|
||||||
|
|
||||||
return await query.SumAsync(t => t.Amount);
|
return await query.SumAsync(t => t.Amount);
|
||||||
}
|
}
|
||||||
@@ -37,13 +41,14 @@ public class BudgetRepository(IFreeSql freeSql) : BaseRepository<BudgetRecord>(f
|
|||||||
var records = await FreeSql.Select<BudgetRecord>()
|
var records = await FreeSql.Select<BudgetRecord>()
|
||||||
.Where(b => b.SelectedCategories.Contains(oldName) &&
|
.Where(b => b.SelectedCategories.Contains(oldName) &&
|
||||||
((type == TransactionType.Expense && b.Category == BudgetCategory.Expense) ||
|
((type == TransactionType.Expense && b.Category == BudgetCategory.Expense) ||
|
||||||
(type == TransactionType.Income && b.Category == BudgetCategory.Income)))
|
(type == TransactionType.Income && b.Category == BudgetCategory.Income) ||
|
||||||
|
(type == TransactionType.None && b.Category == BudgetCategory.Savings)))
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
foreach (var record in records)
|
foreach (var record in records)
|
||||||
{
|
{
|
||||||
var categories = record.SelectedCategories.Split(',').ToList();
|
var categories = record.SelectedCategories.Split(',').ToList();
|
||||||
for (var i = 0; i < categories.Count; i++)
|
for (int i = 0; i < categories.Count; i++)
|
||||||
{
|
{
|
||||||
if (categories[i] == oldName)
|
if (categories[i] == oldName)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
|
|
||||||
global using Entity;
|
global using Entity;
|
||||||
global using System.Linq;
|
|
||||||
global using System.Data;
|
|
||||||
global using System.Dynamic;
|
|
||||||
global using FreeSql;
|
global using FreeSql;
|
||||||
|
global using System.Linq;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace Repository;
|
namespace Repository;
|
||||||
|
|
||||||
public interface ITransactionRecordRepository : IBaseRepository<TransactionRecord>
|
public interface ITransactionRecordRepository : IBaseRepository<TransactionRecord>
|
||||||
{
|
{
|
||||||
@@ -6,102 +6,202 @@ public interface ITransactionRecordRepository : IBaseRepository<TransactionRecor
|
|||||||
|
|
||||||
Task<TransactionRecord?> ExistsByImportNoAsync(string importNo, string importFrom);
|
Task<TransactionRecord?> ExistsByImportNoAsync(string importNo, string importFrom);
|
||||||
|
|
||||||
Task<List<TransactionRecord>> QueryAsync(
|
/// <summary>
|
||||||
|
/// 分页获取交易记录列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="pageIndex">页码，从1开始</param>
|
||||||
|
/// <param name="pageSize">每页数量</param>
|
||||||
|
/// <param name="searchKeyword">搜索关键词（搜索交易摘要和分类）</param>
|
||||||
|
/// <param name="classifies">筛选分类列表</param>
|
||||||
|
/// <param name="type">筛选交易类型</param>
|
||||||
|
/// <param name="year">筛选年份</param>
|
||||||
|
/// <param name="month">筛选月份</param>
|
||||||
|
/// <param name="startDate">筛选开始日期</param>
|
||||||
|
/// <param name="endDate">筛选结束日期</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[]? classifies = null,
|
||||||
|
TransactionType? type = null,
|
||||||
int? year = null,
|
int? year = null,
|
||||||
int? month = null,
|
int? month = null,
|
||||||
DateTime? startDate = null,
|
DateTime? startDate = null,
|
||||||
DateTime? endDate = 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);
|
||||||
|
|
||||||
Task<long> CountAsync(
|
/// <summary>
|
||||||
|
/// 获取总数
|
||||||
|
/// </summary>
|
||||||
|
Task<long> GetTotalCountAsync(
|
||||||
|
string? searchKeyword = null,
|
||||||
|
string[]? classifies = null,
|
||||||
|
TransactionType? type = null,
|
||||||
int? year = null,
|
int? year = null,
|
||||||
int? month = null,
|
int? month = null,
|
||||||
DateTime? startDate = null,
|
DateTime? startDate = null,
|
||||||
DateTime? endDate = 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();
|
||||||
|
|
||||||
Task<List<TransactionRecord>> GetByEmailIdAsync(long emailMessageId);
|
/// <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);
|
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);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取未分类的账单数量
|
||||||
|
/// </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);
|
||||||
|
|
||||||
Task<List<TransactionRecord>> GetClassifiedByKeywordsAsync(List<string> keywords, int limit = 10);
|
/// <summary>
|
||||||
|
/// 获取按交易摘要(Reason)分组的统计信息（支持分页）
|
||||||
Task<List<TransactionRecord>> GetUnconfirmedRecordsAsync();
|
/// </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);
|
Task<int> BatchUpdateByReasonAsync(string reason, TransactionType type, string classify);
|
||||||
|
|
||||||
Task<int> UpdateCategoryNameAsync(string oldName, string newName, TransactionType type);
|
/// <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>
|
||||||
|
/// 根据关键词查询已分类的账单（用于智能分类参考）
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="keywords">关键词列表</param>
|
||||||
|
/// <param name="limit">返回结果数量限制</param>
|
||||||
|
/// <returns>已分类的账单列表</returns>
|
||||||
|
Task<List<TransactionRecord>> GetClassifiedByKeywordsAsync(List<string> keywords, int limit = 10);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 根据关键词查询已分类的账单，并计算相关度分数
|
||||||
|
/// </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>
|
||||||
|
/// 获取抵账候选列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="currentId">当前交易ID</param>
|
||||||
|
/// <param name="amount">当前交易金额</param>
|
||||||
|
/// <param name="currentType">当前交易类型</param>
|
||||||
|
/// <returns>候选交易列表</returns>
|
||||||
|
Task<List<TransactionRecord>> GetCandidatesForOffsetAsync(long currentId, decimal amount, TransactionType currentType);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取待确认分类的账单列表
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>待确认账单列表</returns>
|
||||||
|
Task<List<TransactionRecord>> GetUnconfirmedRecordsAsync();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 全部确认待确认的分类
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>影响行数</returns>
|
||||||
Task<int> ConfirmAllUnconfirmedAsync(long[] ids);
|
Task<int> ConfirmAllUnconfirmedAsync(long[] ids);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新分类名称
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="oldName">旧分类名称</param>
|
||||||
|
/// <param name="newName">新分类名称</param>
|
||||||
|
/// <param name="type">交易类型</param>
|
||||||
|
/// <returns>影响行数</returns>
|
||||||
|
Task<int> UpdateCategoryNameAsync(string oldName, string newName, TransactionType type);
|
||||||
}
|
}
|
||||||
|
|
||||||
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>()
|
||||||
@@ -116,48 +216,116 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
|
|||||||
.FirstAsync();
|
.FirstAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<TransactionRecord>> QueryAsync(
|
public async Task<List<TransactionRecord>> GetPagedListAsync(
|
||||||
|
int pageIndex = 1,
|
||||||
|
int pageSize = 20,
|
||||||
|
string? searchKeyword = null,
|
||||||
|
string[]? classifies = null,
|
||||||
|
TransactionType? type = null,
|
||||||
int? year = null,
|
int? year = null,
|
||||||
int? month = null,
|
int? month = null,
|
||||||
DateTime? startDate = null,
|
DateTime? startDate = null,
|
||||||
DateTime? endDate = 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 = BuildQuery(year, month, startDate, endDate, type, classifies, searchKeyword, reason);
|
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 != null && classifies.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);
|
||||||
|
|
||||||
|
// 根据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
|
return await query
|
||||||
.OrderByDescending(t => t.OccurredAt)
|
.OrderByDescending(t => t.OccurredAt)
|
||||||
.OrderByDescending(t => t.Id)
|
.OrderByDescending(t => t.Id)
|
||||||
.Page(pageIndex, pageSize)
|
.Page(pageIndex, pageSize)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<long> CountAsync(
|
public async Task<long> GetTotalCountAsync(
|
||||||
|
string? searchKeyword = null,
|
||||||
|
string[]? classifies = null,
|
||||||
|
TransactionType? type = null,
|
||||||
int? year = null,
|
int? year = null,
|
||||||
int? month = null,
|
int? month = null,
|
||||||
DateTime? startDate = null,
|
DateTime? startDate = null,
|
||||||
DateTime? endDate = null,
|
DateTime? endDate = null,
|
||||||
TransactionType? type = null,
|
|
||||||
string[]? classifies = null,
|
|
||||||
string? searchKeyword = null,
|
|
||||||
string? reason = null)
|
string? reason = null)
|
||||||
{
|
{
|
||||||
var query = BuildQuery(year, month, startDate, endDate, type, classifies, searchKeyword, reason);
|
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 != null && classifies.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 await query.CountAsync();
|
return await query.CountAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -169,10 +337,37 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
|
|||||||
.ToListAsync(t => t.Classify);
|
.ToListAsync(t => t.Classify);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<TransactionRecord>> GetByEmailIdAsync(long emailMessageId)
|
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>()
|
return await FreeSql.Select<TransactionRecord>()
|
||||||
.Where(t => t.EmailMessageId == emailMessageId)
|
.Where(t => t.OccurredAt >= startDate && t.OccurredAt <= endDate)
|
||||||
.OrderBy(t => t.OccurredAt)
|
.OrderBy(t => t.OccurredAt)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
}
|
}
|
||||||
@@ -184,6 +379,21 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
|
|||||||
.CountAsync();
|
.CountAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<List<TransactionRecord>> GetByEmailIdAsync(long emailMessageId)
|
||||||
|
{
|
||||||
|
return await FreeSql.Select<TransactionRecord>()
|
||||||
|
.Where(t => t.EmailMessageId == emailMessageId)
|
||||||
|
.OrderBy(t => t.OccurredAt)
|
||||||
|
.ToListAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<int> GetUnclassifiedCountAsync()
|
||||||
|
{
|
||||||
|
return (int)await FreeSql.Select<TransactionRecord>()
|
||||||
|
.Where(t => string.IsNullOrEmpty(t.Classify))
|
||||||
|
.CountAsync();
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<List<TransactionRecord>> GetUnclassifiedAsync(int pageSize = 10)
|
public async Task<List<TransactionRecord>> GetUnclassifiedAsync(int pageSize = 10)
|
||||||
{
|
{
|
||||||
return await FreeSql.Select<TransactionRecord>()
|
return await FreeSql.Select<TransactionRecord>()
|
||||||
@@ -193,33 +403,56 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
|
|||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<TransactionRecord>> GetClassifiedByKeywordsAsync(List<string> keywords, int limit = 10)
|
public async Task<(List<ReasonGroupDto> list, int total)> GetReasonGroupsAsync(int pageIndex = 1, int pageSize = 20)
|
||||||
{
|
{
|
||||||
if (keywords.Count == 0)
|
// 先按照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
|
||||||
{
|
{
|
||||||
return [];
|
Reason = g.Key,
|
||||||
}
|
Count = g.Count(),
|
||||||
|
TotalAmount = g.Sum(g.Value.Amount)
|
||||||
|
});
|
||||||
|
|
||||||
var query = FreeSql.Select<TransactionRecord>()
|
// 按总金额绝对值降序排序
|
||||||
.Where(t => t.Classify != "");
|
var sortedGroups = groups.OrderByDescending(g => Math.Abs(g.TotalAmount)).ToList();
|
||||||
|
var total = sortedGroups.Count;
|
||||||
|
|
||||||
if (keywords.Count > 0)
|
// 分页
|
||||||
|
var pagedGroups = sortedGroups
|
||||||
|
.Skip((pageIndex - 1) * pageSize)
|
||||||
|
.Take(pageSize)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
// 为每个分组获取详细信息
|
||||||
|
var result = new List<ReasonGroupDto>();
|
||||||
|
foreach (var group in pagedGroups)
|
||||||
{
|
{
|
||||||
query = query.Where(t => keywords.Any(keyword => t.Reason.Contains(keyword)));
|
// 获取该分组的所有记录
|
||||||
}
|
var records = await FreeSql.Select<TransactionRecord>()
|
||||||
|
.Where(t => t.Reason == group.Reason)
|
||||||
return await query
|
.Where(t => string.IsNullOrEmpty(t.Classify))
|
||||||
.OrderByDescending(t => t.OccurredAt)
|
|
||||||
.Limit(limit)
|
|
||||||
.ToListAsync();
|
.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)
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<TransactionRecord>> GetUnconfirmedRecordsAsync()
|
return (result, total);
|
||||||
{
|
|
||||||
return await FreeSql.Select<TransactionRecord>()
|
|
||||||
.Where(t => t.UnconfirmedClassify != null && t.UnconfirmedClassify != "")
|
|
||||||
.OrderByDescending(t => t.OccurredAt)
|
|
||||||
.ToListAsync();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<int> BatchUpdateByReasonAsync(string reason, TransactionType type, string classify)
|
public async Task<int> BatchUpdateByReasonAsync(string reason, TransactionType type, string classify)
|
||||||
@@ -231,6 +464,224 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
|
|||||||
.ExecuteAffrowsAsync();
|
.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<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)
|
||||||
|
{
|
||||||
|
if (keywords == null || keywords.Count == 0)
|
||||||
|
{
|
||||||
|
return new List<TransactionRecord>();
|
||||||
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<(TransactionRecord record, double relevanceScore)>> GetClassifiedByKeywordsWithScoreAsync(List<string> keywords, double minMatchRate = 0.3, int limit = 10)
|
||||||
|
{
|
||||||
|
if (keywords == null || keywords.Count == 0)
|
||||||
|
{
|
||||||
|
return new List<(TransactionRecord, double)>();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询所有已分类且包含任意关键词的账单
|
||||||
|
var candidates = await FreeSql.Select<TransactionRecord>()
|
||||||
|
.Where(t => t.Classify != "")
|
||||||
|
.Where(t => keywords.Any(keyword => t.Reason.Contains(keyword)))
|
||||||
|
.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)
|
||||||
|
{
|
||||||
|
var absAmount = Math.Abs(amount);
|
||||||
|
var minAmount = absAmount - 5;
|
||||||
|
var maxAmount = absAmount + 5;
|
||||||
|
|
||||||
|
var currentRecord = await FreeSql.Select<TransactionRecord>()
|
||||||
|
.Where(t => t.Id == currentId)
|
||||||
|
.FirstAsync();
|
||||||
|
|
||||||
|
if (currentRecord == null)
|
||||||
|
{
|
||||||
|
return new List<TransactionRecord>();
|
||||||
|
}
|
||||||
|
|
||||||
|
var list = await FreeSql.Select<TransactionRecord>()
|
||||||
|
.Where(t => t.Id != currentId)
|
||||||
|
.Where(t => t.Type != currentType)
|
||||||
|
.Where(t => Math.Abs(t.Amount) >= minAmount && Math.Abs(t.Amount) <= maxAmount)
|
||||||
|
.Take(50)
|
||||||
|
.ToListAsync();
|
||||||
|
|
||||||
|
return list.OrderBy(t => Math.Abs(Math.Abs(t.Amount) - absAmount))
|
||||||
|
.ThenBy(x=> Math.Abs((x.OccurredAt - currentRecord.OccurredAt).TotalSeconds))
|
||||||
|
.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<int> UpdateCategoryNameAsync(string oldName, string newName, TransactionType type)
|
public async Task<int> UpdateCategoryNameAsync(string oldName, string newName, TransactionType type)
|
||||||
{
|
{
|
||||||
return await FreeSql.Update<TransactionRecord>()
|
return await FreeSql.Update<TransactionRecord>()
|
||||||
@@ -239,6 +690,14 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
|
|||||||
.ExecuteAffrowsAsync();
|
.ExecuteAffrowsAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<List<TransactionRecord>> GetUnconfirmedRecordsAsync()
|
||||||
|
{
|
||||||
|
return await FreeSql.Select<TransactionRecord>()
|
||||||
|
.Where(t => t.UnconfirmedClassify != null && t.UnconfirmedClassify != "")
|
||||||
|
.OrderByDescending(t => t.OccurredAt)
|
||||||
|
.ToListAsync();
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<int> ConfirmAllUnconfirmedAsync(long[] ids)
|
public async Task<int> ConfirmAllUnconfirmedAsync(long[] ids)
|
||||||
{
|
{
|
||||||
return await FreeSql.Update<TransactionRecord>()
|
return await FreeSql.Update<TransactionRecord>()
|
||||||
@@ -251,3 +710,79 @@ public class TransactionRecordRepository(IFreeSql freeSql) : BaseRepository<Tran
|
|||||||
.ExecuteAffrowsAsync();
|
.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; }
|
||||||
|
}
|
||||||
@@ -1,456 +0,0 @@
|
|||||||
# 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使用）
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
# 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
|
|
||||||
70
Service/AgentFramework/AITools.cs
Normal file
70
Service/AgentFramework/AITools.cs
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// AI 工具集
|
||||||
|
/// </summary>
|
||||||
|
public interface IAITools
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// AI 分类决策
|
||||||
|
/// </summary>
|
||||||
|
Task<ClassificationResult[]> ClassifyTransactionsAsync(
|
||||||
|
string systemPrompt,
|
||||||
|
string userPrompt);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// AI 工具实现
|
||||||
|
/// </summary>
|
||||||
|
public class AITools(
|
||||||
|
IOpenAiService openAiService,
|
||||||
|
ILogger<AITools> logger
|
||||||
|
) : IAITools
|
||||||
|
{
|
||||||
|
public async Task<ClassificationResult[]> ClassifyTransactionsAsync(
|
||||||
|
string systemPrompt,
|
||||||
|
string userPrompt)
|
||||||
|
{
|
||||||
|
logger.LogInformation("调用 AI 进行账单分类");
|
||||||
|
|
||||||
|
var response = await openAiService.ChatAsync(systemPrompt, userPrompt);
|
||||||
|
if (string.IsNullOrWhiteSpace(response))
|
||||||
|
{
|
||||||
|
logger.LogWarning("AI 返回空响应");
|
||||||
|
return Array.Empty<ClassificationResult>();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解析 NDJSON 格式的 AI 响应
|
||||||
|
var results = new List<ClassificationResult>();
|
||||||
|
var lines = response.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
|
||||||
|
foreach (var line in lines)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(line))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var doc = JsonDocument.Parse(line);
|
||||||
|
var root = doc.RootElement;
|
||||||
|
|
||||||
|
var result = new ClassificationResult
|
||||||
|
{
|
||||||
|
Reason = root.GetProperty("reason").GetString() ?? string.Empty,
|
||||||
|
Classify = root.GetProperty("classify").GetString() ?? string.Empty,
|
||||||
|
Type = (TransactionType)root.GetProperty("type").GetInt32(),
|
||||||
|
Confidence = 0.9 // 可从 AI 响应中解析
|
||||||
|
};
|
||||||
|
|
||||||
|
results.Add(result);
|
||||||
|
}
|
||||||
|
catch (JsonException ex)
|
||||||
|
{
|
||||||
|
logger.LogWarning(ex, "解析 AI 响应行失败: {Line}", line);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.LogInformation("AI 分类完成，得到 {Count} 条结果", results.Count);
|
||||||
|
return results.ToArray();
|
||||||
|
}
|
||||||
|
}
|
||||||
53
Service/AgentFramework/AgentFrameworkExtensions.cs
Normal file
53
Service/AgentFramework/AgentFrameworkExtensions.cs
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Microsoft.Agents.AI;
|
||||||
|
|
||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Agent Framework 依赖注入扩展
|
||||||
|
/// </summary>
|
||||||
|
public static class AgentFrameworkExtensions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 注册 Agent Framework 相关服务
|
||||||
|
/// </summary>
|
||||||
|
public static IServiceCollection AddAgentFramework(this IServiceCollection services)
|
||||||
|
{
|
||||||
|
// 注册 Tool Registry (Singleton - 无状态，全局共享)
|
||||||
|
services.AddSingleton<IToolRegistry, ToolRegistry>();
|
||||||
|
|
||||||
|
// 注册 Tools (Scoped - 因为依赖 Scoped Repository)
|
||||||
|
services.AddSingleton<ITransactionQueryTools, TransactionQueryTools>();
|
||||||
|
services.AddSingleton<ITextProcessingTools, TextProcessingTools>();
|
||||||
|
services.AddSingleton<IAITools, AITools>();
|
||||||
|
|
||||||
|
// 注册 Agents (Scoped - 因为依赖 Scoped Tools)
|
||||||
|
services.AddSingleton<ClassificationAgent>();
|
||||||
|
services.AddSingleton<ParsingAgent>();
|
||||||
|
services.AddSingleton<ImportAgent>();
|
||||||
|
|
||||||
|
// 注册 Service Facade (Scoped - 避免生命周期冲突)
|
||||||
|
services.AddSingleton<ISmartHandleServiceV2, SmartHandleServiceV2>();
|
||||||
|
|
||||||
|
return services;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 初始化 Agent 框架的 Tools
|
||||||
|
/// 在应用启动时调用此方法
|
||||||
|
/// </summary>
|
||||||
|
public static void InitializeAgentTools(
|
||||||
|
this IServiceProvider serviceProvider)
|
||||||
|
{
|
||||||
|
var toolRegistry = serviceProvider.GetRequiredService<IToolRegistry>();
|
||||||
|
var logger = serviceProvider.GetRequiredService<ILogger<IToolRegistry>>();
|
||||||
|
|
||||||
|
logger.LogInformation("开始初始化 Agent Tools...");
|
||||||
|
|
||||||
|
// 这里可以注册更多的 Tool
|
||||||
|
// 目前大部分 Tool 被整合到了工具类中，后续可根据需要扩展
|
||||||
|
|
||||||
|
logger.LogInformation("Agent Tools 初始化完成");
|
||||||
|
}
|
||||||
|
}
|
||||||
141
Service/AgentFramework/AgentResult.cs
Normal file
141
Service/AgentFramework/AgentResult.cs
Normal file
@@ -0,0 +1,141 @@
|
|||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Agent 执行结果的标准化输出模型
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">数据类型</typeparam>
|
||||||
|
public record AgentResult<T>
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Agent 执行的主要数据结果
|
||||||
|
/// </summary>
|
||||||
|
public T Data { get; init; } = default!;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 多轮提炼后的总结信息（3-5 句，包含关键指标）
|
||||||
|
/// </summary>
|
||||||
|
public string Summary { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Agent 执行的步骤链（用于可视化和调试）
|
||||||
|
/// </summary>
|
||||||
|
public List<ExecutionStep> Steps { get; init; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 元数据（统计信息、性能指标等）
|
||||||
|
/// </summary>
|
||||||
|
public Dictionary<string, object?> Metadata { get; init; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 执行是否成功
|
||||||
|
/// </summary>
|
||||||
|
public bool Success { get; init; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 错误信息（如果有的话）
|
||||||
|
/// </summary>
|
||||||
|
public string? Error { get; init; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Agent 执行步骤
|
||||||
|
/// </summary>
|
||||||
|
public record ExecutionStep
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 步骤名称
|
||||||
|
/// </summary>
|
||||||
|
public string Name { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 步骤描述
|
||||||
|
/// </summary>
|
||||||
|
public string Description { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 步骤状态：Pending, Running, Completed, Failed
|
||||||
|
/// </summary>
|
||||||
|
public string Status { get; init; } = "Pending";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 执行耗时（毫秒）
|
||||||
|
/// </summary>
|
||||||
|
public long DurationMs { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 步骤输出数据（可选）
|
||||||
|
/// </summary>
|
||||||
|
public object? Output { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 错误信息（如果步骤失败）
|
||||||
|
/// </summary>
|
||||||
|
public string? Error { get; init; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 分类结果模型
|
||||||
|
/// </summary>
|
||||||
|
public record ClassificationResult
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 原始摘要
|
||||||
|
/// </summary>
|
||||||
|
public string Reason { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 分类名称
|
||||||
|
/// </summary>
|
||||||
|
public string Classify { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 交易类型
|
||||||
|
/// </summary>
|
||||||
|
public TransactionType Type { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// AI 置信度评分 (0-1)
|
||||||
|
/// </summary>
|
||||||
|
public double Confidence { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 影响的交易记录 ID
|
||||||
|
/// </summary>
|
||||||
|
public List<long> TransactionIds { get; init; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 参考的相似记录
|
||||||
|
/// </summary>
|
||||||
|
public List<string> References { get; init; } = new();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 账单解析结果模型
|
||||||
|
/// </summary>
|
||||||
|
public record TransactionParseResult
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 金额
|
||||||
|
/// </summary>
|
||||||
|
public decimal Amount { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 摘要
|
||||||
|
/// </summary>
|
||||||
|
public string Reason { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 日期
|
||||||
|
/// </summary>
|
||||||
|
public DateTime Date { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 交易类型
|
||||||
|
/// </summary>
|
||||||
|
public TransactionType Type { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 分类
|
||||||
|
/// </summary>
|
||||||
|
public string? Classify { get; init; }
|
||||||
|
}
|
||||||
217
Service/AgentFramework/BaseAgent.cs
Normal file
217
Service/AgentFramework/BaseAgent.cs
Normal file
@@ -0,0 +1,217 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Agent 基类 - 提供通用的工作流编排能力
|
||||||
|
/// </summary>
|
||||||
|
public abstract class BaseAgent
|
||||||
|
{
|
||||||
|
protected readonly IToolRegistry _toolRegistry;
|
||||||
|
protected readonly ILogger<BaseAgent> _logger;
|
||||||
|
protected readonly List<ExecutionStep> _steps = new();
|
||||||
|
protected readonly Dictionary<string, object?> _metadata = new();
|
||||||
|
|
||||||
|
// 定义 ActivitySource 供 DevUI 捕获
|
||||||
|
private static readonly ActivitySource _activitySource = new("Microsoft.Agents.Workflows");
|
||||||
|
|
||||||
|
protected BaseAgent(
|
||||||
|
IToolRegistry toolRegistry,
|
||||||
|
ILogger<BaseAgent> logger)
|
||||||
|
{
|
||||||
|
_toolRegistry = toolRegistry;
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 记录执行步骤
|
||||||
|
/// </summary>
|
||||||
|
protected void RecordStep(
|
||||||
|
string name,
|
||||||
|
string description,
|
||||||
|
object? output = null,
|
||||||
|
long durationMs = 0)
|
||||||
|
{
|
||||||
|
var step = new ExecutionStep
|
||||||
|
{
|
||||||
|
Name = name,
|
||||||
|
Description = description,
|
||||||
|
Status = "Completed",
|
||||||
|
Output = output,
|
||||||
|
DurationMs = durationMs
|
||||||
|
};
|
||||||
|
|
||||||
|
_steps.Add(step);
|
||||||
|
|
||||||
|
// 使用 Activity 进行埋点，将被 DevUI 自动捕获
|
||||||
|
using var activity = _activitySource.StartActivity(name);
|
||||||
|
activity?.SetTag("agent.step.description", description);
|
||||||
|
if (output != null) activity?.SetTag("agent.step.output", output.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 记录失败的步骤
|
||||||
|
/// </summary>
|
||||||
|
protected void RecordFailedStep(
|
||||||
|
string name,
|
||||||
|
string description,
|
||||||
|
string error,
|
||||||
|
long durationMs = 0)
|
||||||
|
{
|
||||||
|
var step = new ExecutionStep
|
||||||
|
{
|
||||||
|
Name = name,
|
||||||
|
Description = description,
|
||||||
|
Status = "Failed",
|
||||||
|
Error = error,
|
||||||
|
DurationMs = durationMs
|
||||||
|
};
|
||||||
|
|
||||||
|
_steps.Add(step);
|
||||||
|
|
||||||
|
using var activity = _activitySource.StartActivity($"{name} (Failed)");
|
||||||
|
activity?.SetTag("agent.step.error", error);
|
||||||
|
_logger.LogError("[Agent步骤失败] {StepName}: {Error}", name, error);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置元数据
|
||||||
|
/// </summary>
|
||||||
|
protected void SetMetadata(string key, object? value)
|
||||||
|
{
|
||||||
|
_metadata[key] = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取执行日志
|
||||||
|
/// </summary>
|
||||||
|
protected List<ExecutionStep> GetExecutionLog()
|
||||||
|
{
|
||||||
|
return _steps.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 生成多轮总结
|
||||||
|
/// </summary>
|
||||||
|
protected virtual async Task<string> GenerateSummaryAsync(
|
||||||
|
string[] phases,
|
||||||
|
Dictionary<string, object?> phaseResults)
|
||||||
|
{
|
||||||
|
var summaryParts = new List<string>();
|
||||||
|
|
||||||
|
// 简单的总结生成逻辑
|
||||||
|
// 实际项目中可以集成 AI 生成更复杂的总结
|
||||||
|
foreach (var phase in phases)
|
||||||
|
{
|
||||||
|
if (phaseResults.TryGetValue(phase, out var result))
|
||||||
|
{
|
||||||
|
summaryParts.Add($"{phase}：已完成");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return await Task.FromResult(string.Join("；", summaryParts) + "。");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 调用 Tool（简化接口）
|
||||||
|
/// </summary>
|
||||||
|
protected async Task<TResult> CallToolAsync<TResult>(
|
||||||
|
string toolName,
|
||||||
|
string stepName,
|
||||||
|
string stepDescription)
|
||||||
|
{
|
||||||
|
var sw = System.Diagnostics.Stopwatch.StartNew();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_logger.LogInformation("开始执行 Tool: {ToolName}", toolName);
|
||||||
|
var result = await _toolRegistry.InvokeToolAsync<TResult>(toolName);
|
||||||
|
sw.Stop();
|
||||||
|
|
||||||
|
RecordStep(stepName, stepDescription, result, sw.ElapsedMilliseconds);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
sw.Stop();
|
||||||
|
RecordFailedStep(stepName, stepDescription, ex.Message, sw.ElapsedMilliseconds);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 调用带参数的 Tool
|
||||||
|
/// </summary>
|
||||||
|
protected async Task<TResult> CallToolAsync<TParam, TResult>(
|
||||||
|
string toolName,
|
||||||
|
TParam param,
|
||||||
|
string stepName,
|
||||||
|
string stepDescription)
|
||||||
|
{
|
||||||
|
var sw = System.Diagnostics.Stopwatch.StartNew();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_logger.LogInformation("开始执行 Tool: {ToolName}，参数: {Param}", toolName, param);
|
||||||
|
var result = await _toolRegistry.InvokeToolAsync<TParam, TResult>(toolName, param);
|
||||||
|
sw.Stop();
|
||||||
|
|
||||||
|
RecordStep(stepName, stepDescription, result, sw.ElapsedMilliseconds);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
sw.Stop();
|
||||||
|
RecordFailedStep(stepName, stepDescription, ex.Message, sw.ElapsedMilliseconds);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 调用带多参数的 Tool
|
||||||
|
/// </summary>
|
||||||
|
protected async Task<TResult> CallToolAsync<TParam1, TParam2, TResult>(
|
||||||
|
string toolName,
|
||||||
|
TParam1 param1,
|
||||||
|
TParam2 param2,
|
||||||
|
string stepName,
|
||||||
|
string stepDescription)
|
||||||
|
{
|
||||||
|
var sw = System.Diagnostics.Stopwatch.StartNew();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_logger.LogInformation("开始执行 Tool: {ToolName}，参数: {Param1}, {Param2}", toolName, param1, param2);
|
||||||
|
var result = await _toolRegistry.InvokeToolAsync<TParam1, TParam2, TResult>(
|
||||||
|
toolName, param1, param2);
|
||||||
|
sw.Stop();
|
||||||
|
|
||||||
|
RecordStep(stepName, stepDescription, result, sw.ElapsedMilliseconds);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
sw.Stop();
|
||||||
|
RecordFailedStep(stepName, stepDescription, ex.Message, sw.ElapsedMilliseconds);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取 Agent 执行结果
|
||||||
|
/// </summary>
|
||||||
|
protected AgentResult<T> CreateResult<T>(
|
||||||
|
T data,
|
||||||
|
string summary,
|
||||||
|
bool success = true,
|
||||||
|
string? error = null)
|
||||||
|
{
|
||||||
|
return new AgentResult<T>
|
||||||
|
{
|
||||||
|
Data = data,
|
||||||
|
Summary = summary,
|
||||||
|
Steps = _steps,
|
||||||
|
Metadata = _metadata,
|
||||||
|
Success = success,
|
||||||
|
Error = error
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
301
Service/AgentFramework/ClassificationAgent.cs
Normal file
301
Service/AgentFramework/ClassificationAgent.cs
Normal file
@@ -0,0 +1,301 @@
|
|||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 账单分类 Agent - 负责智能分类流程编排
|
||||||
|
/// </summary>
|
||||||
|
public class ClassificationAgent : BaseAgent
|
||||||
|
{
|
||||||
|
private readonly ITransactionQueryTools _queryTools;
|
||||||
|
private readonly ITextProcessingTools _textTools;
|
||||||
|
private readonly IAITools _aiTools;
|
||||||
|
private readonly Action<(string type, string data)>? _progressCallback;
|
||||||
|
|
||||||
|
public ClassificationAgent(
|
||||||
|
IToolRegistry toolRegistry,
|
||||||
|
ITransactionQueryTools queryTools,
|
||||||
|
ITextProcessingTools textTools,
|
||||||
|
IAITools aiTools,
|
||||||
|
ILogger<ClassificationAgent> logger,
|
||||||
|
Action<(string type, string data)>? progressCallback = null
|
||||||
|
) : base(toolRegistry, logger)
|
||||||
|
{
|
||||||
|
_queryTools = queryTools;
|
||||||
|
_textTools = textTools;
|
||||||
|
_aiTools = aiTools;
|
||||||
|
_progressCallback = progressCallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 执行智能分类工作流
|
||||||
|
/// </summary>
|
||||||
|
public async Task<AgentResult<ClassificationResult[]>> ExecuteAsync(
|
||||||
|
long[] transactionIds,
|
||||||
|
ITransactionCategoryRepository categoryRepository)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// ========== Phase 1: 数据采集阶段 ==========
|
||||||
|
ReportProgress("start", "开始分类，正在查询待分类账单");
|
||||||
|
|
||||||
|
var sampleRecords = await _queryTools.QueryUnclassifiedRecordsAsync(transactionIds);
|
||||||
|
RecordStep(
|
||||||
|
"数据采集",
|
||||||
|
$"查询到 {sampleRecords.Length} 条待分类账单",
|
||||||
|
sampleRecords.Length);
|
||||||
|
|
||||||
|
if (sampleRecords.Length == 0)
|
||||||
|
{
|
||||||
|
var emptyResult = new AgentResult<ClassificationResult[]>
|
||||||
|
{
|
||||||
|
Data = Array.Empty<ClassificationResult>(),
|
||||||
|
Summary = "未找到待分类的账单。",
|
||||||
|
Steps = _steps,
|
||||||
|
Metadata = _metadata,
|
||||||
|
Success = false,
|
||||||
|
Error = "没有待分类记录"
|
||||||
|
};
|
||||||
|
return emptyResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
ReportProgress("progress", $"找到 {sampleRecords.Length} 条待分类账单");
|
||||||
|
SetMetadata("sample_count", sampleRecords.Length);
|
||||||
|
|
||||||
|
// ========== Phase 2: 分析阶段 ==========
|
||||||
|
ReportProgress("progress", "正在进行分析...");
|
||||||
|
|
||||||
|
// 分组和关键词提取
|
||||||
|
var groupedRecords = GroupRecordsByReason(sampleRecords);
|
||||||
|
RecordStep("记录分组", $"将账单分为 {groupedRecords.Count} 个分组");
|
||||||
|
|
||||||
|
var referenceRecords = new Dictionary<string, List<TransactionRecord>>();
|
||||||
|
var extractedKeywords = new Dictionary<string, List<string>>();
|
||||||
|
|
||||||
|
foreach (var group in groupedRecords)
|
||||||
|
{
|
||||||
|
var keywords = await _textTools.ExtractKeywordsAsync(group.Reason);
|
||||||
|
extractedKeywords[group.Reason] = keywords;
|
||||||
|
|
||||||
|
if (keywords.Count > 0)
|
||||||
|
{
|
||||||
|
var similar = await _queryTools.QueryClassifiedByKeywordsAsync(keywords, minMatchRate: 0.4, limit: 10);
|
||||||
|
if (similar.Count > 0)
|
||||||
|
{
|
||||||
|
var topSimilar = similar.Take(5).Select(x => x.record).ToList();
|
||||||
|
referenceRecords[group.Reason] = topSimilar;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RecordStep(
|
||||||
|
"关键词提取与相似度匹配",
|
||||||
|
$"为 {extractedKeywords.Count} 个摘要提取了关键词，找到 {referenceRecords.Count} 个参考记录",
|
||||||
|
referenceRecords.Count);
|
||||||
|
|
||||||
|
SetMetadata("groups_count", groupedRecords.Count);
|
||||||
|
SetMetadata("reference_records_count", referenceRecords.Count);
|
||||||
|
ReportProgress("progress", $"分析完成，共分组 {groupedRecords.Count} 个");
|
||||||
|
|
||||||
|
// ========== Phase 3: 决策阶段 ==========
|
||||||
|
_logger.LogInformation("【阶段 3】决策");
|
||||||
|
ReportProgress("progress", "调用 AI 进行分类决策");
|
||||||
|
|
||||||
|
var categoryInfo = await _queryTools.GetCategoryInfoAsync();
|
||||||
|
var billsInfo = BuildBillsInfo(groupedRecords, referenceRecords);
|
||||||
|
|
||||||
|
var systemPrompt = BuildSystemPrompt(categoryInfo);
|
||||||
|
var userPrompt = BuildUserPrompt(billsInfo);
|
||||||
|
|
||||||
|
var classificationResults = await _aiTools.ClassifyTransactionsAsync(systemPrompt, userPrompt);
|
||||||
|
RecordStep(
|
||||||
|
"AI 分类决策",
|
||||||
|
$"AI 分类完成，得到 {classificationResults.Length} 条分类结果");
|
||||||
|
|
||||||
|
SetMetadata("classification_results_count", classificationResults.Length);
|
||||||
|
|
||||||
|
// ========== Phase 4: 结果保存阶段 ==========
|
||||||
|
_logger.LogInformation("【阶段 4】保存结果");
|
||||||
|
ReportProgress("progress", "正在保存分类结果...");
|
||||||
|
|
||||||
|
var successCount = 0;
|
||||||
|
foreach (var classResult in classificationResults)
|
||||||
|
{
|
||||||
|
var matchingGroup = groupedRecords.FirstOrDefault(g => g.Reason == classResult.Reason);
|
||||||
|
if (matchingGroup.Reason == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
foreach (var id in matchingGroup.Ids)
|
||||||
|
{
|
||||||
|
var success = await _queryTools.UpdateTransactionClassifyAsync(
|
||||||
|
id,
|
||||||
|
classResult.Classify,
|
||||||
|
classResult.Type);
|
||||||
|
|
||||||
|
if (success)
|
||||||
|
{
|
||||||
|
successCount++;
|
||||||
|
var resultJson = JsonSerializer.Serialize(new
|
||||||
|
{
|
||||||
|
id,
|
||||||
|
classResult.Classify,
|
||||||
|
classResult.Type
|
||||||
|
});
|
||||||
|
ReportProgress("data", resultJson);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RecordStep("保存结果", $"成功保存 {successCount} 条分类结果");
|
||||||
|
SetMetadata("saved_count", successCount);
|
||||||
|
|
||||||
|
// ========== 生成多轮总结 ==========
|
||||||
|
var summary = GenerateMultiPhaseSummary(
|
||||||
|
sampleRecords.Length,
|
||||||
|
groupedRecords.Count,
|
||||||
|
classificationResults.Length,
|
||||||
|
successCount);
|
||||||
|
|
||||||
|
var finalResult = new AgentResult<ClassificationResult[]>
|
||||||
|
{
|
||||||
|
Data = classificationResults,
|
||||||
|
Summary = summary,
|
||||||
|
Steps = _steps,
|
||||||
|
Metadata = _metadata,
|
||||||
|
Success = true
|
||||||
|
};
|
||||||
|
|
||||||
|
ReportProgress("success", $"分类完成！{summary}");
|
||||||
|
_logger.LogInformation("=== 分类 Agent 执行完成 ===");
|
||||||
|
|
||||||
|
return finalResult;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "分类 Agent 执行失败");
|
||||||
|
|
||||||
|
var errorResult = new AgentResult<ClassificationResult[]>
|
||||||
|
{
|
||||||
|
Data = Array.Empty<ClassificationResult>(),
|
||||||
|
Summary = $"分类失败: {ex.Message}",
|
||||||
|
Steps = _steps,
|
||||||
|
Metadata = _metadata,
|
||||||
|
Success = false,
|
||||||
|
Error = ex.Message
|
||||||
|
};
|
||||||
|
|
||||||
|
ReportProgress("error", ex.Message);
|
||||||
|
return errorResult;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ========== 辅助方法 ==========
|
||||||
|
|
||||||
|
private List<(string Reason, List<long> Ids, int Count, decimal TotalAmount, TransactionType SampleType)> GroupRecordsByReason(
|
||||||
|
TransactionRecord[] records)
|
||||||
|
{
|
||||||
|
var grouped = records
|
||||||
|
.GroupBy(r => r.Reason)
|
||||||
|
.Select(g => (
|
||||||
|
Reason: g.Key,
|
||||||
|
Ids: g.Select(r => r.Id).ToList(),
|
||||||
|
Count: g.Count(),
|
||||||
|
TotalAmount: g.Sum(r => r.Amount),
|
||||||
|
SampleType: g.First().Type
|
||||||
|
))
|
||||||
|
.OrderByDescending(g => Math.Abs(g.TotalAmount))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
return grouped;
|
||||||
|
}
|
||||||
|
|
||||||
|
private string BuildBillsInfo(
|
||||||
|
List<(string Reason, List<long> Ids, int Count, decimal TotalAmount, TransactionType SampleType)> groupedRecords,
|
||||||
|
Dictionary<string, List<TransactionRecord>> referenceRecords)
|
||||||
|
{
|
||||||
|
var billsInfo = new StringBuilder();
|
||||||
|
foreach (var (group, index) in groupedRecords.Select((g, i) => (g, i)))
|
||||||
|
{
|
||||||
|
billsInfo.AppendLine($"{index + 1}. 摘要={group.Reason}, 当前类型={GetTypeName(group.SampleType)}, 涉及金额={group.TotalAmount}");
|
||||||
|
|
||||||
|
if (referenceRecords.TryGetValue(group.Reason, out var references))
|
||||||
|
{
|
||||||
|
billsInfo.AppendLine(" 【参考】相似且已分类的账单：");
|
||||||
|
foreach (var refer in references.Take(3))
|
||||||
|
{
|
||||||
|
billsInfo.AppendLine($" - 摘要={refer.Reason}, 分类={refer.Classify}, 类型={GetTypeName(refer.Type)}, 金额={refer.Amount}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return billsInfo.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private string BuildSystemPrompt(string categoryInfo)
|
||||||
|
{
|
||||||
|
return $$"""
|
||||||
|
你是一个专业的账单分类助手。请根据提供的账单分组信息和分类列表，为每个分组选择最合适的分类。
|
||||||
|
|
||||||
|
可用的分类列表：
|
||||||
|
{{categoryInfo}}
|
||||||
|
|
||||||
|
分类规则：
|
||||||
|
1. 根据账单的摘要和涉及金额，选择最匹配的分类
|
||||||
|
2. 如果提供了【参考】信息，优先参考相似账单的分类，这些是历史上已分类的相似账单
|
||||||
|
3. 如果无法确定分类，可以选择"其他"
|
||||||
|
4. 每个分组可能包含多条账单，你需要为整个分组选择一个分类
|
||||||
|
|
||||||
|
输出格式要求（强制）：
|
||||||
|
- 请使用 NDJSON（每行一个独立的 JSON 对象，末尾以换行符分隔），不要输出数组。
|
||||||
|
- 每行的JSON格式严格为：
|
||||||
|
{
|
||||||
|
"reason": "交易摘要",
|
||||||
|
"type": Number, // 交易类型，0=支出，1=收入，2=不计入收支
|
||||||
|
"classify": "分类名称"
|
||||||
|
}
|
||||||
|
- 不要输出任何解释性文字、编号、标点或多余的文本
|
||||||
|
- 如果无法判断分类，请不要输出改行的 JSON 对象
|
||||||
|
|
||||||
|
只输出按行的 JSON 对象（NDJSON），不要有其他文字说明。
|
||||||
|
""";
|
||||||
|
}
|
||||||
|
|
||||||
|
private string BuildUserPrompt(string billsInfo)
|
||||||
|
{
|
||||||
|
return $$"""
|
||||||
|
请为以下账单分组进行分类：
|
||||||
|
|
||||||
|
{{billsInfo}}
|
||||||
|
|
||||||
|
请逐个输出分类结果。
|
||||||
|
""";
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GenerateMultiPhaseSummary(
|
||||||
|
int sampleCount,
|
||||||
|
int groupCount,
|
||||||
|
int classificationCount,
|
||||||
|
int savedCount)
|
||||||
|
{
|
||||||
|
var highConfidenceCount = savedCount; // 简化，实际可从 Confidence 字段计算
|
||||||
|
var confidenceRate = sampleCount > 0 ? (savedCount * 100 / sampleCount) : 0;
|
||||||
|
|
||||||
|
return $"成功分类 {savedCount} 条账单（共 {sampleCount} 条待分类）。" +
|
||||||
|
$"分为 {groupCount} 个分组，AI 给出 {classificationCount} 条分类建议。" +
|
||||||
|
$"分类完成度 {confidenceRate}%，所有结果已保存。";
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ReportProgress(string type, string data)
|
||||||
|
{
|
||||||
|
_progressCallback?.Invoke((type, data));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetTypeName(TransactionType type)
|
||||||
|
{
|
||||||
|
return type switch
|
||||||
|
{
|
||||||
|
TransactionType.Expense => "支出",
|
||||||
|
TransactionType.Income => "收入",
|
||||||
|
TransactionType.None => "不计入",
|
||||||
|
_ => "未知"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
101
Service/AgentFramework/IToolRegistry.cs
Normal file
101
Service/AgentFramework/IToolRegistry.cs
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tool 的定义和元数据
|
||||||
|
/// </summary>
|
||||||
|
public record ToolDefinition
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Tool 唯一标识
|
||||||
|
/// </summary>
|
||||||
|
public string Name { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tool 描述
|
||||||
|
/// </summary>
|
||||||
|
public string Description { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tool 对应的委托
|
||||||
|
/// </summary>
|
||||||
|
public Delegate Handler { get; init; } = null!;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tool 所属类别
|
||||||
|
/// </summary>
|
||||||
|
public string Category { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tool 是否可缓存
|
||||||
|
/// </summary>
|
||||||
|
public bool Cacheable { get; init; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tool Registry 接口 - 管理所有可用的 Tools
|
||||||
|
/// </summary>
|
||||||
|
public interface IToolRegistry
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 注册一个 Tool
|
||||||
|
/// </summary>
|
||||||
|
void RegisterTool<TResult>(
|
||||||
|
string name,
|
||||||
|
string description,
|
||||||
|
Func<Task<TResult>> handler,
|
||||||
|
string category = "General",
|
||||||
|
bool cacheable = false);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 注册一个带参数的 Tool
|
||||||
|
/// </summary>
|
||||||
|
void RegisterTool<TParam, TResult>(
|
||||||
|
string name,
|
||||||
|
string description,
|
||||||
|
Func<TParam, Task<TResult>> handler,
|
||||||
|
string category = "General",
|
||||||
|
bool cacheable = false);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 注册一个带多参数的 Tool
|
||||||
|
/// </summary>
|
||||||
|
void RegisterTool<TParam1, TParam2, TResult>(
|
||||||
|
string name,
|
||||||
|
string description,
|
||||||
|
Func<TParam1, TParam2, Task<TResult>> handler,
|
||||||
|
string category = "General",
|
||||||
|
bool cacheable = false);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取 Tool 定义
|
||||||
|
/// </summary>
|
||||||
|
ToolDefinition? GetToolDefinition(string name);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取所有 Tools
|
||||||
|
/// </summary>
|
||||||
|
IEnumerable<ToolDefinition> GetAllTools();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 按类别获取 Tools
|
||||||
|
/// </summary>
|
||||||
|
IEnumerable<ToolDefinition> GetToolsByCategory(string category);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 调用无参 Tool
|
||||||
|
/// </summary>
|
||||||
|
Task<TResult> InvokeToolAsync<TResult>(string toolName);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 调用带参 Tool
|
||||||
|
/// </summary>
|
||||||
|
Task<TResult> InvokeToolAsync<TParam, TResult>(string toolName, TParam param);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 调用带多参 Tool
|
||||||
|
/// </summary>
|
||||||
|
Task<TResult> InvokeToolAsync<TParam1, TParam2, TResult>(
|
||||||
|
string toolName,
|
||||||
|
TParam1 param1,
|
||||||
|
TParam2 param2);
|
||||||
|
}
|
||||||
190
Service/AgentFramework/ImportAgent.cs
Normal file
190
Service/AgentFramework/ImportAgent.cs
Normal file
@@ -0,0 +1,190 @@
|
|||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文件导入 Agent - 处理支付宝、微信等账单导入
|
||||||
|
/// </summary>
|
||||||
|
public class ImportAgent : BaseAgent
|
||||||
|
{
|
||||||
|
private readonly ITransactionQueryTools _queryTools;
|
||||||
|
private readonly ILogger<ImportAgent> _importLogger;
|
||||||
|
|
||||||
|
public ImportAgent(
|
||||||
|
IToolRegistry toolRegistry,
|
||||||
|
ITransactionQueryTools queryTools,
|
||||||
|
ILogger<ImportAgent> logger,
|
||||||
|
ILogger<ImportAgent> importLogger
|
||||||
|
) : base(toolRegistry, logger)
|
||||||
|
{
|
||||||
|
_queryTools = queryTools;
|
||||||
|
_importLogger = importLogger;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 执行批量导入流程
|
||||||
|
/// </summary>
|
||||||
|
public async Task<AgentResult<ImportResult>> ExecuteAsync(
|
||||||
|
Dictionary<string, string>[] rows,
|
||||||
|
string source,
|
||||||
|
Func<Dictionary<string, string>, Task<TransactionRecord?>> transformAsync)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Phase 1: 数据验证
|
||||||
|
RecordStep("数据验证", $"验证 {rows.Length} 条记录");
|
||||||
|
SetMetadata("total_rows", rows.Length);
|
||||||
|
|
||||||
|
var importNos = rows
|
||||||
|
.Select(r => r.ContainsKey("交易号") ? r["交易号"] : null)
|
||||||
|
.Where(no => !string.IsNullOrWhiteSpace(no))
|
||||||
|
.Cast<string>()
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
if (importNos.Length == 0)
|
||||||
|
{
|
||||||
|
var emptyResult = new ImportResult
|
||||||
|
{
|
||||||
|
TotalCount = rows.Length,
|
||||||
|
AddedCount = 0,
|
||||||
|
UpdatedCount = 0,
|
||||||
|
SkippedCount = rows.Length
|
||||||
|
};
|
||||||
|
|
||||||
|
return CreateResult(
|
||||||
|
emptyResult,
|
||||||
|
"导入失败：找不到有效的交易号。",
|
||||||
|
false,
|
||||||
|
"No valid transaction numbers found");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phase 2: 批量检查存在性
|
||||||
|
_logger.LogInformation("【阶段 2】批量检查存在性");
|
||||||
|
var existenceMap = await _queryTools.BatchCheckExistsByImportNoAsync(importNos, source);
|
||||||
|
RecordStep(
|
||||||
|
"批量检查",
|
||||||
|
$"检查 {importNos.Length} 条记录，其中 {existenceMap.Values.Count(v => v)} 条已存在");
|
||||||
|
|
||||||
|
SetMetadata("existing_count", existenceMap.Values.Count(v => v));
|
||||||
|
SetMetadata("new_count", existenceMap.Values.Count(v => !v));
|
||||||
|
|
||||||
|
// Phase 3: 数据转换和冲突解决
|
||||||
|
_logger.LogInformation("【阶段 3】数据转换和冲突解决");
|
||||||
|
var addRecords = new List<TransactionRecord>();
|
||||||
|
var updateRecords = new List<TransactionRecord>();
|
||||||
|
var skippedCount = 0;
|
||||||
|
|
||||||
|
foreach (var row in rows)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var importNo = row.ContainsKey("交易号") ? row["交易号"] : null;
|
||||||
|
if (string.IsNullOrWhiteSpace(importNo))
|
||||||
|
{
|
||||||
|
skippedCount++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var transformed = await transformAsync(row);
|
||||||
|
if (transformed == null)
|
||||||
|
{
|
||||||
|
skippedCount++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
transformed.ImportNo = importNo;
|
||||||
|
transformed.ImportFrom = source;
|
||||||
|
|
||||||
|
var exists = existenceMap.GetValueOrDefault(importNo, false);
|
||||||
|
if (exists)
|
||||||
|
{
|
||||||
|
updateRecords.Add(transformed);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
addRecords.Add(transformed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_importLogger.LogWarning(ex, "转换记录失败: {Row}", row);
|
||||||
|
skippedCount++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RecordStep(
|
||||||
|
"数据转换",
|
||||||
|
$"转换完成：新增 {addRecords.Count}，更新 {updateRecords.Count}，跳过 {skippedCount}");
|
||||||
|
|
||||||
|
SetMetadata("add_count", addRecords.Count);
|
||||||
|
SetMetadata("update_count", updateRecords.Count);
|
||||||
|
SetMetadata("skip_count", skippedCount);
|
||||||
|
|
||||||
|
// Phase 4: 批量保存
|
||||||
|
_logger.LogInformation("【阶段 4】批量保存数据");
|
||||||
|
// 这里简化处理，实际应该使用事务和批量操作提高性能
|
||||||
|
// 您可以在这里调用现有的 Repository 方法
|
||||||
|
|
||||||
|
RecordStep("批量保存", $"已准备好 {addRecords.Count + updateRecords.Count} 条待保存记录");
|
||||||
|
|
||||||
|
var importResult = new ImportResult
|
||||||
|
{
|
||||||
|
TotalCount = rows.Length,
|
||||||
|
AddedCount = addRecords.Count,
|
||||||
|
UpdatedCount = updateRecords.Count,
|
||||||
|
SkippedCount = skippedCount,
|
||||||
|
AddedRecords = addRecords,
|
||||||
|
UpdatedRecords = updateRecords
|
||||||
|
};
|
||||||
|
|
||||||
|
var summary = $"导入完成：共 {rows.Length} 条记录，新增 {addRecords.Count}，更新 {updateRecords.Count}，跳过 {skippedCount}。";
|
||||||
|
|
||||||
|
_logger.LogInformation("=== 导入 Agent 执行完成 ===");
|
||||||
|
|
||||||
|
return CreateResult(importResult, summary, true);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "导入 Agent 执行失败");
|
||||||
|
return CreateResult(
|
||||||
|
new ImportResult { TotalCount = rows.Length },
|
||||||
|
$"导入失败: {ex.Message}",
|
||||||
|
false,
|
||||||
|
ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 导入结果
|
||||||
|
/// </summary>
|
||||||
|
public record ImportResult
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 总记录数
|
||||||
|
/// </summary>
|
||||||
|
public int TotalCount { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 新增数
|
||||||
|
/// </summary>
|
||||||
|
public int AddedCount { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新数
|
||||||
|
/// </summary>
|
||||||
|
public int UpdatedCount { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 跳过数
|
||||||
|
/// </summary>
|
||||||
|
public int SkippedCount { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 新增的记录（可选）
|
||||||
|
/// </summary>
|
||||||
|
public List<TransactionRecord> AddedRecords { get; init; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新的记录（可选）
|
||||||
|
/// </summary>
|
||||||
|
public List<TransactionRecord> UpdatedRecords { get; init; } = new();
|
||||||
|
}
|
||||||
62
Service/AgentFramework/ParsingAgent.cs
Normal file
62
Service/AgentFramework/ParsingAgent.cs
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 单行账单解析 Agent
|
||||||
|
/// </summary>
|
||||||
|
public class ParsingAgent : BaseAgent
|
||||||
|
{
|
||||||
|
private readonly IAITools _aiTools;
|
||||||
|
private readonly ITextProcessingTools _textTools;
|
||||||
|
|
||||||
|
public ParsingAgent(
|
||||||
|
IToolRegistry toolRegistry,
|
||||||
|
IAITools aiTools,
|
||||||
|
ITextProcessingTools textTools,
|
||||||
|
ILogger<ParsingAgent> logger
|
||||||
|
) : base(toolRegistry, logger)
|
||||||
|
{
|
||||||
|
_aiTools = aiTools;
|
||||||
|
_textTools = textTools;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 解析单行账单文本
|
||||||
|
/// </summary>
|
||||||
|
public async Task<AgentResult<TransactionParseResult?>> ExecuteAsync(string billText)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Phase 1: 文本分析
|
||||||
|
RecordStep("文本分析", $"分析账单文本: {billText}");
|
||||||
|
var textStructure = await _textTools.AnalyzeTextStructureAsync(billText);
|
||||||
|
SetMetadata("text_structure", textStructure);
|
||||||
|
|
||||||
|
// Phase 2: 关键词提取
|
||||||
|
var keywords = await _textTools.ExtractKeywordsAsync(billText);
|
||||||
|
RecordStep("关键词提取", $"提取到 {keywords.Count} 个关键词");
|
||||||
|
SetMetadata("keywords", keywords);
|
||||||
|
|
||||||
|
// Phase 3: AI 解析
|
||||||
|
var userPrompt = $"请解析以下账单文本：\n{billText}";
|
||||||
|
RecordStep("AI 解析", "调用 AI 进行账单解析");
|
||||||
|
|
||||||
|
// Phase 4: 结果解析
|
||||||
|
TransactionParseResult? parseResult = null;
|
||||||
|
|
||||||
|
var summary = parseResult != null
|
||||||
|
? $"成功解析账单：{parseResult.Reason}，金额 {parseResult.Amount}，日期 {parseResult.Date:yyyy-MM-dd}。"
|
||||||
|
: "账单解析失败，无法提取结构化数据。";
|
||||||
|
|
||||||
|
return CreateResult<TransactionParseResult?>(parseResult, summary, parseResult != null);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "解析 Agent 执行失败");
|
||||||
|
return CreateResult<TransactionParseResult?>(
|
||||||
|
null,
|
||||||
|
$"解析失败: {ex.Message}",
|
||||||
|
false,
|
||||||
|
ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
51
Service/AgentFramework/TextProcessingTools.cs
Normal file
51
Service/AgentFramework/TextProcessingTools.cs
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文本处理工具集
|
||||||
|
/// </summary>
|
||||||
|
public interface ITextProcessingTools
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 提取关键词
|
||||||
|
/// </summary>
|
||||||
|
Task<List<string>> ExtractKeywordsAsync(string text);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 分析文本结构
|
||||||
|
/// </summary>
|
||||||
|
Task<Dictionary<string, object?>> AnalyzeTextStructureAsync(string text);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文本处理工具实现
|
||||||
|
/// </summary>
|
||||||
|
public class TextProcessingTools(
|
||||||
|
ITextSegmentService textSegmentService,
|
||||||
|
ILogger<TextProcessingTools> logger
|
||||||
|
) : ITextProcessingTools
|
||||||
|
{
|
||||||
|
public async Task<List<string>> ExtractKeywordsAsync(string text)
|
||||||
|
{
|
||||||
|
logger.LogDebug("提取关键词: {Text}", text);
|
||||||
|
|
||||||
|
var keywords = await Task.FromResult(textSegmentService.ExtractKeywords(text));
|
||||||
|
|
||||||
|
logger.LogDebug("提取到 {Count} 个关键词: {Keywords}",
|
||||||
|
keywords.Count,
|
||||||
|
string.Join(", ", keywords));
|
||||||
|
|
||||||
|
return keywords;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Dictionary<string, object?>> AnalyzeTextStructureAsync(string text)
|
||||||
|
{
|
||||||
|
logger.LogDebug("分析文本结构");
|
||||||
|
|
||||||
|
return await Task.FromResult(new Dictionary<string, object?>
|
||||||
|
{
|
||||||
|
["length"] = text.Length,
|
||||||
|
["wordCount"] = text.Split(' ').Length,
|
||||||
|
["timestamp"] = DateTime.UtcNow
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
177
Service/AgentFramework/ToolRegistry.cs
Normal file
177
Service/AgentFramework/ToolRegistry.cs
Normal file
@@ -0,0 +1,177 @@
|
|||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Tool 注册表实现
|
||||||
|
/// </summary>
|
||||||
|
public class ToolRegistry : IToolRegistry
|
||||||
|
{
|
||||||
|
private readonly Dictionary<string, ToolDefinition> _tools = new();
|
||||||
|
private readonly ILogger<ToolRegistry> _logger;
|
||||||
|
|
||||||
|
public ToolRegistry(ILogger<ToolRegistry> logger)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RegisterTool<TResult>(
|
||||||
|
string name,
|
||||||
|
string description,
|
||||||
|
Func<Task<TResult>> handler,
|
||||||
|
string category = "General",
|
||||||
|
bool cacheable = false)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(name))
|
||||||
|
throw new ArgumentException("Tool 名称不能为空", nameof(name));
|
||||||
|
|
||||||
|
var toolDef = new ToolDefinition
|
||||||
|
{
|
||||||
|
Name = name,
|
||||||
|
Description = description,
|
||||||
|
Handler = handler,
|
||||||
|
Category = category,
|
||||||
|
Cacheable = cacheable
|
||||||
|
};
|
||||||
|
|
||||||
|
_tools[name] = toolDef;
|
||||||
|
_logger.LogInformation("已注册 Tool: {ToolName} (类别: {Category})", name, category);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RegisterTool<TParam, TResult>(
|
||||||
|
string name,
|
||||||
|
string description,
|
||||||
|
Func<TParam, Task<TResult>> handler,
|
||||||
|
string category = "General",
|
||||||
|
bool cacheable = false)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(name))
|
||||||
|
throw new ArgumentException("Tool 名称不能为空", nameof(name));
|
||||||
|
|
||||||
|
var toolDef = new ToolDefinition
|
||||||
|
{
|
||||||
|
Name = name,
|
||||||
|
Description = description,
|
||||||
|
Handler = handler,
|
||||||
|
Category = category,
|
||||||
|
Cacheable = cacheable
|
||||||
|
};
|
||||||
|
|
||||||
|
_tools[name] = toolDef;
|
||||||
|
_logger.LogInformation("已注册 Tool: {ToolName} (类别: {Category})", name, category);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RegisterTool<TParam1, TParam2, TResult>(
|
||||||
|
string name,
|
||||||
|
string description,
|
||||||
|
Func<TParam1, TParam2, Task<TResult>> handler,
|
||||||
|
string category = "General",
|
||||||
|
bool cacheable = false)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(name))
|
||||||
|
throw new ArgumentException("Tool 名称不能为空", nameof(name));
|
||||||
|
|
||||||
|
var toolDef = new ToolDefinition
|
||||||
|
{
|
||||||
|
Name = name,
|
||||||
|
Description = description,
|
||||||
|
Handler = handler,
|
||||||
|
Category = category,
|
||||||
|
Cacheable = cacheable
|
||||||
|
};
|
||||||
|
|
||||||
|
_tools[name] = toolDef;
|
||||||
|
_logger.LogInformation("已注册 Tool: {ToolName} (类别: {Category})", name, category);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ToolDefinition? GetToolDefinition(string name)
|
||||||
|
{
|
||||||
|
return _tools.TryGetValue(name, out var tool) ? tool : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<ToolDefinition> GetAllTools()
|
||||||
|
{
|
||||||
|
return _tools.Values;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<ToolDefinition> GetToolsByCategory(string category)
|
||||||
|
{
|
||||||
|
return _tools.Values.Where(t => t.Category == category);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<TResult> InvokeToolAsync<TResult>(string toolName)
|
||||||
|
{
|
||||||
|
if (!_tools.TryGetValue(toolName, out var toolDef))
|
||||||
|
throw new InvalidOperationException($"未找到 Tool: {toolName}");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_logger.LogDebug("调用 Tool: {ToolName}", toolName);
|
||||||
|
|
||||||
|
if (toolDef.Handler is Func<Task<TResult>> handler)
|
||||||
|
{
|
||||||
|
var result = await handler();
|
||||||
|
_logger.LogDebug("Tool {ToolName} 执行成功", toolName);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new InvalidOperationException($"Tool {toolName} 签名不匹配");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Tool {ToolName} 执行失败", toolName);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<TResult> InvokeToolAsync<TParam, TResult>(string toolName, TParam param)
|
||||||
|
{
|
||||||
|
if (!_tools.TryGetValue(toolName, out var toolDef))
|
||||||
|
throw new InvalidOperationException($"未找到 Tool: {toolName}");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_logger.LogDebug("调用 Tool: {ToolName}, 参数: {Param}", toolName, param);
|
||||||
|
|
||||||
|
if (toolDef.Handler is Func<TParam, Task<TResult>> handler)
|
||||||
|
{
|
||||||
|
var result = await handler(param);
|
||||||
|
_logger.LogDebug("Tool {ToolName} 执行成功", toolName);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new InvalidOperationException($"Tool {toolName} 签名不匹配");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Tool {ToolName} 执行失败", toolName);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<TResult> InvokeToolAsync<TParam1, TParam2, TResult>(
|
||||||
|
string toolName,
|
||||||
|
TParam1 param1,
|
||||||
|
TParam2 param2)
|
||||||
|
{
|
||||||
|
if (!_tools.TryGetValue(toolName, out var toolDef))
|
||||||
|
throw new InvalidOperationException($"未找到 Tool: {toolName}");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_logger.LogDebug("调用 Tool: {ToolName}, 参数: {Param1}, {Param2}", toolName, param1, param2);
|
||||||
|
|
||||||
|
if (toolDef.Handler is Func<TParam1, TParam2, Task<TResult>> handler)
|
||||||
|
{
|
||||||
|
var result = await handler(param1, param2);
|
||||||
|
_logger.LogDebug("Tool {ToolName} 执行成功", toolName);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new InvalidOperationException($"Tool {toolName} 签名不匹配");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "Tool {ToolName} 执行失败", toolName);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
150
Service/AgentFramework/TransactionQueryTools.cs
Normal file
150
Service/AgentFramework/TransactionQueryTools.cs
Normal file
@@ -0,0 +1,150 @@
|
|||||||
|
namespace Service.AgentFramework;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 账单分类查询工具集
|
||||||
|
/// </summary>
|
||||||
|
public interface ITransactionQueryTools
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 查询待分类的账单记录
|
||||||
|
/// </summary>
|
||||||
|
Task<TransactionRecord[]> QueryUnclassifiedRecordsAsync(long[] transactionIds);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 按关键词查询已分类的相似记录（带评分）
|
||||||
|
/// </summary>
|
||||||
|
Task<List<(TransactionRecord record, double relevanceScore)>> QueryClassifiedByKeywordsAsync(
|
||||||
|
List<string> keywords,
|
||||||
|
double minMatchRate = 0.4,
|
||||||
|
int limit = 10);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 批量查询账单是否已存在（按导入编号）
|
||||||
|
/// </summary>
|
||||||
|
Task<Dictionary<string, bool>> BatchCheckExistsByImportNoAsync(
|
||||||
|
string[] importNos,
|
||||||
|
string source);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取所有分类信息
|
||||||
|
/// </summary>
|
||||||
|
Task<string> GetCategoryInfoAsync();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新账单分类信息
|
||||||
|
/// </summary>
|
||||||
|
Task<bool> UpdateTransactionClassifyAsync(
|
||||||
|
long transactionId,
|
||||||
|
string classify,
|
||||||
|
TransactionType type);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 账单分类查询工具实现
|
||||||
|
/// </summary>
|
||||||
|
public class TransactionQueryTools(
|
||||||
|
ITransactionRecordRepository transactionRepository,
|
||||||
|
ITransactionCategoryRepository categoryRepository,
|
||||||
|
ILogger<TransactionQueryTools> logger
|
||||||
|
) : ITransactionQueryTools
|
||||||
|
{
|
||||||
|
public async Task<TransactionRecord[]> QueryUnclassifiedRecordsAsync(long[] transactionIds)
|
||||||
|
{
|
||||||
|
logger.LogInformation("查询待分类记录，ID 数量: {Count}", transactionIds.Length);
|
||||||
|
|
||||||
|
var records = await transactionRepository.GetByIdsAsync(transactionIds);
|
||||||
|
var unclassified = records
|
||||||
|
.Where(x => string.IsNullOrEmpty(x.Classify))
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
logger.LogInformation("找到 {Count} 条待分类记录", unclassified.Length);
|
||||||
|
return unclassified;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<(TransactionRecord record, double relevanceScore)>> QueryClassifiedByKeywordsAsync(
|
||||||
|
List<string> keywords,
|
||||||
|
double minMatchRate = 0.4,
|
||||||
|
int limit = 10)
|
||||||
|
{
|
||||||
|
logger.LogInformation("按关键词查询相似记录，关键词: {Keywords}", string.Join(", ", keywords));
|
||||||
|
|
||||||
|
var result = await transactionRepository.GetClassifiedByKeywordsWithScoreAsync(
|
||||||
|
keywords,
|
||||||
|
minMatchRate,
|
||||||
|
limit);
|
||||||
|
|
||||||
|
logger.LogInformation("找到 {Count} 条相似记录，相关度分数: {Scores}",
|
||||||
|
result.Count,
|
||||||
|
string.Join(", ", result.Select(x => $"{x.record.Reason}({x.relevanceScore:F2})")));
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Dictionary<string, bool>> BatchCheckExistsByImportNoAsync(
|
||||||
|
string[] importNos,
|
||||||
|
string source)
|
||||||
|
{
|
||||||
|
logger.LogInformation("批量检查导入编号是否存在，数量: {Count}，来源: {Source}",
|
||||||
|
importNos.Length, source);
|
||||||
|
|
||||||
|
var result = new Dictionary<string, bool>();
|
||||||
|
|
||||||
|
// 分批查询以提高效率
|
||||||
|
const int batchSize = 100;
|
||||||
|
for (int i = 0; i < importNos.Length; i += batchSize)
|
||||||
|
{
|
||||||
|
var batch = importNos.Skip(i).Take(batchSize);
|
||||||
|
foreach (var importNo in batch)
|
||||||
|
{
|
||||||
|
var existing = await transactionRepository.ExistsByImportNoAsync(importNo, source);
|
||||||
|
result[importNo] = existing != null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var existCount = result.Values.Count(v => v);
|
||||||
|
logger.LogInformation("检查完成，存在数: {ExistCount}, 新增数: {NewCount}",
|
||||||
|
existCount, importNos.Length - existCount);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<string> GetCategoryInfoAsync()
|
||||||
|
{
|
||||||
|
logger.LogInformation("获取分类信息");
|
||||||
|
|
||||||
|
var categories = await categoryRepository.GetAllAsync();
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
|
||||||
|
sb.AppendLine("可用分类列表：");
|
||||||
|
foreach (var cat in categories)
|
||||||
|
{
|
||||||
|
sb.AppendLine($"- {cat.Name}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> UpdateTransactionClassifyAsync(
|
||||||
|
long transactionId,
|
||||||
|
string classify,
|
||||||
|
TransactionType type)
|
||||||
|
{
|
||||||
|
logger.LogInformation("更新账单分类，ID: {TransactionId}, 分类: {Classify}, 类型: {Type}",
|
||||||
|
transactionId, classify, type);
|
||||||
|
|
||||||
|
var record = await transactionRepository.GetByIdAsync(transactionId);
|
||||||
|
if (record == null)
|
||||||
|
{
|
||||||
|
logger.LogWarning("未找到交易记录，ID: {TransactionId}", transactionId);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
record.Classify = classify;
|
||||||
|
record.Type = type;
|
||||||
|
|
||||||
|
var result = await transactionRepository.UpdateAsync(record);
|
||||||
|
logger.LogInformation("账单分类更新结果: {Success}", result);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
|||||||
@@ -1,929 +0,0 @@
|
|||||||
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>
|
|
||||||
|
|
||||||
计划收入:
|
|
||||||
<span class='income-value'>
|
|
||||||
<strong>{monthlyIncomeItems.Sum(item => item.limit):N0}</strong>
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
""");
|
|
||||||
if (yearlyIncomeItems.Count > 0)
|
|
||||||
{
|
|
||||||
description.AppendLine($"""
|
|
||||||
<p>
|
|
||||||
|
|
||||||
+ 本月发生的年度预算收入:
|
|
||||||
<span class='income-value'>
|
|
||||||
<strong>{yearlyIncomeItems.Sum(item => item.current):N0}</strong>
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
""");
|
|
||||||
}
|
|
||||||
description.AppendLine($"""
|
|
||||||
<p>
|
|
||||||
|
|
||||||
- 计划支出:
|
|
||||||
<span class='expense-value'>
|
|
||||||
<strong>{monthlyExpenseItems.Sum(item => item.limit):N0}</strong>
|
|
||||||
</span>
|
|
||||||
""");
|
|
||||||
if (yearlyExpenseItems.Count > 0)
|
|
||||||
{
|
|
||||||
description.AppendLine($"""
|
|
||||||
<p>
|
|
||||||
|
|
||||||
- 本月发生的年度预算支出:
|
|
||||||
<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) + "月";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,548 +0,0 @@
|
|||||||
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
728
Service/BudgetService.cs
Normal file
728
Service/BudgetService.cs
Normal file
@@ -0,0 +1,728 @@
|
|||||||
|
namespace Service;
|
||||||
|
|
||||||
|
public interface IBudgetService
|
||||||
|
{
|
||||||
|
Task<List<BudgetResult>> GetListAsync(DateTime? referenceDate = null);
|
||||||
|
|
||||||
|
Task<BudgetResult?> GetStatisticsAsync(long id, DateTime referenceDate);
|
||||||
|
|
||||||
|
Task<string> ArchiveBudgetsAsync(int year, int month);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取指定分类的统计信息（月度和年度）
|
||||||
|
/// </summary>
|
||||||
|
Task<BudgetCategoryStats> GetCategoryStatsAsync(BudgetCategory category, DateTime? referenceDate = null);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取未被预算覆盖的分类统计信息
|
||||||
|
/// </summary>
|
||||||
|
Task<List<UncoveredCategoryDetail>> GetUncoveredCategoriesAsync(BudgetCategory category, DateTime? referenceDate = null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public class BudgetService(
|
||||||
|
IBudgetRepository budgetRepository,
|
||||||
|
IBudgetArchiveRepository budgetArchiveRepository,
|
||||||
|
ITransactionRecordRepository transactionRecordRepository,
|
||||||
|
IOpenAiService openAiService,
|
||||||
|
IConfigService configService,
|
||||||
|
IMessageService messageService,
|
||||||
|
ILogger<BudgetService> logger
|
||||||
|
) : IBudgetService
|
||||||
|
{
|
||||||
|
public async Task<List<BudgetResult>> GetListAsync(DateTime? referenceDate = null)
|
||||||
|
{
|
||||||
|
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 GetVirtualSavingsDtoAsync(
|
||||||
|
BudgetPeriodType.Month,
|
||||||
|
referenceDate,
|
||||||
|
budgets));
|
||||||
|
dtos.Add(await GetVirtualSavingsDtoAsync(
|
||||||
|
BudgetPeriodType.Year,
|
||||||
|
referenceDate,
|
||||||
|
budgets));
|
||||||
|
|
||||||
|
return dtos.Where(dto => dto != null).Cast<BudgetResult>().ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<BudgetResult?> GetStatisticsAsync(long id, DateTime referenceDate)
|
||||||
|
{
|
||||||
|
bool isArchive = false;
|
||||||
|
BudgetRecord? budget = null;
|
||||||
|
if (id == -1)
|
||||||
|
{
|
||||||
|
if (isAcrhiveFunc(BudgetPeriodType.Year))
|
||||||
|
{
|
||||||
|
isArchive = true;
|
||||||
|
budget = await BuildVirtualSavingsBudgetRecordAsync(-1, referenceDate, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (id == -2)
|
||||||
|
{
|
||||||
|
if (isAcrhiveFunc(BudgetPeriodType.Month))
|
||||||
|
{
|
||||||
|
isArchive = true;
|
||||||
|
budget = await BuildVirtualSavingsBudgetRecordAsync(-2, referenceDate, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
budget = await budgetRepository.GetByIdAsync(id);
|
||||||
|
|
||||||
|
if (budget == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
isArchive = isAcrhiveFunc(budget.Type);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isArchive && budget != null)
|
||||||
|
{
|
||||||
|
var archive = await budgetArchiveRepository.GetArchiveAsync(
|
||||||
|
id,
|
||||||
|
referenceDate.Year,
|
||||||
|
referenceDate.Month);
|
||||||
|
|
||||||
|
if (archive != null) // 存在归档 直接读取归档数据
|
||||||
|
{
|
||||||
|
budget.Limit = archive.BudgetedAmount;
|
||||||
|
return BudgetResult.FromEntity(
|
||||||
|
budget,
|
||||||
|
archive.RealizedAmount,
|
||||||
|
referenceDate,
|
||||||
|
archive.Description ?? string.Empty);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (id == -1)
|
||||||
|
{
|
||||||
|
return await GetVirtualSavingsDtoAsync(BudgetPeriodType.Year, referenceDate);
|
||||||
|
}
|
||||||
|
if (id == -2)
|
||||||
|
{
|
||||||
|
return await GetVirtualSavingsDtoAsync(BudgetPeriodType.Month, referenceDate);
|
||||||
|
}
|
||||||
|
|
||||||
|
budget = await budgetRepository.GetByIdAsync(id);
|
||||||
|
if (budget == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var currentAmount = await CalculateCurrentAmountAsync(budget, referenceDate);
|
||||||
|
return BudgetResult.FromEntity(budget, currentAmount, referenceDate);
|
||||||
|
|
||||||
|
bool isAcrhiveFunc(BudgetPeriodType periodType)
|
||||||
|
{
|
||||||
|
if (periodType == BudgetPeriodType.Year)
|
||||||
|
{
|
||||||
|
return DateTime.Now.Year > referenceDate.Year;
|
||||||
|
}
|
||||||
|
else if (periodType == BudgetPeriodType.Month)
|
||||||
|
{
|
||||||
|
return DateTime.Now.Year > referenceDate.Year
|
||||||
|
|| (DateTime.Now.Year == referenceDate.Year
|
||||||
|
&& DateTime.Now.Month > referenceDate.Month);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<BudgetCategoryStats> GetCategoryStatsAsync(BudgetCategory category, DateTime? referenceDate = null)
|
||||||
|
{
|
||||||
|
var budgets = (await budgetRepository.GetAllAsync()).ToList();
|
||||||
|
var refDate = referenceDate ?? DateTime.Now;
|
||||||
|
|
||||||
|
var result = new BudgetCategoryStats();
|
||||||
|
|
||||||
|
// 获取月度统计
|
||||||
|
result.Month = await CalculateCategoryStatsAsync(budgets, category, BudgetPeriodType.Month, refDate);
|
||||||
|
|
||||||
|
// 获取年度统计
|
||||||
|
result.Year = await CalculateCategoryStatsAsync(budgets, category, BudgetPeriodType.Year, refDate);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<List<UncoveredCategoryDetail>> GetUncoveredCategoriesAsync(BudgetCategory category, DateTime? referenceDate = null)
|
||||||
|
{
|
||||||
|
var date = referenceDate ?? DateTime.Now;
|
||||||
|
var transactionType = category switch
|
||||||
|
{
|
||||||
|
BudgetCategory.Expense => TransactionType.Expense,
|
||||||
|
BudgetCategory.Income => TransactionType.Income,
|
||||||
|
_ => TransactionType.None
|
||||||
|
};
|
||||||
|
|
||||||
|
if (transactionType == TransactionType.None) return new List<UncoveredCategoryDetail>();
|
||||||
|
|
||||||
|
// 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 transactionRecordRepository.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();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<BudgetStatsDto> CalculateCategoryStatsAsync(
|
||||||
|
List<BudgetRecord> budgets,
|
||||||
|
BudgetCategory category,
|
||||||
|
BudgetPeriodType statType,
|
||||||
|
DateTime referenceDate)
|
||||||
|
{
|
||||||
|
var result = new BudgetStatsDto
|
||||||
|
{
|
||||||
|
PeriodType = statType,
|
||||||
|
Rate = 0,
|
||||||
|
Current = 0,
|
||||||
|
Limit = 0,
|
||||||
|
Count = 0
|
||||||
|
};
|
||||||
|
|
||||||
|
// 获取当前分类下所有预算
|
||||||
|
var relevant = budgets
|
||||||
|
.Where(b => b.Category == category)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
if (relevant.Count == 0)
|
||||||
|
{
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
result.Count = relevant.Count;
|
||||||
|
decimal totalCurrent = 0;
|
||||||
|
decimal totalLimit = 0;
|
||||||
|
|
||||||
|
foreach (var budget in relevant)
|
||||||
|
{
|
||||||
|
// 限额折算
|
||||||
|
var itemLimit = budget.Limit;
|
||||||
|
if (statType == BudgetPeriodType.Month && budget.Type == BudgetPeriodType.Year)
|
||||||
|
{
|
||||||
|
// 月度视图下，年度预算不参与限额计算
|
||||||
|
itemLimit = 0;
|
||||||
|
}
|
||||||
|
else if (statType == BudgetPeriodType.Year && budget.Type == BudgetPeriodType.Month)
|
||||||
|
{
|
||||||
|
// 年度视图下，月度预算折算为年度
|
||||||
|
itemLimit = budget.Limit * 12;
|
||||||
|
}
|
||||||
|
totalLimit += itemLimit;
|
||||||
|
|
||||||
|
// 当前值累加
|
||||||
|
var currentAmount = await CalculateCurrentAmountAsync(budget, referenceDate);
|
||||||
|
if (budget.Type == statType)
|
||||||
|
{
|
||||||
|
totalCurrent += currentAmount;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// 如果周期不匹配
|
||||||
|
if (statType == BudgetPeriodType.Year && budget.Type == BudgetPeriodType.Month)
|
||||||
|
{
|
||||||
|
// 在年度视图下，月度预算计入其当前值（作为对年度目前的贡献）
|
||||||
|
totalCurrent += currentAmount;
|
||||||
|
}
|
||||||
|
// 月度视图下，年度预算的 current 不计入
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result.Limit = totalLimit;
|
||||||
|
result.Current = totalCurrent;
|
||||||
|
result.Rate = totalLimit > 0 ? totalCurrent / totalLimit * 100 : 0;
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<string> ArchiveBudgetsAsync(int year, int month)
|
||||||
|
{
|
||||||
|
var referenceDate = new DateTime(year, month, 1);
|
||||||
|
var budgets = await GetListAsync(referenceDate);
|
||||||
|
|
||||||
|
var addArchives = new List<BudgetArchive>();
|
||||||
|
var updateArchives = new List<BudgetArchive>();
|
||||||
|
foreach (var budget in budgets)
|
||||||
|
{
|
||||||
|
var archive = await budgetArchiveRepository.GetArchiveAsync(budget.Id, year, month);
|
||||||
|
|
||||||
|
if (archive != null)
|
||||||
|
{
|
||||||
|
archive.RealizedAmount = budget.Current;
|
||||||
|
archive.ArchiveDate = DateTime.Now;
|
||||||
|
archive.Description = budget.Description;
|
||||||
|
updateArchives.Add(archive);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
archive = new BudgetArchive
|
||||||
|
{
|
||||||
|
BudgetId = budget.Id,
|
||||||
|
BudgetType = budget.Type,
|
||||||
|
Year = year,
|
||||||
|
Month = month,
|
||||||
|
BudgetedAmount = budget.Limit,
|
||||||
|
RealizedAmount = budget.Current,
|
||||||
|
Description = budget.Description,
|
||||||
|
ArchiveDate = DateTime.Now
|
||||||
|
};
|
||||||
|
|
||||||
|
addArchives.Add(archive);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (addArchives.Count > 0)
|
||||||
|
{
|
||||||
|
if (!await budgetArchiveRepository.AddRangeAsync(addArchives))
|
||||||
|
{
|
||||||
|
return "保存预算归档失败";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (updateArchives.Count > 0)
|
||||||
|
{
|
||||||
|
if (!await budgetArchiveRepository.UpdateRangeAsync(updateArchives))
|
||||||
|
{
|
||||||
|
return "更新预算归档失败";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = NotifyAsync(year, month);
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task NotifyAsync(int year, int month)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var archives = await budgetArchiveRepository.GetListAsync(year, month);
|
||||||
|
var budgets = await budgetRepository.GetAllAsync();
|
||||||
|
var budgetMap = budgets.ToDictionary(b => b.Id, b => b);
|
||||||
|
|
||||||
|
var archiveData = archives.Select(a =>
|
||||||
|
{
|
||||||
|
budgetMap.TryGetValue(a.BudgetId, out var br);
|
||||||
|
var name = br?.Name ?? (a.BudgetId == -1 ? "年度存款" : a.BudgetId == -2 ? "月度存款" : "未知");
|
||||||
|
return new
|
||||||
|
{
|
||||||
|
Name = name,
|
||||||
|
Type = a.BudgetType.ToString(),
|
||||||
|
Limit = a.BudgetedAmount,
|
||||||
|
Actual = a.RealizedAmount,
|
||||||
|
Category = br?.Category.ToString() ?? (a.BudgetId < 0 ? "Savings" : "Unknown")
|
||||||
|
};
|
||||||
|
}).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 = budgets
|
||||||
|
.Where(b => !string.IsNullOrEmpty(b.SelectedCategories))
|
||||||
|
.SelectMany(b => b.SelectedCategories.Split(','))
|
||||||
|
.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}月
|
||||||
|
账单数据说明：支出金额已取绝对值（TotalAmount 为正数表示支出/收入的总量）。
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
【格式要求】
|
||||||
|
1. 使用HTML格式（移动端H5页面风格）
|
||||||
|
2. 生成清晰的报告标题（基于用户问题）
|
||||||
|
3. 使用表格展示统计数据（table > thead/tbody > tr > th/td）
|
||||||
|
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 包裹大段内容
|
||||||
|
|
||||||
|
【系统信息】
|
||||||
|
当前时间：{DateTime.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");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "生成预算执行通知报告失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<decimal> CalculateCurrentAmountAsync(BudgetRecord budget, DateTime? now = null)
|
||||||
|
{
|
||||||
|
var referenceDate = now ?? DateTime.Now;
|
||||||
|
var (startDate, endDate) = GetPeriodRange(budget.StartDate, budget.Type, referenceDate);
|
||||||
|
|
||||||
|
return await budgetRepository.GetCurrentAmountAsync(budget, startDate, endDate);
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<BudgetResult?> GetVirtualSavingsDtoAsync(
|
||||||
|
BudgetPeriodType periodType,
|
||||||
|
DateTime? referenceDate = null,
|
||||||
|
IEnumerable<BudgetRecord>? existingBudgets = null)
|
||||||
|
{
|
||||||
|
var allBudgets = existingBudgets;
|
||||||
|
|
||||||
|
if (existingBudgets == null)
|
||||||
|
{
|
||||||
|
allBudgets = await budgetRepository.GetAllAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (allBudgets == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var date = referenceDate ?? DateTime.Now;
|
||||||
|
|
||||||
|
decimal incomeLimitAtPeriod = 0;
|
||||||
|
decimal expenseLimitAtPeriod = 0;
|
||||||
|
|
||||||
|
var incomeItems = new List<(string Name, decimal Limit, decimal Factor, decimal Total)>();
|
||||||
|
var expenseItems = new List<(string Name, decimal Limit, decimal Factor, decimal Total)>();
|
||||||
|
|
||||||
|
foreach (var b in allBudgets)
|
||||||
|
{
|
||||||
|
if (b.Category == BudgetCategory.Savings) continue;
|
||||||
|
|
||||||
|
// 折算系数：根据当前请求的 periodType (Year 或 Month)，将预算 b 的 Limit 折算过来
|
||||||
|
decimal factor = 1.0m;
|
||||||
|
|
||||||
|
if (periodType == BudgetPeriodType.Year)
|
||||||
|
{
|
||||||
|
factor = b.Type switch
|
||||||
|
{
|
||||||
|
BudgetPeriodType.Month => 12,
|
||||||
|
BudgetPeriodType.Year => 1,
|
||||||
|
_ => 0
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else if (periodType == BudgetPeriodType.Month)
|
||||||
|
{
|
||||||
|
factor = b.Type switch
|
||||||
|
{
|
||||||
|
BudgetPeriodType.Month => 1,
|
||||||
|
BudgetPeriodType.Year => 0,
|
||||||
|
_ => 0
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
factor = 0; // 其他周期暂不计算虚拟存款
|
||||||
|
}
|
||||||
|
|
||||||
|
if (factor <= 0) continue;
|
||||||
|
|
||||||
|
var subtotal = b.Limit * factor;
|
||||||
|
if (b.Category == BudgetCategory.Income)
|
||||||
|
{
|
||||||
|
incomeLimitAtPeriod += subtotal;
|
||||||
|
incomeItems.Add((b.Name, b.Limit, factor, subtotal));
|
||||||
|
}
|
||||||
|
else if (b.Category == BudgetCategory.Expense)
|
||||||
|
{
|
||||||
|
expenseLimitAtPeriod += subtotal;
|
||||||
|
expenseItems.Add((b.Name, b.Limit, factor, subtotal));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var description = new StringBuilder();
|
||||||
|
description.Append("<h3>预算收入明细</h3>");
|
||||||
|
if (incomeItems.Count == 0) description.Append("<p>无收入预算</p>");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
description.Append("<table><thead><tr><th>名称</th><th>金额</th><th>折算</th><th>合计</th></tr></thead><tbody>");
|
||||||
|
foreach (var item in incomeItems)
|
||||||
|
{
|
||||||
|
description.Append($"<tr><td>{item.Name}</td><td>{item.Limit:N0}</td><td>x{item.Factor:0.##}</td><td><span class='income-value'>{item.Total:N0}</span></td></tr>");
|
||||||
|
}
|
||||||
|
description.Append("</tbody></table>");
|
||||||
|
}
|
||||||
|
description.Append($"<p>收入合计: <span class='income-value'><strong>{incomeLimitAtPeriod:N0}</strong></span></p>");
|
||||||
|
|
||||||
|
description.Append("<h3>预算支出明细</h3>");
|
||||||
|
if (expenseItems.Count == 0) description.Append("<p>无支出预算</p>");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
description.Append("<table><thead><tr><th>名称</th><th>金额</th><th>折算</th><th>合计</th></tr></thead><tbody>");
|
||||||
|
foreach (var item in expenseItems)
|
||||||
|
{
|
||||||
|
description.Append($"<tr><td>{item.Name}</td><td>{item.Limit:N0}</td><td>x{item.Factor:0.##}</td><td><span class='expense-value'>{item.Total:N0}</span></td></tr>");
|
||||||
|
}
|
||||||
|
description.Append("</tbody></table>");
|
||||||
|
}
|
||||||
|
description.Append($"<p>支出合计: <span class='expense-value'><strong>{expenseLimitAtPeriod:N0}</strong></span></p>");
|
||||||
|
|
||||||
|
description.Append("<h3>存款计划结论</h3>");
|
||||||
|
description.Append($"<p>计划存款 = 收入 <span class='income-value'>{incomeLimitAtPeriod:N0}</span> - 支出 <span class='expense-value'>{expenseLimitAtPeriod:N0}</span></p>");
|
||||||
|
description.Append($"<p>最终目标：<span class='highlight'><strong>{incomeLimitAtPeriod - expenseLimitAtPeriod:N0}</strong></span></p>");
|
||||||
|
|
||||||
|
var virtualBudget = await BuildVirtualSavingsBudgetRecordAsync(
|
||||||
|
periodType == BudgetPeriodType.Year ? -1 : -2,
|
||||||
|
date,
|
||||||
|
incomeLimitAtPeriod - expenseLimitAtPeriod);
|
||||||
|
|
||||||
|
// 计算实际发生的 收入 - 支出
|
||||||
|
var current = await CalculateCurrentAmountAsync(new BudgetRecord
|
||||||
|
{
|
||||||
|
Category = virtualBudget.Category,
|
||||||
|
Type = virtualBudget.Type,
|
||||||
|
SelectedCategories = virtualBudget.SelectedCategories,
|
||||||
|
StartDate = virtualBudget.StartDate,
|
||||||
|
}, date);
|
||||||
|
|
||||||
|
return BudgetResult.FromEntity(virtualBudget, current, date, description.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<BudgetRecord> BuildVirtualSavingsBudgetRecordAsync(
|
||||||
|
long id,
|
||||||
|
DateTime date,
|
||||||
|
decimal limit)
|
||||||
|
{
|
||||||
|
var savingsCategories = await configService.GetConfigByKeyAsync<string>("SavingsCategories") ?? string.Empty;
|
||||||
|
return new BudgetRecord
|
||||||
|
{
|
||||||
|
Id = id,
|
||||||
|
Name = id == -1 ? "年度存款" : "月度存款",
|
||||||
|
Category = BudgetCategory.Savings,
|
||||||
|
Type = id == -1 ? BudgetPeriodType.Year : BudgetPeriodType.Month,
|
||||||
|
Limit = limit,
|
||||||
|
StartDate = id == -1
|
||||||
|
? new DateTime(date.Year, 1, 1)
|
||||||
|
: new DateTime(date.Year, date.Month, 1),
|
||||||
|
SelectedCategories = savingsCategories
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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; } = Array.Empty<string>();
|
||||||
|
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 string Description { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
public static BudgetResult FromEntity(
|
||||||
|
BudgetRecord entity,
|
||||||
|
decimal currentAmount = 0,
|
||||||
|
DateTime? referenceDate = null,
|
||||||
|
string description = "")
|
||||||
|
{
|
||||||
|
var date = referenceDate ?? DateTime.Now;
|
||||||
|
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)
|
||||||
|
? Array.Empty<string>()
|
||||||
|
: 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,
|
||||||
|
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 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; }
|
||||||
|
}
|
||||||
@@ -43,12 +43,12 @@ public class ConfigService(IConfigRepository configRepository) : IConfigService
|
|||||||
var config = await configRepository.GetByKeyAsync(key);
|
var config = await configRepository.GetByKeyAsync(key);
|
||||||
var type = typeof(T) switch
|
var type = typeof(T) switch
|
||||||
{
|
{
|
||||||
{ } t when t == typeof(bool) => ConfigType.Boolean,
|
Type t when t == typeof(bool) => ConfigType.Boolean,
|
||||||
{ } t when t == typeof(int)
|
Type t when t == typeof(int)
|
||||||
|| t == typeof(double)
|
|| t == typeof(double)
|
||||||
|| t == typeof(float)
|
|| t == typeof(float)
|
||||||
|| t == typeof(decimal) => ConfigType.Number,
|
|| t == typeof(decimal) => ConfigType.Number,
|
||||||
{ } t when t == typeof(string) => ConfigType.String,
|
Type t when t == typeof(string) => ConfigType.String,
|
||||||
_ => ConfigType.Json
|
_ => ConfigType.Json
|
||||||
};
|
};
|
||||||
var valueStr = type switch
|
var valueStr = type switch
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
using Service.AI;
|
using Service.EmailParseServices;
|
||||||
using Service.EmailServices.EmailParse;
|
|
||||||
using Service.Message;
|
|
||||||
|
|
||||||
namespace Service.EmailServices;
|
namespace Service.EmailServices;
|
||||||
|
|
||||||
@@ -67,7 +65,7 @@ public class EmailHandleService(
|
|||||||
await messageService.AddAsync(
|
await messageService.AddAsync(
|
||||||
"邮件解析失败",
|
"邮件解析失败",
|
||||||
$"来自 {from} 发送给 {to} 的邮件（主题：{subject}）未能成功解析内容，可能格式已变更或不受支持。",
|
$"来自 {from} 发送给 {to} 的邮件（主题：{subject}）未能成功解析内容，可能格式已变更或不受支持。",
|
||||||
url: "/balance?tab=email"
|
url: $"/balance?tab=email"
|
||||||
);
|
);
|
||||||
logger.LogWarning("未能成功解析邮件内容，跳过账单处理");
|
logger.LogWarning("未能成功解析邮件内容，跳过账单处理");
|
||||||
return true;
|
return true;
|
||||||
@@ -75,7 +73,7 @@ public class EmailHandleService(
|
|||||||
|
|
||||||
logger.LogInformation("成功解析邮件，共 {Count} 条交易记录", parsed.Length);
|
logger.LogInformation("成功解析邮件，共 {Count} 条交易记录", parsed.Length);
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
@@ -144,7 +142,7 @@ public class EmailHandleService(
|
|||||||
|
|
||||||
logger.LogInformation("成功解析邮件，共 {Count} 条交易记录", parsed.Length);
|
logger.LogInformation("成功解析邮件，共 {Count} 条交易记录", parsed.Length);
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
@@ -179,7 +177,7 @@ public class EmailHandleService(
|
|||||||
{
|
{
|
||||||
var clone = records.ToArray().DeepClone();
|
var clone = records.ToArray().DeepClone();
|
||||||
|
|
||||||
if (clone?.Any() != true)
|
if(clone?.Any() != true)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
using Service.AI;
|
namespace Service.EmailParseServices;
|
||||||
|
|
||||||
namespace Service.EmailServices.EmailParse;
|
|
||||||
|
|
||||||
public class EmailParseForm95555(
|
public class EmailParseForm95555(
|
||||||
ILogger<EmailParseForm95555> logger,
|
ILogger<EmailParseForm95555> logger,
|
||||||
@@ -28,7 +26,7 @@ public class EmailParseForm95555(
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Task<(
|
public override async Task<(
|
||||||
string card,
|
string card,
|
||||||
string reason,
|
string reason,
|
||||||
decimal amount,
|
decimal amount,
|
||||||
@@ -53,7 +51,7 @@ public class EmailParseForm95555(
|
|||||||
if (matches.Count <= 0)
|
if (matches.Count <= 0)
|
||||||
{
|
{
|
||||||
logger.LogWarning("未能从招商银行邮件内容中解析出交易信息");
|
logger.LogWarning("未能从招商银行邮件内容中解析出交易信息");
|
||||||
return Task.FromResult<(string card, string reason, decimal amount, decimal balance, TransactionType type, DateTime? occurredAt)[]>([]);
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
var results = new List<(
|
var results = new List<(
|
||||||
@@ -72,7 +70,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;
|
||||||
}
|
}
|
||||||
@@ -87,7 +85,7 @@ public class EmailParseForm95555(
|
|||||||
results.Add((card, reason, amount, balance, type, occurredAt));
|
results.Add((card, reason, amount, balance, type, occurredAt));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Task.FromResult(results.ToArray());
|
return results.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
private DateTime? ParseOccurredAt(string value)
|
private DateTime? ParseOccurredAt(string value)
|
||||||
|
|||||||
@@ -1,19 +1,12 @@
|
|||||||
using HtmlAgilityPack;
|
using HtmlAgilityPack;
|
||||||
using Service.AI;
|
|
||||||
// ReSharper disable ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
|
|
||||||
// ReSharper disable ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
|
|
||||||
|
|
||||||
namespace Service.EmailServices.EmailParse;
|
namespace Service.EmailParseServices;
|
||||||
|
|
||||||
[UsedImplicitly]
|
public class EmailParseFormCCSVC(
|
||||||
public partial class EmailParseFormCcsvc(
|
ILogger<EmailParseFormCCSVC> logger,
|
||||||
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"))
|
||||||
@@ -27,7 +20,12 @@ public partial class EmailParseFormCcsvc(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 必须包含HTML标签
|
// 必须包含HTML标签
|
||||||
return HtmlRegex().IsMatch(body);
|
if (!Regex.IsMatch(body, "<.*?>"))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override async Task<(
|
public override async Task<(
|
||||||
@@ -49,7 +47,7 @@ public partial class EmailParseFormCcsvc(
|
|||||||
if (dateNode == null)
|
if (dateNode == null)
|
||||||
{
|
{
|
||||||
logger.LogWarning("Date node not found");
|
logger.LogWarning("Date node not found");
|
||||||
return [];
|
return Array.Empty<(string, string, decimal, decimal, TransactionType, DateTime?)>();
|
||||||
}
|
}
|
||||||
|
|
||||||
var dateText = dateNode.InnerText.Trim();
|
var dateText = dateNode.InnerText.Trim();
|
||||||
@@ -58,7 +56,7 @@ public partial 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 [];
|
return Array.Empty<(string, string, decimal, decimal, TransactionType, DateTime?)>();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Get Balance (Available Limit)
|
// 2. Get Balance (Available Limit)
|
||||||
@@ -92,7 +90,6 @@ public partial class EmailParseFormCcsvc(
|
|||||||
{
|
{
|
||||||
foreach (var node in transactionNodes)
|
foreach (var node in transactionNodes)
|
||||||
{
|
{
|
||||||
var card = "";
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Time
|
// Time
|
||||||
@@ -125,23 +122,30 @@ public partial 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([' '], StringSplitOptions.RemoveEmptyEntries);
|
var parts = descText.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
|
||||||
var reason = descText;
|
string card = "";
|
||||||
TransactionType type;
|
string reason = descText;
|
||||||
|
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;
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
using Service.AI;
|
namespace Service.EmailParseServices;
|
||||||
|
|
||||||
namespace Service.EmailServices.EmailParse;
|
|
||||||
|
|
||||||
public interface IEmailParseServices
|
public interface IEmailParseServices
|
||||||
{
|
{
|
||||||
@@ -47,7 +45,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解析邮件内容也未能提取到任何交易记录");
|
||||||
}
|
}
|
||||||
@@ -150,19 +148,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)
|
||||||
{
|
{
|
||||||
var card = obj.TryGetProperty("card", out var pCard) ? pCard.GetString() ?? string.Empty : string.Empty;
|
string card = obj.TryGetProperty("card", out var pCard) ? pCard.GetString() ?? string.Empty : string.Empty;
|
||||||
var reason = obj.TryGetProperty("reason", out var pReason) ? pReason.GetString() ?? string.Empty : string.Empty;
|
string reason = obj.TryGetProperty("reason", out var pReason) ? pReason.GetString() ?? string.Empty : string.Empty;
|
||||||
var typeStr = obj.TryGetProperty("type", out var pType) ? pType.GetString() ?? string.Empty : string.Empty;
|
string typeStr = obj.TryGetProperty("type", out var pType) ? pType.GetString() ?? string.Empty : string.Empty;
|
||||||
var occurredAtStr = obj.TryGetProperty("occurredAt", out var pOccurredAt) ? pOccurredAt.GetString() ?? string.Empty : string.Empty;
|
string occurredAtStr = obj.TryGetProperty("occurredAt", out var pOccurredAt) ? pOccurredAt.GetString() ?? string.Empty : string.Empty;
|
||||||
|
|
||||||
var amount = 0m;
|
decimal 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
var balance = 0m;
|
decimal 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;
|
||||||
@@ -175,7 +173,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;
|
||||||
}
|
}
|
||||||
@@ -203,7 +201,7 @@ public abstract class EmailParseServicesBase(
|
|||||||
|
|
||||||
// 收入关键词
|
// 收入关键词
|
||||||
string[] incomeKeywords =
|
string[] incomeKeywords =
|
||||||
[
|
{
|
||||||
"工资", "奖金", "退款",
|
"工资", "奖金", "退款",
|
||||||
"返现", "收入", "转入",
|
"返现", "收入", "转入",
|
||||||
"存入", "利息", "分红",
|
"存入", "利息", "分红",
|
||||||
@@ -235,13 +233,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 =
|
||||||
[
|
{
|
||||||
"消费", "支付", "购买",
|
"消费", "支付", "购买",
|
||||||
"转出", "取款", "支出",
|
"转出", "取款", "支出",
|
||||||
"扣款", "缴费", "付款",
|
"扣款", "缴费", "付款",
|
||||||
@@ -271,7 +269,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;
|
||||||
|
|
||||||
|
|||||||
@@ -182,7 +182,6 @@ 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
|
||||||
@@ -199,12 +198,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)
|
||||||
|
|||||||
@@ -7,12 +7,11 @@ 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 Microsoft.Extensions.Configuration;
|
||||||
global using Common;
|
global using Common;
|
||||||
global using System.Net;
|
global using Service.AgentFramework;
|
||||||
global using System.Text.Encodings.Web;
|
|
||||||
global using JetBrains.Annotations;
|
|
||||||
@@ -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,15 @@ 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)
|
||||||
{
|
{
|
||||||
@@ -387,7 +388,7 @@ public class ImportService(
|
|||||||
|
|
||||||
if (headers == null || headers.Length == 0)
|
if (headers == null || headers.Length == 0)
|
||||||
{
|
{
|
||||||
return [];
|
return Array.Empty<IDictionary<string, string>>();
|
||||||
}
|
}
|
||||||
|
|
||||||
var result = new List<IDictionary<string, string>>();
|
var result = new List<IDictionary<string, string>>();
|
||||||
@@ -419,7 +420,7 @@ public class ImportService(
|
|||||||
|
|
||||||
if (worksheet == null || worksheet.Dimension == null)
|
if (worksheet == null || worksheet.Dimension == null)
|
||||||
{
|
{
|
||||||
return [];
|
return Array.Empty<IDictionary<string, string>>();
|
||||||
}
|
}
|
||||||
|
|
||||||
var rowCount = worksheet.Dimension.End.Row;
|
var rowCount = worksheet.Dimension.End.Row;
|
||||||
@@ -427,12 +428,12 @@ public class ImportService(
|
|||||||
|
|
||||||
if (rowCount < 2)
|
if (rowCount < 2)
|
||||||
{
|
{
|
||||||
return [];
|
return Array.Empty<IDictionary<string, string>>();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 读取表头（第一行）
|
// 读取表头（第一行）
|
||||||
var headers = new List<string>();
|
var headers = new List<string>();
|
||||||
for (var col = 1; col <= colCount; col++)
|
for (int 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);
|
||||||
@@ -441,10 +442,10 @@ public class ImportService(
|
|||||||
var result = new List<IDictionary<string, string>>();
|
var result = new List<IDictionary<string, string>>();
|
||||||
|
|
||||||
// 读取数据行（从第二行开始）
|
// 读取数据行（从第二行开始）
|
||||||
for (var row = 2; row <= rowCount; row++)
|
for (int row = 2; row <= rowCount; row++)
|
||||||
{
|
{
|
||||||
var rowData = new Dictionary<string, string>();
|
var rowData = new Dictionary<string, string>();
|
||||||
for (var col = 1; col <= colCount; col++)
|
for (int 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;
|
||||||
@@ -457,7 +458,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",
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using Quartz;
|
using Quartz;
|
||||||
using Service.Budget;
|
|
||||||
|
|
||||||
namespace Service.Jobs;
|
namespace Service.Jobs;
|
||||||
|
|
||||||
@@ -24,8 +23,6 @@ public class BudgetArchiveJob(
|
|||||||
|
|
||||||
using var scope = serviceProvider.CreateScope();
|
using var scope = serviceProvider.CreateScope();
|
||||||
var budgetService = scope.ServiceProvider.GetRequiredService<IBudgetService>();
|
var budgetService = scope.ServiceProvider.GetRequiredService<IBudgetService>();
|
||||||
|
|
||||||
// 归档月度数据
|
|
||||||
var result = await budgetService.ArchiveBudgetsAsync(year, month);
|
var result = await budgetService.ArchiveBudgetsAsync(year, month);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(result))
|
if (string.IsNullOrEmpty(result))
|
||||||
|
|||||||
@@ -1,150 +0,0 @@
|
|||||||
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. 尺寸：24x24，viewBox="0 0 24 24"
|
|
||||||
2. 色彩：使用丰富的渐变色和多色搭配，让图标更有吸引力和辨识度
|
|
||||||
- 可以使用 <linearGradient> 或 <radialGradient> 创建渐变效果
|
|
||||||
- 不同元素使用不同颜色，增加层次感
|
|
||||||
- 根据分类含义选择合适的配色方案（如餐饮用暖色系、交通用蓝色系等）
|
|
||||||
3. 设计风格：5 个图标必须风格明显不同，避免雷同
|
|
||||||
- 第1个：扁平化风格，色彩鲜明，使用渐变
|
|
||||||
- 第2个：线性风格，多色描边，细节丰富
|
|
||||||
- 第3个：3D立体风格，使用阴影和高光效果
|
|
||||||
- 第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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -127,7 +127,6 @@ 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
|
||||||
@@ -144,12 +143,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)
|
||||||
|
|||||||
@@ -1,78 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
using Quartz;
|
using Quartz;
|
||||||
using Service.Transaction;
|
|
||||||
|
|
||||||
namespace Service.Jobs;
|
namespace Service.Jobs;
|
||||||
|
|
||||||
|
|||||||
106
Service/LogCleanupService.cs
Normal file
106
Service/LogCleanupService.cs
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
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, "清理日志过程中发生错误");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace Service.Message;
|
namespace Service;
|
||||||
|
|
||||||
public interface IMessageService
|
public interface IMessageService
|
||||||
{
|
{
|
||||||
@@ -1,12 +1,11 @@
|
|||||||
using WebPush;
|
using WebPush;
|
||||||
using PushSubscription = Entity.PushSubscription;
|
|
||||||
|
|
||||||
namespace Service.Message;
|
namespace Service;
|
||||||
|
|
||||||
public interface INotificationService
|
public interface INotificationService
|
||||||
{
|
{
|
||||||
Task<string> GetVapidPublicKeyAsync();
|
Task<string> GetVapidPublicKeyAsync();
|
||||||
Task SubscribeAsync(PushSubscription subscription);
|
Task SubscribeAsync(Entity.PushSubscription subscription);
|
||||||
Task SendNotificationAsync(string message, string? url = null);
|
Task SendNotificationAsync(string message, string? url = null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +32,7 @@ public class NotificationService(
|
|||||||
return Task.FromResult(GetSettings().PublicKey);
|
return Task.FromResult(GetSettings().PublicKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task SubscribeAsync(PushSubscription subscription)
|
public async Task SubscribeAsync(Entity.PushSubscription subscription)
|
||||||
{
|
{
|
||||||
var existing = await subscriptionRepo.GetByEndpointAsync(subscription.Endpoint);
|
var existing = await subscriptionRepo.GetByEndpointAsync(subscription.Endpoint);
|
||||||
if (existing != null)
|
if (existing != null)
|
||||||
@@ -62,7 +61,7 @@ public class NotificationService(
|
|||||||
var webPushClient = new WebPushClient();
|
var webPushClient = new WebPushClient();
|
||||||
|
|
||||||
var subscriptions = await subscriptionRepo.GetAllAsync();
|
var subscriptions = await subscriptionRepo.GetAllAsync();
|
||||||
var payload = JsonSerializer.Serialize(new
|
var payload = System.Text.Json.JsonSerializer.Serialize(new
|
||||||
{
|
{
|
||||||
title = "System Notification",
|
title = "System Notification",
|
||||||
body = message,
|
body = message,
|
||||||
@@ -79,7 +78,7 @@ public class NotificationService(
|
|||||||
}
|
}
|
||||||
catch (WebPushException ex)
|
catch (WebPushException ex)
|
||||||
{
|
{
|
||||||
if (ex.StatusCode == HttpStatusCode.Gone || ex.StatusCode == HttpStatusCode.NotFound)
|
if (ex.StatusCode == System.Net.HttpStatusCode.Gone || ex.StatusCode == System.Net.HttpStatusCode.NotFound)
|
||||||
{
|
{
|
||||||
await subscriptionRepo.DeleteAsync(sub.Id);
|
await subscriptionRepo.DeleteAsync(sub.Id);
|
||||||
}
|
}
|
||||||
@@ -1,21 +1,21 @@
|
|||||||
using System.Net.Http.Headers;
|
using System.Net.Http.Headers;
|
||||||
|
|
||||||
namespace Service.AI;
|
namespace Service;
|
||||||
|
|
||||||
public interface IOpenAiService
|
public interface IOpenAiService
|
||||||
{
|
{
|
||||||
Task<string?> ChatAsync(string systemPrompt, string userPrompt, int timeoutSeconds = 15);
|
Task<string?> ChatAsync(string systemPrompt, string userPrompt);
|
||||||
Task<string?> ChatAsync(string prompt, int timeoutSeconds = 15);
|
Task<string?> ChatAsync(string prompt);
|
||||||
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, int timeoutSeconds = 15)
|
public async Task<string?> ChatAsync(string systemPrompt, string userPrompt)
|
||||||
{
|
{
|
||||||
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(timeoutSeconds);
|
http.Timeout = TimeSpan.FromSeconds(15);
|
||||||
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, int timeoutSeconds = 15)
|
public async Task<string?> ChatAsync(string prompt)
|
||||||
{
|
{
|
||||||
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(timeoutSeconds);
|
http.Timeout = TimeSpan.FromSeconds(60 * 5);
|
||||||
http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", cfg.Key);
|
http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", cfg.Key);
|
||||||
|
|
||||||
var payload = new
|
var payload = new
|
||||||
@@ -158,8 +158,10 @@ 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)
|
||||||
@@ -230,8 +232,10 @@ 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)
|
||||||
61
Service/PeriodicBillBackgroundService.cs
Normal file
61
Service/PeriodicBillBackgroundService.cs
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
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("周期性账单后台服务已停止");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,16 +5,16 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="JetBrains.Annotations" />
|
|
||||||
<PackageReference Include="MailKit" />
|
<PackageReference Include="MailKit" />
|
||||||
|
<PackageReference Include="Microsoft.Agents.AI" />
|
||||||
<PackageReference Include="MimeKit" />
|
<PackageReference Include="MimeKit" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
|
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging" />
|
||||||
<PackageReference Include="Serilog" />
|
<PackageReference Include="Serilog" />
|
||||||
<PackageReference Include="Serilog.Extensions.Logging" />
|
<PackageReference Include="Serilog.Extensions.Logging" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging" />
|
|
||||||
<PackageReference Include="CsvHelper" />
|
<PackageReference Include="CsvHelper" />
|
||||||
<PackageReference Include="EPPlus" />
|
<PackageReference Include="EPPlus" />
|
||||||
<PackageReference Include="HtmlAgilityPack" />
|
<PackageReference Include="HtmlAgilityPack" />
|
||||||
@@ -23,6 +23,7 @@
|
|||||||
<PackageReference Include="JiebaNet.Analyser" />
|
<PackageReference Include="JiebaNet.Analyser" />
|
||||||
<PackageReference Include="Newtonsoft.Json" />
|
<PackageReference Include="Newtonsoft.Json" />
|
||||||
<PackageReference Include="WebPush" />
|
<PackageReference Include="WebPush" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.AI" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
using Service.Transaction;
|
namespace Service;
|
||||||
|
|
||||||
namespace Service.AI;
|
|
||||||
|
|
||||||
public interface ISmartHandleService
|
public interface ISmartHandleService
|
||||||
{
|
{
|
||||||
@@ -13,7 +11,6 @@ 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,
|
||||||
@@ -64,7 +61,7 @@ public class SmartHandleService(
|
|||||||
{
|
{
|
||||||
// 查询包含这些关键词且已分类的账单（带相关度评分）
|
// 查询包含这些关键词且已分类的账单（带相关度评分）
|
||||||
// minMatchRate=0.4 表示至少匹配40%的关键词才被认为是相似的
|
// minMatchRate=0.4 表示至少匹配40%的关键词才被认为是相似的
|
||||||
var similarClassifiedWithScore = await transactionStatisticsService.GetClassifiedByKeywordsWithScoreAsync(keywords, minMatchRate: 0.4, limit: 10);
|
var similarClassifiedWithScore = await transactionRepository.GetClassifiedByKeywordsWithScoreAsync(keywords, minMatchRate: 0.4, limit: 10);
|
||||||
|
|
||||||
if (similarClassifiedWithScore.Count > 0)
|
if (similarClassifiedWithScore.Count > 0)
|
||||||
{
|
{
|
||||||
@@ -146,7 +143,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 sentIds = new HashSet<long>();
|
var sendedIds = new HashSet<long>();
|
||||||
|
|
||||||
// 将流解析逻辑提取为本地函数以减少嵌套
|
// 将流解析逻辑提取为本地函数以减少嵌套
|
||||||
void HandleResult(GroupClassifyResult? result)
|
void HandleResult(GroupClassifyResult? result)
|
||||||
@@ -157,11 +154,8 @@ public class SmartHandleService(
|
|||||||
if (group == null) return;
|
if (group == null) return;
|
||||||
foreach (var id in group.Ids)
|
foreach (var id in group.Ids)
|
||||||
{
|
{
|
||||||
if (!sentIds.Add(id))
|
if (sendedIds.Add(id))
|
||||||
{
|
{
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
var resultJson = JsonSerializer.Serialize(new
|
var resultJson = JsonSerializer.Serialize(new
|
||||||
{
|
{
|
||||||
id,
|
id,
|
||||||
@@ -171,6 +165,7 @@ public class SmartHandleService(
|
|||||||
chunkAction(("data", resultJson));
|
chunkAction(("data", resultJson));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 解析缓冲区中的所有完整 JSON 对象或数组
|
// 解析缓冲区中的所有完整 JSON 对象或数组
|
||||||
void FlushBuffer(StringBuilder buffer)
|
void FlushBuffer(StringBuilder buffer)
|
||||||
@@ -198,7 +193,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -341,7 +336,7 @@ public class SmartHandleService(
|
|||||||
{
|
{
|
||||||
content = $"""
|
content = $"""
|
||||||
<pre style="max-height: 80px; font-size: 8px; overflow-y: auto; padding: 8px; border: 1px solid #3c3c3c">
|
<pre style="max-height: 80px; font-size: 8px; overflow-y: auto; padding: 8px; border: 1px solid #3c3c3c">
|
||||||
{WebUtility.HtmlEncode(sqlText)}
|
{System.Net.WebUtility.HtmlEncode(sqlText)}
|
||||||
</pre>
|
</pre>
|
||||||
"""
|
"""
|
||||||
})
|
})
|
||||||
@@ -366,7 +361,7 @@ public class SmartHandleService(
|
|||||||
var dataJson = JsonSerializer.Serialize(queryResults, new JsonSerializerOptions
|
var dataJson = JsonSerializer.Serialize(queryResults, new JsonSerializerOptions
|
||||||
{
|
{
|
||||||
WriteIndented = true,
|
WriteIndented = true,
|
||||||
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
|
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
|
||||||
});
|
});
|
||||||
|
|
||||||
var userPromptExtra = await configService.GetConfigByKeyAsync<string>("BillAnalysisPrompt");
|
var userPromptExtra = await configService.GetConfigByKeyAsync<string>("BillAnalysisPrompt");
|
||||||
@@ -434,6 +429,7 @@ public class SmartHandleService(
|
|||||||
{
|
{
|
||||||
// 获取所有分类
|
// 获取所有分类
|
||||||
var categories = await categoryRepository.GetAllAsync();
|
var categories = await categoryRepository.GetAllAsync();
|
||||||
|
var categoryList = string.Join("、", categories.Select(c => $"{GetTypeName(c.Type)}-{c.Name}"));
|
||||||
|
|
||||||
// 构建分类信息
|
// 构建分类信息
|
||||||
var categoryInfo = new StringBuilder();
|
var categoryInfo = new StringBuilder();
|
||||||
@@ -494,8 +490,8 @@ public class SmartHandleService(
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private static int FindMatchingBrace(string str, int startPos)
|
private static int FindMatchingBrace(string str, int startPos)
|
||||||
{
|
{
|
||||||
var braceCount = 0;
|
int braceCount = 0;
|
||||||
for (var i = startPos; i < str.Length; i++)
|
for (int i = startPos; i < str.Length; i++)
|
||||||
{
|
{
|
||||||
if (str[i] == '{') braceCount++;
|
if (str[i] == '{') braceCount++;
|
||||||
else if (str[i] == '}')
|
else if (str[i] == '}')
|
||||||
@@ -546,13 +542,13 @@ public class SmartHandleService(
|
|||||||
public record GroupClassifyResult
|
public record GroupClassifyResult
|
||||||
{
|
{
|
||||||
[JsonPropertyName("reason")]
|
[JsonPropertyName("reason")]
|
||||||
public string Reason { get; init; } = string.Empty;
|
public string Reason { get; set; } = string.Empty;
|
||||||
|
|
||||||
[JsonPropertyName("classify")]
|
[JsonPropertyName("classify")]
|
||||||
public string? Classify { get; init; }
|
public string? Classify { get; set; }
|
||||||
|
|
||||||
[JsonPropertyName("type")]
|
[JsonPropertyName("type")]
|
||||||
public TransactionType Type { get; init; }
|
public TransactionType Type { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
||||||
82
Service/SmartHandleServiceV2.cs
Normal file
82
Service/SmartHandleServiceV2.cs
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
namespace Service;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 智能处理服务 - 使用 Agent Framework 重构
|
||||||
|
/// </summary>
|
||||||
|
public interface ISmartHandleServiceV2
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 使用 Agent Framework 进行智能分类
|
||||||
|
/// </summary>
|
||||||
|
Task<AgentResult<ClassificationResult[]>> SmartClassifyAgentAsync(
|
||||||
|
long[] transactionIds,
|
||||||
|
Action<(string type, string data)> chunkAction);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 使用 Agent Framework 解析单行账单
|
||||||
|
/// </summary>
|
||||||
|
Task<AgentResult<AgentFramework.TransactionParseResult?>> ParseOneLineBillAgentAsync(string text);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 智能处理服务实现 - Agent Framework 版本
|
||||||
|
/// </summary>
|
||||||
|
public class SmartHandleServiceV2(
|
||||||
|
ClassificationAgent classificationAgent,
|
||||||
|
ParsingAgent parsingAgent,
|
||||||
|
ITransactionCategoryRepository categoryRepository,
|
||||||
|
ILogger<SmartHandleServiceV2> logger
|
||||||
|
) : ISmartHandleServiceV2
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 使用 Agent Framework 进行智能分类
|
||||||
|
/// </summary>
|
||||||
|
public async Task<AgentResult<ClassificationResult[]>> SmartClassifyAgentAsync(
|
||||||
|
long[] transactionIds,
|
||||||
|
Action<(string type, string data)> chunkAction)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
logger.LogInformation("开始执行智能分类 Agent，ID 数量: {Count}", transactionIds.Length);
|
||||||
|
|
||||||
|
var result = await classificationAgent.ExecuteAsync(transactionIds, categoryRepository);
|
||||||
|
|
||||||
|
logger.LogInformation("分类完成：{Summary}", result.Summary);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "智能分类 Agent 执行失败");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 使用 Agent Framework 解析单行账单
|
||||||
|
/// </summary>
|
||||||
|
public async Task<AgentResult<AgentFramework.TransactionParseResult?>> ParseOneLineBillAgentAsync(string text)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
logger.LogInformation("开始解析账单: {Text}", text);
|
||||||
|
|
||||||
|
var result = await parsingAgent.ExecuteAsync(text);
|
||||||
|
|
||||||
|
if (result.Success)
|
||||||
|
{
|
||||||
|
logger.LogInformation("解析成功: {Summary}", result.Summary);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.LogWarning("解析失败: {Error}", result.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.LogError(ex, "解析 Agent 执行失败");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
using JiebaNet.Analyser;
|
namespace Service;
|
||||||
using JiebaNet.Segmenter;
|
|
||||||
|
|
||||||
namespace Service.AI;
|
using JiebaNet.Segmenter;
|
||||||
|
using JiebaNet.Analyser;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 文本分词服务接口
|
/// 文本分词服务接口
|
||||||
@@ -77,7 +78,7 @@ public class TextSegmentService : ITextSegmentService
|
|||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(text))
|
if (string.IsNullOrWhiteSpace(text))
|
||||||
{
|
{
|
||||||
return [];
|
return new List<string>();
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -118,7 +119,7 @@ public class TextSegmentService : ITextSegmentService
|
|||||||
{
|
{
|
||||||
_logger.LogError(ex, "提取关键词失败，文本: {Text}", text);
|
_logger.LogError(ex, "提取关键词失败，文本: {Text}", text);
|
||||||
// 降级处理：返回原文
|
// 降级处理：返回原文
|
||||||
return [text.Length > 10 ? text.Substring(0, 10) : text];
|
return new List<string> { text.Length > 10 ? text.Substring(0, 10) : text };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -126,7 +127,7 @@ public class TextSegmentService : ITextSegmentService
|
|||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(text))
|
if (string.IsNullOrWhiteSpace(text))
|
||||||
{
|
{
|
||||||
return [];
|
return new List<string>();
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -145,7 +146,7 @@ public class TextSegmentService : ITextSegmentService
|
|||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "分词失败，文本: {Text}", text);
|
_logger.LogError(ex, "分词失败，文本: {Text}", text);
|
||||||
return [text];
|
return new List<string> { text };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,350 +0,0 @@
|
|||||||
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; }
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace Service.Transaction;
|
namespace Service;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 周期性账单服务接口
|
/// 周期性账单服务接口
|
||||||
@@ -108,11 +108,6 @@ 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;
|
||||||
|
|
||||||
// 如果从未执行过，需要执行
|
// 如果从未执行过，需要执行
|
||||||
@@ -149,7 +144,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 is >= 0 and <= 6)
|
.Where(d => d >= 0 && d <= 6)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
return executeDays.Contains(dayOfWeek);
|
return executeDays.Contains(dayOfWeek);
|
||||||
@@ -165,7 +160,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 is >= 1 and <= 31)
|
.Where(d => d >= 1 && d <= 31)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
// 如果当前为月末，且配置中有大于当月天数的日期，则也执行
|
// 如果当前为月末，且配置中有大于当月天数的日期，则也执行
|
||||||
@@ -228,7 +223,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 is >= 0 and <= 6)
|
.Where(d => d >= 0 && d <= 6)
|
||||||
.OrderBy(d => d)
|
.OrderBy(d => d)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
@@ -258,7 +253,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 is >= 1 and <= 31)
|
.Where(d => d >= 1 && d <= 31)
|
||||||
.OrderBy(d => d)
|
.OrderBy(d => d)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
1
Web/.eslintcache
Normal file
1
Web/.eslintcache
Normal file
File diff suppressed because one or more lines are too long
@@ -2,6 +2,5 @@
|
|||||||
"$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"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,130 +0,0 @@
|
|||||||
# 版本切换功能实现总结
|
|
||||||
|
|
||||||
## 实现概述
|
|
||||||
|
|
||||||
在设置的开发者选项中添加了版本切换功能，用户可以在 V1 和 V2 版本之间切换。
|
|
||||||
|
|
||||||
## 修改的文件
|
|
||||||
|
|
||||||
### 1. Web/src/stores/version.js (新增)
|
|
||||||
- 创建 Pinia store 管理版本状态
|
|
||||||
- 使用 localStorage 持久化版本选择
|
|
||||||
- 提供 `setVersion()` 和 `isV2()` 方法
|
|
||||||
|
|
||||||
### 2. Web/src/views/SettingView.vue (修改)
|
|
||||||
- 在开发者选项中添加"切换版本"选项
|
|
||||||
- 显示当前版本（V1/V2）
|
|
||||||
- 实现版本切换对话框
|
|
||||||
- 实现版本切换后的路由跳转逻辑
|
|
||||||
|
|
||||||
### 3. Web/src/router/index.js (修改)
|
|
||||||
- 引入 version store
|
|
||||||
- 在路由守卫中添加版本路由重定向逻辑
|
|
||||||
- V2 模式下自动跳转到 V2 路由（如果存在）
|
|
||||||
- V1 模式下自动跳转到 V1 路由（如果在 V2 路由）
|
|
||||||
|
|
||||||
## 核心功能
|
|
||||||
|
|
||||||
1. **版本选择界面**
|
|
||||||
- 设置页面显示当前版本
|
|
||||||
- 点击弹出对话框，选择 V1 或 V2
|
|
||||||
- 切换成功后显示提示信息
|
|
||||||
|
|
||||||
2. **智能路由跳转**
|
|
||||||
- 选择 V2 后，如果当前路由有 V2 版本，自动跳转
|
|
||||||
- 选择 V1 后，如果当前在 V2 路由，自动跳转到 V1
|
|
||||||
- 没有对应版本时，保持当前路由不变
|
|
||||||
|
|
||||||
3. **路由守卫保护**
|
|
||||||
- 每次路由跳转时检查版本设置
|
|
||||||
- 自动重定向到正确版本的路由
|
|
||||||
- 保留 query 和 params 参数
|
|
||||||
|
|
||||||
4. **状态持久化**
|
|
||||||
- 版本选择保存在 localStorage
|
|
||||||
- 刷新页面后版本设置保持不变
|
|
||||||
|
|
||||||
## V2 路由命名规范
|
|
||||||
|
|
||||||
V2 路由必须遵循命名规范：`原路由名-v2`
|
|
||||||
|
|
||||||
示例：
|
|
||||||
- V1: `calendar` → V2: `calendar-v2`
|
|
||||||
- V1: `budget` → V2: `budget-v2`
|
|
||||||
|
|
||||||
## 当前支持的 V2 路由
|
|
||||||
|
|
||||||
- `calendar` → `calendar-v2` (CalendarV2.vue)
|
|
||||||
|
|
||||||
## 测试验证
|
|
||||||
|
|
||||||
- ✅ ESLint 检查通过（无错误）
|
|
||||||
- ✅ 构建成功（pnpm build）
|
|
||||||
- ✅ 所有修改文件符合项目代码规范
|
|
||||||
|
|
||||||
## 使用示例
|
|
||||||
|
|
||||||
### 用户操作流程
|
|
||||||
|
|
||||||
1. 进入"设置"页面
|
|
||||||
2. 滚动到"开发者"分组
|
|
||||||
3. 点击"切换版本"（当前版本显示在右侧）
|
|
||||||
4. 选择"V1"或"V2"
|
|
||||||
5. 系统自动跳转到对应版本的路由
|
|
||||||
|
|
||||||
### 开发者添加新 V2 路由
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
// router/index.js
|
|
||||||
{
|
|
||||||
path: '/xxx-v2',
|
|
||||||
name: 'xxx-v2',
|
|
||||||
component: () => import('../views/XxxViewV2.vue'),
|
|
||||||
meta: { requiresAuth: true }
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
添加后即可自动支持版本切换。
|
|
||||||
|
|
||||||
## 技术细节
|
|
||||||
|
|
||||||
### 版本检测逻辑
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
// 在路由守卫中
|
|
||||||
if (versionStore.isV2()) {
|
|
||||||
// 尝试跳转到 V2 路由
|
|
||||||
const v2RouteName = `${routeName}-v2`
|
|
||||||
if (存在 v2Route) {
|
|
||||||
跳转到 v2Route
|
|
||||||
} else {
|
|
||||||
保持当前路由
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 版本状态管理
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
// stores/version.js
|
|
||||||
const currentVersion = ref(localStorage.getItem('app-version') || 'v1')
|
|
||||||
|
|
||||||
const setVersion = (version) => {
|
|
||||||
currentVersion.value = version
|
|
||||||
localStorage.setItem('app-version', version)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## 注意事项
|
|
||||||
|
|
||||||
1. V2 路由必须按照 `xxx-v2` 命名规范
|
|
||||||
2. 如果页面没有 V2 版本，切换后会保持在 V1 版本
|
|
||||||
3. 路由守卫会自动处理所有版本相关的路由跳转
|
|
||||||
4. 版本状态持久化在 localStorage 中
|
|
||||||
|
|
||||||
## 后续改进建议
|
|
||||||
|
|
||||||
1. 可以在 UI 上添加更明显的版本标识
|
|
||||||
2. 可以在无 V2 路由时给出提示
|
|
||||||
3. 可以添加版本切换的动画效果
|
|
||||||
4. 可以为不同版本设置不同的主题样式
|
|
||||||
@@ -1,143 +0,0 @@
|
|||||||
# 版本切换功能测试文档
|
|
||||||
|
|
||||||
## 功能说明
|
|
||||||
|
|
||||||
在设置的开发者选项中添加了版本切换功能，用户可以在 V1 和 V2 版本之间切换。当选择 V2 时，如果有对应的 V2 路由则自动跳转，否则保持当前路由。
|
|
||||||
|
|
||||||
## 实现文件
|
|
||||||
|
|
||||||
1. **Store**: `Web/src/stores/version.js` - 版本状态管理
|
|
||||||
2. **View**: `Web/src/views/SettingView.vue` - 设置页面添加版本切换入口
|
|
||||||
3. **Router**: `Web/src/router/index.js` - 路由守卫实现版本路由重定向
|
|
||||||
|
|
||||||
## 功能特性
|
|
||||||
|
|
||||||
- ✅ 版本状态持久化存储（localStorage）
|
|
||||||
- ✅ 设置页面显示当前版本（V1/V2）
|
|
||||||
- ✅ 点击弹出对话框选择版本
|
|
||||||
- ✅ 自动检测并跳转到对应版本路由
|
|
||||||
- ✅ 如果没有对应版本路由，保持当前路由
|
|
||||||
- ✅ 路由守卫自动处理版本路由
|
|
||||||
|
|
||||||
## 测试步骤
|
|
||||||
|
|
||||||
### 1. 基础功能测试
|
|
||||||
|
|
||||||
1. 启动应用并登录
|
|
||||||
2. 进入"设置"页面
|
|
||||||
3. 找到"开发者"分组下的"切换版本"选项
|
|
||||||
4. 当前版本应显示为 "V1"（首次使用）
|
|
||||||
|
|
||||||
### 2. 切换到 V2 测试
|
|
||||||
|
|
||||||
1. 点击"切换版本"
|
|
||||||
2. 弹出对话框，显示"选择版本"标题
|
|
||||||
3. 对话框有两个按钮："V1"（取消按钮）和"V2"（确认按钮）
|
|
||||||
4. 点击"V2"按钮
|
|
||||||
5. 应显示提示"已切换到 V2"
|
|
||||||
6. "切换版本"选项的值应更新为 "V2"
|
|
||||||
|
|
||||||
### 3. V2 路由跳转测试
|
|
||||||
|
|
||||||
#### 测试有 V2 路由的情况（日历页面）
|
|
||||||
|
|
||||||
1. 确保当前版本为 V2
|
|
||||||
2. 点击导航栏的"日历"（路由名：`calendar`）
|
|
||||||
3. 应自动跳转到 `calendar-v2`（CalendarV2.vue）
|
|
||||||
4. 地址栏 URL 应为 `/calendar-v2`
|
|
||||||
|
|
||||||
#### 测试没有 V2 路由的情况
|
|
||||||
|
|
||||||
1. 确保当前版本为 V2
|
|
||||||
2. 点击导航栏的"账单分析"（路由名：`bill-analysis`）
|
|
||||||
3. 应保持在 `bill-analysis` 路由（没有 v2 版本）
|
|
||||||
4. 地址栏 URL 应为 `/bill-analysis`
|
|
||||||
|
|
||||||
### 4. 切换回 V1 测试
|
|
||||||
|
|
||||||
1. 当前版本为 V2，在 `calendar-v2` 页面
|
|
||||||
2. 进入"设置"页面，点击"切换版本"
|
|
||||||
3. 点击"V1"按钮
|
|
||||||
4. 应显示提示"已切换到 V1"
|
|
||||||
5. 如果当前在 V2 路由（如 `calendar-v2`），应自动跳转到 V1 路由（`calendar`）
|
|
||||||
6. 地址栏 URL 应为 `/calendar`
|
|
||||||
|
|
||||||
### 5. 持久化测试
|
|
||||||
|
|
||||||
1. 切换到 V2 版本
|
|
||||||
2. 刷新页面
|
|
||||||
3. 重新登录后，进入"设置"页面
|
|
||||||
4. "切换版本"选项应仍显示 "V2"
|
|
||||||
5. 访问有 V2 路由的页面，应自动跳转到 V2 版本
|
|
||||||
|
|
||||||
### 6. 路由守卫测试
|
|
||||||
|
|
||||||
#### 直接访问 V2 路由（V1 模式下）
|
|
||||||
|
|
||||||
1. 确保当前版本为 V1
|
|
||||||
2. 在地址栏直接输入 `/calendar-v2`
|
|
||||||
3. 应自动重定向到 `/calendar`
|
|
||||||
|
|
||||||
#### 直接访问 V1 路由（V2 模式下）
|
|
||||||
|
|
||||||
1. 确保当前版本为 V2
|
|
||||||
2. 在地址栏直接输入 `/calendar`
|
|
||||||
3. 应自动重定向到 `/calendar-v2`
|
|
||||||
|
|
||||||
## 当前支持 V2 的路由
|
|
||||||
|
|
||||||
- `calendar` → `calendar-v2` (CalendarV2.vue)
|
|
||||||
|
|
||||||
## 代码验证
|
|
||||||
|
|
||||||
### 版本 Store 检查
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
// 打开浏览器控制台
|
|
||||||
const versionStore = useVersionStore()
|
|
||||||
console.log(versionStore.currentVersion) // 应输出 'v1' 或 'v2'
|
|
||||||
console.log(versionStore.isV2()) // 应输出 true 或 false
|
|
||||||
```
|
|
||||||
|
|
||||||
### LocalStorage 检查
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
// 打开浏览器控制台
|
|
||||||
console.log(localStorage.getItem('app-version')) // 应输出 'v1' 或 'v2'
|
|
||||||
```
|
|
||||||
|
|
||||||
## 预期结果
|
|
||||||
|
|
||||||
- ✅ 所有路由跳转正常
|
|
||||||
- ✅ 版本切换提示正常显示
|
|
||||||
- ✅ 版本状态持久化正常
|
|
||||||
- ✅ 路由守卫正常工作
|
|
||||||
- ✅ 没有控制台错误
|
|
||||||
- ✅ UI 响应流畅
|
|
||||||
|
|
||||||
## 潜在问题
|
|
||||||
|
|
||||||
1. 如果用户在 V2 路由页面直接切换到 V1，可能会出现短暂的页面重载
|
|
||||||
2. 某些页面可能没有 V2 版本，切换后会保持在 V1 版本
|
|
||||||
|
|
||||||
## 后续扩展
|
|
||||||
|
|
||||||
如需添加更多 V2 路由，只需：
|
|
||||||
|
|
||||||
1. 创建新的 Vue 组件（如 `XXXViewV2.vue`）
|
|
||||||
2. 在 `router/index.js` 中添加路由，命名格式为 `原路由名-v2`
|
|
||||||
3. 路由守卫会自动处理版本切换逻辑
|
|
||||||
|
|
||||||
## 示例：添加新的 V2 路由
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
// router/index.js
|
|
||||||
{
|
|
||||||
path: '/budget-v2',
|
|
||||||
name: 'budget-v2',
|
|
||||||
component: () => import('../views/BudgetViewV2.vue'),
|
|
||||||
meta: { requiresAuth: true }
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
添加后，当用户选择 V2 版本并访问 `/budget` 时，会自动跳转到 `/budget-v2`。
|
|
||||||
@@ -1,82 +1,52 @@
|
|||||||
import js from '@eslint/js'
|
import js from '@eslint/js'
|
||||||
import globals from 'globals'
|
import globals from 'globals'
|
||||||
import pluginVue from 'eslint-plugin-vue'
|
import pluginVue from 'eslint-plugin-vue'
|
||||||
|
import skipFormatting from '@vue/eslint-config-prettier/skip-formatting'
|
||||||
|
|
||||||
export default [
|
export default [
|
||||||
{
|
{
|
||||||
ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**', '**/node_modules/**', '.nuxt/**']
|
ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**', '**/node_modules/**', '.nuxt/**'],
|
||||||
},
|
},
|
||||||
// Load Vue recommended rules first (sets up parser etc.)
|
|
||||||
...pluginVue.configs['flat/recommended'],
|
|
||||||
|
|
||||||
// General Configuration for all JS/Vue files
|
|
||||||
{
|
{
|
||||||
files: ['**/*.{js,mjs,jsx,vue}'],
|
files: ['**/*.{js,mjs,jsx}'],
|
||||||
languageOptions: {
|
languageOptions: {
|
||||||
globals: {
|
globals: {
|
||||||
...globals.browser
|
...globals.browser,
|
||||||
},
|
},
|
||||||
|
parserOptions: {
|
||||||
ecmaVersion: 'latest',
|
ecmaVersion: 'latest',
|
||||||
sourceType: 'module'
|
sourceType: 'module',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
// Import standard JS recommended rules
|
|
||||||
...js.configs.recommended.rules,
|
...js.configs.recommended.rules,
|
||||||
|
'indent': ['error', 2],
|
||||||
// --- 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 }],
|
'quotes': ['error', 'single', { avoidEscape: true }],
|
||||||
'semi': ['error', 'never'],
|
'semi': ['error', 'never'],
|
||||||
|
'no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
|
||||||
'comma-dangle': ['error', 'never'],
|
'comma-dangle': ['error', 'never'],
|
||||||
'no-trailing-spaces': 'error',
|
'no-trailing-spaces': 'error',
|
||||||
'no-multiple-empty-lines': ['error', { max: 1 }],
|
'no-multiple-empty-lines': ['error', { max: 1 }],
|
||||||
'space-before-function-paren': ['error', 'always'],
|
'space-before-function-paren': ['error', 'always'],
|
||||||
'object-curly-spacing': ['error', 'always'],
|
|
||||||
'array-bracket-spacing': ['error', 'never']
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
},
|
||||||
// Vue Specific Overrides
|
...pluginVue.configs['flat/recommended'],
|
||||||
{
|
{
|
||||||
files: ['**/*.vue'],
|
files: ['**/*.vue'],
|
||||||
rules: {
|
rules: {
|
||||||
'vue/multi-word-component-names': 'off',
|
'vue/multi-word-component-names': 'off',
|
||||||
'vue/no-v-html': 'warn',
|
'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',
|
'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
|
skipFormatting,
|
||||||
{
|
{
|
||||||
files: ['**/service-worker.js', '**/src/registerServiceWorker.js'],
|
files: ['**/service-worker.js', '**/src/registerServiceWorker.js'],
|
||||||
languageOptions: {
|
languageOptions: {
|
||||||
globals: {
|
globals: {
|
||||||
...globals.serviceworker
|
...globals.serviceworker,
|
||||||
}
|
...globals.browser,
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
|
},
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
<!-- iOS Safari -->
|
<!-- iOS Safari -->
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="default">
|
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
|
||||||
<meta name="apple-mobile-web-app-title" content="账单管理">
|
<meta name="apple-mobile-web-app-title" content="账单管理">
|
||||||
<link rel="apple-touch-icon" href="/icons/icon-152x152.svg">
|
<link rel="apple-touch-icon" href="/icons/icon-152x152.svg">
|
||||||
<link rel="apple-touch-icon" sizes="72x72" href="/icons/icon-72x72.svg">
|
<link rel="apple-touch-icon" sizes="72x72" href="/icons/icon-72x72.svg">
|
||||||
@@ -24,11 +24,10 @@
|
|||||||
|
|
||||||
<!-- Android Chrome -->
|
<!-- Android Chrome -->
|
||||||
<meta name="mobile-web-app-capable" content="yes">
|
<meta name="mobile-web-app-capable" content="yes">
|
||||||
<meta name="theme-color" content="#FFFFFF" media="(prefers-color-scheme: light)">
|
<meta name="theme-color" content="#1989fa">
|
||||||
<meta name="theme-color" content="#09090B" media="(prefers-color-scheme: dark)">
|
|
||||||
|
|
||||||
<!-- Microsoft -->
|
<!-- Microsoft -->
|
||||||
<meta name="msapplication-TileColor" content="#FFFFFF">
|
<meta name="msapplication-TileColor" content="#1989fa">
|
||||||
<meta name="msapplication-TileImage" content="/icons/icon-144x144.png">
|
<meta name="msapplication-TileImage" content="/icons/icon-144x144.png">
|
||||||
|
|
||||||
<meta name="description" content="个人账单管理与邮件解析系统">
|
<meta name="description" content="个人账单管理与邮件解析系统">
|
||||||
|
|||||||
@@ -11,12 +11,11 @@
|
|||||||
"build": "vite build",
|
"build": "vite build",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"lint": "eslint . --fix --cache",
|
"lint": "eslint . --fix --cache",
|
||||||
"format": "prettier --write src/"
|
"format": "prettier --write --experimental-cli 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",
|
||||||
@@ -30,7 +29,6 @@
|
|||||||
"eslint-plugin-vue": "~10.5.1",
|
"eslint-plugin-vue": "~10.5.1",
|
||||||
"globals": "^16.5.0",
|
"globals": "^16.5.0",
|
||||||
"prettier": "3.6.2",
|
"prettier": "3.6.2",
|
||||||
"sass-embedded": "^1.97.3",
|
|
||||||
"vite": "^7.2.4",
|
"vite": "^7.2.4",
|
||||||
"vite-plugin-vue-devtools": "^8.0.5"
|
"vite-plugin-vue-devtools": "^8.0.5"
|
||||||
}
|
}
|
||||||
|
|||||||
516
Web/pnpm-lock.yaml
generated
516
Web/pnpm-lock.yaml
generated
@@ -14,9 +14,6 @@ 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)
|
||||||
@@ -35,7 +32,7 @@ importers:
|
|||||||
version: 9.39.2
|
version: 9.39.2
|
||||||
'@vitejs/plugin-vue':
|
'@vitejs/plugin-vue':
|
||||||
specifier: ^6.0.2
|
specifier: ^6.0.2
|
||||||
version: 6.0.3(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))(vue@3.5.26)
|
version: 6.0.3(vite@7.3.0)(vue@3.5.26)
|
||||||
'@vue/eslint-config-prettier':
|
'@vue/eslint-config-prettier':
|
||||||
specifier: ^10.2.0
|
specifier: ^10.2.0
|
||||||
version: 10.2.0(eslint@9.39.2)(prettier@3.6.2)
|
version: 10.2.0(eslint@9.39.2)(prettier@3.6.2)
|
||||||
@@ -51,15 +48,12 @@ importers:
|
|||||||
prettier:
|
prettier:
|
||||||
specifier: 3.6.2
|
specifier: 3.6.2
|
||||||
version: 3.6.2
|
version: 3.6.2
|
||||||
sass-embedded:
|
|
||||||
specifier: ^1.97.3
|
|
||||||
version: 1.97.3
|
|
||||||
vite:
|
vite:
|
||||||
specifier: ^7.2.4
|
specifier: ^7.2.4
|
||||||
version: 7.3.0(sass-embedded@1.97.3)(sass@1.97.3)
|
version: 7.3.0
|
||||||
vite-plugin-vue-devtools:
|
vite-plugin-vue-devtools:
|
||||||
specifier: ^8.0.5
|
specifier: ^8.0.5
|
||||||
version: 8.0.5(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))(vue@3.5.26)
|
version: 8.0.5(vite@7.3.0)(vue@3.5.26)
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
|
|
||||||
@@ -203,9 +197,6 @@ packages:
|
|||||||
resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==}
|
resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==}
|
||||||
engines: {node: '>=6.9.0'}
|
engines: {node: '>=6.9.0'}
|
||||||
|
|
||||||
'@bufbuild/protobuf@2.11.0':
|
|
||||||
resolution: {integrity: sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ==}
|
|
||||||
|
|
||||||
'@esbuild/aix-ppc64@0.27.2':
|
'@esbuild/aix-ppc64@0.27.2':
|
||||||
resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==}
|
resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==}
|
||||||
engines: {node: '>=18'}
|
engines: {node: '>=18'}
|
||||||
@@ -432,88 +423,6 @@ packages:
|
|||||||
'@jridgewell/trace-mapping@0.3.31':
|
'@jridgewell/trace-mapping@0.3.31':
|
||||||
resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
|
resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
|
||||||
|
|
||||||
'@parcel/watcher-android-arm64@2.5.6':
|
|
||||||
resolution: {integrity: sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [android]
|
|
||||||
|
|
||||||
'@parcel/watcher-darwin-arm64@2.5.6':
|
|
||||||
resolution: {integrity: sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [darwin]
|
|
||||||
|
|
||||||
'@parcel/watcher-darwin-x64@2.5.6':
|
|
||||||
resolution: {integrity: sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [darwin]
|
|
||||||
|
|
||||||
'@parcel/watcher-freebsd-x64@2.5.6':
|
|
||||||
resolution: {integrity: sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [freebsd]
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm-glibc@2.5.6':
|
|
||||||
resolution: {integrity: sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [arm]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm-musl@2.5.6':
|
|
||||||
resolution: {integrity: sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [arm]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm64-glibc@2.5.6':
|
|
||||||
resolution: {integrity: sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm64-musl@2.5.6':
|
|
||||||
resolution: {integrity: sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-x64-glibc@2.5.6':
|
|
||||||
resolution: {integrity: sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-x64-musl@2.5.6':
|
|
||||||
resolution: {integrity: sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
'@parcel/watcher-win32-arm64@2.5.6':
|
|
||||||
resolution: {integrity: sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [win32]
|
|
||||||
|
|
||||||
'@parcel/watcher-win32-ia32@2.5.6':
|
|
||||||
resolution: {integrity: sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [ia32]
|
|
||||||
os: [win32]
|
|
||||||
|
|
||||||
'@parcel/watcher-win32-x64@2.5.6':
|
|
||||||
resolution: {integrity: sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [win32]
|
|
||||||
|
|
||||||
'@parcel/watcher@2.5.6':
|
|
||||||
resolution: {integrity: sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==}
|
|
||||||
engines: {node: '>= 10.0.0'}
|
|
||||||
|
|
||||||
'@pkgr/core@0.2.9':
|
'@pkgr/core@0.2.9':
|
||||||
resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==}
|
resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==}
|
||||||
engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
|
engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
|
||||||
@@ -558,56 +467,67 @@ packages:
|
|||||||
resolution: {integrity: sha512-EHMUcDwhtdRGlXZsGSIuXSYwD5kOT9NVnx9sqzYiwAc91wfYOE1g1djOEDseZJKKqtHAHGwnGPQu3kytmfaXLQ==}
|
resolution: {integrity: sha512-EHMUcDwhtdRGlXZsGSIuXSYwD5kOT9NVnx9sqzYiwAc91wfYOE1g1djOEDseZJKKqtHAHGwnGPQu3kytmfaXLQ==}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-arm-musleabihf@4.54.0':
|
'@rollup/rollup-linux-arm-musleabihf@4.54.0':
|
||||||
resolution: {integrity: sha512-+pBrqEjaakN2ySv5RVrj/qLytYhPKEUwk+e3SFU5jTLHIcAtqh2rLrd/OkbNuHJpsBgxsD8ccJt5ga/SeG0JmA==}
|
resolution: {integrity: sha512-+pBrqEjaakN2ySv5RVrj/qLytYhPKEUwk+e3SFU5jTLHIcAtqh2rLrd/OkbNuHJpsBgxsD8ccJt5ga/SeG0JmA==}
|
||||||
cpu: [arm]
|
cpu: [arm]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@rollup/rollup-linux-arm64-gnu@4.54.0':
|
'@rollup/rollup-linux-arm64-gnu@4.54.0':
|
||||||
resolution: {integrity: sha512-NSqc7rE9wuUaRBsBp5ckQ5CVz5aIRKCwsoa6WMF7G01sX3/qHUw/z4pv+D+ahL1EIKy6Enpcnz1RY8pf7bjwng==}
|
resolution: {integrity: sha512-NSqc7rE9wuUaRBsBp5ckQ5CVz5aIRKCwsoa6WMF7G01sX3/qHUw/z4pv+D+ahL1EIKy6Enpcnz1RY8pf7bjwng==}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-arm64-musl@4.54.0':
|
'@rollup/rollup-linux-arm64-musl@4.54.0':
|
||||||
resolution: {integrity: sha512-gr5vDbg3Bakga5kbdpqx81m2n9IX8M6gIMlQQIXiLTNeQW6CucvuInJ91EuCJ/JYvc+rcLLsDFcfAD1K7fMofg==}
|
resolution: {integrity: sha512-gr5vDbg3Bakga5kbdpqx81m2n9IX8M6gIMlQQIXiLTNeQW6CucvuInJ91EuCJ/JYvc+rcLLsDFcfAD1K7fMofg==}
|
||||||
cpu: [arm64]
|
cpu: [arm64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@rollup/rollup-linux-loong64-gnu@4.54.0':
|
'@rollup/rollup-linux-loong64-gnu@4.54.0':
|
||||||
resolution: {integrity: sha512-gsrtB1NA3ZYj2vq0Rzkylo9ylCtW/PhpLEivlgWe0bpgtX5+9j9EZa0wtZiCjgu6zmSeZWyI/e2YRX1URozpIw==}
|
resolution: {integrity: sha512-gsrtB1NA3ZYj2vq0Rzkylo9ylCtW/PhpLEivlgWe0bpgtX5+9j9EZa0wtZiCjgu6zmSeZWyI/e2YRX1URozpIw==}
|
||||||
cpu: [loong64]
|
cpu: [loong64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-ppc64-gnu@4.54.0':
|
'@rollup/rollup-linux-ppc64-gnu@4.54.0':
|
||||||
resolution: {integrity: sha512-y3qNOfTBStmFNq+t4s7Tmc9hW2ENtPg8FeUD/VShI7rKxNW7O4fFeaYbMsd3tpFlIg1Q8IapFgy7Q9i2BqeBvA==}
|
resolution: {integrity: sha512-y3qNOfTBStmFNq+t4s7Tmc9hW2ENtPg8FeUD/VShI7rKxNW7O4fFeaYbMsd3tpFlIg1Q8IapFgy7Q9i2BqeBvA==}
|
||||||
cpu: [ppc64]
|
cpu: [ppc64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-riscv64-gnu@4.54.0':
|
'@rollup/rollup-linux-riscv64-gnu@4.54.0':
|
||||||
resolution: {integrity: sha512-89sepv7h2lIVPsFma8iwmccN7Yjjtgz0Rj/Ou6fEqg3HDhpCa+Et+YSufy27i6b0Wav69Qv4WBNl3Rs6pwhebQ==}
|
resolution: {integrity: sha512-89sepv7h2lIVPsFma8iwmccN7Yjjtgz0Rj/Ou6fEqg3HDhpCa+Et+YSufy27i6b0Wav69Qv4WBNl3Rs6pwhebQ==}
|
||||||
cpu: [riscv64]
|
cpu: [riscv64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-riscv64-musl@4.54.0':
|
'@rollup/rollup-linux-riscv64-musl@4.54.0':
|
||||||
resolution: {integrity: sha512-ZcU77ieh0M2Q8Ur7D5X7KvK+UxbXeDHwiOt/CPSBTI1fBmeDMivW0dPkdqkT4rOgDjrDDBUed9x4EgraIKoR2A==}
|
resolution: {integrity: sha512-ZcU77ieh0M2Q8Ur7D5X7KvK+UxbXeDHwiOt/CPSBTI1fBmeDMivW0dPkdqkT4rOgDjrDDBUed9x4EgraIKoR2A==}
|
||||||
cpu: [riscv64]
|
cpu: [riscv64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@rollup/rollup-linux-s390x-gnu@4.54.0':
|
'@rollup/rollup-linux-s390x-gnu@4.54.0':
|
||||||
resolution: {integrity: sha512-2AdWy5RdDF5+4YfG/YesGDDtbyJlC9LHmL6rZw6FurBJ5n4vFGupsOBGfwMRjBYH7qRQowT8D/U4LoSvVwOhSQ==}
|
resolution: {integrity: sha512-2AdWy5RdDF5+4YfG/YesGDDtbyJlC9LHmL6rZw6FurBJ5n4vFGupsOBGfwMRjBYH7qRQowT8D/U4LoSvVwOhSQ==}
|
||||||
cpu: [s390x]
|
cpu: [s390x]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-x64-gnu@4.54.0':
|
'@rollup/rollup-linux-x64-gnu@4.54.0':
|
||||||
resolution: {integrity: sha512-WGt5J8Ij/rvyqpFexxk3ffKqqbLf9AqrTBbWDk7ApGUzaIs6V+s2s84kAxklFwmMF/vBNGrVdYgbblCOFFezMQ==}
|
resolution: {integrity: sha512-WGt5J8Ij/rvyqpFexxk3ffKqqbLf9AqrTBbWDk7ApGUzaIs6V+s2s84kAxklFwmMF/vBNGrVdYgbblCOFFezMQ==}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [glibc]
|
||||||
|
|
||||||
'@rollup/rollup-linux-x64-musl@4.54.0':
|
'@rollup/rollup-linux-x64-musl@4.54.0':
|
||||||
resolution: {integrity: sha512-JzQmb38ATzHjxlPHuTH6tE7ojnMKM2kYNzt44LO/jJi8BpceEC8QuXYA908n8r3CNuG/B3BV8VR3Hi1rYtmPiw==}
|
resolution: {integrity: sha512-JzQmb38ATzHjxlPHuTH6tE7ojnMKM2kYNzt44LO/jJi8BpceEC8QuXYA908n8r3CNuG/B3BV8VR3Hi1rYtmPiw==}
|
||||||
cpu: [x64]
|
cpu: [x64]
|
||||||
os: [linux]
|
os: [linux]
|
||||||
|
libc: [musl]
|
||||||
|
|
||||||
'@rollup/rollup-openharmony-arm64@4.54.0':
|
'@rollup/rollup-openharmony-arm64@4.54.0':
|
||||||
resolution: {integrity: sha512-huT3fd0iC7jigGh7n3q/+lfPcXxBi+om/Rs3yiFxjvSxbSB6aohDFXbWvlspaqjeOh+hx7DDHS+5Es5qRkWkZg==}
|
resolution: {integrity: sha512-huT3fd0iC7jigGh7n3q/+lfPcXxBi+om/Rs3yiFxjvSxbSB6aohDFXbWvlspaqjeOh+hx7DDHS+5Es5qRkWkZg==}
|
||||||
@@ -799,10 +719,6 @@ packages:
|
|||||||
resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
|
resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
|
||||||
engines: {node: '>=10'}
|
engines: {node: '>=10'}
|
||||||
|
|
||||||
chokidar@4.0.3:
|
|
||||||
resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
|
|
||||||
engines: {node: '>= 14.16.0'}
|
|
||||||
|
|
||||||
color-convert@2.0.1:
|
color-convert@2.0.1:
|
||||||
resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
|
resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
|
||||||
engines: {node: '>=7.0.0'}
|
engines: {node: '>=7.0.0'}
|
||||||
@@ -810,9 +726,6 @@ packages:
|
|||||||
color-name@1.1.4:
|
color-name@1.1.4:
|
||||||
resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
|
resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
|
||||||
|
|
||||||
colorjs.io@0.5.2:
|
|
||||||
resolution: {integrity: sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==}
|
|
||||||
|
|
||||||
combined-stream@1.0.8:
|
combined-stream@1.0.8:
|
||||||
resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
|
resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
|
||||||
engines: {node: '>= 0.8'}
|
engines: {node: '>= 0.8'}
|
||||||
@@ -870,17 +783,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
|
resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
|
||||||
engines: {node: '>=0.4.0'}
|
engines: {node: '>=0.4.0'}
|
||||||
|
|
||||||
detect-libc@2.1.2:
|
|
||||||
resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
|
|
||||||
engines: {node: '>=8'}
|
|
||||||
|
|
||||||
dunder-proto@1.0.1:
|
dunder-proto@1.0.1:
|
||||||
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==}
|
||||||
|
|
||||||
@@ -1107,9 +1013,6 @@ packages:
|
|||||||
resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
|
resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
|
||||||
engines: {node: '>= 4'}
|
engines: {node: '>= 4'}
|
||||||
|
|
||||||
immutable@5.1.4:
|
|
||||||
resolution: {integrity: sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==}
|
|
||||||
|
|
||||||
import-fresh@3.3.1:
|
import-fresh@3.3.1:
|
||||||
resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
|
resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
|
||||||
engines: {node: '>=6'}
|
engines: {node: '>=6'}
|
||||||
@@ -1234,9 +1137,6 @@ packages:
|
|||||||
natural-compare@1.4.0:
|
natural-compare@1.4.0:
|
||||||
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
|
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
|
||||||
|
|
||||||
node-addon-api@7.1.1:
|
|
||||||
resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
|
|
||||||
|
|
||||||
node-releases@2.0.27:
|
node-releases@2.0.27:
|
||||||
resolution: {integrity: sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==}
|
resolution: {integrity: sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==}
|
||||||
|
|
||||||
@@ -1327,10 +1227,6 @@ packages:
|
|||||||
resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
|
resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
|
||||||
engines: {node: '>=6'}
|
engines: {node: '>=6'}
|
||||||
|
|
||||||
readdirp@4.1.2:
|
|
||||||
resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
|
|
||||||
engines: {node: '>= 14.18.0'}
|
|
||||||
|
|
||||||
resolve-from@4.0.0:
|
resolve-from@4.0.0:
|
||||||
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
|
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
|
||||||
engines: {node: '>=4'}
|
engines: {node: '>=4'}
|
||||||
@@ -1347,123 +1243,6 @@ packages:
|
|||||||
resolution: {integrity: sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==}
|
resolution: {integrity: sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==}
|
||||||
engines: {node: '>=18'}
|
engines: {node: '>=18'}
|
||||||
|
|
||||||
rxjs@7.8.2:
|
|
||||||
resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==}
|
|
||||||
|
|
||||||
sass-embedded-all-unknown@1.97.3:
|
|
||||||
resolution: {integrity: sha512-t6N46NlPuXiY3rlmG6/+1nwebOBOaLFOOVqNQOC2cJhghOD4hh2kHNQQTorCsbY9S1Kir2la1/XLBwOJfui0xg==}
|
|
||||||
cpu: ['!arm', '!arm64', '!riscv64', '!x64']
|
|
||||||
|
|
||||||
sass-embedded-android-arm64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-aiZ6iqiHsUsaDx0EFbbmmA0QgxicSxVVN3lnJJ0f1RStY0DthUkquGT5RJ4TPdaZ6ebeJWkboV4bra+CP766eA==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [android]
|
|
||||||
|
|
||||||
sass-embedded-android-arm@1.97.3:
|
|
||||||
resolution: {integrity: sha512-cRTtf/KV/q0nzGZoUzVkeIVVFv3L/tS1w4WnlHapphsjTXF/duTxI8JOU1c/9GhRPiMdfeXH7vYNcMmtjwX7jg==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [arm]
|
|
||||||
os: [android]
|
|
||||||
|
|
||||||
sass-embedded-android-riscv64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-zVEDgl9JJodofGHobaM/q6pNETG69uuBIGQHRo789jloESxxZe82lI3AWJQuPmYCOG5ElfRthqgv89h3gTeLYA==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [riscv64]
|
|
||||||
os: [android]
|
|
||||||
|
|
||||||
sass-embedded-android-x64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-3ke0le7ZKepyXn/dKKspYkpBC0zUk/BMciyP5ajQUDy4qJwobd8zXdAq6kOkdiMB+d9UFJOmEkvgFJHl3lqwcw==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [android]
|
|
||||||
|
|
||||||
sass-embedded-darwin-arm64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-fuqMTqO4gbOmA/kC5b9y9xxNYw6zDEyfOtMgabS7Mz93wimSk2M1quQaTJnL98Mkcsl2j+7shNHxIS/qpcIDDA==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [darwin]
|
|
||||||
|
|
||||||
sass-embedded-darwin-x64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-b/2RBs/2bZpP8lMkyZ0Px0vkVkT8uBd0YXpOwK7iOwYkAT8SsO4+WdVwErsqC65vI5e1e5p1bb20tuwsoQBMVA==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [darwin]
|
|
||||||
|
|
||||||
sass-embedded-linux-arm64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-IP1+2otCT3DuV46ooxPaOKV1oL5rLjteRzf8ldZtfIEcwhSgSsHgA71CbjYgLEwMY9h4jeal8Jfv3QnedPvSjg==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
sass-embedded-linux-arm@1.97.3:
|
|
||||||
resolution: {integrity: sha512-2lPQ7HQQg4CKsH18FTsj2hbw5GJa6sBQgDsls+cV7buXlHjqF8iTKhAQViT6nrpLK/e8nFCoaRgSqEC8xMnXuA==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [arm]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
sass-embedded-linux-musl-arm64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-Lij0SdZCsr+mNRSyDZ7XtJpXEITrYsaGbOTz5e6uFLJ9bmzUbV7M8BXz2/cA7bhfpRPT7/lwRKPdV4+aR9Ozcw==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
sass-embedded-linux-musl-arm@1.97.3:
|
|
||||||
resolution: {integrity: sha512-cBTMU68X2opBpoYsSZnI321gnoaiMBEtc+60CKCclN6PCL3W3uXm8g4TLoil1hDD6mqU9YYNlVG6sJ+ZNef6Lg==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [arm]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
sass-embedded-linux-musl-riscv64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-sBeLFIzMGshR4WmHAD4oIM7WJVkSoCIEwutzptFtGlSlwfNiijULp+J5hA2KteGvI6Gji35apR5aWj66wEn/iA==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [riscv64]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
sass-embedded-linux-musl-x64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-/oWJ+OVrDg7ADDQxRLC/4g1+Nsz1g4mkYS2t6XmyMJKFTFK50FVI2t5sOdFH+zmMp+nXHKM036W94y9m4jjEcw==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
sass-embedded-linux-riscv64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-l3IfySApLVYdNx0Kjm7Zehte1CDPZVcldma3dZt+TfzvlAEerM6YDgsk5XEj3L8eHBCgHgF4A0MJspHEo2WNfA==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [riscv64]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
sass-embedded-linux-x64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-Kwqwc/jSSlcpRjULAOVbndqEy2GBzo6OBmmuBVINWUaJLJ8Kczz3vIsDUWLfWz/kTEw9FHBSiL0WCtYLVAXSLg==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [linux]
|
|
||||||
|
|
||||||
sass-embedded-unknown-all@1.97.3:
|
|
||||||
resolution: {integrity: sha512-/GHajyYJmvb0IABUQHbVHf1nuHPtIDo/ClMZ81IDr59wT5CNcMe7/dMNujXwWugtQVGI5UGmqXWZQCeoGnct8Q==}
|
|
||||||
os: ['!android', '!darwin', '!linux', '!win32']
|
|
||||||
|
|
||||||
sass-embedded-win32-arm64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-RDGtRS1GVvQfMGAmVXNxYiUOvPzn9oO1zYB/XUM9fudDRnieYTcUytpNTQZLs6Y1KfJxgt5Y+giRceC92fT8Uw==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [win32]
|
|
||||||
|
|
||||||
sass-embedded-win32-x64@1.97.3:
|
|
||||||
resolution: {integrity: sha512-SFRa2lED9UEwV6vIGeBXeBOLKF+rowF3WmNfb/BzhxmdAsKofCXrJ8ePW7OcDVrvNEbTOGwhsReIsF5sH8fVaw==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [win32]
|
|
||||||
|
|
||||||
sass-embedded@1.97.3:
|
|
||||||
resolution: {integrity: sha512-eKzFy13Nk+IRHhlAwP3sfuv+PzOrvzUkwJK2hdoCKYcWGSdmwFpeGpWmyewdw8EgBnsKaSBtgf/0b2K635ecSA==}
|
|
||||||
engines: {node: '>=16.0.0'}
|
|
||||||
hasBin: true
|
|
||||||
|
|
||||||
sass@1.97.3:
|
|
||||||
resolution: {integrity: sha512-fDz1zJpd5GycprAbu4Q2PV/RprsRtKC/0z82z0JLgdytmcq0+ujJbJ/09bPGDxCLkKY3Np5cRAOcWiVkLXJURg==}
|
|
||||||
engines: {node: '>=14.0.0'}
|
|
||||||
hasBin: true
|
|
||||||
|
|
||||||
semver@6.3.1:
|
semver@6.3.1:
|
||||||
resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
|
resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
@@ -1505,18 +1284,6 @@ packages:
|
|||||||
resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
|
resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
|
||||||
engines: {node: '>=8'}
|
engines: {node: '>=8'}
|
||||||
|
|
||||||
supports-color@8.1.1:
|
|
||||||
resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
|
|
||||||
engines: {node: '>=10'}
|
|
||||||
|
|
||||||
sync-child-process@1.0.2:
|
|
||||||
resolution: {integrity: sha512-8lD+t2KrrScJ/7KXCSyfhT3/hRq78rC0wBFqNJXv3mZyn6hW2ypM05JmlSvtqRbeq6jqA94oHbxAr2vYsJ8vDA==}
|
|
||||||
engines: {node: '>=16.0.0'}
|
|
||||||
|
|
||||||
sync-message-port@1.2.0:
|
|
||||||
resolution: {integrity: sha512-gAQ9qrUN/UCypHtGFbbe7Rc/f9bzO88IwrG8TDo/aMKAApKyD6E3W4Cm0EfhfBb6Z6SKt59tTCTfD+n1xmAvMg==}
|
|
||||||
engines: {node: '>=16.0.0'}
|
|
||||||
|
|
||||||
synckit@0.11.11:
|
synckit@0.11.11:
|
||||||
resolution: {integrity: sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==}
|
resolution: {integrity: sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==}
|
||||||
engines: {node: ^14.18.0 || >=16.0.0}
|
engines: {node: ^14.18.0 || >=16.0.0}
|
||||||
@@ -1529,9 +1296,6 @@ 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'}
|
||||||
@@ -1557,9 +1321,6 @@ packages:
|
|||||||
peerDependencies:
|
peerDependencies:
|
||||||
vue: ^3.0.0
|
vue: ^3.0.0
|
||||||
|
|
||||||
varint@6.0.0:
|
|
||||||
resolution: {integrity: sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==}
|
|
||||||
|
|
||||||
vite-dev-rpc@1.1.0:
|
vite-dev-rpc@1.1.0:
|
||||||
resolution: {integrity: sha512-pKXZlgoXGoE8sEKiKJSng4hI1sQ4wi5YT24FCrwrLt6opmkjlqPPVmiPWWJn8M8byMxRGzp1CrFuqQs4M/Z39A==}
|
resolution: {integrity: sha512-pKXZlgoXGoE8sEKiKJSng4hI1sQ4wi5YT24FCrwrLt6opmkjlqPPVmiPWWJn8M8byMxRGzp1CrFuqQs4M/Z39A==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
@@ -1674,9 +1435,6 @@ 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':
|
||||||
@@ -1870,8 +1628,6 @@ snapshots:
|
|||||||
'@babel/helper-string-parser': 7.27.1
|
'@babel/helper-string-parser': 7.27.1
|
||||||
'@babel/helper-validator-identifier': 7.28.5
|
'@babel/helper-validator-identifier': 7.28.5
|
||||||
|
|
||||||
'@bufbuild/protobuf@2.11.0': {}
|
|
||||||
|
|
||||||
'@esbuild/aix-ppc64@0.27.2':
|
'@esbuild/aix-ppc64@0.27.2':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
@@ -2026,67 +1782,6 @@ snapshots:
|
|||||||
'@jridgewell/resolve-uri': 3.1.2
|
'@jridgewell/resolve-uri': 3.1.2
|
||||||
'@jridgewell/sourcemap-codec': 1.5.5
|
'@jridgewell/sourcemap-codec': 1.5.5
|
||||||
|
|
||||||
'@parcel/watcher-android-arm64@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-darwin-arm64@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-darwin-x64@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-freebsd-x64@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm-glibc@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm-musl@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm64-glibc@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-arm64-musl@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-x64-glibc@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-linux-x64-musl@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-win32-arm64@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-win32-ia32@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher-win32-x64@2.5.6':
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@parcel/watcher@2.5.6':
|
|
||||||
dependencies:
|
|
||||||
detect-libc: 2.1.2
|
|
||||||
is-glob: 4.0.3
|
|
||||||
node-addon-api: 7.1.1
|
|
||||||
picomatch: 4.0.3
|
|
||||||
optionalDependencies:
|
|
||||||
'@parcel/watcher-android-arm64': 2.5.6
|
|
||||||
'@parcel/watcher-darwin-arm64': 2.5.6
|
|
||||||
'@parcel/watcher-darwin-x64': 2.5.6
|
|
||||||
'@parcel/watcher-freebsd-x64': 2.5.6
|
|
||||||
'@parcel/watcher-linux-arm-glibc': 2.5.6
|
|
||||||
'@parcel/watcher-linux-arm-musl': 2.5.6
|
|
||||||
'@parcel/watcher-linux-arm64-glibc': 2.5.6
|
|
||||||
'@parcel/watcher-linux-arm64-musl': 2.5.6
|
|
||||||
'@parcel/watcher-linux-x64-glibc': 2.5.6
|
|
||||||
'@parcel/watcher-linux-x64-musl': 2.5.6
|
|
||||||
'@parcel/watcher-win32-arm64': 2.5.6
|
|
||||||
'@parcel/watcher-win32-ia32': 2.5.6
|
|
||||||
'@parcel/watcher-win32-x64': 2.5.6
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
'@pkgr/core@0.2.9': {}
|
'@pkgr/core@0.2.9': {}
|
||||||
|
|
||||||
'@polka/url@1.0.0-next.29': {}
|
'@polka/url@1.0.0-next.29': {}
|
||||||
@@ -2169,10 +1864,10 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
vue: 3.5.26
|
vue: 3.5.26
|
||||||
|
|
||||||
'@vitejs/plugin-vue@6.0.3(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))(vue@3.5.26)':
|
'@vitejs/plugin-vue@6.0.3(vite@7.3.0)(vue@3.5.26)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@rolldown/pluginutils': 1.0.0-beta.53
|
'@rolldown/pluginutils': 1.0.0-beta.53
|
||||||
vite: 7.3.0(sass-embedded@1.97.3)(sass@1.97.3)
|
vite: 7.3.0
|
||||||
vue: 3.5.26
|
vue: 3.5.26
|
||||||
|
|
||||||
'@vue/babel-helper-vue-transform-on@1.5.0': {}
|
'@vue/babel-helper-vue-transform-on@1.5.0': {}
|
||||||
@@ -2240,14 +1935,14 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@vue/devtools-kit': 7.7.9
|
'@vue/devtools-kit': 7.7.9
|
||||||
|
|
||||||
'@vue/devtools-core@8.0.5(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))(vue@3.5.26)':
|
'@vue/devtools-core@8.0.5(vite@7.3.0)(vue@3.5.26)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@vue/devtools-kit': 8.0.5
|
'@vue/devtools-kit': 8.0.5
|
||||||
'@vue/devtools-shared': 8.0.5
|
'@vue/devtools-shared': 8.0.5
|
||||||
mitt: 3.0.1
|
mitt: 3.0.1
|
||||||
nanoid: 5.1.6
|
nanoid: 5.1.6
|
||||||
pathe: 2.0.3
|
pathe: 2.0.3
|
||||||
vite-hot-client: 2.1.0(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))
|
vite-hot-client: 2.1.0(vite@7.3.0)
|
||||||
vue: 3.5.26
|
vue: 3.5.26
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- vite
|
- vite
|
||||||
@@ -2383,19 +2078,12 @@ snapshots:
|
|||||||
ansi-styles: 4.3.0
|
ansi-styles: 4.3.0
|
||||||
supports-color: 7.2.0
|
supports-color: 7.2.0
|
||||||
|
|
||||||
chokidar@4.0.3:
|
|
||||||
dependencies:
|
|
||||||
readdirp: 4.1.2
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
color-convert@2.0.1:
|
color-convert@2.0.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
color-name: 1.1.4
|
color-name: 1.1.4
|
||||||
|
|
||||||
color-name@1.1.4: {}
|
color-name@1.1.4: {}
|
||||||
|
|
||||||
colorjs.io@0.5.2: {}
|
|
||||||
|
|
||||||
combined-stream@1.0.8:
|
combined-stream@1.0.8:
|
||||||
dependencies:
|
dependencies:
|
||||||
delayed-stream: 1.0.0
|
delayed-stream: 1.0.0
|
||||||
@@ -2437,20 +2125,12 @@ snapshots:
|
|||||||
|
|
||||||
delayed-stream@1.0.0: {}
|
delayed-stream@1.0.0: {}
|
||||||
|
|
||||||
detect-libc@2.1.2:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
dunder-proto@1.0.1:
|
dunder-proto@1.0.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
call-bind-apply-helpers: 1.0.2
|
call-bind-apply-helpers: 1.0.2
|
||||||
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: {}
|
||||||
@@ -2686,8 +2366,6 @@ snapshots:
|
|||||||
|
|
||||||
ignore@5.3.2: {}
|
ignore@5.3.2: {}
|
||||||
|
|
||||||
immutable@5.1.4: {}
|
|
||||||
|
|
||||||
import-fresh@3.3.1:
|
import-fresh@3.3.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
parent-module: 1.0.1
|
parent-module: 1.0.1
|
||||||
@@ -2780,9 +2458,6 @@ snapshots:
|
|||||||
|
|
||||||
natural-compare@1.4.0: {}
|
natural-compare@1.4.0: {}
|
||||||
|
|
||||||
node-addon-api@7.1.1:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
node-releases@2.0.27: {}
|
node-releases@2.0.27: {}
|
||||||
|
|
||||||
nth-check@2.1.1:
|
nth-check@2.1.1:
|
||||||
@@ -2861,9 +2536,6 @@ snapshots:
|
|||||||
|
|
||||||
punycode@2.3.1: {}
|
punycode@2.3.1: {}
|
||||||
|
|
||||||
readdirp@4.1.2:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
resolve-from@4.0.0: {}
|
resolve-from@4.0.0: {}
|
||||||
|
|
||||||
rfdc@1.4.1: {}
|
rfdc@1.4.1: {}
|
||||||
@@ -2898,106 +2570,6 @@ snapshots:
|
|||||||
|
|
||||||
run-applescript@7.1.0: {}
|
run-applescript@7.1.0: {}
|
||||||
|
|
||||||
rxjs@7.8.2:
|
|
||||||
dependencies:
|
|
||||||
tslib: 2.3.0
|
|
||||||
|
|
||||||
sass-embedded-all-unknown@1.97.3:
|
|
||||||
dependencies:
|
|
||||||
sass: 1.97.3
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-android-arm64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-android-arm@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-android-riscv64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-android-x64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-darwin-arm64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-darwin-x64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-linux-arm64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-linux-arm@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-linux-musl-arm64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-linux-musl-arm@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-linux-musl-riscv64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-linux-musl-x64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-linux-riscv64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-linux-x64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-unknown-all@1.97.3:
|
|
||||||
dependencies:
|
|
||||||
sass: 1.97.3
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-win32-arm64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded-win32-x64@1.97.3:
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
sass-embedded@1.97.3:
|
|
||||||
dependencies:
|
|
||||||
'@bufbuild/protobuf': 2.11.0
|
|
||||||
colorjs.io: 0.5.2
|
|
||||||
immutable: 5.1.4
|
|
||||||
rxjs: 7.8.2
|
|
||||||
supports-color: 8.1.1
|
|
||||||
sync-child-process: 1.0.2
|
|
||||||
varint: 6.0.0
|
|
||||||
optionalDependencies:
|
|
||||||
sass-embedded-all-unknown: 1.97.3
|
|
||||||
sass-embedded-android-arm: 1.97.3
|
|
||||||
sass-embedded-android-arm64: 1.97.3
|
|
||||||
sass-embedded-android-riscv64: 1.97.3
|
|
||||||
sass-embedded-android-x64: 1.97.3
|
|
||||||
sass-embedded-darwin-arm64: 1.97.3
|
|
||||||
sass-embedded-darwin-x64: 1.97.3
|
|
||||||
sass-embedded-linux-arm: 1.97.3
|
|
||||||
sass-embedded-linux-arm64: 1.97.3
|
|
||||||
sass-embedded-linux-musl-arm: 1.97.3
|
|
||||||
sass-embedded-linux-musl-arm64: 1.97.3
|
|
||||||
sass-embedded-linux-musl-riscv64: 1.97.3
|
|
||||||
sass-embedded-linux-musl-x64: 1.97.3
|
|
||||||
sass-embedded-linux-riscv64: 1.97.3
|
|
||||||
sass-embedded-linux-x64: 1.97.3
|
|
||||||
sass-embedded-unknown-all: 1.97.3
|
|
||||||
sass-embedded-win32-arm64: 1.97.3
|
|
||||||
sass-embedded-win32-x64: 1.97.3
|
|
||||||
|
|
||||||
sass@1.97.3:
|
|
||||||
dependencies:
|
|
||||||
chokidar: 4.0.3
|
|
||||||
immutable: 5.1.4
|
|
||||||
source-map-js: 1.2.1
|
|
||||||
optionalDependencies:
|
|
||||||
'@parcel/watcher': 2.5.6
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
semver@6.3.1: {}
|
semver@6.3.1: {}
|
||||||
|
|
||||||
semver@7.7.3: {}
|
semver@7.7.3: {}
|
||||||
@@ -3028,16 +2600,6 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
has-flag: 4.0.0
|
has-flag: 4.0.0
|
||||||
|
|
||||||
supports-color@8.1.1:
|
|
||||||
dependencies:
|
|
||||||
has-flag: 4.0.0
|
|
||||||
|
|
||||||
sync-child-process@1.0.2:
|
|
||||||
dependencies:
|
|
||||||
sync-message-port: 1.2.0
|
|
||||||
|
|
||||||
sync-message-port@1.2.0: {}
|
|
||||||
|
|
||||||
synckit@0.11.11:
|
synckit@0.11.11:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@pkgr/core': 0.2.9
|
'@pkgr/core': 0.2.9
|
||||||
@@ -3049,8 +2611,6 @@ 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
|
||||||
@@ -3079,19 +2639,17 @@ snapshots:
|
|||||||
'@vue/shared': 3.5.26
|
'@vue/shared': 3.5.26
|
||||||
vue: 3.5.26
|
vue: 3.5.26
|
||||||
|
|
||||||
varint@6.0.0: {}
|
vite-dev-rpc@1.1.0(vite@7.3.0):
|
||||||
|
|
||||||
vite-dev-rpc@1.1.0(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3)):
|
|
||||||
dependencies:
|
dependencies:
|
||||||
birpc: 2.9.0
|
birpc: 2.9.0
|
||||||
vite: 7.3.0(sass-embedded@1.97.3)(sass@1.97.3)
|
vite: 7.3.0
|
||||||
vite-hot-client: 2.1.0(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))
|
vite-hot-client: 2.1.0(vite@7.3.0)
|
||||||
|
|
||||||
vite-hot-client@2.1.0(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3)):
|
vite-hot-client@2.1.0(vite@7.3.0):
|
||||||
dependencies:
|
dependencies:
|
||||||
vite: 7.3.0(sass-embedded@1.97.3)(sass@1.97.3)
|
vite: 7.3.0
|
||||||
|
|
||||||
vite-plugin-inspect@11.3.3(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3)):
|
vite-plugin-inspect@11.3.3(vite@7.3.0):
|
||||||
dependencies:
|
dependencies:
|
||||||
ansis: 4.2.0
|
ansis: 4.2.0
|
||||||
debug: 4.4.3
|
debug: 4.4.3
|
||||||
@@ -3101,26 +2659,26 @@ snapshots:
|
|||||||
perfect-debounce: 2.0.0
|
perfect-debounce: 2.0.0
|
||||||
sirv: 3.0.2
|
sirv: 3.0.2
|
||||||
unplugin-utils: 0.3.1
|
unplugin-utils: 0.3.1
|
||||||
vite: 7.3.0(sass-embedded@1.97.3)(sass@1.97.3)
|
vite: 7.3.0
|
||||||
vite-dev-rpc: 1.1.0(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))
|
vite-dev-rpc: 1.1.0(vite@7.3.0)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
vite-plugin-vue-devtools@8.0.5(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))(vue@3.5.26):
|
vite-plugin-vue-devtools@8.0.5(vite@7.3.0)(vue@3.5.26):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@vue/devtools-core': 8.0.5(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))(vue@3.5.26)
|
'@vue/devtools-core': 8.0.5(vite@7.3.0)(vue@3.5.26)
|
||||||
'@vue/devtools-kit': 8.0.5
|
'@vue/devtools-kit': 8.0.5
|
||||||
'@vue/devtools-shared': 8.0.5
|
'@vue/devtools-shared': 8.0.5
|
||||||
sirv: 3.0.2
|
sirv: 3.0.2
|
||||||
vite: 7.3.0(sass-embedded@1.97.3)(sass@1.97.3)
|
vite: 7.3.0
|
||||||
vite-plugin-inspect: 11.3.3(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))
|
vite-plugin-inspect: 11.3.3(vite@7.3.0)
|
||||||
vite-plugin-vue-inspector: 5.3.2(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3))
|
vite-plugin-vue-inspector: 5.3.2(vite@7.3.0)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- '@nuxt/kit'
|
- '@nuxt/kit'
|
||||||
- supports-color
|
- supports-color
|
||||||
- vue
|
- vue
|
||||||
|
|
||||||
vite-plugin-vue-inspector@5.3.2(vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3)):
|
vite-plugin-vue-inspector@5.3.2(vite@7.3.0):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@babel/core': 7.28.5
|
'@babel/core': 7.28.5
|
||||||
'@babel/plugin-proposal-decorators': 7.28.0(@babel/core@7.28.5)
|
'@babel/plugin-proposal-decorators': 7.28.0(@babel/core@7.28.5)
|
||||||
@@ -3131,11 +2689,11 @@ snapshots:
|
|||||||
'@vue/compiler-dom': 3.5.26
|
'@vue/compiler-dom': 3.5.26
|
||||||
kolorist: 1.8.0
|
kolorist: 1.8.0
|
||||||
magic-string: 0.30.21
|
magic-string: 0.30.21
|
||||||
vite: 7.3.0(sass-embedded@1.97.3)(sass@1.97.3)
|
vite: 7.3.0
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
vite@7.3.0(sass-embedded@1.97.3)(sass@1.97.3):
|
vite@7.3.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
esbuild: 0.27.2
|
esbuild: 0.27.2
|
||||||
fdir: 6.5.0(picomatch@4.0.3)
|
fdir: 6.5.0(picomatch@4.0.3)
|
||||||
@@ -3145,8 +2703,6 @@ snapshots:
|
|||||||
tinyglobby: 0.2.15
|
tinyglobby: 0.2.15
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
fsevents: 2.3.3
|
fsevents: 2.3.3
|
||||||
sass: 1.97.3
|
|
||||||
sass-embedded: 1.97.3
|
|
||||||
|
|
||||||
vue-eslint-parser@10.2.0(eslint@9.39.2):
|
vue-eslint-parser@10.2.0(eslint@9.39.2):
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -3188,7 +2744,3 @@ 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
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "账单",
|
"name": "账单",
|
||||||
"short_name": "账单",
|
"short_name": "账单",
|
||||||
"description": "个人账单管理与邮件解析",
|
"description": "个人账单管理与邮件解析",
|
||||||
"start_url": "/",
|
"start_url": "/",
|
||||||
"display": "standalone",
|
"display": "standalone",
|
||||||
"background_color": "#ffffff",
|
"background_color": "#ffffff",
|
||||||
"theme_color": "#ffffff",
|
"theme_color": "#1989fa",
|
||||||
"orientation": "portrait-primary",
|
"orientation": "portrait-primary",
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,56 +1,56 @@
|
|||||||
const VERSION = '1.0.0' // Build Time: 2026-01-07 15:59:36
|
const VERSION = '1.0.0'; // Build Time: 2026-01-07 15:59:36
|
||||||
const CACHE_NAME = `emailbill-${VERSION}`
|
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);
|
||||||
})
|
})
|
||||||
)
|
);
|
||||||
})
|
});
|
||||||
|
|
||||||
// 监听跳过等待消息
|
// 监听跳过等待消息
|
||||||
self.addEventListener('message', (event) => {
|
self.addEventListener('message', (event) => {
|
||||||
if (event.data && event.data.type === 'SKIP_WAITING') {
|
if (event.data && event.data.type === 'SKIP_WAITING') {
|
||||||
self.skipWaiting()
|
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请求使用网络优先策略
|
||||||
@@ -60,19 +60,19 @@ self.addEventListener('fetch', (event) => {
|
|||||||
.then((response) => {
|
.then((response) => {
|
||||||
// 只针对成功的GET请求进行缓存
|
// 只针对成功的GET请求进行缓存
|
||||||
if (request.method === 'GET' && response.status === 200) {
|
if (request.method === 'GET' && response.status === 200) {
|
||||||
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(() => {
|
||||||
// 网络失败时尝试从缓存获取
|
// 网络失败时尝试从缓存获取
|
||||||
return caches.match(request)
|
return caches.match(request);
|
||||||
})
|
})
|
||||||
)
|
);
|
||||||
return
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 页面请求使用网络优先策略，确保能获取到最新的 index.html
|
// 页面请求使用网络优先策略，确保能获取到最新的 index.html
|
||||||
@@ -80,17 +80,17 @@ self.addEventListener('fetch', (event) => {
|
|||||||
event.respondWith(
|
event.respondWith(
|
||||||
fetch(request)
|
fetch(request)
|
||||||
.then((response) => {
|
.then((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(() => {
|
||||||
return caches.match('/index.html') || caches.match(request)
|
return caches.match('/index.html') || caches.match(request);
|
||||||
})
|
})
|
||||||
)
|
);
|
||||||
return
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 其他静态资源使用缓存优先策略
|
// 其他静态资源使用缓存优先策略
|
||||||
@@ -98,50 +98,50 @@ self.addEventListener('fetch', (event) => {
|
|||||||
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' }
|
let data = { title: '账单管理', body: '您有新的消息', url: '/', icon: '/icons/icon-192x192.png' };
|
||||||
|
|
||||||
if (event.data) {
|
if (event.data) {
|
||||||
try {
|
try {
|
||||||
const json = event.data.json()
|
const json = event.data.json();
|
||||||
data = { ...data, ...json }
|
data = { ...data, ...json };
|
||||||
} catch {
|
} catch {
|
||||||
data.body = event.data.text()
|
data.body = event.data.text();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,41 +153,41 @@ self.addEventListener('push', (event) => {
|
|||||||
tag: 'emailbill-notification',
|
tag: 'emailbill-notification',
|
||||||
requireInteraction: false,
|
requireInteraction: false,
|
||||||
data: { url: data.url }
|
data: { url: data.url }
|
||||||
}
|
};
|
||||||
|
|
||||||
event.waitUntil(
|
event.waitUntil(
|
||||||
self.registration.showNotification(data.title, 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 || '/'
|
const urlToOpen = event.notification.data?.url || '/';
|
||||||
event.waitUntil(
|
event.waitUntil(
|
||||||
clients.matchAll({ type: 'window', includeUncontrolled: true }).then((windowClients) => {
|
clients.matchAll({ type: 'window', includeUncontrolled: true }).then((windowClients) => {
|
||||||
// 如果已经打开了该 URL，则聚焦
|
// 如果已经打开了该 URL，则聚焦
|
||||||
for (let i = 0; i < windowClients.length; i++) {
|
for (let i = 0; i < windowClients.length; i++) {
|
||||||
const client = windowClients[i]
|
const client = windowClients[i];
|
||||||
if (client.url === urlToOpen && 'focus' in client) {
|
if (client.url === urlToOpen && 'focus' in client) {
|
||||||
return client.focus()
|
return client.focus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 否则打开新窗口
|
// 否则打开新窗口
|
||||||
if (clients.openWindow) {
|
if (clients.openWindow) {
|
||||||
return clients.openWindow(urlToOpen)
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,37 +1,12 @@
|
|||||||
<template>
|
<template>
|
||||||
<van-config-provider
|
<van-config-provider :theme="theme" class="app-provider">
|
||||||
:theme="theme"
|
|
||||||
class="app-provider"
|
|
||||||
>
|
|
||||||
<div class="app-root">
|
<div class="app-root">
|
||||||
<router-view v-slot="{ Component }">
|
<RouterView />
|
||||||
<keep-alive
|
<van-tabbar v-show="showTabbar" v-model="active">
|
||||||
:include="cachedViews"
|
<van-tabbar-item name="ccalendar" icon="notes" to="/calendar">
|
||||||
:max="8"
|
|
||||||
>
|
|
||||||
<component
|
|
||||||
:is="Component"
|
|
||||||
:key="route.name"
|
|
||||||
/>
|
|
||||||
</keep-alive>
|
|
||||||
</router-view>
|
|
||||||
<van-tabbar
|
|
||||||
v-show="showTabbar"
|
|
||||||
v-model="active"
|
|
||||||
>
|
|
||||||
<van-tabbar-item
|
|
||||||
name="ccalendar"
|
|
||||||
icon="notes"
|
|
||||||
to="/calendar"
|
|
||||||
>
|
|
||||||
日历
|
日历
|
||||||
</van-tabbar-item>
|
</van-tabbar-item>
|
||||||
<van-tabbar-item
|
<van-tabbar-item name="statistics" icon="chart-trending-o" to="/" @click="handleTabClick('/statistics')">
|
||||||
name="statistics"
|
|
||||||
icon="chart-trending-o"
|
|
||||||
to="/"
|
|
||||||
@click="handleTabClick('/statistics')"
|
|
||||||
>
|
|
||||||
统计
|
统计
|
||||||
</van-tabbar-item>
|
</van-tabbar-item>
|
||||||
<van-tabbar-item
|
<van-tabbar-item
|
||||||
@@ -43,36 +18,17 @@
|
|||||||
>
|
>
|
||||||
账单
|
账单
|
||||||
</van-tabbar-item>
|
</van-tabbar-item>
|
||||||
<van-tabbar-item
|
<van-tabbar-item name="budget" icon="bill-o" to="/budget" @click="handleTabClick('/budget')">
|
||||||
name="budget"
|
|
||||||
icon="bill-o"
|
|
||||||
to="/budget"
|
|
||||||
@click="handleTabClick('/budget')"
|
|
||||||
>
|
|
||||||
预算
|
预算
|
||||||
</van-tabbar-item>
|
</van-tabbar-item>
|
||||||
<van-tabbar-item
|
<van-tabbar-item name="setting" icon="setting" to="/setting">
|
||||||
name="setting"
|
|
||||||
icon="setting"
|
|
||||||
to="/setting"
|
|
||||||
>
|
|
||||||
设置
|
设置
|
||||||
</van-tabbar-item>
|
</van-tabbar-item>
|
||||||
</van-tabbar>
|
</van-tabbar>
|
||||||
<GlobalAddBill
|
<GlobalAddBill v-if="isShowAddBill" @success="handleAddTransactionSuccess"/>
|
||||||
v-if="isShowAddBill"
|
|
||||||
@success="handleAddTransactionSuccess"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div
|
<div v-if="needRefresh" class="update-toast" @click="updateServiceWorker">
|
||||||
v-if="needRefresh"
|
<van-icon name="upgrade" class="update-icon" />
|
||||||
class="update-toast"
|
|
||||||
@click="updateServiceWorker"
|
|
||||||
>
|
|
||||||
<van-icon
|
|
||||||
name="upgrade"
|
|
||||||
class="update-icon"
|
|
||||||
/>
|
|
||||||
<span>新版本可用，点击刷新</span>
|
<span>新版本可用，点击刷新</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -89,15 +45,6 @@ import '@/styles/common.css'
|
|||||||
|
|
||||||
const messageStore = useMessageStore()
|
const messageStore = useMessageStore()
|
||||||
|
|
||||||
// 定义需要缓存的页面组件名称
|
|
||||||
const cachedViews = ref([
|
|
||||||
'CalendarV2', // 日历V2页面
|
|
||||||
'CalendarView', // 日历V1页面
|
|
||||||
'StatisticsView', // 统计页面
|
|
||||||
'BalanceView', // 账单页面
|
|
||||||
'BudgetView' // 预算页面
|
|
||||||
])
|
|
||||||
|
|
||||||
const updateVh = () => {
|
const updateVh = () => {
|
||||||
const vh = window.innerHeight
|
const vh = window.innerHeight
|
||||||
document.documentElement.style.setProperty('--vh', `${vh}px`)
|
document.documentElement.style.setProperty('--vh', `${vh}px`)
|
||||||
@@ -138,15 +85,12 @@ onUnmounted(() => {
|
|||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
// 根据路由判断是否显示Tabbar
|
// 根据路由判断是否显示Tabbar
|
||||||
const showTabbar = computed(() => {
|
const showTabbar = computed(() => {
|
||||||
return (
|
return route.path === '/' ||
|
||||||
route.path === '/' ||
|
|
||||||
route.path === '/calendar' ||
|
route.path === '/calendar' ||
|
||||||
route.path === '/calendar-v2' ||
|
|
||||||
route.path === '/message' ||
|
route.path === '/message' ||
|
||||||
route.path === '/setting' ||
|
route.path === '/setting' ||
|
||||||
route.path === '/balance' ||
|
route.path === '/balance' ||
|
||||||
route.path === '/budget'
|
route.path === '/budget'
|
||||||
)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const active = ref('')
|
const active = ref('')
|
||||||
@@ -156,8 +100,6 @@ const theme = ref('light')
|
|||||||
const updateTheme = () => {
|
const updateTheme = () => {
|
||||||
const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches
|
const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches
|
||||||
theme.value = isDark ? 'dark' : 'light'
|
theme.value = isDark ? 'dark' : 'light'
|
||||||
// 在文档根元素上设置 data-theme 属性，使 CSS 变量生效
|
|
||||||
document.documentElement.setAttribute('data-theme', theme.value)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 监听系统主题变化
|
// 监听系统主题变化
|
||||||
@@ -174,20 +116,16 @@ setInterval(() => {
|
|||||||
}, 60 * 1000) // 每60秒更新一次未读消息数
|
}, 60 * 1000) // 每60秒更新一次未读消息数
|
||||||
|
|
||||||
// 监听路由变化调整
|
// 监听路由变化调整
|
||||||
watch(
|
watch(() => route.path, (newPath) => {
|
||||||
() => route.path,
|
|
||||||
(newPath) => {
|
|
||||||
setActive(newPath)
|
setActive(newPath)
|
||||||
|
|
||||||
messageStore.updateUnreadCount()
|
messageStore.updateUnreadCount()
|
||||||
}
|
})
|
||||||
)
|
|
||||||
|
|
||||||
const setActive = (path) => {
|
const setActive = (path) => {
|
||||||
active.value = (() => {
|
active.value = (() => {
|
||||||
switch (path) {
|
switch (path) {
|
||||||
case '/calendar':
|
case '/calendar':
|
||||||
case '/calendar-v2':
|
|
||||||
return 'ccalendar'
|
return 'ccalendar'
|
||||||
case '/balance':
|
case '/balance':
|
||||||
case '/message':
|
case '/message':
|
||||||
@@ -200,10 +138,14 @@ const setActive = (path) => {
|
|||||||
return 'statistics'
|
return 'statistics'
|
||||||
}
|
}
|
||||||
})()
|
})()
|
||||||
|
console.log(active.value, path)
|
||||||
}
|
}
|
||||||
|
|
||||||
const isShowAddBill = computed(() => {
|
const isShowAddBill = computed(() => {
|
||||||
return route.path === '/' || route.path === '/balance' || route.path === '/message' || route.path === '/calendar' || route.path === '/calendar-v2'
|
return route.path === '/'
|
||||||
|
|| route.path === '/calendar'
|
||||||
|
|| route.path === '/balance'
|
||||||
|
|| route.path === '/message'
|
||||||
})
|
})
|
||||||
|
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
@@ -224,6 +166,7 @@ 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>
|
||||||
@@ -231,7 +174,6 @@ const handleAddTransactionSuccess = () => {
|
|||||||
/* 使用准确的视口高度 CSS 变量 */
|
/* 使用准确的视口高度 CSS 变量 */
|
||||||
height: var(--vh, 100vh);
|
height: var(--vh, 100vh);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background-color: var(--van-background);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.app-root {
|
.app-root {
|
||||||
@@ -241,7 +183,6 @@ const handleAddTransactionSuccess = () => {
|
|||||||
padding-top: max(0px, calc(env(safe-area-inset-top, 0px) * 0.75));
|
padding-top: max(0px, calc(env(safe-area-inset-top, 0px) * 0.75));
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background-color: var(--van-background);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TabBar 固定在底部 */
|
/* TabBar 固定在底部 */
|
||||||
|
|||||||
@@ -1,59 +0,0 @@
|
|||||||
# 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
|
|
||||||
@@ -26,8 +26,7 @@ export const uploadBillFile = (file, type) => {
|
|||||||
Authorization: `Bearer ${useAuthStore().token || ''}`
|
Authorization: `Bearer ${useAuthStore().token || ''}`
|
||||||
},
|
},
|
||||||
timeout: 60000 // 文件上传增加超时时间
|
timeout: 60000 // 文件上传增加超时时间
|
||||||
})
|
}).then(response => {
|
||||||
.then((response) => {
|
|
||||||
const { data } = response
|
const { data } = response
|
||||||
|
|
||||||
if (data.success === false) {
|
if (data.success === false) {
|
||||||
@@ -36,8 +35,7 @@ export const uploadBillFile = (file, type) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return data
|
return data
|
||||||
})
|
}).catch(error => {
|
||||||
.catch((error) => {
|
|
||||||
console.error('上传错误:', error)
|
console.error('上传错误:', error)
|
||||||
|
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
* 获取预算列表
|
* 获取预算列表
|
||||||
* @param {string} referenceDate 参考日期 (可选)
|
* @param {string} referenceDate 参考日期 (可选)
|
||||||
*/
|
*/
|
||||||
export function getBudgetList (referenceDate) {
|
export function getBudgetList(referenceDate) {
|
||||||
return request({
|
return request({
|
||||||
url: '/Budget/GetList',
|
url: '/Budget/GetList',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
@@ -12,11 +12,24 @@ export function getBudgetList (referenceDate) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取单个预算统计
|
||||||
|
* @param {number} id 预算ID
|
||||||
|
* @param {string} referenceDate 参考日期
|
||||||
|
*/
|
||||||
|
export function getBudgetStatistics(id, referenceDate) {
|
||||||
|
return request({
|
||||||
|
url: '/Budget/GetStatistics',
|
||||||
|
method: 'get',
|
||||||
|
params: { id, referenceDate }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建预算
|
* 创建预算
|
||||||
* @param {object} data 预算数据
|
* @param {object} data 预算数据
|
||||||
*/
|
*/
|
||||||
export function createBudget (data) {
|
export function createBudget(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/Budget/Create',
|
url: '/Budget/Create',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
@@ -28,7 +41,7 @@ export function createBudget (data) {
|
|||||||
* 更新预算
|
* 更新预算
|
||||||
* @param {object} data 预算数据
|
* @param {object} data 预算数据
|
||||||
*/
|
*/
|
||||||
export function updateBudget (data) {
|
export function updateBudget(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/Budget/Update',
|
url: '/Budget/Update',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
@@ -40,7 +53,7 @@ export function updateBudget (data) {
|
|||||||
* 删除预算
|
* 删除预算
|
||||||
* @param {number} id 预算ID
|
* @param {number} id 预算ID
|
||||||
*/
|
*/
|
||||||
export function deleteBudget (id) {
|
export function deleteBudget(id) {
|
||||||
return request({
|
return request({
|
||||||
url: `/Budget/DeleteById/${id}`,
|
url: `/Budget/DeleteById/${id}`,
|
||||||
method: 'delete'
|
method: 'delete'
|
||||||
@@ -52,7 +65,7 @@ export function deleteBudget (id) {
|
|||||||
* @param {string} category 分类 (Expense/Income/Savings)
|
* @param {string} category 分类 (Expense/Income/Savings)
|
||||||
* @param {string} referenceDate 参考日期 (可选)
|
* @param {string} referenceDate 参考日期 (可选)
|
||||||
*/
|
*/
|
||||||
export function getCategoryStats (category, referenceDate) {
|
export function getCategoryStats(category, referenceDate) {
|
||||||
return request({
|
return request({
|
||||||
url: '/Budget/GetCategoryStats',
|
url: '/Budget/GetCategoryStats',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
@@ -64,48 +77,22 @@ export function getCategoryStats (category, referenceDate) {
|
|||||||
* @param {number} category 预算分类
|
* @param {number} category 预算分类
|
||||||
* @param {string} referenceDate 参考日期
|
* @param {string} referenceDate 参考日期
|
||||||
*/
|
*/
|
||||||
export function getUncoveredCategories (category, referenceDate) {
|
export function getUncoveredCategories(category, referenceDate) {
|
||||||
return request({
|
return request({
|
||||||
url: '/Budget/GetUncoveredCategories',
|
url: '/Budget/GetUncoveredCategories',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: { category, referenceDate }
|
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} year 年份
|
||||||
* @param {number} month 月份
|
* @param {number} month 月份
|
||||||
* @param {number} type 周期类型 (1:Month, 2:Year)
|
|
||||||
*/
|
*/
|
||||||
export function getSavingsBudget (year, month, type) {
|
export function archiveBudgets(year, month) {
|
||||||
return request({
|
return request({
|
||||||
url: '/Budget/GetSavingsBudget',
|
url: `/Budget/ArchiveBudgetsAsync/${year}/${month}`,
|
||||||
method: 'get',
|
method: 'post'
|
||||||
params: { year, month, type }
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
import request from '@/api/request'
|
import request from '@/api/request'
|
||||||
|
|
||||||
export function getJobs () {
|
export function getJobs() {
|
||||||
return request({
|
return request({
|
||||||
url: '/Job/GetJobs',
|
url: '/Job/GetJobs',
|
||||||
method: 'get'
|
method: 'get'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export function executeJob (jobName) {
|
export function executeJob(jobName) {
|
||||||
return request({
|
return request({
|
||||||
url: '/Job/Execute',
|
url: '/Job/Execute',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
@@ -15,7 +15,7 @@ export function executeJob (jobName) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export function pauseJob (jobName) {
|
export function pauseJob(jobName) {
|
||||||
return request({
|
return request({
|
||||||
url: '/Job/Pause',
|
url: '/Job/Pause',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
@@ -23,7 +23,7 @@ export function pauseJob (jobName) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export function resumeJob (jobName) {
|
export function resumeJob(jobName) {
|
||||||
return request({
|
return request({
|
||||||
url: '/Job/Resume',
|
url: '/Job/Resume',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user