47 Commits
Author SHA1 Message Date
liwentao 86b7555943 完善e2e测试与后端测试,微信小程序端UI层测试暂未完成 2026-07-23 20:16:31 +08:00
liwentao b689656faf 增加品牌方案管理 2026-07-23 18:56:35 +08:00
liwentao 4c07ec5455 新增e2e测试脚本,修复部分问题 2026-07-22 20:00:13 +08:00
liwentao 53d1ce6fb2 更新会员端个人页面中团课签到记录显示 2026-07-20 17:27:22 +08:00
liwentao 4a4697c816 新增教练端,实现业务闭环:会员登录注册→查询团课→预约团课→扫码签到→教练端开课→记录实际开课时间→教练端结课→记录实际结课时间→后台查询数据 2026-07-20 17:21:28 +08:00
liwentao df0e68469b 新增教练管理,优化预约人数计数方式 2026-07-19 19:02:10 +08:00
liwentao 97a5eff678 完善业务闭环,实现对轮播图的管理,优化数据库表文件 2026-07-18 16:21:40 +08:00
liwentao feaf014b4a 补充缺失的文件 2026-07-17 16:37:59 +08:00
liwentao ff899f491e 实现用户登录→查询团课→预约团课→扫码签到→后台查看数据闭环 2026-07-17 16:36:25 +08:00
liwentao 922c5850b5 补充缺失的文件 2026-07-17 15:57:05 +08:00
liwentao 2e7c2ced43 实现大部分页面前后端互通 2026-07-17 15:48:36 +08:00
liwentao a9ccdab421 实现部分页面前后端相通 2026-07-16 17:29:27 +08:00
liwentao 7e45ecd144 重写会员端,初步完善首页 2026-07-15 17:26:07 +08:00
liwentao cacc8997ec 移除流程中的支付相关和会员卡相关 2026-07-14 18:49:15 +08:00
liwentao 593f6f13e7 新增数据统计页面 2026-07-10 13:56:16 +08:00
liwentao 8ee326b43a 修补缺失文件 2026-07-09 15:34:50 +08:00
liwentao 8fb4e714d8 新增会员卡管理 2026-07-09 15:33:05 +08:00
liwentao a8e69e0850 新增会员管理 2026-07-09 14:45:45 +08:00
liwentao f5b5724e92 完善团课相关管理 2026-07-08 17:02:04 +08:00
liwentao 1e41f31271 更新后台管理系统,实现团课管理基础显示 2026-07-06 16:44:27 +08:00
liwentao efd4d03037 修复多处问题 2026-06-29 02:56:13 +08:00
liwentao 80759f6793 修复一次支付发放两张会员卡的问题 2026-06-28 17:56:31 +08:00
liwentao f8279129be 修复编译时错误 2026-06-28 16:42:24 +08:00
future fc48db071e 完成一键登录和支付功能 2026-06-28 14:47:42 +08:00
future 35e7532f1b 解决bom字符 2026-06-25 01:22:33 +08:00
future 0d143be7b3 与dev重组登录 2026-06-25 01:12:42 +08:00
future 2ffd1aa7d6 修复项目构建 2026-06-24 23:08:53 +08:00
liwentao 581cc995c6 修复后端bug,更新测试数据 2026-06-24 07:27:44 +08:00
liwentao 2251f31524 新增支付宝连接沙箱模拟支付(暂不可用 2026-06-24 04:59:32 +08:00
futureandfujia 4481819eba 修复丢失文件 2026-06-24 00:46:47 +08:00
futureandfujia 79eb07599e feat: 添加签到模块和数据库表结构
- 新增gym-checkIn签到模块
- 创建sign_in_record签到记录表(V13迁移脚本)
- 添加签到相关路由配置
- 更新应用配置以支持签到模块
- 添加Redis密钥常量
2026-06-24 00:46:47 +08:00
futureandfujia a7f31083cf 签到模块 2026-06-24 00:46:47 +08:00
futureandfujia 524182c478 修复项目构建 2026-06-24 00:46:47 +08:00
future 3586a7d74b 登录 2026-06-23 22:47:35 +08:00
liwentao 8da58a8f51 新增功能:团课签到前验证是否到店签到 2026-06-18 10:48:23 +08:00
liwentao 0b2146f237 新增团课扫码签到功能,文档已更新 2026-06-18 10:11:47 +08:00
liwentao 7cc9a68144 新增团课推荐功能 2026-06-15 16:43:12 +08:00
liwentao b5c8a087dd 新增团课多条件查询 2026-06-15 14:09:19 +08:00
liwentao 7a94145819 新增团课类型,类型标签,以及相关功能 2026-06-11 13:57:46 +08:00
liwentao 7e4035e0ae 完成模块4,4.1基础信息统计 2026-06-09 23:04:43 +08:00
liwentao e19324d0ef 测试git 2026-06-09 18:25:04 +08:00
futureandfujia e0e707edcb 添加签到表迁移文件 2026-06-09 17:29:10 +08:00
liwentao 8ab528a74b 修复web-application-type 2026-06-09 16:28:36 +08:00
liwentao de7a359ead 将member-config.yml迁移至manage-app模块
删除重复的V6sql语句
2026-06-09 11:21:19 +08:00
future fbb41911a2 修复websoket重名问题 2026-06-09 10:53:35 +08:00
future 223a427614 完成签到模块功能 2026-06-09 10:07:30 +08:00
future 78c80c4b1d 签到模块 2026-06-09 09:43:31 +08:00
580 changed files with 73414 additions and 7397 deletions
+82
View File
@@ -0,0 +1,82 @@
# AGENT.md
> 面向 AI 代理的健身房管理系统开发工作流指南。
>
> 项目子模块:`gym-manage-api`Java 多模块后端)、`gym-manage-web`Vue3 管理后台)、`gym-manage-uniapp`(会员端小程序)、`gym-manage-coach-uniapp`(教练端小程序)
---
## 服务工作端口
| 服务 | 端口 | 说明 |
|------|------|------|
| Gateway | 8080 | API 网关,路由 `/api/**` → localhost:8084 |
| App | 8084 | 主应用服务,Swagger: `http://localhost:8084/swagger-ui.html` |
| Frontend Dev | 3002 | Vite 开发服务器 (`pnpm dev`) |
| PostgreSQL | 55432 | 数据库,`manage_system` / `novalon` / `novalon123` |
| Redis | 6379 | 缓存 |
---
## 工作流
### 1. `/grill-with-docs` — 需求梳理
启动需求澄清流程,通过迭代问答将模糊需求转化为清晰、文档化的共识。
- 识别需求中的模糊点与歧义,以问答形式逐一澄清
- 澄清过程中产生的新领域术语 / 修正定义,**即时同步到** [gym-manage-api/CONTEXT.md](gym-manage-api/CONTEXT.md)
- 重要架构决策(满足:难以逆转 + 不记录会令人困惑 + 存在真实权衡)写入 [gym-manage-api/docs/adr/](gym-manage-api/docs/adr/)
- 输出:需求共识 spec 文档,存放于 `docs/superpowers/specs/`,格式沿用现有 spec 模板(文档版本/日期/作者/状态 → 项目概况 → 设计方案)
### 2. `/to-prd` — 生成 PRD
`/grill-with-docs` 澄清后的需求转化为结构化产品需求文档。
- 沿袭 `docs/superpowers/specs/` 现有文档格式
- 输出存放于 `docs/superpowers/specs/`
### 3. `/to-issues` — 任务拆解
将 PRD 拆解成可执行的具体任务。
- **按端到端功能拆解**(每个 issue 覆盖完整功能链路:API + Web + UniApp
- 格式沿袭 `docs/superpowers/plans/` 现有模板(含 AI 代理指令头、阶段化任务清单、文件结构)
- 输出存放于 `docs/superpowers/plans/`
### 4. `/test-driven-development` — 测试驱动开发
TDD 全栈覆盖,按 issue 逐个实现。每个 TDD 循环完成后 `git commit`
**循环**:Red(写失败测试)→ Green(最小实现)→ Refactor(重构优化)
**测试层次与命令**
| 层 | 子项目 | 框架 | 命令 |
|----|--------|------|------|
| 后端单元/集成 | `gym-manage-api` | JUnit 5 | `cd gym-manage-api && mvn test` |
| Web 前端单元 | `gym-manage-web` | vitest | `cd gym-manage-web && pnpm test` |
| Web E2E | `gym-manage-web` | Playwright | `cd gym-manage-web && pnpm test:e2e` |
| UniApp 单元 | `gym-manage-uniapp` / `gym-manage-coach-uniapp` | vitest | 首次涉及时先搭建测试基础设施,再正常 TDD |
**首次涉及 UniApp 端时**:先为该子项目配置 vitest + @vue/test-utils,搭建完成后进入 Red-Green-Refactor。
### 5. `/systemic-debugging` — 系统化诊断
遇到棘手 Bug 时进行系统化诊断:收集日志 → 提出假设 → 插桩验证 → 定位根因 → 修复 → 回归验证。
**诊断入口速查**
| 问题类型 | 排查入口 |
|----------|----------|
| 后端 API 错误 | Gateway 控制台日志、App 控制台日志(日志级别 DEBUG,输出至 stdout |
| 数据库问题 | `psql -U novalon -d manage_system -p 55432` |
| Web 前端错误 | 浏览器 DevTools Console + Network 标签 |
| E2E 测试失败 | Playwright HTML Report,查看失败截图与 trace |
| UniApp 小程序错误 | 微信开发者工具控制台(`urlCheck: false` 已关闭 URL 校验) |
| Docker 环境 | `docker-compose logs -f backend` / `frontend` / `postgres` |
**直接数据库查询**
```bash
psql -U novalon -d manage_system -p 55432 -c "SELECT * FROM table_name LIMIT 10;"
```
+143
View File
@@ -0,0 +1,143 @@
# Gym Manage - 健身房管理系统
一个面向健身房的多端业务管理系统:后台管理 Web 端(管理员/员工)、会员端小程序(微信小程序)、教练端小程序(微信小程序),共享同一 SpringBoot 后端。
## Language
### 系统管理 (System)
**用户 (User)**:
拥有登录凭据的系统账号,可被分配一个或多个角色,通过角色获得操作权限。
_Avoid_: 账号、员工、管理员
**角色 (Role)**:
一组权限的集合体。用户通过被分配角色来间接获得权限。角色包含角色编码(唯一标识)和权限树配置。
_Avoid_: 权限组、岗位
**菜单 (Menu)**:
前端页面的导航入口树。菜单可嵌套,与权限绑定后控制用户可见的页面和按钮。
_Avoid_: 导航、路由
**数据字典 (Dict Type / Dict Data)**:
"类型-数据项"两级结构。Dict Type 定义字段类别(如"课程状态"),Dict Data 定义具体枚举值(如"待开始"、"进行中")。
_Avoid_: 枚举、配置项
**系统配置 (System Config)**:
系统运行时的键值对参数,如上传文件大小限制、默认分页条数等。
_Avoid_: 设置、参数
### 审计 (Audit)
**操作日志 (Operation Log)**:
记录用户在系统中的所有操作(创建/修改/删除),包含操作人、操作模块、操作时间、IP 地址。
_Avoid_: 行为日志、活动记录
**登录日志 (Login Log)**:
记录所有的登录/登出事件,包含成功/失败状态和原因。
_Avoid_: 认证记录、会话日志
**异常日志 (Exception Log)**:
系统运行时的未捕获异常记录,包含堆栈信息、请求路径。
_Avoid_: 错误日志、故障记录
### 通知 (Notification)
**公告 (Notice)**:
管理员发布的系统级通知,展示给所有用户。
_Avoid_: 消息、通知
**轮播图 (Banner)**:
首页顶部轮播的推广图片,可配置跳转链接和生效时间。
_Avoid_: 广告、幻灯片
### 会员 (Member)
**会员 (Member)**:
在系统中注册的健身用户,可通过微信小程序登录认证。拥有会员卡、储值卡等资产。
_Avoid_: 客户、用户、消费者
**会员卡类型 (Member Card Type)**:
预定义的会员卡模板,包含名称、时长(天)、价格、权益描述。
_Avoid_: 卡种、套餐
**会员卡记录 (Member Card Record)**:
会员购买特定会员卡类型的实例,有生效期、失效期、使用次数等生命周期数据。
_Avoid_: 购卡记录、会员资格
**储值卡 (Stored Card)**:
会员的预充值余额账户,用于消费支付。有支付密码保护。
_Avoid_: 余额、钱包
### 团课 (Group Course)
**团课 (Group Course)**:
由教练带领多名会员参加的集体健身课程。有类型、标签、时间、地点、人数上限、教练等属性。
_Avoid_: 课程、班级、大课
**课程类型 (Course Type)**:
团课的分类体系,如"瑜伽"、"动感单车"、"搏击操"。
_Avoid_: 课程分类
**课程标签 (Course Label)**:
团课的附加标签,用于搜索和推荐,可多个标签叠加。
_Avoid_: 标签、标记
**预约 (Booking)**:
会员对某节团课的报名操作。预约后可取消,超时不可取消。
_Avoid_: 报名、预定、登记
**签到 (Check-In)**:
会员到达上课地点后确认到场的操作。通过扫描教练展示的二维码完成。
_Avoid_: 打卡、签到
**签到二维码 (Check-In QR Code)**:
教练端生成的限时二维码,会员扫描后完成签到。有时效性和防伪造机制。
_Avoid_: 签到码
**课程推荐 (Course Recommend)**:
系统管理员手动指定的精选课程列表,在会员端首页展示。
_Avoid_: 热门课程、精选
### 教练 (Coach)
**教练 (Coach)**:
可开设和带领团课的人员。关联课程列表、违规记录。
_Avoid_: 私教、指导员、讲师
**开课 (Start Course / Open Course)**:
教练到上课时间后点击"开始上课"将课程状态从"待开始"变为"进行中"。
_Avoid_: 开始上课、启动课程
**结课 (End Course)**:
教练下课后点击"结束课程"将课程状态从"进行中"变为"已完成"。
_Avoid_: 下课、完成课程
**违规记录 (Violation)**:
教练的违规行为记录,如迟到、早退、未开课等。
_Avoid_: 处罚记录、违纪
### 数据统计 (Statistics)
**数据统计 (Data Statistics)**:
系统仪表盘数据,包含会员增长趋势、预约率、签到率、收入等维度的图表和汇总数据。
_Avoid_: 报表、分析
**教练业绩 (Coach Performance)**:
按教练维度的教学数据排行和明细,包含开课次数、学员人次、出勤率等。
_Avoid_: 教练评分、教练排名
### 支付 (Payment)
**汇付支付 (Huifu Payment)**:
通过汇付天下聚合支付平台完成的支付流程,包含创建订单、支付回调、退款。
_Avoid_: 微信支付、支付宝
### 认证 (Auth)
**JWT Token**:
JSON Web Token,用户登录后获取的身份凭证,所有 API 请求需在 Authorization header 携带。有过期时间。
_Avoid_: 令牌、会话
**签名 (Signature)**:
API 请求的防篡改签名参数,由请求体 + 时间戳 + 密钥生成。
_Avoid_: 校验码
@@ -0,0 +1 @@
{"code":404,"message":"No static resource files/30/preview.","timestamp":"2026-07-22T18:27:23.0606736"}
+106
View File
@@ -0,0 +1,106 @@
# 全面端到端测试报告
## 测试概要
| 项目 | 值 |
|------|-----|
| 测试时间 | 2026-07-22T10:36:09.900Z ~ 2026-07-22T10:36:11.075Z |
| 总步骤数 | 14 |
| 通过 | 14 |
| 失败 | 0 |
| 课程ID | 33 |
| 课程名称 | 全流程测试-mrvy5z1v |
| 二维码路径 | D:\Work\BIG_project\week2\base14-update-test\gym-manage\QRCODE\全流程测试_mrvy5z1v.png |
| API地址 | http://192.168.110.64:8084 |
## 测试范围
| 模块 | 项目 | 测试内容 |
|------|------|----------|
| 后台管理系统 | `gym-manage-web` | 管理员登录、创建团课(无封面、张教练)、修改团课时间、保存二维码 |
| 会员端 | `gym-manage-uniapp` | 会员登录、预约团课、扫码签到 |
| 教练端 | `gym-manage-coach-uniapp` | 教练登录、手动开课、手动结课 |
| 后端API | `gym-manage-api` | 所有操作通过REST API完成 |
## 业务规则验证
| 规则 | 条件 | 测试策略 |
|------|------|----------|
| 预约时间限制 | 需在开课前 >= 30分钟 | 创建课程startTime为5小时后,预约成功 |
| 签到时间窗口 | 开课前2小时 ~ 课程结束 | 调整startTime为1小时后,签到成功 |
| 教练开课 | 开课时间后10分钟内正常开课 | 调整startTime为3分钟前,开课成功 |
| 教练结课 | 结束时间后10分钟内结课 | 调整endTime为2分钟前,结课 |
## 测试流程
```
1. Admin: Login -> Get coach list -> Create course -> Save QR code
2. Member: Login -> Book course
3. Admin: Adjust startTime (for sign-in window)
4. Member: Sign in (scan QR)
5. Admin: Adjust startTime to past (for coach start)
6. Coach: Login -> Start course
7. Admin: Adjust endTime to past (for coach end)
8. Coach: End course
```
## 详细步骤结果
| # | 步骤 | 状态 | 详情 | 时间 |
|---|------|------|------|------|
| 1 | 1a. 管理员登录 | PASS | admin / userId=1 | 2026-07-22T10:36:10.260Z |
| 2 | 1b. 获取教练列表 | PASS | 找到 coach_zhang, id=11, nickname=张教练(瑜伽) | 2026-07-22T10:36:10.291Z |
| 3 | 1c. 创建团课 | PASS | id=33, name="全流程测试-mrvy5z1v", coachId=11, 无封面, startTime=2026-07-22T23:36:10 | 2026-07-22T10:36:10.356Z |
| 4 | 1d. 保存二维码 | PASS | 已保存: D:\Work\BIG_project\week2\base14-update-test\gym-manage\QRCODE\全流程测试_mrvy5z1v.png (2121 bytes) | 2026-07-22T10:36:10.416Z |
| 5 | 2a. 会员登录 | PASS | memberId=16 | 2026-07-22T10:36:10.431Z |
| 6 | 2b. 预约团课 | PASS | courseId=33, bookingId=4, 距开课约5h>=30min要求) | 2026-07-22T10:36:10.468Z |
| 7 | 2c. 调整课程时间(签到用) | PASS | startTime→2026-07-22T19:36:101h后→满足签到2h窗口) | 2026-07-22T10:36:10.502Z |
| 8 | 2d. 扫码签到 | PASS | courseId=33, memberId=16, 签到时间距开课约1h(满足2h窗口) | 2026-07-22T10:36:10.535Z |
| 9 | 3a. 教练登录 | PASS | coach_zhang, userId=11 | 2026-07-22T10:36:10.903Z |
| 10 | 3b. 调整课程时间(开课用) | PASS | startTime→2026-07-22T18:33:103分钟前→教练可正常开课) | 2026-07-22T10:36:10.940Z |
| 11 | 3c. 手动开课 | PASS | courseId=33, status=3, msg=开课成功 | 2026-07-22T10:36:10.974Z |
| 12 | 3d. 调整结束时间(结课用) | PASS | endTime→2026-07-22T18:34:102分钟前→教练可结课) | 2026-07-22T10:36:11.002Z |
| 13 | 3e. 手动结课 | PASS | courseId=33, status=2, msg=结课成功 | 2026-07-22T10:36:11.032Z |
| 14 | 4. 最终课程状态 | PASS | name="全流程测试-mrvy5z1v", status=2, members=0, startTime=2026-07-22T18:33:10 | 2026-07-22T10:36:11.074Z |
## 使用的API端点
| 端点 | 方法 | 用途 | 认证 |
|------|------|------|------|
| `/api/auth/login` | POST | 管理员/教练登录 | HMAC签名 |
| `/api/coach/list` | GET | 获取教练列表 | JWT (Admin) |
| `/api/groupCourse` | POST | 创建团课 | JWT (Admin) |
| `/api/groupCourse/{id}` | PUT | 修改团课时间 | JWT (Admin) |
| `/api/groupCourse/{id}/detail` | GET | 获取课程详情(含二维码) | JWT (Admin) |
| `/api/member/auth/miniapp/login` | POST | 会员登录 | HMAC签名 |
| `/api/groupCourse/book` | POST | 预约团课 | JWT (Member) |
| `/api/groupCourse/signin/{memberId}` | POST | 扫码签到 | JWT (Member) |
| `/api/coach/courses/{courseId}/start` | POST | 教练手动开课 | JWT (Coach) |
| `/api/coach/courses/{courseId}/end` | POST | 教练手动结课 | JWT (Coach) |
## 认证机制
- **JWT Token**: `Authorization: Bearer {token}`
- **HMAC-SHA256**: `X-Signature`, `X-Timestamp`, `X-Nonce`
- **Secret Key**: `NovalonManageSystemSecretKey2026`
## 测试账号
| 角色 | 用户名 | 密码 |
|------|--------|------|
| 管理员 | admin | Test@123 |
| 会员 | (小程序code登录) | dev-test-fullflow-1784716569900 |
| 教练 | coach_zhang | Test@123 |
## 时间约束处理策略
本测试通过后台API动态调整课程时间,绕过各步骤的时间限制:
| 步骤 | 时间约束 | 处理方式 |
|------|----------|----------|
| 预约 | 需 >= 30分钟前 | 创建课程startTime=当前+5h |
| 签到 | 开课前2h ~ 课程结束 | PUT修改startTime=当前+1h |
| 开课 | 开课时间后10分钟内 | PUT修改startTime=当前-3min |
| 结课 | 结束时间后10分钟内 | PUT修改endTime=当前-2min |
> **注意**: 使用 `formatLocalTime()` 发送本地时间(无时区),确保与服务器 LocalDateTime 一致。
+144
View File
@@ -0,0 +1,144 @@
# 全面端到端测试报告(含UI层)
## 测试概要
| 项目 | 值 |
|------|-----|
| 测试时间 | 2026-07-22T11:08:38.270Z ~ 2026-07-22T11:09:11.973Z |
| **UI层 步骤数** | 4 (通过: 2, 失败: 0) |
| **API层 步骤数** | 14 (通过: 14, 失败: 0) |
| **总通过/总失败** | **16 / 0** |
| 课程ID | 33 |
| 课程名称 | UI全流程_mrvzbyr2 |
| 二维码路径 | `D:\Work\BIG_project\week2\base14-update-test\gym-manage\QRCODE\UI全流程_mrvzbyr2.png` (1984 bytes) |
| API地址 | http://192.168.110.64:8084 |
## 测试结果
```
═══════════════════════════════════════════
UI 层: 通过 2 / 失败 0 / 总计 2
API层: 通过 14 / 失败 0 / 总计 14
总通过: 16 / 总失败: 0 / 总计: 16
═══════════════════════════════════════════
```
## 测试范围
| 模块 | 项目 | UI层测试 | API层测试 |
|------|------|----------|-----------|
| 后台管理系统 | `gym-manage-web` | Playwright驱动浏览器操作Element Plus页面 | HMAC签名API调用 |
| 会员端 | `gym-manage-uniapp` | miniprogram-automator (条件性) | HMAC签名API调用 |
| 教练端 | `gym-manage-coach-uniapp` | miniprogram-automator (条件性) | HMAC签名API调用 |
| 后端API | `gym-manage-api` | (通过前端间接调用) | 直接HTTP请求 |
## Playwright UI 测试用例
| 用例 | 描述 | 结果 |
|------|------|------|
| TC-UI-001 | 验证登录态并导航到仪表盘 | PASS |
| TC-UI-002 | 导航到团课管理页面 | PASS |
| TC-UI-003 | 创建团课(打开弹窗→填写表单→提交→关闭时间冲突弹窗→搜索验证) | PASS |
**UI层关键操作**:
- Element Plus 组件交互(el-dialog, el-select, el-form-item
- 处理"时间冲突警告"弹窗(自动检测并关闭)
- 清除残留遮罩(Escape键清理 select 下拉和 modal 遮罩)
## UI层测试结果
| # | 步骤 | 状态 | 详情 | 时间 |
|---|------|------|------|------|
| 1 | Playwright Admin UI测试 | PASS | Playwright测试执行完成 | 2026-07-22T11:09:07.689Z |
| 2 | 会员端DevTools CLI | PASS | 存在: D:\微信web开发者工具\cli.bat | 2026-07-22T11:09:07.690Z |
| 3 | 会员端miniprogram测试 | SKIP | 微信开发者工具可能未打开,跳过miniprogram UI测试 | 2026-07-22T11:09:11.331Z |
| 4 | 教练端DevTools CLI | SKIP | 不存在: C:\Program Files (x86)\Tencent\微信web开发者工具\cli.bat | 2026-07-22T11:09:11.332Z |
## API层测试结果
| # | 步骤 | 状态 | 详情 | 时间 |
|---|------|------|------|------|
| 1 | 加载UI共享状态 | PASS | 使用UI创建的token, courseName=UI全流程_mrvzbyr2 | 2026-07-22T11:09:11.360Z |
| 2 | 获取教练列表 | PASS | 找到 coach_zhang, id=11 | 2026-07-22T11:09:11.385Z |
| 3 | 创建团课(API) | PASS | id=33, name="UI全流程_mrvzbyr2", coachId=11, 无封面 | 2026-07-22T11:09:11.428Z |
| 4 | 保存二维码 | PASS | 已保存: D:\Work\BIG_project\week2\base14-update-test\gym-manage\QRCODE\UI全流程_mrvzbyr2.png (1984 bytes) | 2026-07-22T11:09:11.453Z |
| 5 | 会员登录 | PASS | memberId=21 | 2026-07-22T11:09:11.469Z |
| 6 | 预约团课 | PASS | courseId=33, bookingId=14, 距开课约5h | 2026-07-22T11:09:11.499Z |
| 7 | 调整时间(签到用) | PASS | startTime→2026-07-22T20:09:11 | 2026-07-22T11:09:11.526Z |
| 8 | 扫码签到 | PASS | courseId=33, memberId=21 | 2026-07-22T11:09:11.555Z |
| 9 | 教练登录 | PASS | coach_zhang, userId=11 | 2026-07-22T11:09:11.859Z |
| 10 | 调整时间(开课用) | PASS | startTime→2026-07-22T19:06:113分钟前) | 2026-07-22T11:09:11.883Z |
| 11 | 手动开课 | PASS | courseId=33, msg=开课成功 | 2026-07-22T11:09:11.909Z |
| 12 | 调整结束时间(结课用) | PASS | endTime→2026-07-22T19:07:11 | 2026-07-22T11:09:11.938Z |
| 13 | 手动结课 | PASS | courseId=33, msg=结课成功 | 2026-07-22T11:09:11.957Z |
| 14 | 最终课程状态 | PASS | 课程已完成所有状态流转(搜索中未找到,可能已被清理) | 2026-07-22T11:09:11.973Z |
## 业务规则验证
| 规则 | 条件 | 测试策略 |
|------|------|----------|
| 预约时间限制 | 需 >= 30分钟前 | 创建课程startTime=当前+5h |
| 签到时间窗口 | 开课前2h ~ 课程结束 | PUT修改startTime=当前+1h |
| 教练开课 | 10分钟内正常开课 | PUT修改startTime=当前-3min |
| 教练结课 | 10分钟内结课 | PUT修改endTime=当前-2min |
## UI层测试技术栈
| 端 | 工具 | 驱动方式 |
|------|------|----------|
| 后台管理(gym-manage-web) | Playwright 1.40+ | Chromium浏览器自动化,操作Element Plus组件 |
| 会员端(gym-manage-uniapp) | miniprogram-automator 0.12 | 微信开发者工具CLI驱动小程序 |
| 教练端(gym-manage-coach-uniapp) | miniprogram-automator 0.10 | 微信开发者工具CLI驱动小程序 |
## API层测试技术栈
- **HTTP客户端**: Node.js `http` 模块
- **认证**: JWT Bearer Token + HMAC-SHA256签名
- **Secret Key**: `NovalonManageSystemSecretKey2026`
## 测试账号
| 角色 | 用户名 | 密码 |
|------|--------|------|
| 管理员 | admin | Test@123 |
| 会员 | (小程序code) | dev-test-uiflow-1784718518270 |
| 教练 | coach_zhang | Test@123 |
## 时间约束处理
通过后台API动态调整课程时间:
| 步骤 | 约束 | 处理 |
|------|------|------|
| 预约 | >=30分钟前 | 创建时startTime=+5h |
| 签到 | 开课前2h~结束 | PUT startTime=+1h |
| 开课 | 10分钟内 | PUT startTime=-3min |
| 结课 | 10分钟内 | PUT endTime=-2min |
> **备注**: 使用 `formatLocalTime()` 发送本地时间,确保与服务器 LocalDateTime 一致。
## 全流程步骤梳理
```
1. [UI-Playwright] 管理员登录后台 → 导航团课管理
2. [UI-Playwright] 点击"新增团课" → 填写表单(无封面、张教练) → 提交
3. [UI-Playwright] 关闭"时间冲突警告"弹窗 → 搜索验证课程创建成功
4. [API] 从创建响应提取 qrCodePath → 下载二维码到 QRCODE/ 目录 (1984 bytes)
5. [API] 会员登录 → 预约团课 (距开课~5h,满足 ≥30min 要求)
6. [API] 管理员修改 startTime→+1h (满足签到窗口:开课前2h内)
7. [API] 会员扫码签到
8. [API] 管理员修改 startTime→-3min (满足开课窗口:10分钟内)
9. [API] 教练手动开课 → "开课成功"
10.[API] 管理员修改 endTime→-2min (满足结课窗口)
11.[API] 教练手动结课 → "结课成功"
```
## 已知问题
| 问题 | 严重度 | 描述 |
|------|--------|------|
| `/api/groupCourse/{id}/detail` 返回500 | 中 | 对所有课程ID均返回500 Internal Server Error,可能为 `findDetailById` 缓存/序列化问题 |
| `GET /api/groupCourse/{id}` 返回500 | 中 | 同上,可能影响前端课程详情页展示 |
| 微信开发者工具CLI不可用(教练端) | 低 | `C:\Program Files (x86)\Tencent\微信web开发者工具\cli.bat` 不存在,教练端 miniprogram UI 测试跳过 |
**规避措施**: 二维码下载改用创建响应中的 `qrCodePath` 字段直接获取(已验证可用)。
+58
View File
@@ -0,0 +1,58 @@
# Gym Manage 领域术语表
> 本文档定义项目中的领域术语(Ubiquitous Language)。不含实现细节。
---
## 核心实体
### Coach(教练)
系统用户(SysUser)被分配"教练"角色(role_key='coach')后的角色化概念。教练不是独立实体,而是用户的角色视图。
### GroupCourse(团课)
由教练授课、会员预约参加的团体课程。关键状态:正常(0)、已取消(1)、已结束(2)、进行中(3)、教练缺席(5)、自动结束(6)、教练迟到(7)。
### GroupCourseBooking(团课预约)
会员对团课的预约记录。关键状态:已预约(0)、已取消(1)、已出席(2)、缺席(3)、教练缺席(4)、迟到(5)。
### CoachViolation(教练违规)
教练在教学过程中的违规行为记录。类型:COACH_LATE(迟到)、COACH_ABSENT(缺席)、NOT_MANUAL_END(未手动结课)。
---
## 统计领域术语
### CoachStatistics(教练违规统计)
**全局汇总维度**的教练违规数据。包含:教练总数、违规总数、迟到/缺席/未手动结课次数、违规教练数、开课总数。这是现有功能。
### CoachPerformance(教练业绩)
**新增领域术语**。指单个教练在指定时间段内的正向业绩指标集合,用于教练绩效考核和横向对比。
### 教练业绩指标
| 指标 | 英文 | 定义 |
|------|------|------|
| 授课量 | Completed Courses | 统计周期内教练完成的团课节数。仅计入 status=2(已结束)或 status=6(自动结束)的课程 |
| 出席人次 | Attended Students | 统计周期内参加该教练课程的学员总人次。即该教练所有课程下 booking.status='2'(已出席)的预约记录数 |
| 出勤率 | Attendance Rate | 出席人次 / 非取消预约总数 × 100% |
| 满员率 | Fill Rate | 各课程(出席人数 / 最大容量)的平均值。基于实际出席人数计算 |
| 违规次数 | Violation Count | 统计周期内该教练的违规记录总数(来自 coach_violation 表) |
| 综合评分 | Composite Score | 授课量(归一化)×40% + 出勤率×30% + 满员率×30%,满分100 |
### 综合评分归一化规则
授课量归一化:将每个教练的授课量映射到 0-100 区间。计算公式 = (该教练授课量 / 所有教练中最大授课量) × 100。授课量为 0 时评分也为 0。
### 排行榜(Coach Ranking
所有教练按综合评分从高到低排列的列表。支持管理员查看全局排名和点击单个教练查看明细。
### 个人业绩视图(Personal Performance View
教练本人查看自己的业绩数据,不含与其他教练的对比。显示授课量、出席人次、出勤率、满员率、违规次数、综合评分。
### 时间周期(Period
- DAY:今日
- WEEK:本周(周一~周日)
- MONTH:本月
- LAST_30_DAYS:近30天
- LAST_90_DAYS:近90天
- YEAR:今年
- CUSTOM:自定义日期范围
+202
View File
@@ -0,0 +1,202 @@
import java.util.Base64;
import java.math.BigInteger;
import java.io.ByteArrayInputStream;
public class KeyAnalyzer {
public static void main(String[] args) {
String privateKeyBase64 = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcxAwrhZF+izz1gxQKOr4jnC05obIBHbl0DzHOcd4CaaDV7Kv1NRJKi33JhdDsW4JGgu16e5Rtzq1VzU5VWz5EKgGL46maOFwCkngJUTP/LC3JVf/wtJmYCm8xNE8C7GNNIqKzYEvUOEfXqagpVvVrGsQ9FpzFp2rP9hBmHY3yizVyPX/uT9S+af5TRxiaItj3SSJGgloaEMrnKOpb/EH7JwPSS0liAyT/NxPfOyyZHc22AvaAIOE5y+0PMUIKPuIdfpOrej3LVpO1Arc2hSgmdB+YIPSiBVYPXa6AuAmil9mpbtSikQJ7Uu7lX4JyTW4QxQ06rPFKnFWVKkzivAElAgMBAAECggEAJd0AJ37iTlMpDQ90xqe7hvRQxAu256gbQ9nrqLY97g0/KIw6WEZSPakFX6gvdvb/NzKmUyAIEKGLoh6tXdZk6qfOqc/6BeK47nIcBfwT9/zerjNUVvn34w4aHyNINieMMHQ+Id8PUZmqWH+Euz9ilVTosuyEPwUZulLvUQqwXzU5VnwVghURbUhDd+ecBJACWgemRun6d5241PQXNYAdH1k7cETd8GfIi3qclhhJrxi7tu5tq4YGCXQIoz7HCLim7GIvT0M+FRgSw2EOrHnAQNFeQ/vQbP71ttLoTxehL6Se9dfWrV5OI+Y/T7vR2F84Qt0iNbaxyJGir7siKDFIwQKBgQDXDzinx3/TasplM78pR/0CtuuKr1Ch02LOPrTosJ1qf1OohxQThowhOTxMsBlgYSKu9s1QRffUUXEqYXxd2B6lzDKfggwO6U2XxIcxWeNow0xoFfqcXYSg7Ga2sCr9uhdwxIdFQNF7SNBpT8ht4fJrRX6mWY1nHybpyTDQ4xoQNQKBgQC6m+yiOoi5JD3zVSSJq/iq5DJPA5B4aoP+t5u9lp2Q7iVO0QI5ilBlEKGE4VOU0glnXlDTfuqEYooMY85ekl4WGb3AOT0PhLL2i+gO2nlWBzf4HPzB/hibjfyPyniRM03cHkG3HXucL7Sne6FwERcfjEqjUd2cdP1l89PNrq4rMQKBgQCMmjABSWYh8/y1I5rEQ4OAJdVjC3GdC1Xa35ZpVybjvLEWSpHunhW5lvD8dllw8LC7UTI0XDpGPqTM/4VO2YBYB2PFc0Gs8g0/v0ZgFpOeJ6kpl80MM/wFNemFYTIKRoMSv/psZY9PmfBgGcBBTuquBXZjDcNr+yr2yAm5V/DvTQKBgHqRi94KoF8q5N39IKCkqhJlDH5FkxDktYoKw2rFkPzuzuZz9gghRyj6wXxsG9/2DWMt2dzw0czehFoa/CO188KEadPmRKr6uCmkP2nyKhxNZX+8WnB5G2Sg4DD6BjMpBYz8+qDx5ozx8LDJTYI0V4HLPgMD9JGdbgsXGhlREOkhAoGALr6IQOXnviWNAhCdc7rrsaMLMPbLZ1wqzWtQUG1JxDobbpzEP4CW/mvW5pMn58mSBg5qbXhyDI4fFP0CPb98QIz2tGnIzYyFzdKmF5Z1N7X1OF9O+tsSqASoBZzTqB4fr/o4mz0s9JCeriBR2LWjsbsDU13DTLsfQpWbtOnIy70=";
System.out.println("========== 密钥分析开始 ==========");
System.out.println("密钥长度: " + privateKeyBase64.length());
byte[] keyBytes = Base64.getDecoder().decode(privateKeyBase64);
System.out.println("解码后长度: " + keyBytes.length + " bytes");
// 打印前30字节
System.out.print("前30字节(hex): ");
for (int i = 0; i < 30 && i < keyBytes.length; i++) {
System.out.printf("%02X ", keyBytes[i]);
}
System.out.println();
// 解析ASN.1结构
try {
parseASN1(keyBytes);
} catch (Exception e) {
System.out.println("解析失败: " + e.getMessage());
e.printStackTrace();
}
}
static void parseASN1(byte[] keyBytes) throws Exception {
ByteArrayInputStream bis = new ByteArrayInputStream(keyBytes);
// 读取SEQUENCE
int tag = bis.read();
System.out.println("第一个tag: 0x" + Integer.toHexString(tag));
if (tag == 0x30) {
System.out.println("这是SEQUENCE");
// 读取长度
int len = readASN1Length(bis);
System.out.println("SEQUENCE长度: " + len);
// 检查下一个tag
int nextTag = bis.read();
System.out.println("下一个tag: 0x" + Integer.toHexString(nextTag));
if (nextTag == 0x02) {
// INTEGER
int intLen = readASN1Length(bis);
byte[] versionBytes = new byte[intLen];
bis.read(versionBytes);
int version = new BigInteger(versionBytes).intValue();
System.out.println("版本INTEGER值: " + version);
// 检查这是PKCS#8还是PKCS#1
// PKCS#8: version=0后是SEQUENCE(算法标识符)
// PKCS#1: version=0后是INTEGER(modulus)
int afterVersionTag = bis.read();
System.out.println("版本后的tag: 0x" + Integer.toHexString(afterVersionTag));
if (afterVersionTag == 0x30) {
System.out.println(">>> 这是PKCS#8格式 (version后是SEQUENCE)");
// 解析PKCS#8
// AlgorithmIdentifier: SEQUENCE { OID, NULL }
int algLen = readASN1Length(bis);
System.out.println("AlgorithmIdentifier长度: " + algLen);
// 跳过AlgorithmIdentifier内容
byte[] algBytes = new byte[algLen];
bis.read(algBytes);
// 打印OID
System.out.print("OID bytes: ");
for (int i = 0; i < algBytes.length; i++) {
System.out.printf("%02X ", algBytes[i]);
}
System.out.println();
// 下一个应该是OCTET STRING (包含私钥)
int octetTag = bis.read();
System.out.println("下一个tag: 0x" + Integer.toHexString(octetTag));
if (octetTag == 0x04) {
System.out.println("这是OCTET STRING (包含私钥数据)");
int octetLen = readASN1Length(bis);
System.out.println("OCTET STRING长度: " + octetLen);
// OCTET STRING内容是PKCS#1私钥
byte[] pkcs1Bytes = new byte[octetLen];
bis.read(pkcs1Bytes);
System.out.print("PKCS#1私钥前20字节: ");
for (int i = 0; i < 20; i++) {
System.out.printf("%02X ", pkcs1Bytes[i]);
}
System.out.println();
// 解析PKCS#1私钥
ByteArrayInputStream pkcs1Stream = new ByteArrayInputStream(pkcs1Bytes);
int pkcs1Tag = pkcs1Stream.read();
System.out.println("PKCS#1第一个tag: 0x" + Integer.toHexString(pkcs1Tag));
if (pkcs1Tag == 0x30) {
int pkcs1Len = readASN1Length(pkcs1Stream);
System.out.println("PKCS#1 SEQUENCE长度: " + pkcs1Len);
// version
int vTag = pkcs1Stream.read();
int vLen = readASN1Length(pkcs1Stream);
byte[] vBytes = new byte[vLen];
pkcs1Stream.read(vBytes);
System.out.println("PKCS#1版本: " + new BigInteger(vBytes));
// 解析私钥参数
parsePKCS1(pkcs1Stream);
}
}
} else if (afterVersionTag == 0x02) {
System.out.println(">>> 这是PKCS#1格式 (version后是INTEGER)");
// 继续解析PKCS#1
parsePKCS1(bis);
} else {
System.out.println(">>> 未知格式 (tag: 0x" + Integer.toHexString(afterVersionTag) + ")");
}
}
}
}
static void parsePKCS1(ByteArrayInputStream bis) throws Exception {
System.out.println("\n========== 解析PKCS#1私钥参数 ==========");
// modulus
BigInteger modulus = readASN1Integer(bis);
System.out.println("modulus长度: " + modulus.bitLength() + " bits");
// publicExponent
BigInteger publicExponent = readASN1Integer(bis);
System.out.println("publicExponent: " + publicExponent);
// privateExponent
BigInteger privateExponent = readASN1Integer(bis);
System.out.println("privateExponent长度: " + privateExponent.bitLength() + " bits");
// prime1
BigInteger prime1 = readASN1Integer(bis);
System.out.println("prime1长度: " + prime1.bitLength() + " bits");
// prime2
BigInteger prime2 = readASN1Integer(bis);
System.out.println("prime2长度: " + prime2.bitLength() + " bits");
// 验证 prime1 * prime2 == modulus
BigInteger calculatedModulus = prime1.multiply(prime2);
boolean valid = calculatedModulus.equals(modulus);
System.out.println("\n验证 prime1 * prime2 == modulus: " + valid);
if (!valid) {
System.out.println(">>> 密钥数学关系不正确!这是无效的RSA私钥");
System.out.println("计算得到的modulus长度: " + calculatedModulus.bitLength() + " bits");
}
// exponent1
BigInteger exponent1 = readASN1Integer(bis);
System.out.println("exponent1长度: " + exponent1.bitLength() + " bits");
// exponent2
BigInteger exponent2 = readASN1Integer(bis);
System.out.println("exponent2长度: " + exponent2.bitLength() + " bits");
// coefficient
BigInteger coefficient = readASN1Integer(bis);
System.out.println("coefficient长度: " + coefficient.bitLength() + " bits");
System.out.println("\n========== 解析完成 ==========");
}
static int readASN1Length(ByteArrayInputStream bis) throws Exception {
int firstByte = bis.read();
if ((firstByte & 0x80) == 0) {
return firstByte;
}
int numBytes = firstByte & 0x7F;
int length = 0;
for (int i = 0; i < numBytes; i++) {
length = (length << 8) | (bis.read() & 0xFF);
}
return length;
}
static BigInteger readASN1Integer(ByteArrayInputStream bis) throws Exception {
int tag = bis.read();
if (tag != 0x02) throw new Exception("期望INTEGER tag: 0x02, 实际: 0x" + Integer.toHexString(tag));
int len = readASN1Length(bis);
byte[] data = new byte[len];
bis.read(data);
return new BigInteger(1, data);
}
}
@@ -0,0 +1,98 @@
# ADR-0001: 教练业绩统计功能设计
**日期**: 2026-07-22
**状态**: 已决定
**决策者**: 通过 grill-with-docs 追问明确
---
## 背景
需要在后台管理系统中为体育馆新增"教练业绩统计"功能。现有系统已有 `gym-dataCount` 模块提供全局统计(含教练违规统计 `CoachStatistics`),但缺少**按教练维度**的业绩数据(授课量、出勤率、满员率等正向指标)。
---
## 决策
### 1. 架构:扩展现有 gym-dataCount 模块
**选择**: 在 `gym-dataCount` 模块中新增 CoachPerformance 相关的 Handler + Service + DAO,而非新建独立模块。
**理由**:
- `gym-dataCount` 模块已有成熟的统计架构(DatabaseClient + Reactive + Redis 缓存 + 时间范围推导)
- 现有 `DataStatisticsDao` 已有教练相关的 SQL 聚合查询,可直接复用
- 避免模块膨胀,将"统计"职责收敛在一个模块中
- `manage-app` 已依赖 `gym-dataCount`,路由注册零成本
**替代方案被拒绝**: 新建 `gym-coach-performance` 独立模块。理由:功能规模不足以支撑独立模块,且会引入额外的模块间依赖管理成本。
### 2. 数据源:完全基于团课预约数据
**选择**: 业绩统计的"出席人次"和"出勤率"完全基于 `group_course_booking` 表(status='2'=已出席),而非 `sign_in_record` 签到表。
**理由**:
- `sign_in_record` 表中没有 `coach_id` 字段,签到只关联会员(member_id),不关联教练
- 学员→教练的唯一数据路径是:member → group_course_booking → group_course → coach_id
- 改造签到表会增加数据库变更成本,且签到不等于上课(签到可能发生在任何时间)
**风险**: 如果未来签到记录需要关联教练(例如一对一的私教签到),需要重新评估此决策。
### 3. 授课量定义:仅计入已完成课程
**选择**: 只统计 `status IN (2, 6)` 的课程(已结束 + 自动结束)。
**拒绝的定义**:
- 所有非取消课程:会包含教练缺席(status=5)的课程,不应算作业绩
- 所有排课:会包含已取消的课程,不能反映真实工作量
### 4. 满员率:按出席人数计算
**选择**: 满员率 = 各课程(出席人数 / max_members)的平均值。
**拒绝的定义**: 按预约人数(current_members)计算。理由:预约了但没来的学员不能算"满员",出席人数更真实地反映了课程实际到场情况。
### 5. 综合评分权重:授课量 40% + 出勤率 30% + 满员率 30%
**选择**: 授课量占比最高,体现工作量;出勤率和满员率体现教学质量。
**归一化规则**: 授课量按所有教练中最大值归一化到 0-100。这样即使只有少数教练开课多,评分也能合理分布。
**拒绝的替代方案**:
- 三指标等权重(33/33/34):弱化了工作量差异
- 授课量 50%:过度强调数量而忽视质量
### 6. 不包含学员留存率
**选择**: 首版不计算学员留存率。
**理由**: 现有系统缺少"学员持续上课"的显式数据模型。要实现留存率需要定义"留存"的判定规则(如:连续两个月以上预约同一教练的课程),这会引入新的领域概念,增加首版复杂度。
---
## 影响
### 后端变更
- `gym-dataCount` 模块新增:`CoachPerformance` domain、`CoachPerformanceHandler``CoachPerformanceDao`
- `manage-app``SystemRouter` 中新增 2 条路由
### 前端变更
- `StatisticsDashboard.vue` 新增"教练业绩"Tab
- `statistics.api.ts` 新增 API 接口类型
- 可选:教练端新增个人业绩页面(通过路由守卫区分角色)
### 数据库
- 无新增表。完全基于现有表(`group_course``group_course_booking``coach_violation``sys_user`
---
## 备选方案记录
### 方案 A:基于签到表改造(已拒绝)
改造 `sign_in_record` 添加 `coach_id` 字段,使签到直接关联教练。
- 优点:数据更准确(签到是真实到店行为)
- 缺点:需要改表、改签到流程、影响面大;签到不等于上团课
### 方案 B:新建独立模块(已拒绝)
新建 `gym-coach-performance` 独立 Maven 模块。
- 优点:职责隔离清晰
- 缺点:模块碎片化,增加编译和依赖管理成本
+452
View File
@@ -0,0 +1,452 @@
# 数据统计模块 API 文档
> **文档版本**: v1.0
> **创建日期**: 2026-06-09
> **作者**: system
> **状态**: 正式发布
---
## 📋 目录
1. [概述](#概述)
2. [基础路径](#基础路径)
3. [统计数据接口](#统计数据接口)
- [获取综合统计数据](#获取综合统计数据)
- [获取会员统计数据](#获取会员统计数据)
- [获取预约统计数据](#获取预约统计数据)
- [获取签到统计数据](#获取签到统计数据)
- [查询历史统计数据](#查询历史统计数据)
- [导出统计数据](#导出统计数据)
4. [数据模型](#数据模型)
- [StatisticsQuery(查询条件)](#StatisticsQuery查询条件)
- [StatisticsSummary(统计汇总)](#StatisticsSummary统计汇总)
- [MemberStatistics(会员统计)](#MemberStatistics会员统计)
- [BookingStatistics(预约统计)](#BookingStatistics预约统计)
- [SignInStatistics(签到统计)](#SignInStatistics签到统计)
5. [状态码说明](#状态码说明)
6. [业务规则](#业务规则)
---
## 概述
数据统计模块提供健身房会员、预约、签到数据的统计功能,支持按日、周、月周期统计,并提供Excel导出功能。采用 Spring WebFlux 响应式编程,统计结果通过 Redis 缓存提高查询性能。
## 基础路径
所有接口的基础路径为: `http://{host}:{port}/api/datacount`
---
## 统计数据接口
### 获取综合统计数据
| 属性 | 值 |
|------|-----|
| **HTTP方法** | GET |
| **接口路径** | `/api/datacount/summary` |
| **所属文件** | `DataStatisticsHandler.java` |
**请求参数**:
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|--------|------|------|--------|------|
| statType | string | 否 | 空 | 统计类型筛选 |
| periodType | string | 否 | DAY | 统计周期:DAY/WEEK/MONTH |
| startTime | string | 否 | 自动计算 | 开始时间(ISO格式) |
| endTime | string | 否 | 自动计算 | 结束时间(ISO格式) |
**请求示例**:
```bash
# 1. 使用周期类型查询今日统计
GET /api/datacount/summary?periodType=DAY
# 2. 使用周期类型查询本周统计
GET /api/datacount/summary?periodType=WEEK
# 3. 使用周期类型查询本月统计
GET /api/datacount/summary?periodType=MONTH
# 4. 使用自定义时间范围查询
GET /api/datacount/summary?startTime=2026-06-01T00:00:00&endTime=2026-06-07T23:59:59
# 5. 带统计类型筛选
GET /api/datacount/summary?statType=member&periodType=WEEK
```
**成功响应** (200 OK):
```json
{
"statDate": "2026-06-09",
"generatedAt": "2026-06-09T10:30:00",
"memberStatistics": {
"statDate": "2026-06-09",
"newMembers": 5,
"activeMembers": 120,
"totalMembers": 500,
"signInMembers": 85,
"bookingMembers": 45,
"cancelMembers": 5
},
"bookingStatistics": {
"statDate": "2026-06-09",
"totalBookings": 60,
"cancelBookings": 10,
"attendBookings": 45,
"absentBookings": 5,
"attendRate": 75.0,
"cancelRate": 16.67
},
"signInStatistics": {
"statDate": "2026-06-09",
"totalSignIns": 95,
"successSignIns": 92,
"failSignIns": 3,
"successRate": 96.84,
"signInTypeDistribution": {
"QR_CODE": 60,
"MANUAL": 25,
"FACE": 10
}
}
}
```
---
### 获取会员统计数据
| 属性 | 值 |
|------|-----|
| **HTTP方法** | GET |
| **接口路径** | `/api/datacount/member` |
| **所属文件** | `DataStatisticsHandler.java` |
**请求参数**:
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|--------|------|------|--------|------|
| periodType | string | 否 | DAY | 统计周期:DAY/WEEK/MONTH |
| startTime | string | 否 | 自动计算 | 开始时间 |
| endTime | string | 否 | 自动计算 | 结束时间 |
**请求示例**:
```bash
# 1. 查询今日会员统计
GET /api/datacount/member
# 2. 查询本周会员统计
GET /api/datacount/member?periodType=WEEK
# 3. 查询指定时间范围的会员统计
GET /api/datacount/member?startTime=2026-06-01T00:00:00&endTime=2026-06-30T23:59:59
```
**成功响应** (200 OK):
```json
{
"statDate": "2026-06-09",
"newMembers": 5,
"activeMembers": 120,
"totalMembers": 500,
"signInMembers": 85,
"bookingMembers": 45,
"cancelMembers": 5
}
```
---
### 获取预约统计数据
| 属性 | 值 |
|------|-----|
| **HTTP方法** | GET |
| **接口路径** | `/api/datacount/booking` |
| **所属文件** | `DataStatisticsHandler.java` |
**请求参数**:
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|--------|------|------|--------|------|
| periodType | string | 否 | DAY | 统计周期:DAY/WEEK/MONTH |
| startTime | string | 否 | 自动计算 | 开始时间 |
| endTime | string | 否 | 自动计算 | 结束时间 |
**请求示例**:
```bash
# 1. 查询今日预约统计
GET /api/datacount/booking
# 2. 查询本月预约统计
GET /api/datacount/booking?periodType=MONTH
# 3. 查询指定日期范围的预约统计
GET /api/datacount/booking?startTime=2026-06-01T00:00:00&endTime=2026-06-15T23:59:59
```
**成功响应** (200 OK):
```json
{
"statDate": "2026-06-09",
"totalBookings": 60,
"cancelBookings": 10,
"attendBookings": 45,
"absentBookings": 5,
"attendRate": 75.0,
"cancelRate": 16.67
}
```
---
### 获取签到统计数据
| 属性 | 值 |
|------|-----|
| **HTTP方法** | GET |
| **接口路径** | `/api/datacount/signin` |
| **所属文件** | `DataStatisticsHandler.java` |
**请求参数**:
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|--------|------|------|--------|------|
| periodType | string | 否 | DAY | 统计周期:DAY/WEEK/MONTH |
| startTime | string | 否 | 自动计算 | 开始时间 |
| endTime | string | 否 | 自动计算 | 结束时间 |
**请求示例**:
```bash
# 1. 查询今日签到统计
GET /api/datacount/signin
# 2. 查询本周签到统计
GET /api/datacount/signin?periodType=WEEK
# 3. 查询指定日期范围的签到统计
GET /api/datacount/signin?startTime=2026-06-01T00:00:00&endTime=2026-06-30T23:59:59
```
**成功响应** (200 OK):
```json
{
"statDate": "2026-06-09",
"totalSignIns": 95,
"successSignIns": 92,
"failSignIns": 3,
"successRate": 96.84,
"signInTypeDistribution": {
"QR_CODE": 60,
"MANUAL": 25,
"FACE": 10
}
}
```
---
### 查询历史统计数据
| 属性 | 值 |
|------|-----|
| **HTTP方法** | GET |
| **接口路径** | `/api/datacount/history` |
| **所属文件** | `DataStatisticsHandler.java` |
**请求参数**:
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|--------|------|------|--------|------|
| statType | string | 否 | 空 | 统计类型:member/booking/signin |
| startTime | string | 是 | - | 开始日期(格式:yyyy-MM-dd |
| endTime | string | 是 | - | 结束日期(格式:yyyy-MM-dd |
**请求示例**:
```bash
# 1. 查询指定日期范围的签到历史统计
GET /api/datacount/history?statType=signin&startTime=2026-06-01&endTime=2026-06-30
# 2. 查询指定日期范围的会员历史统计
GET /api/datacount/history?statType=member&startTime=2026-06-01&endTime=2026-06-15
# 3. 查询指定日期范围的预约历史统计
GET /api/datacount/history?statType=booking&startTime=2026-06-01&endTime=2026-06-30
# 4. 查询所有类型的历史统计(不指定statType)
GET /api/datacount/history?startTime=2026-06-01&endTime=2026-06-07
```
**成功响应** (200 OK):
```json
[
{
"statDate": "2026-06-07",
"totalSignIns": 88,
"successSignIns": 86,
"failSignIns": 2,
"successRate": 97.73,
"signInTypeDistribution": {
"QR_CODE": 55,
"MANUAL": 23,
"FACE": 10
}
},
{
"statDate": "2026-06-08",
"totalSignIns": 92,
"successSignIns": 90,
"failSignIns": 2,
"successRate": 97.83,
"signInTypeDistribution": {
"QR_CODE": 58,
"MANUAL": 24,
"FACE": 10
}
}
]
```
---
### 导出统计数据
| 属性 | 值 |
|------|-----|
| **HTTP方法** | GET |
| **接口路径** | `/api/datacount/export` |
| **所属文件** | `DataStatisticsHandler.java` |
**请求参数**:
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|--------|------|------|--------|------|
| periodType | string | 否 | DAY | 统计周期:DAY/WEEK/MONTH |
| startTime | string | 否 | 自动计算 | 开始时间 |
| endTime | string | 否 | 自动计算 | 结束时间 |
**请求示例**:
```bash
# 1. 导出今日统计数据
GET /api/datacount/export
# 2. 导出本周统计数据
GET /api/datacount/export?periodType=WEEK
# 3. 导出本月统计数据
GET /api/datacount/export?periodType=MONTH
# 4. 导出指定时间范围的统计数据
GET /api/datacount/export?startTime=2026-06-01T00:00:00&endTime=2026-06-30T23:59:59
```
**成功响应** (200 OK):
返回 Excel 文件(.xlsx),包含以下 Sheet
- **会员统计**: 会员相关统计数据
- **预约统计**: 预约相关统计数据
- **签到统计**: 签到相关统计数据
**Content-Type**: `application/vnd.openxmlformats-officedocument.spreadsheetml.sheet`
---
## 数据模型
### StatisticsQuery(查询条件)
| 字段名 | 类型 | 说明 |
|--------|------|------|
| statType | String | 统计类型筛选 |
| periodType | String | 统计周期:DAY/WEEK/MONTH |
| startTime | LocalDateTime | 开始时间 |
| endTime | LocalDateTime | 结束时间 |
### StatisticsSummary(统计汇总)
| 字段名 | 类型 | 说明 |
|--------|------|------|
| statDate | String | 统计日期 |
| generatedAt | String | 生成时间 |
| memberStatistics | MemberStatistics | 会员统计数据 |
| bookingStatistics | BookingStatistics | 预约统计数据 |
| signInStatistics | SignInStatistics | 签到统计数据 |
### MemberStatistics(会员统计)
| 字段名 | 类型 | 说明 |
|--------|------|------|
| statDate | String | 统计日期 |
| newMembers | Long | 新增会员数 |
| activeMembers | Long | 活跃会员数 |
| totalMembers | Long | 累计会员总数 |
| signInMembers | Long | 签到会员数 |
| bookingMembers | Long | 预约会员数 |
| cancelMembers | Long | 取消预约会员数 |
### BookingStatistics(预约统计)
| 字段名 | 类型 | 说明 |
|--------|------|------|
| statDate | String | 统计日期 |
| totalBookings | Long | 预约总数 |
| cancelBookings | Long | 取消预约数 |
| attendBookings | Long | 出席预约数 |
| absentBookings | Long | 缺席预约数 |
| attendRate | Double | 出席率(% |
| cancelRate | Double | 取消率(% |
### SignInStatistics(签到统计)
| 字段名 | 类型 | 说明 |
|--------|------|------|
| statDate | String | 统计日期 |
| totalSignIns | Long | 签到总次数 |
| successSignIns | Long | 成功签到次数 |
| failSignIns | Long | 失败签到次数 |
| successRate | Double | 签到成功率(% |
| signInTypeDistribution | Map<String, Long> | 签到类型分布 |
---
## 状态码说明
| 状态码 | 说明 |
|--------|------|
| 200 | 请求成功 |
| 400 | 请求参数错误 |
| 500 | 服务器内部错误 |
---
## 业务规则
1. **统计周期**: 支持按日、周、月统计
- DAY: 当天 00:00:00 - 当前时间
- WEEK: 本周一 00:00:00 - 本周日 23:59:59
- MONTH: 本月1日 00:00:00 - 本月最后一天 23:59:59
2. **数据保留**: 统计数据缓存30天,业务记录永久保存
3. **缓存策略**: 查询结果缓存1小时,统计数据缓存30天
4. **定时任务**:
- 每日凌晨2点执行前一天的日统计
- 每周一凌晨3点执行上周的周统计
- 每月1日凌晨3点执行上月的月统计
- 每月15日凌晨4点清理30天前的旧数据
5. **数据导出**: 支持Excel格式导出,包含会员、预约、签到三个Sheet
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,530 @@
# 团课推荐模块 API 文档
> **文档版本**: v1.0
> **创建日期**: 2026-06-15
> **作者**: 张翔
> **状态**: 正式发布
---
## 📋 目录
1. [概述](#概述)
2. [基础路径](#基础路径)
3. [团课推荐管理接口](#团课推荐管理接口)
- [获取所有团课推荐](#获取所有团课推荐)
- [获取所有启用的团课推荐](#获取所有启用的团课推荐)
- [根据ID获取团课推荐](#根据ID获取团课推荐)
- [根据团课ID获取推荐](#根据团课ID获取推荐)
- [创建团课推荐](#创建团课推荐)
- [更新团课推荐](#更新团课推荐)
- [删除团课推荐](#删除团课推荐)
- [启用团课推荐](#启用团课推荐)
- [禁用团课推荐](#禁用团课推荐)
4. [数据模型](#数据模型)
- [GroupCourseRecommend(团课推荐)](#GroupCourseRecommend团课推荐)
5. [状态码说明](#状态码说明)
6. [业务规则](#业务规则)
---
## 概述
团课推荐模块提供团课推荐信息的创建、编辑、查询、删除和状态管理功能。推荐信息包含团课ID、推荐标题、推荐内容、推荐理由、优先级等必要信息,支持按优先级排序展示。
## 基础路径
所有接口的基础路径为: `http://{host}:{port}/api/groupCourse/recommend`
---
## 团课推荐管理接口
### 获取所有团课推荐
| 属性 | 值 |
|------|-----|
| **HTTP方法** | GET |
| **接口路径** | `/api/groupCourse/recommend/list` |
| **所属文件** | `GroupCourseRecommendHandler.java` |
**请求参数**:
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|--------|------|------|--------|------|
| sortBy | string | 否 | priority | 排序字段(支持:priority、createdAt、updatedAt |
| sortOrder | string | 否 | desc | 排序方式(asc-升序,desc-降序) |
**成功响应** (200 OK):
```json
[
{
"id": 1,
"courseId": 1,
"recommendTitle": "本周热门课程",
"recommendContent": "这是一门非常棒的课程,快来参加吧!",
"recommendReason": "教练专业,课程内容丰富",
"priority": 10,
"isActive": true,
"groupCourse": {
"id": 1,
"courseName": "瑜伽入门",
"coachId": 1,
"courseType": 1,
"startTime": "2026-06-15T09:00:00",
"endTime": "2026-06-15T10:00:00",
"maxMembers": 20,
"currentMembers": 15,
"status": 0,
"location": "健身房A区",
"coverImage": "https://example.com/yoga.jpg",
"description": "适合初学者的瑜伽课程"
},
"createdAt": "2026-06-15T10:00:00",
"updatedAt": "2026-06-15T10:00:00"
}
]
```
---
### 获取所有启用的团课推荐
| 属性 | 值 |
|------|-----|
| **HTTP方法** | GET |
| **接口路径** | `/api/groupCourse/recommend/active` |
| **所属文件** | `GroupCourseRecommendHandler.java` |
**功能说明**: 获取系统中所有已启用的团课推荐列表,按优先级从高到低排序。
**成功响应** (200 OK):
```json
[
{
"id": 2,
"courseId": 3,
"recommendTitle": "新学员推荐",
"recommendContent": "专为新学员设计的入门课程,轻松上手",
"recommendReason": "零基础友好,教练耐心指导",
"priority": 20,
"isActive": true,
"groupCourse": {
"id": 3,
"courseName": "基础有氧",
"coachId": 2,
"courseType": 2,
"startTime": "2026-06-16T18:00:00",
"endTime": "2026-06-16T19:00:00",
"maxMembers": 30,
"currentMembers": 8,
"status": 0,
"location": "健身房B区",
"coverImage": "https://example.com/aerobic.jpg",
"description": "适合所有健身水平的有氧课程"
},
"createdAt": "2026-06-15T11:00:00",
"updatedAt": "2026-06-15T11:00:00"
}
]
```
---
### 根据ID获取团课推荐
| 属性 | 值 |
|------|-----|
| **HTTP方法** | GET |
| **接口路径** | `/api/groupCourse/recommend/{id}` |
| **所属文件** | `GroupCourseRecommendHandler.java` |
**路径参数**:
| 参数名 | 类型 | 必填 | 说明 |
|--------|------|------|------|
| id | Long | 是 | 团课推荐ID |
**成功响应** (200 OK):
```json
{
"id": 1,
"courseId": 1,
"recommendTitle": "本周热门课程",
"recommendContent": "这是一门非常棒的课程,快来参加吧!",
"recommendReason": "教练专业,课程内容丰富",
"priority": 10,
"isActive": true,
"groupCourse": {
"id": 1,
"courseName": "瑜伽入门",
"coachId": 1,
"courseType": 1,
"startTime": "2026-06-15T09:00:00",
"endTime": "2026-06-15T10:00:00",
"maxMembers": 20,
"currentMembers": 15,
"status": 0,
"location": "健身房A区",
"coverImage": "https://example.com/yoga.jpg",
"description": "适合初学者的瑜伽课程"
},
"createdAt": "2026-06-15T10:00:00",
"updatedAt": "2026-06-15T10:00:00"
}
```
**失败响应** (404 Not Found):
```json
{}
```
---
### 根据团课ID获取推荐
| 属性 | 值 |
|------|-----|
| **HTTP方法** | GET |
| **接口路径** | `/api/groupCourse/recommend/course/{courseId}` |
| **所属文件** | `GroupCourseRecommendHandler.java` |
**路径参数**:
| 参数名 | 类型 | 必填 | 说明 |
|--------|------|------|------|
| courseId | Long | 是 | 团课ID |
**成功响应** (200 OK):
```json
[
{
"id": 1,
"courseId": 1,
"recommendTitle": "本周热门课程",
"recommendContent": "这是一门非常棒的课程,快来参加吧!",
"recommendReason": "教练专业,课程内容丰富",
"priority": 10,
"isActive": true,
"groupCourse": {
"id": 1,
"courseName": "瑜伽入门",
"coachId": 1,
"courseType": 1,
"startTime": "2026-06-15T09:00:00",
"endTime": "2026-06-15T10:00:00",
"maxMembers": 20,
"currentMembers": 15,
"status": 0,
"location": "健身房A区"
},
"createdAt": "2026-06-15T10:00:00",
"updatedAt": "2026-06-15T10:00:00"
}
]
```
---
### 创建团课推荐
| 属性 | 值 |
|------|-----|
| **HTTP方法** | POST |
| **接口路径** | `/api/groupCourse/recommend` |
| **所属文件** | `GroupCourseRecommendHandler.java` |
**请求体**:
```json
{
"courseId": 1,
"recommendTitle": "本周热门课程",
"recommendContent": "这是一门非常棒的课程,快来参加吧!",
"recommendReason": "教练专业,课程内容丰富",
"priority": 10,
"isActive": true
}
```
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|--------|------|------|--------|------|
| courseId | Long | **是** | - | 团课ID(必须是有效的团课) |
| recommendTitle | String | 否 | - | 推荐标题 |
| recommendContent | String | 否 | - | 推荐内容 |
| recommendReason | String | 否 | - | 推荐理由 |
| priority | Integer | 否 | 0 | 优先级(数字越大优先级越高) |
| isActive | Boolean | 否 | true | 是否启用 |
**成功响应** (200 OK):
```json
{
"success": true,
"message": "团课推荐创建成功",
"data": {
"id": 1,
"courseId": 1,
"recommendTitle": "本周热门课程",
"recommendContent": "这是一门非常棒的课程,快来参加吧!",
"recommendReason": "教练专业,课程内容丰富",
"priority": 10,
"isActive": true,
"createdAt": "2026-06-15T10:00:00",
"updatedAt": "2026-06-15T10:00:00"
}
}
```
**失败响应** (400 Bad Request):
```json
{
"success": false,
"message": "团课ID不能为空"
}
```
---
### 更新团课推荐
| 属性 | 值 |
|------|-----|
| **HTTP方法** | PUT |
| **接口路径** | `/api/groupCourse/recommend/{id}` |
| **所属文件** | `GroupCourseRecommendHandler.java` |
**路径参数**:
| 参数名 | 类型 | 必填 | 说明 |
|--------|------|------|------|
| id | Long | 是 | 团课推荐ID |
**请求体**:
```json
{
"recommendTitle": "本周热门课程(更新)",
"recommendContent": "更新后的推荐内容",
"recommendReason": "更新后的推荐理由",
"priority": 15,
"isActive": true
}
```
| 参数名 | 类型 | 必填 | 说明 |
|--------|------|------|------|
| courseId | Long | 否 | 团课ID |
| recommendTitle | String | 否 | 推荐标题 |
| recommendContent | String | 否 | 推荐内容 |
| recommendReason | String | 否 | 推荐理由 |
| priority | Integer | 否 | 优先级 |
| isActive | Boolean | 否 | 是否启用 |
**成功响应** (200 OK):
```json
{
"success": true,
"message": "团课推荐更新成功",
"data": {
"id": 1,
"courseId": 1,
"recommendTitle": "本周热门课程(更新)",
"recommendContent": "更新后的推荐内容",
"recommendReason": "更新后的推荐理由",
"priority": 15,
"isActive": true,
"updatedAt": "2026-06-15T12:00:00"
}
}
```
**失败响应** (400 Bad Request):
```json
{
"success": false,
"message": "团课推荐不存在"
}
```
---
### 删除团课推荐
| 属性 | 值 |
|------|-----|
| **HTTP方法** | DELETE |
| **接口路径** | `/api/groupCourse/recommend/{id}` |
| **所属文件** | `GroupCourseRecommendHandler.java` |
**路径参数**:
| 参数名 | 类型 | 必填 | 说明 |
|--------|------|------|------|
| id | Long | 是 | 团课推荐ID |
**成功响应** (200 OK):
```json
{
"success": true,
"message": "团课推荐删除成功"
}
```
**失败响应** (400 Bad Request):
```json
{
"success": false,
"message": "团课推荐不存在"
}
```
---
### 启用团课推荐
| 属性 | 值 |
|------|-----|
| **HTTP方法** | POST |
| **接口路径** | `/api/groupCourse/recommend/{id}/enable` |
| **所属文件** | `GroupCourseRecommendHandler.java` |
**路径参数**:
| 参数名 | 类型 | 必填 | 说明 |
|--------|------|------|------|
| id | Long | 是 | 团课推荐ID |
**成功响应** (200 OK):
```json
{
"success": true,
"message": "团课推荐启用成功",
"data": {
"id": 1,
"courseId": 1,
"recommendTitle": "本周热门课程",
"isActive": true
}
}
```
**失败响应** (400 Bad Request):
```json
{
"success": false,
"message": "团课推荐不存在"
}
```
---
### 禁用团课推荐
| 属性 | 值 |
|------|-----|
| **HTTP方法** | POST |
| **接口路径** | `/api/groupCourse/recommend/{id}/disable` |
| **所属文件** | `GroupCourseRecommendHandler.java` |
**路径参数**:
| 参数名 | 类型 | 必填 | 说明 |
|--------|------|------|------|
| id | Long | 是 | 团课推荐ID |
**成功响应** (200 OK):
```json
{
"success": true,
"message": "团课推荐禁用成功",
"data": {
"id": 1,
"courseId": 1,
"recommendTitle": "本周热门课程",
"isActive": false
}
}
```
**失败响应** (400 Bad Request):
```json
{
"success": false,
"message": "团课推荐不存在"
}
```
---
## 数据模型
### GroupCourseRecommend(团课推荐)
| 字段名 | 类型 | 说明 |
|--------|------|------|
| id | Long | 主键ID |
| courseId | Long | 团课ID(关联group_course.id |
| recommendTitle | String | 推荐标题 |
| recommendContent | String | 推荐内容 |
| recommendReason | String | 推荐理由 |
| priority | Integer | 优先级(数字越大优先级越高),默认0 |
| isActive | Boolean | 是否启用,默认true |
| groupCourse | GroupCourse | 关联的团课信息(查询时自动填充) |
| createdBy | String | 创建人 |
| updatedBy | String | 更新人 |
| createdAt | LocalDateTime | 创建时间 |
| updatedAt | LocalDateTime | 更新时间 |
| deletedAt | LocalDateTime | 删除时间(软删除) |
---
## 状态码说明
### 推荐状态
| 状态值 | 含义 |
|--------|------|
| true | 启用 |
| false | 禁用 |
---
## 业务规则
### 团课推荐管理
1. **创建推荐**:团课ID为必填项,且必须是有效的团课
2. **优先级排序**:获取启用的推荐列表时,按优先级从高到低排序
3. **删除推荐**:采用软删除机制,数据保留可恢复
4. **状态管理**:支持启用/禁用推荐状态,禁用的推荐不会在推荐列表中显示
---
## 附录:错误响应格式
所有接口的错误响应统一格式:
```json
{
"success": false,
"message": "错误描述信息"
}
```
---
*文档结束*
+87
View File
@@ -0,0 +1,87 @@
一、基础有氧与热身(难度 1-3
主要是低冲击、低技巧,用于建立运动基础。
慢走/椭圆机轻松模式:1(几乎无难度,适合所有人)
固定自行车(低阻力):2(注意座椅高度调节即可)
跑步机慢跑:3(需要基本协调性,膝盖有压力)
跳绳(连续基础跳):3(需要手脚配合,心肺要求明显)
二、固定器械训练(难度 2-5
轨迹固定,主要考验力量和耐力,技巧要求低。
坐姿腿屈伸/腿弯举:2(很容易找到发力感)
坐姿推胸机:3(需注意肩胛后收,避免耸肩)
高位下拉(坐姿):3(需控制不要过度后仰)
史密斯机深蹲:4(轨迹固定,但需保持核心稳定)
蝴蝶机夹胸:3(易用肘关节代偿,需锁定肩关节)
三、自重基础动作(难度 3-7
需要一定的力量-体重比和身体控制能力。
平板支撑:3(耐力考验,技巧低)
跪姿俯卧撑:3(上肢力量较弱者首选)
标准俯卧撑:5(需核心收紧,身体成直线)
引体向上(弹力带辅助):6(背部和手臂力量要求高)
标准引体向上:8(力量-体重比极高,多数男性无法完成1次)
徒手深蹲:3(注意膝盖方向与背部直立)
单腿深蹲(手枪蹲):8(需要极高下肢力量、柔韧性和平衡)
四、自由重量杠铃/哑铃(难度 5-9)
技巧风险最高,需要神经系统协调和长期动作打磨。
哑铃二头弯举:4(容易晃动借力,但较安全)
哑铃侧平举:5(极易用斜方肌代偿,真正练到三角肌中束很难)
杠铃卧推:7(肩关节压力大,起桥、沉肩、稳定手腕均有技巧,有压伤风险)
杠铃深蹲(颈后):8(全身协调性、核心抗压、杠位放置、呼吸模式,学习曲线陡峭)
传统硬拉:9(风险极高,需要精确的脊柱中立、髋铰链、背阔肌收紧,错误时伤腰)
高翻/抓举(奥运举重):10(需要爆发力、柔韧、精准衔接,非数月训练不能掌握)
五、高强度与爆发力(难度 6-10
对心肺、神经系统和恢复能力要求极高。
波比跳(标准版):6(连续做时心肺压力极大)
冲刺跑(短跑):7(对腘绳肌和脚踝爆发力要求高)
跳箱(合理高度):6(需要落地缓冲技巧)
负重雪橇推:6(主要考验腿部耐力和意志力)
双力臂(引体向上后翻腕上杠):9(需要爆发引体 + 极高相对力量)
六、柔韧与平衡类(难度 3-8
考验本体感觉和关节活动度。
静态拉伸(坐姿体前屈):2(无风险,但需要坚持)
瑜伽下犬式:3(常见,但需背部与手臂对齐)
单腿罗马尼亚硬拉(徒手):6(极考验平衡和髋稳定)
全深蹲(脚跟贴地,亚洲蹲):5(踝关节灵活度限制多数人)
竖叉/横叉:8(需要数月甚至数年拉伸)
+129
View File
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-manage-api</artifactId>
<version>1.0.0</version>
</parent>
<artifactId>gym-auth</artifactId>
<packaging>jar</packaging>
<name>Gym Auth</name>
<description>Phone Authentication Module - Phone Number Login Services</description>
<dependencies>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-db</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-sys</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-member</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.25</version>
</dependency>
<!-- 阿里云号码认证服务(新版SDK -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>dypnsapi20170525</artifactId>
<version>1.0.6</version>
</dependency>
<!-- 阿里云一键登录服务(旧版SDK,保留兼容) -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dypnsapi</artifactId>
<version>1.2.12</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>4.6.0</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>dysmsapi20170525</artifactId>
<version>2.0.0</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<executions>
<execution>
<id>default-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>21</source>
<target>21</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,7 @@
package cn.novalon.gym.manage.auth.config;
import org.springframework.context.annotation.Configuration;
@Configuration
public class AuthConfig {
}
@@ -0,0 +1,18 @@
package cn.novalon.gym.manage.auth.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Data
@Configuration
@ConfigurationProperties(prefix = "dcloud.univerify")
public class DCloudUniverifyConfig {
private String appid;
private String appkey;
private String apiSecret;
private String apiUrl = "https://developer.dcloud.net.cn/api/client/univerify/getPhoneNumber";
private String proxyHost;
private Integer proxyPort;
private Integer timeout = 10000;
}
@@ -0,0 +1,47 @@
package cn.novalon.gym.manage.auth.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
/**
* 阿里云短信配置属性类
*
* @author auto-generated
* @date 2026-06-20
*/
@Data
@Configuration
@ConfigurationProperties(prefix = "alibaba.cloud.sms")
public class SmsProperties {
/**
* 访问密钥ID
*/
private String accessKeyId;
/**
* 访问密钥密钥
*/
private String accessKeySecret;
/**
* 短信签名名称
*/
private String signName;
/**
* 短信模板CODE
*/
private String templateCode;
/**
* 短信验证码长度(默认6位)
*/
private int codeLength = 6;
/**
* 短信验证码有效期(秒,默认300秒=5分钟)
*/
private long codeExpireSeconds = 300;
}
@@ -0,0 +1,26 @@
package cn.novalon.gym.manage.auth.dto;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 手机号验证码登录请求DTO
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PhoneCodeLoginDto {
@NotBlank(message = "手机号不能为空")
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
private String phone;
@NotBlank(message = "验证码不能为空")
@Pattern(regexp = "^\\d{4,6}$", message = "验证码格式不正确")
private String code;
}
@@ -0,0 +1,23 @@
package cn.novalon.gym.manage.auth.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PhoneLoginDto {
private String phone;
private String accessToken;
private String openid;
private String nickname;
private String avatar;
}
@@ -0,0 +1,22 @@
package cn.novalon.gym.manage.auth.dto;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 发送短信验证码请求DTO
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SendCodeRequest {
@NotBlank(message = "手机号不能为空")
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
private String phone;
}
@@ -0,0 +1,25 @@
package cn.novalon.gym.manage.auth.dto;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 短信验证码登录请求DTO
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SmsLoginDto {
@NotBlank(message = "手机号不能为空")
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
private String phone;
@NotBlank(message = "验证码不能为空")
private String code;
}
@@ -0,0 +1,59 @@
package cn.novalon.gym.manage.auth.handler;
import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
import cn.novalon.gym.manage.auth.dto.SendCodeRequest;
import cn.novalon.gym.manage.auth.service.PhoneAuthService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono;
import java.util.Map;
@Slf4j
@Component
@RequiredArgsConstructor
@Tag(name = "手机号认证", description = "手机号一键登录与验证码登录")
public class PhoneAuthHandler {
private final PhoneAuthService phoneAuthService;
@Operation(summary = "手机号一键登录", description = "使用uniapp官方运营商认证,直接手机号登录或注册")
public Mono<ServerResponse> oneClickLogin(ServerRequest request) {
log.info("收到手机号一键登录请求");
return request.bodyToMono(PhoneLoginDto.class)
.flatMap(phoneAuthService::oneClickLogin)
.flatMap(response -> ServerResponse.ok()
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(response));
}
@Operation(summary = "发送短信验证码", description = "使用阿里云发送短信验证码")
public Mono<ServerResponse> sendSmsCode(ServerRequest request) {
log.info("收到发送短信验证码请求");
return request.bodyToMono(SendCodeRequest.class)
.flatMap(req -> phoneAuthService.sendSmsCode(req.getPhone()))
.flatMap(success -> ServerResponse.ok()
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(Map.of("success", success, "message", success ? "验证码发送成功" : "验证码发送失败")));
}
@Operation(summary = "手机号验证码登录", description = "使用阿里云短信验证码登录或注册")
public Mono<ServerResponse> codeLogin(ServerRequest request) {
log.info("收到手机号验证码登录请求");
return request.bodyToMono(PhoneCodeLoginDto.class)
.flatMap(phoneAuthService::codeLogin)
.flatMap(response -> ServerResponse.ok()
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(response));
}
}
@@ -0,0 +1,37 @@
package cn.novalon.gym.manage.auth.service;
import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
import reactor.core.publisher.Mono;
/**
* 手机号认证服务接口
*/
public interface PhoneAuthService {
/**
* 手机号一键登录(uniapp官方运营商认证)
* 已注册则直接登录,未注册则自动注册后登录
*
* @param request 登录请求
* @return 登录响应
*/
Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request);
/**
* 发送短信验证码(阿里云)
*
* @param phone 手机号
* @return 是否发送成功
*/
Mono<Boolean> sendSmsCode(String phone);
/**
* 手机号验证码登录(阿里云)
*
* @param request 登录请求
* @return 登录响应
*/
Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request);
}
@@ -0,0 +1,37 @@
package cn.novalon.gym.manage.auth.service;
import reactor.core.publisher.Mono;
/**
* 短信服务接口
*
* @author auto-generated
* @date 2026-06-20
*/
public interface SmsService {
/**
* 发送短信验证码
*
* @param phone 手机号
* @return 发送结果
*/
Mono<Boolean> sendVerificationCode(String phone);
/**
* 验证短信验证码
*
* @param phone 手机号
* @param code 验证码
* @return 验证结果
*/
Mono<Boolean> verifyCode(String phone, String code);
/**
* 获取验证码(用于测试或特殊场景)
*
* @param phone 手机号
* @return 验证码
*/
Mono<String> getVerificationCode(String phone);
}
@@ -0,0 +1,270 @@
package cn.novalon.gym.manage.auth.service.impl;
import cn.novalon.gym.manage.auth.config.DCloudUniverifyConfig;
import cn.novalon.gym.manage.auth.config.SmsProperties;
import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
import cn.novalon.gym.manage.auth.service.PhoneAuthService;
import cn.novalon.gym.manage.auth.service.SmsService;
import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
import cn.novalon.gym.manage.common.exception.ErrorCode;
import cn.novalon.gym.manage.common.exception.SystemException;
import cn.novalon.gym.manage.member.entity.Member;
import cn.novalon.gym.manage.member.es.entity.MemberES;
import cn.novalon.gym.manage.member.es.repository.MemberESRepository;
import cn.novalon.gym.manage.member.repository.IMemberRepository;
import cn.novalon.gym.manage.member.util.AesUtil;
import cn.novalon.gym.manage.member.util.EsSyncUtils;
import cn.novalon.gym.manage.member.util.MemberNoGenerator;
import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
@RequiredArgsConstructor
public class PhoneAuthServiceImpl implements PhoneAuthService {
private final IMemberRepository memberRepository;
private final MemberESRepository memberESRepository;
private final EsSyncUtils esSyncUtils;
private final JwtTokenProvider jwtTokenProvider;
private final SmsService smsService;
private final SmsProperties smsProperties;
private final DCloudUniverifyConfig dCloudUniverifyConfig;
private WebClient webClient;
private EsSyncUtils.EntitySyncer<Member, MemberES, String> memberSyncer;
@PostConstruct
public void init() {
this.memberSyncer = esSyncUtils.bind(Member.class, MemberES.class, memberESRepository);
this.webClient = WebClient.builder()
.baseUrl(dCloudUniverifyConfig.getApiUrl())
.defaultHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE)
.build();
}
@Override
public Mono<PhoneLoginVO> oneClickLogin(PhoneLoginDto request) {
log.info("手机号一键登录请求, phone: {}, accessToken: {}, openid: {}", request.getPhone(), request.getAccessToken(), request.getOpenid());
if (request.getPhone() != null && !request.getPhone().isEmpty()) {
log.info("直接使用手机号登录");
String encryptedPhone = encryptPhone(request.getPhone());
return processPhoneLogin(encryptedPhone, request);
}
if (request.getAccessToken() == null || request.getAccessToken().isEmpty()) {
log.error("一键登录失败: accessToken为空");
return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "登录凭证无效,请重试"));
}
return getPhoneByDcloudApi(request.getAccessToken(), request.getOpenid())
.flatMap(phone -> {
log.info("通过access_token获取手机号成功: {}", maskPhone(phone));
String encryptedPhone = encryptPhone(phone);
return processPhoneLogin(encryptedPhone, request);
})
.onErrorResume(e -> {
log.error("一键登录失败", e);
return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + e.getMessage()));
});
}
private Mono<PhoneLoginVO> processPhoneLogin(String encryptedPhone, PhoneLoginDto request) {
return memberRepository.findByPhone(encryptedPhone)
.flatMap(existingMember -> {
log.info("手机号已注册,直接登录, memberId: {}", existingMember.getId());
return doLogin(existingMember, false, request);
})
.switchIfEmpty(Mono.defer(() -> {
log.info("手机号未注册,创建新会员");
return createNewMemberAndLogin(request, encryptedPhone);
}));
}
private Mono<String> getPhoneByDcloudApi(String accessToken, String openid) {
Map<String, String> requestBody = new HashMap<>();
requestBody.put("appid", dCloudUniverifyConfig.getAppid());
requestBody.put("appkey", dCloudUniverifyConfig.getAppkey());
requestBody.put("apiSecret", dCloudUniverifyConfig.getApiSecret());
requestBody.put("access_token", accessToken);
requestBody.put("openid", openid);
log.info("调用DCloud Univerify API, params: {}", requestBody);
return webClient.post()
.bodyValue(requestBody)
.retrieve()
.bodyToMono(Map.class)
.flatMap(response -> {
log.info("DCloud API响应: {}", response);
Integer code = (Integer) response.get("code");
Boolean success = (Boolean) response.get("success");
if ((code != null && code == 0) || (success != null && success)) {
Map<String, Object> data = (Map<String, Object>) response.get("data");
if (data != null) {
String phoneNumber = (String) data.get("phoneNumber");
if (phoneNumber != null && !phoneNumber.isEmpty()) {
return Mono.just(phoneNumber);
}
}
String phoneNumber = (String) response.get("phoneNumber");
if (phoneNumber != null && !phoneNumber.isEmpty()) {
return Mono.just(phoneNumber);
}
String phone = (String) response.get("phone");
if (phone != null && !phone.isEmpty()) {
return Mono.just(phone);
}
}
String message = (String) response.get("message");
log.warn("DCloud API返回错误: code={}, success={}, message={}", code, success, message);
return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + message));
})
.onErrorResume(e -> {
log.error("调用DCloud API失败", e);
return Mono.error(new SystemException(ErrorCode.AUTH_PHONE_ERROR, "手机号获取失败: " + e.getMessage()));
});
}
/**
* 手机号脱敏显示
*/
private String maskPhone(String phone) {
if (phone == null || phone.length() < 11) {
return phone;
}
return phone.substring(0, 3) + "****" + phone.substring(7);
}
@Override
public Mono<Boolean> sendSmsCode(String phone) {
log.info("发送短信验证码, phone: {}", phone);
return smsService.sendVerificationCode(phone);
}
@Override
public Mono<PhoneLoginVO> codeLogin(PhoneCodeLoginDto request) {
log.info("手机号验证码登录, phone: {}", request.getPhone());
return smsService.verifyCode(request.getPhone(), request.getCode())
.flatMap(verified -> {
if (!verified) {
log.warn("验证码验证失败, phone: {}", request.getPhone());
return Mono.error(new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "验证码错误或已过期"));
}
String encryptedPhone = encryptPhone(request.getPhone());
return memberRepository.findByPhone(encryptedPhone)
.flatMap(existingMember -> {
log.info("手机号已注册,直接登录, memberId: {}", existingMember.getId());
return doLogin(existingMember, false, null);
})
.switchIfEmpty(Mono.defer(() -> {
log.info("手机号未注册,创建新会员");
PhoneLoginDto registerRequest = new PhoneLoginDto();
return createNewMemberAndLogin(registerRequest, encryptedPhone);
}));
});
}
private Mono<PhoneLoginVO> createNewMemberAndLogin(PhoneLoginDto request, String encryptedPhone) {
String memberNo = MemberNoGenerator.generate();
log.info("生成会员号: {}", memberNo);
Member member = new Member();
member.setMemberNo(memberNo);
member.setPhone(encryptedPhone);
member.setNickname(request != null ? request.getNickname() : null);
member.setAvatar(request != null ? request.getAvatar() : null);
member.setLastLoginAt(LocalDateTime.now());
member.setIsDeleted(false);
return memberRepository.save(member)
.doOnSuccess(memberSyncer::sync)
.flatMap(savedMember -> {
log.info("新会员创建成功, memberId: {}, memberNo: {}", savedMember.getId(), savedMember.getMemberNo());
return doLogin(savedMember, true, request);
});
}
private Mono<PhoneLoginVO> doLogin(Member member, boolean isNewUser, PhoneLoginDto request) {
log.info("登录成功, memberId: {}", member.getId());
member.setLastLoginAt(LocalDateTime.now());
if (isNewUser && request != null) {
if ((member.getNickname() == null || member.getNickname().isEmpty())
&& request.getNickname() != null && !request.getNickname().isEmpty()) {
member.setNickname(request.getNickname());
}
if ((member.getAvatar() == null || member.getAvatar().isEmpty())
&& request.getAvatar() != null && !request.getAvatar().isEmpty()) {
member.setAvatar(request.getAvatar());
}
}
return memberRepository.save(member)
.doOnSuccess(memberSyncer::sync)
.map(this::buildLoginResponse);
}
private PhoneLoginVO buildLoginResponse(Member member) {
boolean needCompleteInfo = member.getNickname() == null || member.getNickname().isEmpty();
List<String> roles = new ArrayList<>();
String accessToken = jwtTokenProvider.generateToken(String.valueOf(member.getId()), member.getId(), roles);
log.info("JWT Token 生成成功, memberId: {}", member.getId());
PhoneLoginVO vo = new PhoneLoginVO();
vo.setMemberId(member.getId());
vo.setMemberNo(member.getMemberNo());
vo.setAccessToken(accessToken);
vo.setRefreshToken(accessToken);
vo.setExpiresIn(86400);
vo.setIsNewUser(member.getCreatedAt() == null ? false :
member.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(1)));
vo.setNeedCompleteInfo(needCompleteInfo);
vo.setNickname(member.getNickname());
vo.setAvatar(member.getAvatar());
vo.setPhone(member.getPhone() != null ? decryptPhone(member.getPhone()) : null);
return vo;
}
private String encryptPhone(String phoneNumber) {
try {
return AesUtil.encrypt(phoneNumber);
} catch (Exception e) {
log.error("手机号加密失败", e);
throw new SystemException(ErrorCode.SYSTEM_INTERNAL_ERROR, "手机号加密失败");
}
}
private String decryptPhone(String encryptedPhone) {
try {
return AesUtil.decrypt(encryptedPhone);
} catch (Exception e) {
log.error("手机号解密失败", e);
return null;
}
}
}
@@ -0,0 +1,198 @@
package cn.novalon.gym.manage.auth.service.impl;
import cn.novalon.gym.manage.auth.config.SmsProperties;
import cn.novalon.gym.manage.auth.service.SmsService;
import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
import cn.novalon.gym.manage.common.util.RedisUtil;
import com.aliyuncs.CommonRequest;
import com.aliyuncs.CommonResponse;
import com.aliyuncs.DefaultAcsClient;
import com.aliyuncs.IAcsClient;
import com.aliyuncs.exceptions.ClientException;
import com.aliyuncs.http.MethodType;
import com.aliyuncs.profile.DefaultProfile;
import com.aliyuncs.profile.IClientProfile;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
@Slf4j
@Service
@RequiredArgsConstructor
public class SmsServiceImpl implements SmsService {
private static final long SEND_INTERVAL_SECONDS = 60;
private static final long CODE_EXPIRE_SECONDS = 300;
private final SmsProperties smsProperties;
private final RedisUtil redisUtil;
private final ObjectMapper objectMapper;
@Override
public Mono<Boolean> sendVerificationCode(String phone) {
log.info("发送短信验证码, phone: {}", phone);
String rateLimitKey = RedisKeyConstants.SMS_CODE + phone + ":rate_limit";
return redisUtil.get(rateLimitKey, Long.class)
.defaultIfEmpty(0L)
.flatMap(lastSendTime -> {
long currentTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
if (currentTime - lastSendTime < SEND_INTERVAL_SECONDS) {
long remainingSeconds = SEND_INTERVAL_SECONDS - (currentTime - lastSendTime);
log.warn("发送频率限制, phone: {}, 剩余时间: {}秒", phone, remainingSeconds);
return Mono.just(false);
}
return Mono.fromCallable(() -> {
try {
IAcsClient client = createClient();
CommonRequest request = new CommonRequest();
request.setSysMethod(MethodType.POST);
request.setSysDomain("dypnsapi.aliyuncs.com");
request.setSysVersion("2017-05-25");
request.setSysAction("SendSmsVerifyCode");
request.putQueryParameter("PhoneNumber", phone);
request.putQueryParameter("SignName", smsProperties.getSignName());
request.putQueryParameter("TemplateCode", smsProperties.getTemplateCode());
request.putQueryParameter("TemplateParam", "{\"code\":\"##code##\",\"min\":\"5\"}");
request.putQueryParameter("ReturnVerifyCode", "true");
log.info("阿里云号码认证请求参数 - signName: {}, templateCode: {}, templateParam: {}",
smsProperties.getSignName(),
smsProperties.getTemplateCode(),
"{\"code\":\"##code##\",\"min\":\"5\"}");
CommonResponse response = client.getCommonResponse(request);
String responseData = response.getData();
log.info("阿里云号码认证原始响应: {}", responseData);
JsonNode jsonNode = objectMapper.readTree(responseData);
JsonNode codeNode = jsonNode.get("Code");
if (codeNode == null) {
log.error("阿里云响应中找不到Code字段, 原始响应: {}", responseData);
return false;
}
String code = codeNode.asText();
if ("OK".equals(code)) {
JsonNode requestIdNode = jsonNode.get("RequestId");
String requestId = requestIdNode != null ? requestIdNode.asText() : "unknown";
log.info("短信验证码发送成功, phone: {}, requestId: {}", phone, requestId);
// 提取验证码并存入Redis
JsonNode modelNode = jsonNode.get("Model");
if (modelNode != null) {
JsonNode verifyCodeNode = modelNode.get("VerifyCode");
if (verifyCodeNode != null) {
String verifyCode = verifyCodeNode.asText();
String smsCodeKey = RedisKeyConstants.SMS_CODE + phone;
redisUtil.setWithExpire(smsCodeKey, verifyCode, CODE_EXPIRE_SECONDS).subscribe();
log.info("验证码已存入Redis, phone: {}, key: {}, expire: {}秒", phone, smsCodeKey, CODE_EXPIRE_SECONDS);
} else {
log.warn("响应中未找到Model.VerifyCode字段, 原始响应: {}", responseData);
}
} else {
log.warn("响应中未找到Model字段, 原始响应: {}", responseData);
}
redisUtil.setWithExpire(rateLimitKey, currentTime, SEND_INTERVAL_SECONDS).subscribe();
return true;
}
JsonNode messageNode = jsonNode.get("Message");
String message = messageNode != null ? messageNode.asText() : "unknown";
log.error("短信验证码发送失败, phone: {}, code: {}, message: {}", phone, code, message);
return false;
} catch (Exception e) {
log.error("发送短信验证码异常, phone: {}, 异常信息: {}", phone, e.getMessage(), e);
return false;
}
});
});
}
@Override
public Mono<Boolean> verifyCode(String phone, String code) {
log.info("验证短信验证码, phone: {}", phone);
return Mono.fromCallable(() -> {
try {
IAcsClient client = createClient();
CommonRequest request = new CommonRequest();
request.setSysMethod(MethodType.POST);
request.setSysDomain("dypnsapi.aliyuncs.com");
request.setSysVersion("2017-05-25");
request.setSysAction("CheckSmsVerifyCode");
request.putQueryParameter("PhoneNumber", phone);
request.putQueryParameter("VerifyCode", code);
log.info("阿里云号码认证核验参数 - phone: {}, code: {}", phone, code);
CommonResponse response = client.getCommonResponse(request);
String responseData = response.getData();
log.info("阿里云号码认证核验原始响应: {}", responseData);
JsonNode jsonNode = objectMapper.readTree(responseData);
JsonNode codeNode = jsonNode.get("Code");
if (codeNode == null) {
log.error("阿里云核验响应中找不到Code字段, 原始响应: {}", responseData);
return false;
}
String responseCode = codeNode.asText();
JsonNode modelNode = jsonNode.get("Model");
JsonNode verifyResultNode = modelNode != null ? modelNode.get("VerifyResult") : null;
boolean verifyResult = verifyResultNode != null && "PASS".equals(verifyResultNode.asText());
if ("OK".equals(responseCode) && verifyResult) {
log.info("验证码验证成功, phone: {}", phone);
return true;
}
JsonNode messageNode = jsonNode.get("Message");
String message = messageNode != null ? messageNode.asText() : "unknown";
log.warn("验证码验证失败, phone: {}, code: {}, message: {}, result: {}",
phone, responseCode, message, verifyResult);
return false;
} catch (Exception e) {
log.error("验证短信验证码异常, phone: {}, 异常信息: {}", phone, e.getMessage(), e);
return false;
}
});
}
@Override
public Mono<String> getVerificationCode(String phone) {
try {
String cacheKey = RedisKeyConstants.SMS_CODE + phone;
return redisUtil.get(cacheKey, String.class);
} catch (Exception e) {
log.error("获取验证码异常, phone: {}", phone, e);
return Mono.empty();
}
}
private IAcsClient createClient() throws ClientException {
IClientProfile profile = DefaultProfile.getProfile(
"cn-hangzhou",
smsProperties.getAccessKeyId(),
smsProperties.getAccessKeySecret());
DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", "Dypnsapi", "dypnsapi.aliyuncs.com");
return new DefaultAcsClient(profile);
}
}
@@ -0,0 +1,36 @@
package cn.novalon.gym.manage.auth.vo;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 手机号一键登录响应VO
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PhoneLoginVO {
private Long memberId;
private String memberNo;
private String phone;
private String accessToken;
private String refreshToken;
private Integer expiresIn;
private Boolean isNewUser;
private Boolean needCompleteInfo;
private String nickname;
private String avatar;
}
@@ -0,0 +1,5 @@
cn.novalon.gym.manage.auth.handler.PhoneAuthHandler
cn.novalon.gym.manage.auth.service.impl.PhoneAuthServiceImpl
cn.novalon.gym.manage.auth.service.impl.SmsServiceImpl
cn.novalon.gym.manage.auth.config.AuthConfig
cn.novalon.gym.manage.auth.config.SmsProperties
@@ -0,0 +1,106 @@
package cn.novalon.gym.manage.auth.dto;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@DisplayName("Auth DTO 单元测试")
class DtoValidationTest {
@Nested
@DisplayName("PhoneLoginDto 测试")
class PhoneLoginDtoTest {
@Test
@DisplayName("无参构造和setter/getter应正确设置和读取所有字段")
void shouldSetAndGetAllFields() {
PhoneLoginDto dto = new PhoneLoginDto();
dto.setPhone("13800138000");
dto.setAccessToken("token-abc-123");
dto.setOpenid("openid-xyz-456");
dto.setNickname("测试用户");
dto.setAvatar("https://cdn.example.com/avatar.png");
assertThat(dto.getPhone()).isEqualTo("13800138000");
assertThat(dto.getAccessToken()).isEqualTo("token-abc-123");
assertThat(dto.getOpenid()).isEqualTo("openid-xyz-456");
assertThat(dto.getNickname()).isEqualTo("测试用户");
assertThat(dto.getAvatar()).isEqualTo("https://cdn.example.com/avatar.png");
}
@Test
@DisplayName("Builder构造应正确设置所有字段")
void shouldBuildCorrectly() {
PhoneLoginDto dto = PhoneLoginDto.builder()
.phone("13900139000")
.accessToken("token-def-456")
.openid("openid-ghi-789")
.nickname("张三")
.avatar("https://cdn.example.com/avatar2.png")
.build();
assertThat(dto.getPhone()).isEqualTo("13900139000");
assertThat(dto.getAccessToken()).isEqualTo("token-def-456");
assertThat(dto.getOpenid()).isEqualTo("openid-ghi-789");
assertThat(dto.getNickname()).isEqualTo("张三");
assertThat(dto.getAvatar()).isEqualTo("https://cdn.example.com/avatar2.png");
}
}
@Nested
@DisplayName("PhoneCodeLoginDto 测试")
class PhoneCodeLoginDtoTest {
@Test
@DisplayName("无参构造和setter/getter应正确设置和读取所有字段")
void shouldSetAndGetAllFields() {
PhoneCodeLoginDto dto = new PhoneCodeLoginDto();
dto.setPhone("15000150000");
dto.setCode("123456");
assertThat(dto.getPhone()).isEqualTo("15000150000");
assertThat(dto.getCode()).isEqualTo("123456");
}
@Test
@DisplayName("Builder构造应正确设置所有字段")
void shouldBuildCorrectly() {
PhoneCodeLoginDto dto = PhoneCodeLoginDto.builder()
.phone("13700137000")
.code("654321")
.build();
assertThat(dto.getPhone()).isEqualTo("13700137000");
assertThat(dto.getCode()).isEqualTo("654321");
}
}
@Nested
@DisplayName("SendCodeRequest 测试")
class SendCodeRequestTest {
@Test
@DisplayName("无参构造和setter/getter应正确设置和读取phone字段")
void shouldSetAndGetPhone() {
SendCodeRequest req = new SendCodeRequest();
req.setPhone("18600186000");
assertThat(req.getPhone()).isEqualTo("18600186000");
}
@Test
@DisplayName("Builder构造应正确设置phone字段")
void shouldBuildCorrectly() {
SendCodeRequest req = SendCodeRequest.builder()
.phone("15900159000")
.build();
assertThat(req.getPhone()).isEqualTo("15900159000");
}
}
}
@@ -0,0 +1,175 @@
package cn.novalon.gym.manage.auth.handler;
import cn.novalon.gym.manage.auth.dto.PhoneLoginDto;
import cn.novalon.gym.manage.auth.dto.PhoneCodeLoginDto;
import cn.novalon.gym.manage.auth.dto.SendCodeRequest;
import cn.novalon.gym.manage.auth.service.PhoneAuthService;
import cn.novalon.gym.manage.auth.vo.PhoneLoginVO;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.reactive.function.server.MockServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)
class PhoneAuthHandlerTest {
@Mock
private PhoneAuthService phoneAuthService;
private PhoneAuthHandler phoneAuthHandler;
@BeforeEach
void setUp() {
phoneAuthHandler = new PhoneAuthHandler(phoneAuthService);
}
// ==================== oneClickLogin ====================
@Test
void oneClickLogin_shouldReturnOkWithLoginResult() {
PhoneLoginVO loginVO = new PhoneLoginVO();
loginVO.setAccessToken("test-jwt-token");
loginVO.setPhone("13800138000");
PhoneLoginDto dto = new PhoneLoginDto();
dto.setAccessToken("dcloud-access-token");
when(phoneAuthService.oneClickLogin(any(PhoneLoginDto.class))).thenReturn(Mono.just(loginVO));
MockServerRequest request = MockServerRequest.builder()
.body(Mono.just(dto));
Mono<ServerResponse> result = phoneAuthHandler.oneClickLogin(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
verify(phoneAuthService).oneClickLogin(any(PhoneLoginDto.class));
}
@Test
void oneClickLogin_shouldPropagateServiceError() {
PhoneLoginDto dto = new PhoneLoginDto();
dto.setAccessToken("invalid-token");
when(phoneAuthService.oneClickLogin(any(PhoneLoginDto.class)))
.thenReturn(Mono.error(new RuntimeException("Auth failed")));
MockServerRequest request = MockServerRequest.builder()
.body(Mono.just(dto));
Mono<ServerResponse> result = phoneAuthHandler.oneClickLogin(request);
StepVerifier.create(result)
.expectError(RuntimeException.class)
.verify();
}
// ==================== sendSmsCode ====================
@Test
void sendSmsCode_shouldReturnOkWithSuccessTrue() {
SendCodeRequest sendCodeRequest = new SendCodeRequest();
sendCodeRequest.setPhone("13800138000");
when(phoneAuthService.sendSmsCode("13800138000")).thenReturn(Mono.just(true));
MockServerRequest request = MockServerRequest.builder()
.body(Mono.just(sendCodeRequest));
Mono<ServerResponse> result = phoneAuthHandler.sendSmsCode(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
}
@Test
void sendSmsCode_shouldReturnOkWithSuccessFalseWhenServiceReturnsFalse() {
SendCodeRequest sendCodeRequest = new SendCodeRequest();
sendCodeRequest.setPhone("13800138000");
when(phoneAuthService.sendSmsCode("13800138000")).thenReturn(Mono.just(false));
MockServerRequest request = MockServerRequest.builder()
.body(Mono.just(sendCodeRequest));
Mono<ServerResponse> result = phoneAuthHandler.sendSmsCode(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
}
@Test
void sendSmsCode_shouldPropagateError() {
SendCodeRequest sendCodeRequest = new SendCodeRequest();
sendCodeRequest.setPhone("13800138000");
when(phoneAuthService.sendSmsCode("13800138000"))
.thenReturn(Mono.error(new RuntimeException("SMS service unavailable")));
MockServerRequest request = MockServerRequest.builder()
.body(Mono.just(sendCodeRequest));
Mono<ServerResponse> result = phoneAuthHandler.sendSmsCode(request);
StepVerifier.create(result)
.expectError(RuntimeException.class)
.verify();
}
// ==================== codeLogin ====================
@Test
void codeLogin_shouldReturnOkWithLoginResult() {
PhoneLoginVO loginVO = new PhoneLoginVO();
loginVO.setAccessToken("test-jwt-token");
PhoneCodeLoginDto dto = new PhoneCodeLoginDto();
dto.setPhone("13800138000");
dto.setCode("123456");
when(phoneAuthService.codeLogin(any(PhoneCodeLoginDto.class))).thenReturn(Mono.just(loginVO));
MockServerRequest request = MockServerRequest.builder()
.body(Mono.just(dto));
Mono<ServerResponse> result = phoneAuthHandler.codeLogin(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
}
@Test
void codeLogin_shouldPropagateServiceError() {
PhoneCodeLoginDto dto = new PhoneCodeLoginDto();
dto.setPhone("13800138000");
dto.setCode("wrong-code");
when(phoneAuthService.codeLogin(any(PhoneCodeLoginDto.class)))
.thenReturn(Mono.error(new RuntimeException("Invalid code")));
MockServerRequest request = MockServerRequest.builder()
.body(Mono.just(dto));
Mono<ServerResponse> result = phoneAuthHandler.codeLogin(request);
StepVerifier.create(result)
.expectError(RuntimeException.class)
.verify();
}
}
+113
View File
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-manage-api</artifactId>
<version>1.0.0</version>
</parent>
<artifactId>gym-brand</artifactId>
<packaging>jar</packaging>
<name>Gym Brand</name>
<description>Brand Customization Module - Logo Upload, Color Settings, Real-time Preview</description>
<dependencies>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-sys</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<scope>test</scope>
</dependency>
<!-- Aliyun OSS SDK -->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<executions>
<execution>
<id>default-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>21</source>
<target>21</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.12</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>verify</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,39 @@
package cn.novalon.gym.manage.brand.config;
import cn.novalon.gym.manage.brand.websocket.BrandWebSocketHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.web.reactive.HandlerMapping;
import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
import org.springframework.web.reactive.socket.WebSocketHandler;
import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
import java.util.HashMap;
import java.util.Map;
/**
* 品牌预览 WebSocket 配置
*
* @author 张翔
* @date 2026-07-23
*/
@Configuration
public class BrandWebSocketConfig {
@Bean
public HandlerMapping brandWebSocketHandlerMapping(BrandWebSocketHandler brandWebSocketHandler) {
Map<String, WebSocketHandler> map = new HashMap<>();
map.put("/ws/brand", brandWebSocketHandler);
SimpleUrlHandlerMapping handlerMapping = new SimpleUrlHandlerMapping();
handlerMapping.setOrder(Ordered.HIGHEST_PRECEDENCE + 1);
handlerMapping.setUrlMap(map);
return handlerMapping;
}
@Bean
public WebSocketHandlerAdapter brandWebSocketHandlerAdapter() {
return new WebSocketHandlerAdapter();
}
}
@@ -0,0 +1,105 @@
package cn.novalon.gym.manage.brand.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/**
* 阿里云 OSS 配置属性
* <p>
* 配置前缀: brand.oss
*
* @author 张翔
* @date 2026-07-23
*/
@Component
@ConfigurationProperties(prefix = "brand.oss")
public class OssProperties {
/** 是否启用 OSS(默认关闭,仅使用本地存储) */
private boolean enabled = false;
/** OSS Endpoint(如 oss-cn-hangzhou.aliyuncs.com */
private String endpoint;
/** AccessKey ID */
private String accessKeyId;
/** AccessKey Secret */
private String accessKeySecret;
/** Bucket 名称 */
private String bucketName;
/** 自定义域名/CDN域名(可选,用于生成访问URL) */
private String customDomain;
/** 文件存储基础路径(默认 brand) */
private String basePath = "brand";
public boolean isEnabled() {
return enabled;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public String getEndpoint() {
return endpoint;
}
public void setEndpoint(String endpoint) {
this.endpoint = endpoint;
}
public String getAccessKeyId() {
return accessKeyId;
}
public void setAccessKeyId(String accessKeyId) {
this.accessKeyId = accessKeyId;
}
public String getAccessKeySecret() {
return accessKeySecret;
}
public void setAccessKeySecret(String accessKeySecret) {
this.accessKeySecret = accessKeySecret;
}
public String getBucketName() {
return bucketName;
}
public void setBucketName(String bucketName) {
this.bucketName = bucketName;
}
public String getCustomDomain() {
return customDomain;
}
public void setCustomDomain(String customDomain) {
this.customDomain = customDomain;
}
public String getBasePath() {
return basePath;
}
public void setBasePath(String basePath) {
this.basePath = basePath;
}
/**
* 判断 OSS 配置是否完整可用
*/
public boolean isConfigured() {
return enabled
&& endpoint != null && !endpoint.isBlank()
&& accessKeyId != null && !accessKeyId.isBlank()
&& accessKeySecret != null && !accessKeySecret.isBlank()
&& bucketName != null && !bucketName.isBlank();
}
}
@@ -0,0 +1,56 @@
package cn.novalon.gym.manage.brand.core.domain;
import java.time.LocalDateTime;
/**
* 品牌配置领域对象
*
* @author 张翔
* @date 2026-07-23
*/
public class BrandConfig {
private Long id;
private String tenantId;
private String logoUrl;
private String backgroundImageUrl;
private String primaryColor;
private String primaryColorRgb;
private String secondaryColor;
private String secondaryColorRgb;
private String fontFamily;
private String brandName;
private String slogan;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
private LocalDateTime deletedAt;
public Long getId() { return id; }
public void setId(Long id) { this.id = id; }
public String getTenantId() { return tenantId; }
public void setTenantId(String tenantId) { this.tenantId = tenantId; }
public String getLogoUrl() { return logoUrl; }
public void setLogoUrl(String logoUrl) { this.logoUrl = logoUrl; }
public String getBackgroundImageUrl() { return backgroundImageUrl; }
public void setBackgroundImageUrl(String backgroundImageUrl) { this.backgroundImageUrl = backgroundImageUrl; }
public String getPrimaryColor() { return primaryColor; }
public void setPrimaryColor(String primaryColor) { this.primaryColor = primaryColor; }
public String getPrimaryColorRgb() { return primaryColorRgb; }
public void setPrimaryColorRgb(String primaryColorRgb) { this.primaryColorRgb = primaryColorRgb; }
public String getSecondaryColor() { return secondaryColor; }
public void setSecondaryColor(String secondaryColor) { this.secondaryColor = secondaryColor; }
public String getSecondaryColorRgb() { return secondaryColorRgb; }
public void setSecondaryColorRgb(String secondaryColorRgb) { this.secondaryColorRgb = secondaryColorRgb; }
public String getFontFamily() { return fontFamily; }
public void setFontFamily(String fontFamily) { this.fontFamily = fontFamily; }
public String getBrandName() { return brandName; }
public void setBrandName(String brandName) { this.brandName = brandName; }
public String getSlogan() { return slogan; }
public void setSlogan(String slogan) { this.slogan = slogan; }
public LocalDateTime getCreatedAt() { return createdAt; }
public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; }
public LocalDateTime getUpdatedAt() { return updatedAt; }
public void setUpdatedAt(LocalDateTime updatedAt) { this.updatedAt = updatedAt; }
public LocalDateTime getDeletedAt() { return deletedAt; }
public void setDeletedAt(LocalDateTime deletedAt) { this.deletedAt = deletedAt; }
}
@@ -0,0 +1,17 @@
package cn.novalon.gym.manage.brand.core.repository;
import cn.novalon.gym.manage.brand.core.domain.BrandConfig;
import reactor.core.publisher.Mono;
/**
* 品牌配置仓储接口
*
* @author 张翔
* @date 2026-07-23
*/
public interface IBrandConfigRepository {
Mono<BrandConfig> findByTenantId(String tenantId);
Mono<BrandConfig> save(BrandConfig brandConfig);
}
@@ -0,0 +1,27 @@
package cn.novalon.gym.manage.brand.core.service;
import org.springframework.http.codec.multipart.FilePart;
import reactor.core.publisher.Mono;
/**
* 文件存储服务接口(OSS + 本地兜底)
*
* @author 张翔
* @date 2026-07-23
*/
public interface FileStorageService {
/**
* 上传图片文件,返回访问URL
*
* @param filePart 文件数据
* @param directory 存储目录(如 "logo", "background"
* @return 文件访问URL
*/
Mono<String> uploadImage(FilePart filePart, String directory);
/**
* 根据URL删除文件
*/
Mono<Void> deleteFile(String fileUrl);
}
@@ -0,0 +1,49 @@
package cn.novalon.gym.manage.brand.core.service;
import cn.novalon.gym.manage.brand.core.domain.BrandConfig;
import org.springframework.http.codec.multipart.FilePart;
import reactor.core.publisher.Mono;
/**
* 品牌配置服务接口
*
* @author 张翔
* @date 2026-07-23
*/
public interface IBrandConfigService {
/**
* 根据租户ID获取品牌配置
*/
Mono<BrandConfig> getBrandConfig(String tenantId);
/**
* 上传Logo
*/
Mono<BrandConfig> uploadLogo(String tenantId, FilePart filePart);
/**
* 上传背景图
*/
Mono<BrandConfig> uploadBackgroundImage(String tenantId, FilePart filePart);
/**
* 更新品牌配色
*/
Mono<BrandConfig> updateColorConfig(String tenantId, BrandConfig config);
/**
* 删除Logo(恢复默认)
*/
Mono<BrandConfig> removeLogo(String tenantId);
/**
* 删除背景图(恢复默认)
*/
Mono<BrandConfig> removeBackgroundImage(String tenantId);
/**
* 更新品牌信息(名称、口号)
*/
Mono<BrandConfig> updateBrandInfo(String tenantId, BrandConfig config);
}
@@ -0,0 +1,172 @@
package cn.novalon.gym.manage.brand.core.service.impl;
import cn.novalon.gym.manage.brand.core.domain.BrandConfig;
import cn.novalon.gym.manage.brand.core.repository.IBrandConfigRepository;
import cn.novalon.gym.manage.brand.core.service.FileStorageService;
import cn.novalon.gym.manage.brand.core.service.IBrandConfigService;
import cn.novalon.gym.manage.brand.websocket.BrandWebSocketHandler;
import org.springframework.http.codec.multipart.FilePart;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
/**
* 品牌配置服务实现
*
* @author 张翔
* @date 2026-07-23
*/
@Service
public class BrandConfigServiceImpl implements IBrandConfigService {
private final IBrandConfigRepository brandConfigRepository;
private final FileStorageService fileStorageService;
private final BrandWebSocketHandler brandWebSocketHandler;
public BrandConfigServiceImpl(
IBrandConfigRepository brandConfigRepository,
FileStorageService fileStorageService,
BrandWebSocketHandler brandWebSocketHandler) {
this.brandConfigRepository = brandConfigRepository;
this.fileStorageService = fileStorageService;
this.brandWebSocketHandler = brandWebSocketHandler;
}
@Override
public Mono<BrandConfig> getBrandConfig(String tenantId) {
return brandConfigRepository.findByTenantId(tenantId)
.switchIfEmpty(Mono.defer(() -> createDefaultConfig(tenantId)));
}
@Override
public Mono<BrandConfig> uploadLogo(String tenantId, FilePart filePart) {
return fileStorageService.uploadImage(filePart, "logo")
.flatMap(logoUrl -> getOrCreateConfig(tenantId)
.flatMap(config -> {
// 删除旧Logo
return fileStorageService.deleteFile(config.getLogoUrl())
.then(Mono.defer(() -> {
config.setLogoUrl(logoUrl);
config.setUpdatedAt(LocalDateTime.now());
return brandConfigRepository.save(config);
}));
}))
.doOnSuccess(config -> notifyPreviewUpdate(config));
}
@Override
public Mono<BrandConfig> uploadBackgroundImage(String tenantId, FilePart filePart) {
return fileStorageService.uploadImage(filePart, "background")
.flatMap(bgUrl -> getOrCreateConfig(tenantId)
.flatMap(config -> {
return fileStorageService.deleteFile(config.getBackgroundImageUrl())
.then(Mono.defer(() -> {
config.setBackgroundImageUrl(bgUrl);
config.setUpdatedAt(LocalDateTime.now());
return brandConfigRepository.save(config);
}));
}))
.doOnSuccess(config -> notifyPreviewUpdate(config));
}
@Override
public Mono<BrandConfig> updateColorConfig(String tenantId, BrandConfig updatedConfig) {
return getOrCreateConfig(tenantId)
.flatMap(config -> {
if (updatedConfig.getPrimaryColor() != null) {
config.setPrimaryColor(updatedConfig.getPrimaryColor());
}
if (updatedConfig.getPrimaryColorRgb() != null) {
config.setPrimaryColorRgb(updatedConfig.getPrimaryColorRgb());
}
if (updatedConfig.getSecondaryColor() != null) {
config.setSecondaryColor(updatedConfig.getSecondaryColor());
}
if (updatedConfig.getSecondaryColorRgb() != null) {
config.setSecondaryColorRgb(updatedConfig.getSecondaryColorRgb());
}
if (updatedConfig.getFontFamily() != null) {
config.setFontFamily(updatedConfig.getFontFamily());
}
config.setUpdatedAt(LocalDateTime.now());
return brandConfigRepository.save(config);
})
.doOnSuccess(config -> notifyPreviewUpdate(config));
}
@Override
public Mono<BrandConfig> removeLogo(String tenantId) {
return getOrCreateConfig(tenantId)
.flatMap(config -> fileStorageService.deleteFile(config.getLogoUrl())
.then(Mono.defer(() -> {
config.setLogoUrl(null);
config.setUpdatedAt(LocalDateTime.now());
return brandConfigRepository.save(config);
})))
.doOnSuccess(config -> notifyPreviewUpdate(config));
}
@Override
public Mono<BrandConfig> removeBackgroundImage(String tenantId) {
return getOrCreateConfig(tenantId)
.flatMap(config -> fileStorageService.deleteFile(config.getBackgroundImageUrl())
.then(Mono.defer(() -> {
config.setBackgroundImageUrl(null);
config.setUpdatedAt(LocalDateTime.now());
return brandConfigRepository.save(config);
})))
.doOnSuccess(config -> notifyPreviewUpdate(config));
}
@Override
public Mono<BrandConfig> updateBrandInfo(String tenantId, BrandConfig updatedConfig) {
return getOrCreateConfig(tenantId)
.flatMap(config -> {
if (updatedConfig.getBrandName() != null) {
config.setBrandName(updatedConfig.getBrandName());
}
if (updatedConfig.getSlogan() != null) {
config.setSlogan(updatedConfig.getSlogan());
}
config.setUpdatedAt(LocalDateTime.now());
return brandConfigRepository.save(config);
})
.doOnSuccess(config -> notifyPreviewUpdate(config));
}
/**
* 获取或创建品牌配置
*/
private Mono<BrandConfig> getOrCreateConfig(String tenantId) {
return brandConfigRepository.findByTenantId(tenantId)
.switchIfEmpty(Mono.defer(() -> createDefaultConfig(tenantId)));
}
/**
* 为租户创建默认品牌配置
*/
private Mono<BrandConfig> createDefaultConfig(String tenantId) {
BrandConfig config = new BrandConfig();
config.setTenantId(tenantId);
config.setPrimaryColor("#00E676");
config.setPrimaryColorRgb("0,230,118");
config.setSecondaryColor("#1A1A1A");
config.setSecondaryColorRgb("26,26,26");
config.setFontFamily("default");
config.setCreatedAt(LocalDateTime.now());
config.setUpdatedAt(LocalDateTime.now());
return brandConfigRepository.save(config);
}
/**
* 通过WebSocket通知前端预览更新
*/
private void notifyPreviewUpdate(BrandConfig config) {
try {
brandWebSocketHandler.broadcastBrandUpdate(config);
} catch (Exception e) {
System.err.println("Failed to broadcast brand update: " + e.getMessage());
}
}
}
@@ -0,0 +1,71 @@
package cn.novalon.gym.manage.brand.core.service.impl;
import cn.novalon.gym.manage.brand.config.OssProperties;
import cn.novalon.gym.manage.brand.core.service.FileStorageService;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.http.codec.multipart.FilePart;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono;
/**
* 双轨文件存储服务(OSS 优先 + 本地兜底)
* <p>
* 作为 FileStorageService 的 @Primary 实现,编排 OSS 和本地存储:
* <ul>
* <li>上传:优先 OSS,失败则回退到本地存储</li>
* <li>删除:同时删除 OSS 和本地副本(尽力而为)</li>
* </ul>
* 当 OSS 未启用或未配置时,直接使用本地存储。
*
* @author 张翔
* @date 2026-07-23
*/
@Service
@Primary
public class DualFileStorageService implements FileStorageService {
private final FileStorageService ossStorage;
private final FileStorageService localStorage;
private final OssProperties ossProperties;
public DualFileStorageService(
@Qualifier("ossFileStorage") FileStorageService ossStorage,
@Qualifier("localFileStorage") FileStorageService localStorage,
OssProperties ossProperties) {
this.ossStorage = ossStorage;
this.localStorage = localStorage;
this.ossProperties = ossProperties;
}
@Override
public Mono<String> uploadImage(FilePart filePart, String directory) {
if (ossProperties.isConfigured()) {
return ossStorage.uploadImage(filePart, directory)
.onErrorResume(e -> {
System.err.println("OSS upload failed, falling back to local storage: " + e.getMessage());
return localStorage.uploadImage(filePart, directory);
});
}
return localStorage.uploadImage(filePart, directory);
}
@Override
public Mono<Void> deleteFile(String fileUrl) {
if (fileUrl == null || fileUrl.isBlank()) {
return Mono.empty();
}
// 本地文件总是尝试删除
Mono<Void> localDelete = localStorage.deleteFile(fileUrl);
if (ossProperties.isConfigured()) {
// OSS 删除:忽略失败(尽力而为)
return ossStorage.deleteFile(fileUrl)
.onErrorResume(e -> Mono.empty())
.then(localDelete);
}
return localDelete;
}
}
@@ -0,0 +1,111 @@
package cn.novalon.gym.manage.brand.core.service.impl;
import cn.novalon.gym.manage.brand.core.service.FileStorageService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.codec.multipart.FilePart;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Set;
import java.util.UUID;
/**
* 本地文件存储服务(兜底实现)
* <p>
* 当 OSS 不可用时,文件存储到服务器本地磁盘。
* 文件访问通过 /api/files/preview/ 路径提供。
*
* @author 张翔
* @date 2026-07-23
*/
@Service("localFileStorage")
public class LocalFileStorageService implements FileStorageService {
private static final Set<String> ALLOWED_EXTENSIONS = Set.of(".png", ".jpg", ".jpeg", ".gif", ".webp");
private static final long MAX_FILE_SIZE = 2 * 1024 * 1024; // 2MB
private final String uploadDir;
private final String baseUrl;
public LocalFileStorageService(
@Value("${file.upload.dir:/tmp/uploads}") String uploadDir,
@Value("${brand.file.base-url:http://localhost:8084/api/files}") String baseUrl) {
this.uploadDir = uploadDir;
this.baseUrl = baseUrl;
}
@Override
public Mono<String> uploadImage(FilePart filePart, String directory) {
String originalFilename = filePart.filename();
String fileExtension = getFileExtension(originalFilename);
if (!ALLOWED_EXTENSIONS.contains(fileExtension.toLowerCase())) {
return Mono.error(new IllegalArgumentException(
"不支持的文件格式,仅支持 PNG/JPG/JPEG/GIF/WEBP"));
}
String newFileName = directory + "_" + UUID.randomUUID().toString() + fileExtension;
Path targetDir = Paths.get(uploadDir, "brand", directory);
return Mono.fromCallable(() -> {
if (!Files.exists(targetDir)) {
Files.createDirectories(targetDir);
}
return targetDir;
}).flatMap(dir -> {
Path filePath = dir.resolve(newFileName);
return filePart.transferTo(filePath.toFile()).thenReturn(filePath);
}).flatMap(filePath -> {
try {
long fileSize = Files.size(filePath);
if (fileSize > MAX_FILE_SIZE) {
Files.deleteIfExists(filePath);
return Mono.error(new IllegalArgumentException("文件大小超过2MB限制"));
}
String relativePath = "brand/" + directory + "/" + newFileName;
return Mono.just(baseUrl + "/preview/" + relativePath);
} catch (IOException e) {
return Mono.error(e);
}
});
}
@Override
public Mono<Void> deleteFile(String fileUrl) {
if (fileUrl == null || fileUrl.isBlank()) {
return Mono.empty();
}
return Mono.fromRunnable(() -> {
try {
String relativePath = extractRelativePath(fileUrl);
if (relativePath != null) {
Path filePath = Paths.get(uploadDir, relativePath);
Files.deleteIfExists(filePath);
}
} catch (IOException e) {
System.err.println("Failed to delete local file: " + fileUrl + ", error: " + e.getMessage());
}
});
}
private String getFileExtension(String filename) {
if (filename == null || !filename.contains(".")) {
return ".png";
}
return filename.substring(filename.lastIndexOf("."));
}
private String extractRelativePath(String fileUrl) {
if (fileUrl.contains("/files/preview/")) {
return fileUrl.substring(fileUrl.indexOf("/files/preview/") + "/files/preview/".length());
}
if (fileUrl.contains("/files/")) {
return fileUrl.substring(fileUrl.indexOf("/files/") + "/files/".length());
}
return null;
}
}
@@ -0,0 +1,161 @@
package cn.novalon.gym.manage.brand.core.service.impl;
import cn.novalon.gym.manage.brand.config.OssProperties;
import cn.novalon.gym.manage.brand.core.service.FileStorageService;
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClientBuilder;
import com.aliyun.oss.model.PutObjectRequest;
import org.springframework.http.codec.multipart.FilePart;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Set;
import java.util.UUID;
/**
* 阿里云 OSS 文件存储服务
* <p>
* 当 brand.oss.enabled=true 且配置完整时启用,
* 将品牌图片上传至阿里云 OSS。
*
* @author 张翔
* @date 2026-07-23
*/
@Service("ossFileStorage")
public class OssFileStorageService implements FileStorageService {
private static final Set<String> ALLOWED_EXTENSIONS = Set.of(".png", ".jpg", ".jpeg", ".gif", ".webp");
private static final long MAX_FILE_SIZE = 2 * 1024 * 1024; // 2MB
private final OssProperties ossProperties;
private OSS ossClient;
public OssFileStorageService(OssProperties ossProperties) {
this.ossProperties = ossProperties;
}
/**
* 懒加载 OSS 客户端,避免未配置时启动失败
*/
private OSS getOssClient() {
if (ossClient == null && ossProperties.isConfigured()) {
synchronized (this) {
if (ossClient == null) {
ossClient = new OSSClientBuilder().build(
ossProperties.getEndpoint(),
ossProperties.getAccessKeyId(),
ossProperties.getAccessKeySecret());
}
}
}
return ossClient;
}
@Override
public Mono<String> uploadImage(FilePart filePart, String directory) {
if (getOssClient() == null) {
return Mono.error(new IllegalStateException("OSS 未配置或未启用"));
}
String originalFilename = filePart.filename();
String fileExtension = getFileExtension(originalFilename);
if (!ALLOWED_EXTENSIONS.contains(fileExtension.toLowerCase())) {
return Mono.error(new IllegalArgumentException(
"不支持的文件格式,仅支持 PNG/JPG/JPEG/GIF/WEBP"));
}
String objectName = ossProperties.getBasePath() + "/" + directory + "/"
+ directory + "_" + UUID.randomUUID().toString() + fileExtension;
String bucketName = ossProperties.getBucketName();
return Mono.fromCallable(() -> {
Path tempFile = Files.createTempFile("oss-upload-", fileExtension);
return tempFile;
}).flatMap(tempFile -> filePart.transferTo(tempFile.toFile()).thenReturn(tempFile))
.flatMap(tempFile -> {
try {
long fileSize = Files.size(tempFile);
if (fileSize > MAX_FILE_SIZE) {
Files.deleteIfExists(tempFile);
return Mono.error(new IllegalArgumentException("文件大小超过2MB限制"));
}
PutObjectRequest putRequest = new PutObjectRequest(bucketName, objectName, tempFile.toFile());
getOssClient().putObject(putRequest);
// 删除临时文件
Files.deleteIfExists(tempFile);
// 生成访问URL
String fileUrl = buildAccessUrl(objectName);
return Mono.just(fileUrl);
} catch (Exception e) {
try {
Files.deleteIfExists(tempFile);
} catch (Exception ignored) {
}
return Mono.error(new RuntimeException("OSS 上传失败: " + e.getMessage(), e));
}
});
}
@Override
public Mono<Void> deleteFile(String fileUrl) {
if (fileUrl == null || fileUrl.isBlank()) {
return Mono.empty();
}
if (getOssClient() == null) {
return Mono.empty();
}
return Mono.fromRunnable(() -> {
try {
String objectName = extractObjectName(fileUrl);
if (objectName != null) {
getOssClient().deleteObject(ossProperties.getBucketName(), objectName);
}
} catch (Exception e) {
System.err.println("Failed to delete OSS file: " + fileUrl + ", error: " + e.getMessage());
}
});
}
/**
* 构建文件访问 URL
* 优先使用自定义域名/CDN域名,否则使用 OSS 默认域名
*/
private String buildAccessUrl(String objectName) {
String domain;
if (ossProperties.getCustomDomain() != null && !ossProperties.getCustomDomain().isBlank()) {
domain = ossProperties.getCustomDomain();
if (domain.endsWith("/")) {
domain = domain.substring(0, domain.length() - 1);
}
} else {
domain = "https://" + ossProperties.getBucketName() + "." + ossProperties.getEndpoint();
}
return domain + "/" + objectName;
}
/**
* 从文件 URL 中提取 OSS Object Name
*/
private String extractObjectName(String fileUrl) {
String basePath = ossProperties.getBasePath();
int idx = fileUrl.indexOf(basePath);
if (idx >= 0) {
return fileUrl.substring(idx);
}
return null;
}
private String getFileExtension(String filename) {
if (filename == null || !filename.contains(".")) {
return ".png";
}
return filename.substring(filename.lastIndexOf("."));
}
}
@@ -0,0 +1,206 @@
package cn.novalon.gym.manage.brand.handler;
import cn.novalon.gym.manage.brand.core.domain.BrandConfig;
import cn.novalon.gym.manage.brand.core.service.IBrandConfigService;
import cn.novalon.gym.manage.sys.util.AuthUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.http.codec.multipart.FilePart;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
import java.util.Map;
/**
* 品牌配置 HTTP Handler
* <p>
* tenantId 从 JWT Token 中提取,不再通过 URL 路径参数传递,
* 确保每个用户只能操作自己租户的品牌配置。
*
* @author 张翔
* @date 2026-07-23
*/
@Component
@Tag(name = "品牌定制", description = "Logo上传、背景图上传、品牌配色设置、实时预览")
public class BrandConfigHandler {
private final IBrandConfigService brandConfigService;
private final AuthUtil authUtil;
public BrandConfigHandler(IBrandConfigService brandConfigService, AuthUtil authUtil) {
this.brandConfigService = brandConfigService;
this.authUtil = authUtil;
}
@Operation(summary = "获取品牌配置", description = "根据当前租户获取品牌配置信息")
public Mono<ServerResponse> getBrandConfig(ServerRequest request) {
String tenantId = authUtil.getTenantId(request);
return brandConfigService.getBrandConfig(tenantId)
.flatMap(config -> ServerResponse.ok().bodyValue(config))
.switchIfEmpty(ServerResponse.ok().bodyValue(Map.of(
"message", "未找到品牌配置,将使用默认配置"
)));
}
@Operation(summary = "上传Logo", description = "上传品牌Logo图片,支持PNG/JPG格式,限制2MB以内")
public Mono<ServerResponse> uploadLogo(ServerRequest request) {
String tenantId = authUtil.getTenantId(request);
return request.multipartData()
.flatMap(multipartData -> {
var part = multipartData.getFirst("file");
if (part == null) {
return ServerResponse.badRequest()
.bodyValue(Map.of("code", 400, "message", "未上传文件"));
}
if (!(part instanceof FilePart filePart)) {
return ServerResponse.badRequest()
.bodyValue(Map.of("code", 400, "message", "无效的文件格式"));
}
return brandConfigService.uploadLogo(tenantId, filePart)
.flatMap(config -> ServerResponse.ok().bodyValue(config));
})
.switchIfEmpty(ServerResponse.badRequest()
.bodyValue(Map.of("code", 400, "message", "请求数据为空")))
.onErrorResume(IllegalArgumentException.class, ex ->
ServerResponse.badRequest().bodyValue(Map.of(
"code", 400,
"message", ex.getMessage()
))
);
}
@Operation(summary = "上传背景图", description = "上传品牌背景图,支持PNG/JPG格式,限制2MB以内")
public Mono<ServerResponse> uploadBackgroundImage(ServerRequest request) {
String tenantId = authUtil.getTenantId(request);
return request.multipartData()
.flatMap(multipartData -> {
var part = multipartData.getFirst("file");
if (part == null) {
return ServerResponse.badRequest()
.bodyValue(Map.of("code", 400, "message", "未上传文件"));
}
if (!(part instanceof FilePart filePart)) {
return ServerResponse.badRequest()
.bodyValue(Map.of("code", 400, "message", "无效的文件格式"));
}
return brandConfigService.uploadBackgroundImage(tenantId, filePart)
.flatMap(config -> ServerResponse.ok().bodyValue(config));
})
.switchIfEmpty(ServerResponse.badRequest()
.bodyValue(Map.of("code", 400, "message", "请求数据为空")))
.onErrorResume(IllegalArgumentException.class, ex ->
ServerResponse.badRequest().bodyValue(Map.of(
"code", 400,
"message", ex.getMessage()
))
);
}
@Operation(summary = "更新品牌配色", description = "设置品牌主色调、辅助色等配色方案")
public Mono<ServerResponse> updateColorConfig(ServerRequest request) {
String tenantId = authUtil.getTenantId(request);
return request.bodyToMono(Map.class)
.map(this::mapToBrandConfig)
.flatMap(config -> brandConfigService.updateColorConfig(tenantId, config))
.flatMap(config -> ServerResponse.ok().bodyValue(config))
.onErrorResume(IllegalArgumentException.class, ex ->
ServerResponse.badRequest().bodyValue(Map.of(
"code", 400,
"message", ex.getMessage(),
"timestamp", LocalDateTime.now()
))
);
}
@Operation(summary = "删除Logo", description = "删除品牌Logo,恢复默认")
public Mono<ServerResponse> removeLogo(ServerRequest request) {
String tenantId = authUtil.getTenantId(request);
return brandConfigService.removeLogo(tenantId)
.flatMap(config -> ServerResponse.ok().bodyValue(config));
}
@Operation(summary = "删除背景图", description = "删除品牌背景图,恢复默认")
public Mono<ServerResponse> removeBackgroundImage(ServerRequest request) {
String tenantId = authUtil.getTenantId(request);
return brandConfigService.removeBackgroundImage(tenantId)
.flatMap(config -> ServerResponse.ok().bodyValue(config));
}
@Operation(summary = "更新品牌信息", description = "设置品牌名称和口号")
public Mono<ServerResponse> updateBrandInfo(ServerRequest request) {
String tenantId = authUtil.getTenantId(request);
return request.bodyToMono(Map.class)
.map(body -> {
BrandConfig config = new BrandConfig();
if (body.containsKey("brandName")) {
String name = (String) body.get("brandName");
if (name.length() > 100) {
throw new IllegalArgumentException("品牌名称不能超过100个字符");
}
config.setBrandName(name);
}
if (body.containsKey("slogan")) {
String slogan = (String) body.get("slogan");
if (slogan.length() > 200) {
throw new IllegalArgumentException("口号不能超过200个字符");
}
config.setSlogan(slogan);
}
return config;
})
.flatMap(config -> brandConfigService.updateBrandInfo(tenantId, config))
.flatMap(config -> ServerResponse.ok().bodyValue(config))
.onErrorResume(IllegalArgumentException.class, ex ->
ServerResponse.badRequest().bodyValue(Map.of(
"code", 400,
"message", ex.getMessage()
))
);
}
/**
* 将前端传来的 Map 转换为 BrandConfig(仅用于颜色配置)
*/
private BrandConfig mapToBrandConfig(Map<String, Object> body) {
BrandConfig config = new BrandConfig();
if (body.containsKey("primaryColor")) {
String color = (String) body.get("primaryColor");
validateHexColor(color);
config.setPrimaryColor(color);
}
if (body.containsKey("primaryColorRgb")) {
config.setPrimaryColorRgb((String) body.get("primaryColorRgb"));
}
if (body.containsKey("secondaryColor")) {
String color = (String) body.get("secondaryColor");
validateHexColor(color);
config.setSecondaryColor(color);
}
if (body.containsKey("secondaryColorRgb")) {
config.setSecondaryColorRgb((String) body.get("secondaryColorRgb"));
}
if (body.containsKey("fontFamily")) {
config.setFontFamily((String) body.get("fontFamily"));
}
return config;
}
/**
* 验证HEX颜色格式
*/
private void validateHexColor(String color) {
if (color == null) {
return;
}
if (!color.matches("^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$")) {
throw new IllegalArgumentException("无效的HEX颜色格式: " + color + ",正确格式如 #1E90FF");
}
}
}
@@ -0,0 +1,207 @@
package cn.novalon.gym.manage.brand.websocket;
import cn.novalon.gym.manage.brand.core.domain.BrandConfig;
import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.socket.WebSocketHandler;
import org.springframework.web.reactive.socket.WebSocketSession;
import reactor.core.publisher.Mono;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* 品牌配置实时预览 WebSocket 处理器
*
* @author 张翔
* @date 2026-07-23
*/
@Component
public class BrandWebSocketHandler implements WebSocketHandler {
private final Map<String, WebSocketSession> sessions = new ConcurrentHashMap<>();
private final Map<String, LocalDateTime> lastActivityTime = new ConcurrentHashMap<>();
private final ObjectMapper objectMapper = new ObjectMapper();
private final JwtTokenProvider jwtTokenProvider;
@Value("${websocket.idle-timeout:300s}")
private Duration idleTimeout;
@Value("${websocket.heartbeat-interval:30s}")
private Duration heartbeatInterval;
public BrandWebSocketHandler(JwtTokenProvider jwtTokenProvider) {
this.jwtTokenProvider = jwtTokenProvider;
}
@Override
public Mono<Void> handle(WebSocketSession session) {
String tenantId = extractTenantId(session);
sessions.put(tenantId, session);
lastActivityTime.put(tenantId, LocalDateTime.now());
return session.receive()
.doOnNext(message -> {
String payload = message.getPayloadAsText();
handleIncomingMessage(session, tenantId, payload);
lastActivityTime.put(tenantId, LocalDateTime.now());
})
.doOnComplete(() -> {
sessions.remove(tenantId);
lastActivityTime.remove(tenantId);
})
.doOnError(error -> {
sessions.remove(tenantId);
lastActivityTime.remove(tenantId);
})
.then();
}
@Scheduled(fixedRate = 60000)
public void cleanupIdleConnections() {
LocalDateTime now = LocalDateTime.now();
lastActivityTime.entrySet().removeIf(entry -> {
if (Duration.between(entry.getValue(), now).compareTo(idleTimeout) > 0) {
String tenantId = entry.getKey();
WebSocketSession session = sessions.remove(tenantId);
if (session != null && session.isOpen()) {
session.close().subscribe();
}
return true;
}
return false;
});
}
@Scheduled(fixedRate = 30000)
public void sendHeartbeat() {
sessions.forEach((tenantId, session) -> {
if (session.isOpen()) {
try {
String heartbeat = objectMapper.writeValueAsString(Map.of(
"type", "heartbeat",
"timestamp", System.currentTimeMillis()
));
session.send(Mono.just(session.textMessage(heartbeat))).subscribe();
} catch (Exception e) {
System.err.println("Brand WS heartbeat error: " + e.getMessage());
}
}
});
}
/**
* 向指定租户推送品牌配置更新
*/
public void sendBrandUpdate(String tenantId, BrandConfig config) {
WebSocketSession session = sessions.get(tenantId);
if (session != null && session.isOpen()) {
try {
Map<String, Object> message = Map.of(
"type", "brandUpdate",
"data", config,
"timestamp", System.currentTimeMillis()
);
String json = objectMapper.writeValueAsString(message);
session.send(Mono.just(session.textMessage(json))).subscribe();
} catch (Exception e) {
System.err.println("Brand WS send error: " + e.getMessage());
}
}
}
/**
* 广播品牌配置更新给所有连接的租户
*/
public void broadcastBrandUpdate(BrandConfig config) {
// 仅推送给对应租户
if (config.getTenantId() != null) {
sendBrandUpdate(config.getTenantId(), config);
}
}
/**
* 从 WebSocket 握手中提取租户ID
* <ol>
* <li>优先从 Authorization Header 的 JWT Token 中提取</li>
* <li>回退到 URL 查询参数 tenantId</li>
* <li>兜底使用 session ID</li>
* </ol>
*/
private String extractTenantId(WebSocketSession session) {
// 1. 优先从 JWT Token 提取
String tenantId = extractTenantIdFromJwt(session);
if (tenantId != null) {
return tenantId;
}
// 2. 回退到查询参数(兼容旧版)
String query = session.getHandshakeInfo().getUri().getQuery();
if (query != null && query.contains("tenantId=")) {
return query.split("tenantId=")[1].split("&")[0];
}
// 3. 兜底
return session.getId();
}
/**
* 从 WebSocket 握手的 Authorization Header 中提取 JWT Token 的 tenantId
*/
private String extractTenantIdFromJwt(WebSocketSession session) {
try {
var headers = session.getHandshakeInfo().getHeaders();
String authHeader = headers.getFirst(HttpHeaders.AUTHORIZATION);
if (authHeader != null && authHeader.startsWith("Bearer ")) {
String token = authHeader.substring(7);
if (jwtTokenProvider.validateToken(token)) {
return jwtTokenProvider.getTenantIdFromToken(token);
}
}
} catch (Exception e) {
System.err.println("Brand WS: Failed to extract tenantId from JWT: " + e.getMessage());
}
return null;
}
private void handleIncomingMessage(WebSocketSession session, String tenantId, String payload) {
try {
Map<String, Object> message = objectMapper.readValue(payload,
new TypeReference<Map<String, Object>>() {});
String type = (String) message.get("type");
switch (type) {
case "ping":
sendPong(session);
break;
case "subscribe":
sessions.put(tenantId, session);
lastActivityTime.put(tenantId, LocalDateTime.now());
break;
default:
break;
}
} catch (Exception e) {
System.err.println("Brand WS message error: " + e.getMessage());
}
}
private void sendPong(WebSocketSession session) {
try {
String pong = objectMapper.writeValueAsString(Map.of(
"type", "pong",
"timestamp", System.currentTimeMillis()
));
session.send(Mono.just(session.textMessage(pong))).subscribe();
} catch (Exception e) {
System.err.println("Brand WS pong error: " + e.getMessage());
}
}
}
@@ -0,0 +1 @@
cn.novalon.gym.manage.brand.config.BrandWebSocketConfig
@@ -0,0 +1,296 @@
package cn.novalon.gym.manage.brand.core.service.impl;
import cn.novalon.gym.manage.brand.core.domain.BrandConfig;
import cn.novalon.gym.manage.brand.core.repository.IBrandConfigRepository;
import cn.novalon.gym.manage.brand.core.service.FileStorageService;
import cn.novalon.gym.manage.brand.websocket.BrandWebSocketHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.codec.multipart.FilePart;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import java.time.LocalDateTime;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)
class BrandConfigServiceImplTest {
@Mock
private IBrandConfigRepository brandConfigRepository;
@Mock
private FileStorageService fileStorageService;
@Mock
private BrandWebSocketHandler brandWebSocketHandler;
@Mock
private FilePart filePart;
private BrandConfigServiceImpl brandConfigService;
private static final String TENANT_ID = "tenant-001";
@BeforeEach
void setUp() {
brandConfigService = new BrandConfigServiceImpl(
brandConfigRepository, fileStorageService, brandWebSocketHandler);
}
// ==================== getBrandConfig ====================
@Test
void getBrandConfig_shouldReturnExistingConfig() {
BrandConfig existingConfig = createTestConfig();
when(brandConfigRepository.findByTenantId(TENANT_ID)).thenReturn(Mono.just(existingConfig));
Mono<BrandConfig> result = brandConfigService.getBrandConfig(TENANT_ID);
StepVerifier.create(result)
.assertNext(config -> {
assertThat(config).isNotNull();
assertThat(config.getTenantId()).isEqualTo(TENANT_ID);
assertThat(config.getPrimaryColor()).isEqualTo("#00E676");
})
.verifyComplete();
verify(brandConfigRepository).findByTenantId(TENANT_ID);
verify(brandConfigRepository, never()).save(any());
}
@Test
void getBrandConfig_shouldCreateDefaultWhenNotFound() {
when(brandConfigRepository.findByTenantId(TENANT_ID)).thenReturn(Mono.empty());
when(brandConfigRepository.save(any(BrandConfig.class)))
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
Mono<BrandConfig> result = brandConfigService.getBrandConfig(TENANT_ID);
StepVerifier.create(result)
.assertNext(config -> {
assertThat(config.getTenantId()).isEqualTo(TENANT_ID);
assertThat(config.getPrimaryColor()).isEqualTo("#00E676");
assertThat(config.getPrimaryColorRgb()).isEqualTo("0,230,118");
assertThat(config.getSecondaryColor()).isEqualTo("#1A1A1A");
assertThat(config.getLogoUrl()).isNull();
})
.verifyComplete();
verify(brandConfigRepository).findByTenantId(TENANT_ID);
verify(brandConfigRepository).save(any(BrandConfig.class));
}
// ==================== uploadLogo ====================
@Test
void uploadLogo_shouldUploadAndSaveConfig() {
BrandConfig existingConfig = createTestConfig();
String newLogoUrl = "https://example.com/new-logo.png";
lenient().when(brandConfigRepository.findByTenantId(TENANT_ID))
.thenReturn(Mono.just(existingConfig));
when(fileStorageService.uploadImage(filePart, "logo")).thenReturn(Mono.just(newLogoUrl));
when(fileStorageService.deleteFile("https://example.com/logo.png")).thenReturn(Mono.empty());
when(brandConfigRepository.save(any(BrandConfig.class)))
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
Mono<BrandConfig> result = brandConfigService.uploadLogo(TENANT_ID, filePart);
StepVerifier.create(result)
.assertNext(config -> {
assertThat(config.getLogoUrl()).isEqualTo(newLogoUrl);
})
.verifyComplete();
verify(fileStorageService).uploadImage(filePart, "logo");
verify(brandConfigRepository, atLeastOnce()).save(any(BrandConfig.class));
}
@Test
void uploadLogo_shouldCreateConfigWhenTenantNotFound() {
String newLogoUrl = "https://example.com/new-logo.png";
lenient().when(brandConfigRepository.findByTenantId(TENANT_ID)).thenReturn(Mono.empty());
when(fileStorageService.uploadImage(filePart, "logo")).thenReturn(Mono.just(newLogoUrl));
lenient().when(fileStorageService.deleteFile(any())).thenReturn(Mono.empty());
when(brandConfigRepository.save(any(BrandConfig.class)))
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
Mono<BrandConfig> result = brandConfigService.uploadLogo(TENANT_ID, filePart);
StepVerifier.create(result)
.assertNext(config -> {
assertThat(config.getLogoUrl()).isEqualTo(newLogoUrl);
assertThat(config.getTenantId()).isEqualTo(TENANT_ID);
})
.verifyComplete();
}
@Test
void uploadLogo_shouldPropagateStorageError() {
BrandConfig existingConfig = createTestConfig();
lenient().when(brandConfigRepository.findByTenantId(TENANT_ID))
.thenReturn(Mono.just(existingConfig));
when(fileStorageService.uploadImage(filePart, "logo"))
.thenReturn(Mono.error(new RuntimeException("Storage error")));
Mono<BrandConfig> result = brandConfigService.uploadLogo(TENANT_ID, filePart);
StepVerifier.create(result)
.expectError(RuntimeException.class)
.verify();
}
// ==================== uploadBackgroundImage ====================
@Test
void uploadBackgroundImage_shouldUploadAndSaveConfig() {
BrandConfig existingConfig = createTestConfig();
String newBgUrl = "https://example.com/new-bg.png";
lenient().when(brandConfigRepository.findByTenantId(TENANT_ID))
.thenReturn(Mono.just(existingConfig));
when(fileStorageService.uploadImage(filePart, "background")).thenReturn(Mono.just(newBgUrl));
lenient().when(fileStorageService.deleteFile(anyString())).thenReturn(Mono.empty());
when(brandConfigRepository.save(any(BrandConfig.class)))
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
Mono<BrandConfig> result = brandConfigService.uploadBackgroundImage(TENANT_ID, filePart);
StepVerifier.create(result)
.assertNext(config -> {
assertThat(config.getBackgroundImageUrl()).isEqualTo(newBgUrl);
})
.verifyComplete();
verify(fileStorageService).uploadImage(filePart, "background");
}
// ==================== updateColorConfig ====================
@Test
void updateColorConfig_shouldUpdateAllColorFields() {
BrandConfig existingConfig = createTestConfig();
BrandConfig updateConfig = new BrandConfig();
updateConfig.setPrimaryColor("#FF0000");
updateConfig.setPrimaryColorRgb("255,0,0");
updateConfig.setSecondaryColor("#00FF00");
updateConfig.setSecondaryColorRgb("0,255,0");
updateConfig.setFontFamily("Arial");
lenient().when(brandConfigRepository.findByTenantId(TENANT_ID))
.thenReturn(Mono.just(existingConfig));
when(brandConfigRepository.save(any(BrandConfig.class)))
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
Mono<BrandConfig> result = brandConfigService.updateColorConfig(TENANT_ID, updateConfig);
StepVerifier.create(result)
.assertNext(config -> {
assertThat(config.getPrimaryColor()).isEqualTo("#FF0000");
assertThat(config.getPrimaryColorRgb()).isEqualTo("255,0,0");
assertThat(config.getSecondaryColor()).isEqualTo("#00FF00");
assertThat(config.getSecondaryColorRgb()).isEqualTo("0,255,0");
assertThat(config.getFontFamily()).isEqualTo("Arial");
})
.verifyComplete();
}
@Test
void updateColorConfig_shouldOnlyUpdateProvidedFields() {
BrandConfig existingConfig = createTestConfig();
BrandConfig updateConfig = new BrandConfig();
updateConfig.setPrimaryColor("#FF0000");
lenient().when(brandConfigRepository.findByTenantId(TENANT_ID))
.thenReturn(Mono.just(existingConfig));
when(brandConfigRepository.save(any(BrandConfig.class)))
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
Mono<BrandConfig> result = brandConfigService.updateColorConfig(TENANT_ID, updateConfig);
StepVerifier.create(result)
.assertNext(config -> {
assertThat(config.getPrimaryColor()).isEqualTo("#FF0000");
assertThat(config.getSecondaryColor()).isEqualTo("#1A1A1A"); // unchanged
assertThat(config.getLogoUrl()).isEqualTo("https://example.com/logo.png"); // unchanged
})
.verifyComplete();
}
// ==================== removeLogo ====================
@Test
void removeLogo_shouldClearLogoUrl() {
BrandConfig existingConfig = createTestConfig();
lenient().when(brandConfigRepository.findByTenantId(TENANT_ID))
.thenReturn(Mono.just(existingConfig));
when(fileStorageService.deleteFile("https://example.com/logo.png")).thenReturn(Mono.empty());
when(brandConfigRepository.save(any(BrandConfig.class)))
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
Mono<BrandConfig> result = brandConfigService.removeLogo(TENANT_ID);
StepVerifier.create(result)
.assertNext(config -> {
assertThat(config.getLogoUrl()).isNull();
})
.verifyComplete();
verify(fileStorageService).deleteFile("https://example.com/logo.png");
}
// ==================== removeBackgroundImage ====================
@Test
void removeBackgroundImage_shouldClearBackgroundImageUrl() {
BrandConfig existingConfig = createTestConfig();
lenient().when(brandConfigRepository.findByTenantId(TENANT_ID))
.thenReturn(Mono.just(existingConfig));
when(fileStorageService.deleteFile("https://example.com/bg.png")).thenReturn(Mono.empty());
when(brandConfigRepository.save(any(BrandConfig.class)))
.thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
Mono<BrandConfig> result = brandConfigService.removeBackgroundImage(TENANT_ID);
StepVerifier.create(result)
.assertNext(config -> {
assertThat(config.getBackgroundImageUrl()).isNull();
})
.verifyComplete();
verify(fileStorageService).deleteFile("https://example.com/bg.png");
}
// ==================== helper ====================
private BrandConfig createTestConfig() {
BrandConfig config = new BrandConfig();
config.setId(1L);
config.setTenantId(TENANT_ID);
config.setLogoUrl("https://example.com/logo.png");
config.setBackgroundImageUrl("https://example.com/bg.png");
config.setPrimaryColor("#00E676");
config.setPrimaryColorRgb("0,230,118");
config.setSecondaryColor("#1A1A1A");
config.setSecondaryColorRgb("26,26,26");
config.setFontFamily("default");
config.setCreatedAt(LocalDateTime.now());
config.setUpdatedAt(LocalDateTime.now());
return config;
}
}
@@ -0,0 +1,170 @@
package cn.novalon.gym.manage.brand.core.service.impl;
import cn.novalon.gym.manage.brand.config.OssProperties;
import cn.novalon.gym.manage.brand.core.service.FileStorageService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.codec.multipart.FilePart;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)
class DualFileStorageServiceTest {
@Mock
private FileStorageService ossStorage;
@Mock
private FileStorageService localStorage;
@Mock
private FilePart filePart;
private OssProperties ossProperties;
private DualFileStorageService dualService;
@BeforeEach
void setUp() {
ossProperties = new OssProperties();
// 默认不启用 OSS
ossProperties.setEnabled(false);
dualService = new DualFileStorageService(ossStorage, localStorage, ossProperties);
}
// ==================== OSS 未启用时,直接走本地存储 ====================
@Test
void shouldUseLocalStorageWhenOssDisabled() {
String localUrl = "http://localhost:8080/api/files/preview/brand/logo/logo_test.png";
when(localStorage.uploadImage(filePart, "logo")).thenReturn(Mono.just(localUrl));
Mono<String> result = dualService.uploadImage(filePart, "logo");
StepVerifier.create(result)
.assertNext(url -> assertThat(url).isEqualTo(localUrl))
.verifyComplete();
verify(localStorage).uploadImage(filePart, "logo");
verify(ossStorage, never()).uploadImage(any(), anyString());
}
@Test
void shouldDeleteFromLocalOnlyWhenOssDisabled() {
String fileUrl = "http://localhost/api/files/preview/brand/logo/test.png";
when(localStorage.deleteFile(fileUrl)).thenReturn(Mono.empty());
Mono<Void> result = dualService.deleteFile(fileUrl);
StepVerifier.create(result).verifyComplete();
verify(localStorage).deleteFile(fileUrl);
verify(ossStorage, never()).deleteFile(anyString());
}
// ==================== OSS 启用时,优先 OSS ====================
@Test
void shouldUseOssWhenEnabledAndConfigured() {
configureOss();
String ossUrl = "https://my-bucket.oss-cn-hangzhou.aliyuncs.com/brand/logo/logo_test.png";
when(ossStorage.uploadImage(filePart, "logo")).thenReturn(Mono.just(ossUrl));
Mono<String> result = dualService.uploadImage(filePart, "logo");
StepVerifier.create(result)
.assertNext(url -> assertThat(url).isEqualTo(ossUrl))
.verifyComplete();
verify(ossStorage).uploadImage(filePart, "logo");
verify(localStorage, never()).uploadImage(any(), anyString());
}
@Test
void shouldFallbackToLocalWhenOssFails() {
configureOss();
String localUrl = "http://localhost:8080/api/files/preview/brand/logo/logo_fallback.png";
when(ossStorage.uploadImage(filePart, "logo"))
.thenReturn(Mono.error(new RuntimeException("OSS unavailable")));
when(localStorage.uploadImage(filePart, "logo")).thenReturn(Mono.just(localUrl));
Mono<String> result = dualService.uploadImage(filePart, "logo");
StepVerifier.create(result)
.assertNext(url -> assertThat(url).isEqualTo(localUrl))
.verifyComplete();
verify(ossStorage).uploadImage(filePart, "logo");
verify(localStorage).uploadImage(filePart, "logo");
}
@Test
void shouldDeleteFromBothWhenOssEnabled() {
configureOss();
String fileUrl = "https://my-bucket.oss-cn-hangzhou.aliyuncs.com/brand/logo/test.png";
when(ossStorage.deleteFile(fileUrl)).thenReturn(Mono.empty());
when(localStorage.deleteFile(fileUrl)).thenReturn(Mono.empty());
Mono<Void> result = dualService.deleteFile(fileUrl);
StepVerifier.create(result).verifyComplete();
verify(ossStorage).deleteFile(fileUrl);
verify(localStorage).deleteFile(fileUrl);
}
@Test
void shouldDeleteLocalEvenWhenOssDeleteFails() {
configureOss();
String fileUrl = "https://my-bucket.oss-cn-hangzhou.aliyuncs.com/brand/logo/test.png";
when(ossStorage.deleteFile(fileUrl))
.thenReturn(Mono.error(new RuntimeException("OSS delete failed")));
when(localStorage.deleteFile(fileUrl)).thenReturn(Mono.empty());
Mono<Void> result = dualService.deleteFile(fileUrl);
StepVerifier.create(result).verifyComplete();
verify(ossStorage).deleteFile(fileUrl);
verify(localStorage).deleteFile(fileUrl);
}
// ==================== 边界情况 ====================
@Test
void deleteFile_shouldHandleNullUrl() {
Mono<Void> result = dualService.deleteFile(null);
StepVerifier.create(result).verifyComplete();
verify(localStorage, never()).deleteFile(any());
verify(ossStorage, never()).deleteFile(any());
}
@Test
void deleteFile_shouldHandleEmptyUrl() {
Mono<Void> result = dualService.deleteFile("");
StepVerifier.create(result).verifyComplete();
verify(localStorage, never()).deleteFile(any());
verify(ossStorage, never()).deleteFile(any());
}
// ==================== helper ====================
private void configureOss() {
ossProperties.setEnabled(true);
ossProperties.setEndpoint("oss-cn-hangzhou.aliyuncs.com");
ossProperties.setAccessKeyId("test-access-key");
ossProperties.setAccessKeySecret("test-access-secret");
ossProperties.setBucketName("test-bucket");
}
}
@@ -0,0 +1,182 @@
package cn.novalon.gym.manage.brand.core.service.impl;
import cn.novalon.gym.manage.brand.core.service.FileStorageService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.codec.multipart.FilePart;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import java.io.File;
import java.nio.file.Path;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class LocalFileStorageServiceTest {
@TempDir
Path tempDir;
@Mock
private FilePart filePart;
private FileStorageService localStorageService;
@BeforeEach
void setUp() {
String uploadDir = tempDir.toString();
String baseUrl = "http://localhost:8080/api/files";
localStorageService = new LocalFileStorageService(uploadDir, baseUrl);
}
@Test
void uploadImage_shouldAcceptAndSaveValidFiles() {
when(filePart.filename()).thenReturn("test-logo.png");
when(filePart.transferTo(any(File.class))).thenAnswer(invocation -> {
File targetFile = invocation.getArgument(0);
targetFile.createNewFile();
return Mono.empty();
});
Mono<String> result = localStorageService.uploadImage(filePart, "logo");
StepVerifier.create(result)
.assertNext(url -> {
assertThat(url).contains("brand/logo/logo_");
assertThat(url).endsWith(".png");
})
.verifyComplete();
}
@Test
void uploadImage_shouldRejectInvalidFormat() {
when(filePart.filename()).thenReturn("document.pdf");
Mono<String> result = localStorageService.uploadImage(filePart, "logo");
StepVerifier.create(result)
.expectError(IllegalArgumentException.class)
.verify();
}
@Test
void uploadImage_shouldRejectTxtFormat() {
when(filePart.filename()).thenReturn("script.txt");
Mono<String> result = localStorageService.uploadImage(filePart, "logo");
StepVerifier.create(result)
.expectError(IllegalArgumentException.class)
.verify();
}
@Test
void uploadImage_shouldRejectBatchFormat() {
when(filePart.filename()).thenReturn("file.bat");
Mono<String> result = localStorageService.uploadImage(filePart, "logo");
StepVerifier.create(result)
.expectError(IllegalArgumentException.class)
.verify();
}
@Test
void uploadImage_shouldHandleNoExtensionAsPng() {
when(filePart.filename()).thenReturn("noextension");
when(filePart.transferTo(any(File.class))).thenAnswer(invocation -> {
File targetFile = invocation.getArgument(0);
targetFile.createNewFile();
return Mono.empty();
});
Mono<String> result = localStorageService.uploadImage(filePart, "logo");
StepVerifier.create(result)
.assertNext(url -> {
assertThat(url).endsWith(".png");
})
.verifyComplete();
}
@Test
void uploadImage_shouldGenerateCorrectUrlFormat() {
when(filePart.filename()).thenReturn("company-logo.png");
when(filePart.transferTo(any(File.class))).thenAnswer(invocation -> {
File targetFile = invocation.getArgument(0);
targetFile.createNewFile();
return Mono.empty();
});
Mono<String> result = localStorageService.uploadImage(filePart, "logo");
StepVerifier.create(result)
.assertNext(url -> {
assertThat(url).startsWith("http://localhost:8080/api/files/preview/brand/logo/");
})
.verifyComplete();
}
@Test
void uploadImage_shouldUseCorrectDirectory() {
when(filePart.filename()).thenReturn("bg.png");
when(filePart.transferTo(any(File.class))).thenAnswer(invocation -> {
File targetFile = invocation.getArgument(0);
targetFile.createNewFile();
return Mono.empty();
});
Mono<String> result = localStorageService.uploadImage(filePart, "background");
StepVerifier.create(result)
.assertNext(url -> {
assertThat(url).contains("brand/background/background_");
})
.verifyComplete();
}
@Test
void uploadImage_shouldHandleTransferError() {
when(filePart.filename()).thenReturn("logo.png");
when(filePart.transferTo(any(File.class)))
.thenReturn(Mono.error(new RuntimeException("Transfer failed")));
Mono<String> result = localStorageService.uploadImage(filePart, "logo");
StepVerifier.create(result)
.expectError(RuntimeException.class)
.verify();
}
@Test
void deleteFile_shouldNotThrowForNullUrl() {
Mono<Void> result = localStorageService.deleteFile(null);
StepVerifier.create(result)
.verifyComplete();
}
@Test
void deleteFile_shouldNotThrowForEmptyUrl() {
Mono<Void> result = localStorageService.deleteFile("");
StepVerifier.create(result)
.verifyComplete();
}
@Test
void deleteFile_shouldNotThrowForNonExistentFile() {
Mono<Void> result = localStorageService.deleteFile(
"http://localhost:8080/api/files/preview/brand/logo/nonexistent.png");
StepVerifier.create(result)
.verifyComplete();
}
}
@@ -0,0 +1,209 @@
package cn.novalon.gym.manage.brand.handler;
import cn.novalon.gym.manage.brand.core.domain.BrandConfig;
import cn.novalon.gym.manage.brand.core.service.IBrandConfigService;
import cn.novalon.gym.manage.sys.util.AuthUtil;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.reactive.function.server.MockServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import java.time.LocalDateTime;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)
class BrandConfigHandlerTest {
@Mock
private IBrandConfigService brandConfigService;
@Mock
private AuthUtil authUtil;
private BrandConfigHandler brandConfigHandler;
private static final String TENANT_ID = "tenant-001";
@BeforeEach
void setUp() {
brandConfigHandler = new BrandConfigHandler(brandConfigService, authUtil);
}
private MockServerRequest.Builder mockRequest() {
return MockServerRequest.builder()
.header("X-Tenant-Id", "tenant-001");
}
// ==================== getBrandConfig ====================
@Test
void getBrandConfig_shouldReturnConfig() {
BrandConfig config = createTestConfig();
when(authUtil.getTenantId(any())).thenReturn(TENANT_ID);
when(brandConfigService.getBrandConfig(TENANT_ID)).thenReturn(Mono.just(config));
MockServerRequest request = mockRequest().build();
Mono<ServerResponse> result = brandConfigHandler.getBrandConfig(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
verify(brandConfigService).getBrandConfig(TENANT_ID);
}
@Test
void getBrandConfig_shouldReturnOkEvenWhenNotFound() {
when(authUtil.getTenantId(any())).thenReturn(TENANT_ID);
when(brandConfigService.getBrandConfig(TENANT_ID)).thenReturn(Mono.empty());
MockServerRequest request = mockRequest().build();
Mono<ServerResponse> result = brandConfigHandler.getBrandConfig(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
}
// ==================== updateColorConfig ====================
@Test
void updateColorConfig_shouldUpdateAndReturnOk() {
BrandConfig config = createTestConfig();
config.setPrimaryColor("#FF0000");
Map<String, Object> requestBody = Map.of("primaryColor", "#FF0000");
when(authUtil.getTenantId(any())).thenReturn(TENANT_ID);
when(brandConfigService.updateColorConfig(eq(TENANT_ID), any(BrandConfig.class)))
.thenReturn(Mono.just(config));
MockServerRequest request = mockRequest()
.body(Mono.just(requestBody));
Mono<ServerResponse> result = brandConfigHandler.updateColorConfig(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
}
@Test
void updateColorConfig_shouldRejectInvalidHex() {
Map<String, Object> requestBody = Map.of("primaryColor", "INVALID");
when(authUtil.getTenantId(any())).thenReturn(TENANT_ID);
MockServerRequest request = mockRequest()
.body(Mono.just(requestBody));
Mono<ServerResponse> result = brandConfigHandler.updateColorConfig(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST))
.verifyComplete();
verify(brandConfigService, never()).updateColorConfig(anyString(), any());
}
@Test
void updateColorConfig_shouldAcceptShortHexFormat() {
BrandConfig config = createTestConfig();
config.setPrimaryColor("#F00");
Map<String, Object> requestBody = Map.of("primaryColor", "#F00");
when(authUtil.getTenantId(any())).thenReturn(TENANT_ID);
when(brandConfigService.updateColorConfig(eq(TENANT_ID), any(BrandConfig.class)))
.thenReturn(Mono.just(config));
MockServerRequest request = mockRequest()
.body(Mono.just(requestBody));
Mono<ServerResponse> result = brandConfigHandler.updateColorConfig(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
}
@Test
void updateColorConfig_shouldRejectInvalidHexInSecondary() {
Map<String, Object> requestBody = Map.of("secondaryColor", "not-a-color");
when(authUtil.getTenantId(any())).thenReturn(TENANT_ID);
MockServerRequest request = mockRequest()
.body(Mono.just(requestBody));
Mono<ServerResponse> result = brandConfigHandler.updateColorConfig(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST))
.verifyComplete();
}
// ==================== removeLogo ====================
@Test
void removeLogo_shouldRemoveAndReturnOk() {
BrandConfig config = createTestConfig();
config.setLogoUrl(null);
when(authUtil.getTenantId(any())).thenReturn(TENANT_ID);
when(brandConfigService.removeLogo(TENANT_ID)).thenReturn(Mono.just(config));
MockServerRequest request = mockRequest().build();
Mono<ServerResponse> result = brandConfigHandler.removeLogo(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
verify(brandConfigService).removeLogo(TENANT_ID);
}
// ==================== removeBackgroundImage ====================
@Test
void removeBackgroundImage_shouldRemoveAndReturnOk() {
BrandConfig config = createTestConfig();
config.setBackgroundImageUrl(null);
when(authUtil.getTenantId(any())).thenReturn(TENANT_ID);
when(brandConfigService.removeBackgroundImage(TENANT_ID)).thenReturn(Mono.just(config));
MockServerRequest request = mockRequest().build();
Mono<ServerResponse> result = brandConfigHandler.removeBackgroundImage(request);
StepVerifier.create(result)
.assertNext(response -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK))
.verifyComplete();
verify(brandConfigService).removeBackgroundImage(TENANT_ID);
}
// ==================== helper ====================
private BrandConfig createTestConfig() {
BrandConfig config = new BrandConfig();
config.setId(1L);
config.setTenantId(TENANT_ID);
config.setLogoUrl("https://example.com/logo.png");
config.setBackgroundImageUrl("https://example.com/bg.png");
config.setPrimaryColor("#00E676");
config.setPrimaryColorRgb("0,230,118");
config.setSecondaryColor("#1A1A1A");
config.setSecondaryColorRgb("26,26,26");
config.setFontFamily("default");
config.setCreatedAt(LocalDateTime.now());
config.setUpdatedAt(LocalDateTime.now());
return config;
}
}
@@ -0,0 +1,181 @@
package cn.novalon.gym.manage.brand.websocket;
import cn.novalon.gym.manage.brand.core.domain.BrandConfig;
import cn.novalon.gym.manage.sys.security.JwtTokenProvider;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpHeaders;
import org.springframework.web.reactive.socket.HandshakeInfo;
import org.springframework.web.reactive.socket.WebSocketMessage;
import org.springframework.web.reactive.socket.WebSocketSession;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import java.net.URI;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)
class BrandWebSocketHandlerTest {
@Mock
private WebSocketSession session;
@Mock
private WebSocketMessage webSocketMessage;
@Mock
private HandshakeInfo handshakeInfo;
@Mock
private JwtTokenProvider jwtTokenProvider;
private BrandWebSocketHandler handler;
@BeforeEach
void setUp() {
handler = new BrandWebSocketHandler(jwtTokenProvider);
}
// ==================== JWT-based tenantId extraction ====================
@Test
void handle_shouldExtractTenantIdFromJwtAuthHeader() {
setupJwtAuthHeader("Bearer valid-jwt-token");
when(jwtTokenProvider.validateToken("valid-jwt-token")).thenReturn(true);
when(jwtTokenProvider.getTenantIdFromToken("valid-jwt-token")).thenReturn("tenant-from-jwt");
when(session.receive()).thenReturn(Flux.never());
// Should not throw — tenantId extracted from JWT
handler.handle(session).subscribe();
}
// ==================== Query param fallback ====================
@Test
void handle_shouldFallbackToQueryParamWhenNoJwtHeader() {
// No Authorization header
when(handshakeInfo.getHeaders()).thenReturn(new HttpHeaders());
URI uri = URI.create("ws://localhost/ws/brand?tenantId=tenant-from-query");
when(session.getHandshakeInfo()).thenReturn(handshakeInfo);
when(handshakeInfo.getUri()).thenReturn(uri);
when(session.receive()).thenReturn(Flux.never());
handler.handle(session).subscribe();
}
@Test
void handle_shouldFallbackToSessionIdWhenNoQueryParamAndNoJwt() {
when(handshakeInfo.getHeaders()).thenReturn(new HttpHeaders());
URI uri = URI.create("ws://localhost/ws/brand");
when(session.getHandshakeInfo()).thenReturn(handshakeInfo);
when(handshakeInfo.getUri()).thenReturn(uri);
when(session.getId()).thenReturn("session-id-123");
when(session.receive()).thenReturn(Flux.never());
handler.handle(session).subscribe();
}
// ==================== Message handling ====================
@Test
void handle_shouldProcessPingMessage() {
setupSessionWithJwt("tenant-001");
when(session.receive()).thenReturn(Flux.just(webSocketMessage));
when(webSocketMessage.getPayloadAsText()).thenReturn("{\"type\":\"ping\"}");
when(session.textMessage(anyString())).thenReturn(webSocketMessage);
when(session.send(any())).thenReturn(Mono.empty());
Mono<Void> result = handler.handle(session);
StepVerifier.create(result).verifyComplete();
}
@Test
void handle_shouldProcessSubscribeMessage() {
setupSessionWithJwt("tenant-001");
when(session.receive()).thenReturn(Flux.just(webSocketMessage));
when(webSocketMessage.getPayloadAsText()).thenReturn("{\"type\":\"subscribe\"}");
Mono<Void> result = handler.handle(session);
StepVerifier.create(result).verifyComplete();
}
@Test
void handle_shouldIgnoreUnknownMessageType() {
setupSessionWithJwt("tenant-001");
when(session.receive()).thenReturn(Flux.just(webSocketMessage));
when(webSocketMessage.getPayloadAsText()).thenReturn("{\"type\":\"unknown\"}");
Mono<Void> result = handler.handle(session);
StepVerifier.create(result).verifyComplete();
}
@Test
void handle_shouldNotCrashOnInvalidJson() {
setupSessionWithJwt("tenant-001");
when(session.receive()).thenReturn(Flux.just(webSocketMessage));
when(webSocketMessage.getPayloadAsText()).thenReturn("not-valid-json");
Mono<Void> result = handler.handle(session);
StepVerifier.create(result).verifyComplete();
}
@Test
void handle_shouldPropagateConnectionError() {
setupSessionWithJwt("tenant-001");
when(session.receive()).thenReturn(Flux.error(new RuntimeException("Connection error")));
Mono<Void> result = handler.handle(session);
StepVerifier.create(result).verifyError();
}
// ==================== sendBrandUpdate ====================
@Test
void sendBrandUpdate_shouldNotFailWhenNoSession() {
BrandConfig config = createTestConfig();
// Should not throw
handler.sendBrandUpdate("nonexistent-tenant", config);
}
// ==================== helper ====================
private void setupSessionWithJwt(String tenantId) {
String token = "jwt-" + tenantId;
HttpHeaders headers = new HttpHeaders();
headers.set(HttpHeaders.AUTHORIZATION, "Bearer " + token);
when(handshakeInfo.getHeaders()).thenReturn(headers);
when(session.getHandshakeInfo()).thenReturn(handshakeInfo);
when(jwtTokenProvider.validateToken(token)).thenReturn(true);
when(jwtTokenProvider.getTenantIdFromToken(token)).thenReturn(tenantId);
}
private void setupJwtAuthHeader(String authHeader) {
String token = authHeader.substring(7); // strip "Bearer "
HttpHeaders headers = new HttpHeaders();
headers.set(HttpHeaders.AUTHORIZATION, authHeader);
when(handshakeInfo.getHeaders()).thenReturn(headers);
when(session.getHandshakeInfo()).thenReturn(handshakeInfo);
}
private BrandConfig createTestConfig() {
BrandConfig config = new BrandConfig();
config.setId(1L);
config.setTenantId("tenant-001");
config.setLogoUrl("https://example.com/logo.png");
config.setPrimaryColor("#00E676");
config.setFontFamily("default");
return config;
}
}
+48
View File
@@ -0,0 +1,48 @@
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# Virtual machine crash logs
hs_err_pid*
replay_pid*
# Maven
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
# IDE
.idea/
*.iml
.vscode/
.settings/
.classpath
.project
# OS
.DS_Store
Thumbs.db
+257
View File
@@ -0,0 +1,257 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-manage-api</artifactId>
<version>1.0.0</version>
</parent>
<artifactId>gym-checkIn</artifactId>
<packaging>jar</packaging>
<name>Gym CheckIn</name>
<description>Check-In Management Module - Member Attendance Services</description>
<dependencies>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-db</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-member</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-groupCourse</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-spring-boot3</artifactId>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-reactor</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.21.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.21.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.21.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.r2dbc</groupId>
<artifactId>r2dbc-h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>r2dbc-postgresql</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.25</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.5.1</version>
</dependency>
<!-- 添加 ZXing JavaSE 扩展(用于生成图片) -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<executions>
<execution>
<id>default-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>21</source>
<target>21</target>
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>1.5.5.Final</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-mapstruct-binding</artifactId>
<version>0.2.0</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.12</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>verify</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.60</minimum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.8.6.0</version>
<dependencies>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
<version>4.8.6</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>spotbugs-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<effort>Max</effort>
<threshold>High</threshold>
<failOnError>true</failOnError>
<excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<FindBugsFilter>
<Match>
<Class name="~.*\.entity\..*" />
</Match>
<Match>
<Class name="~.*\.dto\..*" />
</Match>
<Match>
<Class name="~.*\.converter\..*" />
</Match>
</FindBugsFilter>
@@ -0,0 +1,43 @@
package cn.novalon.gym.manage.checkIn.config;
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.reactive.HandlerMapping;
import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
import org.springframework.web.reactive.socket.WebSocketHandler;
import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
import java.util.HashMap;
import java.util.Map;
@Configuration
public class CheckInWebSocketConfig {
@Autowired
private MyWebSocketHandler myWebSocketHandler;
/**
* 注册 WebSocket 路由映射
* 路径对应前端连接的 ws://xxx/webSocket/checkIn
*/
@Bean
public HandlerMapping webSocketMapping() {
Map<String, WebSocketHandler> map = new HashMap<>();
map.put("/webSocket/checkIn", myWebSocketHandler);
SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
mapping.setUrlMap(map);
mapping.setOrder(10); // 设置优先级
return mapping;
}
/**
* 注册 WebSocket 处理器适配器(必须)
*/
@Bean
public WebSocketHandlerAdapter handlerAdapter() {
return new WebSocketHandlerAdapter();
}
}
@@ -0,0 +1,46 @@
package cn.novalon.gym.manage.checkIn.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Data
@Configuration
@ConfigurationProperties(prefix = "qr.config")
public class QRCodeConfig {
/**
* 二维码宽度(像素)
*/
private Integer width = 300;
/**
* 二维码高度(像素)
*/
private Integer height = 300;
/**
* 白边宽度
*/
private Integer margin = 1;
/**
* 容错率:L, M, Q, H
*/
private String errorCorrection = "M";
/**
* 图片格式:png, jpg
*/
private String format = "png";
/**
* 是否启用Logo
*/
private Boolean logoEnabled = false;
/**
* Logo路径
*/
private String logoPath = "";
}
@@ -0,0 +1,43 @@
package cn.novalon.gym.manage.checkIn.config;
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.reactive.HandlerMapping;
import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
import org.springframework.web.reactive.socket.WebSocketHandler;
import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
import java.util.HashMap;
import java.util.Map;
@Configuration
public class WebSocketConfig {
@Autowired
private MyWebSocketHandler myWebSocketHandler;
/**
* 注册 WebSocket 路由映射
* 路径对应前端连接的 ws://xxx/webSocket/checkIn
*/
@Bean
public HandlerMapping webSocketMapping() {
Map<String, WebSocketHandler> map = new HashMap<>();
map.put("/webSocket/checkIn", myWebSocketHandler);
SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
mapping.setUrlMap(map);
mapping.setOrder(10); // 设置优先级
return mapping;
}
/**
* 注册 WebSocket 处理器适配器(必须)
*/
@Bean
public WebSocketHandlerAdapter handlerAdapter() {
return new WebSocketHandlerAdapter();
}
}
@@ -0,0 +1,43 @@
package cn.novalon.gym.manage.checkIn.constant;
import java.time.LocalDate;
import java.util.UUID;
/**
* 打卡模块 Redis 键常量
*
* @author 付嘉
* @date 2026-05-30
*/
public final class QRRedisKey {
private static final String SEPARATOR = ":";
private static final String QRCODE_USER_DAILY = "qrcode:user:daily";
private static final String QRCODE_CONTENT = "QR_";
private QRRedisKey() {
// 私有构造,防止实例化
}
/**
* 用户当日二维码
* 格式:qrcode:user:daily:{userId}:{date}
* 示例:qrcode:user:daily:1001:2026-05-30
*/
public static String qrcodeUserDaily(Long userId, LocalDate date) {
return QRCODE_USER_DAILY + SEPARATOR + userId + SEPARATOR + date;
}
/**
* 用户当日二维码(今天)
*/
public static String qrcodeUserToday(Long userId) {
return qrcodeUserDaily(userId, LocalDate.now());
}
/**
* 生成二维码内容(每个用户每次调用都不同)
*/
public static String generateQrcodeContent() {
return QRCODE_CONTENT + UUID.randomUUID().toString().replace("-", "");
}
}
@@ -0,0 +1,13 @@
package cn.novalon.gym.manage.checkIn.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class QRCodeDto {
private String qrContent;
private boolean isUsed;
}
@@ -0,0 +1,209 @@
package cn.novalon.gym.manage.checkIn.entity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.Id;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.relational.core.mapping.Column;
import org.springframework.data.relational.core.mapping.Table;
import java.time.LocalDateTime;
/**
* 会员到店签到记录实体
*
* @author 付嘉
* @date 2026-06-08
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table("sign_in_record")
public class SignInRecord {
/**
* 自增主键
*/
@Id
private Long id;
/**
* 会员ID,关联member表
*/
@Column("member_id")
private Long memberId;
/**
* 签到时使用的会员卡ID
*/
@Column("member_card_id")
private Long memberCardId;
/**
* 签到入场时间
*/
@Column("sign_in_time")
private LocalDateTime signInTime;
/**
* 签到方式:QR_CODE-扫码签到,MANUAL-手动签到,FACE-人脸识别
*/
@Column("sign_in_type")
private String signInType;
/**
* 签到状态:SUCCESS-成功,FAILED-失败
*/
@Column("sign_in_status")
private String signInStatus;
/**
* JSONB格式,存储会员卡验证时的快照数据
*/
@Column("verification_details")
private String verificationDetails;
/**
* 失败时的具体原因文案
*/
@Column("fail_reason")
private String failReason;
/**
* 操作人ID(前台人员),自助签到时为NULL
*/
@Column("operator_id")
private Long operatorId;
/**
* 操作人姓名冗余
*/
@Column("operator_name")
private String operatorName;
/**
* 签到设备标识或型号
*/
@Column("device_info")
private String deviceInfo;
/**
* 客户端IP地址
*/
@Column("ip_address")
private String ipAddress;
/**
* 签到来源:MINI_PROGRAM-小程序扫码,PC_BACKEND-后台管理端
*/
@Column("source")
private String source;
/**
* 软删除标识:false-未删除,true-已删除
*/
@Column("is_delete")
private Boolean isDelete;
/**
* 记录创建时间
*/
@CreatedDate
@Column("created_at")
private LocalDateTime createdAt;
/**
* 记录更新时间
*/
@LastModifiedDate
@Column("updated_at")
private LocalDateTime updatedAt;
// ========== 常量定义 ==========
/**
* 签到类型常量
*/
public static final class SignInType {
/** 扫码签到 */
public static final String QR_CODE = "QR_CODE";
/** 手动签到 */
public static final String MANUAL = "MANUAL";
/** 人脸识别 */
public static final String FACE = "FACE";
private SignInType() {}
}
/**
* 签到状态常量
*/
public static final class SignInStatus {
/** 成功 */
public static final String SUCCESS = "SUCCESS";
/** 失败 */
public static final String FAILED = "FAILED";
private SignInStatus() {}
}
/**
* 签到来源常量
*/
public static final class Source {
/** 小程序扫码 */
public static final String MINI_PROGRAM = "MINI_PROGRAM";
/** 后台管理端手动签到 */
public static final String PC_BACKEND = "PC_BACKEND";
private Source() {}
}
// ========== 辅助方法 ==========
/**
* 判断签到是否成功
*/
public boolean isSuccess() {
return SignInStatus.SUCCESS.equals(this.signInStatus);
}
/**
* 判断签到是否失败
*/
public boolean isFailed() {
return SignInStatus.FAILED.equals(this.signInStatus);
}
/**
* 判断是否为扫码签到
*/
public boolean isQrCodeSign() {
return SignInType.QR_CODE.equals(this.signInType);
}
/**
* 判断是否已删除
*/
public boolean isDeleted() {
return Boolean.TRUE.equals(this.isDelete);
}
/**
* 软删除
*/
public void softDelete() {
this.isDelete = true;
}
/**
* 恢复删除
*/
public void restore() {
this.isDelete = false;
}
}
@@ -0,0 +1,197 @@
package cn.novalon.gym.manage.checkIn.handler;
import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
import cn.novalon.gym.manage.sys.util.AuthUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono;
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Map;
@Slf4j
@Component
@RequiredArgsConstructor
public class CheckInHandler {
private final AuthUtil authUtil;
private final CheckServiceImpl checkService;
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
/**
* 签到
*
* POST /api/checkIn
*
*/
public Mono<ServerResponse> checkIn(ServerRequest request) {
Long memberId = authUtil.getMemberIdOrThrow(request);
return request.bodyToMono(Map.class)
.flatMap(body -> {
String qrContent = (String) body.get("qrContent");
log.info("收到签到请求, memberId: {}, qrContent: {}", memberId, qrContent);
boolean messageToClient = MyWebSocketHandler.sendMessageToClient(qrContent, "正在进行签到");
log.info("WebSocket 推送结果: {}", messageToClient);
return checkService.checkIn(memberId, qrContent)
.flatMap(result -> ServerResponse.ok()
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(result));
})
.onErrorResume(e -> {
log.error("签到失败", e);
return ServerResponse.status(HttpStatus.BAD_REQUEST)
.bodyValue(Map.of("code", 400, "message", e.getMessage()));
});
}
/**
* 获取二维码
*
* GET /api/checkin/qrcode
*
*/
public Mono<ServerResponse> getQRCode(ServerRequest request) {
Long memberId = authUtil.getMemberIdOrThrow(request);
log.info("收到用户{}获取二维码请求", memberId);
return checkService.getQRCode(memberId)
.flatMap(qrCodeVo -> ServerResponse.ok()
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(qrCodeVo));
}
/**
* 查询签到记录列表
*
* GET /api/checkIn/records
*
* @param request
* @return
*/
public Mono<ServerResponse> getSignInRecords(ServerRequest request) {
Long memberId = authUtil.getMemberIdOrThrow(request);
String startDateStr = request.queryParam("startDate").orElse(null);
String endDateStr = request.queryParam("endDate").orElse(null);
LocalDate startDate = startDateStr != null ? LocalDate.parse(startDateStr, DATE_FORMATTER) : LocalDate.now().minusDays(30);
LocalDate endDate = endDateStr != null ? LocalDate.parse(endDateStr, DATE_FORMATTER) : LocalDate.now();
log.info("查询签到记录, memberId: {}, startDate: {}, endDate: {}", memberId, startDate, endDate);
return checkService.getSignInRecords(memberId, startDate, endDate)
.collectList()
.flatMap(records -> ServerResponse.ok()
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(Map.of("code", 200, "message", "success", "data", records)));
}
/**
* 查询单条签到记录
*
* GET /api/checkIn/records/{id}
*
* @param request
* @return
*/
public Mono<ServerResponse> getSignInRecordById(ServerRequest request) {
Long id = Long.parseLong(request.pathVariable("id"));
log.info("查询签到记录详情, id: {}", id);
return checkService.getSignInRecordById(id)
.flatMap(record -> ServerResponse.ok()
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(Map.of("code", 200, "message", "success", "data", record)))
.switchIfEmpty(ServerResponse.notFound().build());
}
/**
* 获取签到统计
*
* GET /api/checkIn/statistics
*
* @param request
* @return
*/
public Mono<ServerResponse> getSignInStatistics(ServerRequest request) {
Long memberId = authUtil.getMemberIdOrThrow(request);
String startDateStr = request.queryParam("startDate").orElse(null);
String endDateStr = request.queryParam("endDate").orElse(null);
LocalDate startDate = startDateStr != null ? LocalDate.parse(startDateStr, DATE_FORMATTER) : LocalDate.now().minusDays(30);
LocalDate endDate = endDateStr != null ? LocalDate.parse(endDateStr, DATE_FORMATTER) : LocalDate.now();
log.info("查询签到统计, memberId: {}, startDate: {}, endDate: {}", memberId, startDate, endDate);
return checkService.getSignInStats(memberId, startDate, endDate)
.flatMap(stats -> ServerResponse.ok()
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(Map.of("code", 200, "message", "success", "data", stats)));
}
/**
* 导出签到记录
*
* GET /api/checkIn/records/export
*
* @param request
* @return
*/
public Mono<ServerResponse> exportSignInRecords(ServerRequest request) {
Long memberId = authUtil.getMemberIdOrThrow(request);
String startDateStr = request.queryParam("startDate").orElse(null);
String endDateStr = request.queryParam("endDate").orElse(null);
LocalDate startDate = startDateStr != null ? LocalDate.parse(startDateStr, DATE_FORMATTER) : LocalDate.now().minusDays(30);
LocalDate endDate = endDateStr != null ? LocalDate.parse(endDateStr, DATE_FORMATTER) : LocalDate.now();
log.info("导出签到记录, memberId: {}, startDate: {}, endDate: {}", memberId, startDate, endDate);
String filename = "签到记录_" + startDateStr + "_" + endDateStr + ".csv";
return checkService.exportSignInRecords(memberId, startDate, endDate)
.flatMap(bytes -> ServerResponse.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"")
.contentType(MediaType.parseMediaType("text/csv; charset=UTF-8"))
.bodyValue(bytes));
}
/**
* 获取每日签到统计
*
* GET /api/checkIn/daily-stats
*
* @param request
* @return
*/
public Mono<ServerResponse> getDailySignInStats(ServerRequest request) {
String dateStr = request.queryParam("date").orElse(null);
LocalDate date = dateStr != null ? LocalDate.parse(dateStr, DATE_FORMATTER) : LocalDate.now();
log.info("查询每日签到统计, date: {}", date);
return checkService.getDailySignInStats(date)
.flatMap(stats -> ServerResponse.ok()
.contentType(MediaType.APPLICATION_JSON)
.bodyValue(Map.of("code", 200, "message", "success", "data", stats)));
}
}
@@ -0,0 +1,101 @@
package cn.novalon.gym.manage.checkIn.repository;
import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
import org.springframework.data.r2dbc.repository.Query;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
/**
* 签到记录 Repository
*
* @author 付嘉
* @date 2026-06-08
*/
@Repository
public interface SignInRecordRepository extends R2dbcRepository<SignInRecord, Long> {
/**
* 查询会员某天的签到记录
*/
@Query("SELECT * FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time < :endTime AND is_delete = false")
Mono<SignInRecord> findByMemberIdAndDate(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
/**
* 查询会员的签到记录列表
*/
@Query("SELECT * FROM sign_in_record WHERE member_id = :memberId AND is_delete = false ORDER BY sign_in_time DESC")
Flux<SignInRecord> findByMemberId(Long memberId);
/**
* 统计会员某天的签到次数
*/
@Query("SELECT COUNT(*) FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time < :endTime AND is_delete = false")
Mono<Long> countByMemberIdAndDate(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
/**
* 插入签到记录
*/
@Query("INSERT INTO sign_in_record (member_id, member_card_id, sign_in_time, sign_in_type, sign_in_status, verification_details, fail_reason, source, created_at, updated_at, is_delete) " +
"VALUES (:memberId, :memberCardId, :signInTime, :signInType, :signInStatus, :verificationDetails, :failReason, :source, NOW(), NOW(), false)")
Mono<Void> insertRecord(Long memberId, Long memberCardId, LocalDateTime signInTime,
String signInType, String signInStatus, String verificationDetails,
String failReason, String source);
/**
* 根据会员ID和时间范围查询签到记录
*/
@Query("SELECT * FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false ORDER BY sign_in_time DESC")
Flux<SignInRecord> findByMemberIdAndTimeRange(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
/**
* 根据时间范围查询签到记录
*/
@Query("SELECT * FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false ORDER BY sign_in_time DESC")
Flux<SignInRecord> findByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
/**
* 统计会员在时间范围内的签到次数
*/
@Query("SELECT COUNT(*) FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false")
Mono<Long> countByMemberIdAndTimeRange(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
/**
* 统计时间范围内的签到次数
*/
@Query("SELECT COUNT(*) FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false")
Mono<Long> countByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
/**
* 统计会员在时间范围内的成功签到次数
*/
@Query("SELECT COUNT(*) FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time <= :endTime AND sign_in_status = 'SUCCESS' AND is_delete = false")
Mono<Long> countSuccessByMemberIdAndTimeRange(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
/**
* 统计时间范围内的成功签到次数
*/
@Query("SELECT COUNT(*) FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time <= :endTime AND sign_in_status = 'SUCCESS' AND is_delete = false")
Mono<Long> countSuccessByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
/**
* 统计时间范围内签到的独立会员数
*/
@Query("SELECT COUNT(DISTINCT member_id) FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false")
Mono<Long> countDistinctMembersByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
/**
* 获取会员在时间范围内的首次签到时间
*/
@Query("SELECT MIN(sign_in_time) FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false")
Mono<LocalDateTime> getFirstSignInTime(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
/**
* 获取会员在时间范围内的最后签到时间
*/
@Query("SELECT MAX(sign_in_time) FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false")
Mono<LocalDateTime> getLastSignInTime(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
}
@@ -0,0 +1,81 @@
package cn.novalon.gym.manage.checkIn.service;
import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.LocalDate;
/**
* 签到服务接口
*
* @author 付嘉
* @date 2026-06-08
*/
public interface ICheckInService {
/**
* 获取签到二维码
*
* @param memberId 会员ID
* @return 二维码VO
*/
Mono<QRCodeVo> getQRCode(Long memberId);
/**
* 扫码签到
*
* @param memberId 会员ID
* @param qrContent 二维码内容
* @return 签到结果JSON字符串
*/
Mono<String> checkIn(Long memberId, String qrContent);
/**
* 查询会员签到记录列表
*
* @param memberId 会员ID
* @param startTime 开始时间
* @param endTime 结束时间
* @return 签到记录列表
*/
Flux<SignInRecordVO> getSignInRecords(Long memberId, LocalDate startTime, LocalDate endTime);
/**
* 根据ID查询签到记录
*
* @param id 签到记录ID
* @return 签到记录VO
*/
Mono<SignInRecordVO> getSignInRecordById(Long id);
/**
* 获取会员签到统计
*
* @param memberId 会员ID
* @param startTime 开始时间
* @param endTime 结束时间
* @return 签到统计VO
*/
Mono<SignInStatsVO> getSignInStats(Long memberId, LocalDate startTime, LocalDate endTime);
/**
* 导出会员签到记录
*
* @param memberId 会员ID
* @param startTime 开始时间
* @param endTime 结束时间
* @return CSV格式的字节数组
*/
Mono<byte[]> exportSignInRecords(Long memberId, LocalDate startTime, LocalDate endTime);
/**
* 获取每日签到统计
*
* @param date 日期
* @return 签到统计VO
*/
Mono<SignInStatsVO> getDailySignInStats(LocalDate date);
}
@@ -0,0 +1,417 @@
package cn.novalon.gym.manage.checkIn.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.extra.qrcode.QrConfig;
import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
import cn.novalon.gym.manage.checkIn.constant.QRRedisKey;
import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
import cn.novalon.gym.manage.checkIn.repository.SignInRecordRepository;
import cn.novalon.gym.manage.checkIn.service.ICheckInService;
import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
import cn.novalon.gym.manage.common.util.RedisUtil;
import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
import cn.novalon.gym.manage.member.entity.MemberCard;
import cn.novalon.gym.manage.member.entity.MemberCardRecord;
import cn.novalon.gym.manage.member.enums.MemberCardType;
import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
import cn.novalon.gym.manage.member.repository.MemberCardRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
@RequiredArgsConstructor
public class CheckServiceImpl implements ICheckInService {
private final QRCodeConfig qrCodeConfig;
private final RedisUtil redisUtil;
private final MemberCardRecordRepository memberCardRecordRepository;
private final MemberCardRepository memberCardRepository;
private final SignInRecordRepository signInRecordRepository;
private final IGroupCourseBookingService groupCourseBookingService;
private final IGroupCourseBookingRepository groupCourseBookingRepository;
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@Override
public Mono<QRCodeVo> getQRCode(Long memberId) {
log.info("开始生成会员签到二维码, memberId: {}", memberId);
String qrContent = QRRedisKey.generateQrcodeContent();
Map<String, Object> redisMap = new HashMap<>();
redisMap.put("qrContent", qrContent);
redisMap.put("isUsed", false);
redisMap.put("memberId", memberId);
return redisUtil.setWithExpire(
RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(),
redisMap,
getSecondsUntilEndOfDay()
)
.then(Mono.fromSupplier(() -> {
String qrCodeBase64 = QrCodeUtil.generateAsBase64(qrContent,
BeanUtil.copyProperties(qrCodeConfig, QrConfig.class), "png");
return new QRCodeVo(qrCodeBase64, false, qrContent, qrCodeConfig.getWidth(), qrCodeConfig.getHeight(), LocalDate.now());
}));
}
@Override
public Mono<String> checkIn(Long memberId, String qrContent) {
String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
// 先检查当天是否已经签到(从数据库查询,作为重复签到的额外保障)
return checkTodayAlreadySignedIn(memberId)
.flatMap(existingRecord -> {
String checkInTime = existingRecord.getSignInTime().format(DATE_FORMATTER);
log.error("重复签到, memberId: {}", memberId);
MyWebSocketHandler.sendFailure(qrContent, "您已经在" + checkInTime + "完成签到,请勿重复签到");
return Mono.error(new RuntimeException("您已经在" + checkInTime + "完成签到,请勿重复签到"));
})
.then(Mono.defer(() -> redisUtil.get(key)))
.flatMap(cachedObj -> {
if (cachedObj != null) {
Map<String, Object> map;
if (cachedObj instanceof Map) {
map = (Map<String, Object>) cachedObj;
} else if (cachedObj instanceof String) {
map = JSONUtil.parseObj((String) cachedObj);
} else {
MyWebSocketHandler.sendFailure(qrContent, "二维码数据格式错误");
return Mono.error(new RuntimeException("二维码数据格式错误"));
}
if (map.get("qrContent").equals(qrContent)) {
if ((boolean) map.get("isUsed")) {
String checkInTime = String.valueOf(map.get("checkInTime"));
log.error("重复签到(缓存), memberId: {}", memberId);
MyWebSocketHandler.sendFailure(qrContent, "您已经在" + checkInTime + "完成签到,请勿重复签到");
return Mono.error(new RuntimeException("您已经在" + checkInTime + "完成签到,请勿重复签到"));
}
log.info("二维码匹配成功,memberId: {}", memberId);
Long memberCardRecordId = map.get("memberCardRecordId") != null
? ((Number) map.get("memberCardRecordId")).longValue() : null;
return processCheckIn(memberId, memberCardRecordId, map, qrContent);
} else {
MyWebSocketHandler.sendFailure(qrContent, "二维码无效");
return Mono.error(new RuntimeException("二维码无效"));
}
}
MyWebSocketHandler.sendFailure(qrContent, "二维码已过期或不存在");
return Mono.error(new RuntimeException("二维码已过期或不存在"));
});
}
/**
* 检查会员当天是否已经签到
* @param memberId 会员ID
* @return 如果已签到返回签到记录,否则返回空
*/
private Mono<SignInRecord> checkTodayAlreadySignedIn(Long memberId) {
LocalDateTime startOfDay = LocalDate.now().atStartOfDay();
LocalDateTime endOfDay = LocalDate.now().atTime(LocalTime.MAX);
return signInRecordRepository.findByMemberIdAndDate(memberId, startOfDay, endOfDay);
}
/**
* 处理签到逻辑
*/
private Mono<String> processCheckIn(Long memberId, Long memberCardRecordId, Map<String, Object> redisMap, String qrContent) {
LocalDateTime now = LocalDateTime.now();
// 发送实时进度通知
MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "正在检查预约信息...");
// 检查是否有需要签到的团课预约,有则返回有效预约
return validateBooking(memberId, now)
.flatMap(booking ->
// 有有效预约:将预约状态更新为"已出席"
groupCourseBookingRepository.updateStatus(booking.getId(), "2")
.doOnNext(count -> log.info("已更新预约状态为已出席, bookingId: {}, rows: {}", booking.getId(), count))
.then(Mono.just(true))
)
.defaultIfEmpty(false)
.then(Mono.defer(() -> {
redisMap.put("isUsed", true);
redisMap.put("checkInTime", now.format(DATE_FORMATTER));
return saveSignInRecord(memberId, null, null)
.then(redisUtil.set(RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(), redisMap))
// 清除统计缓存和课程缓存,确保管理端/教练端立即反映最新数据
.then(Mono.defer(() ->
redisUtil.deleteByPattern("datacount:statistics:*")
.then(Mono.defer(() -> redisUtil.deleteByPattern("group_course:*")))
.doOnSuccess(v -> log.info("已清除统计缓存和课程缓存, memberId: {}", memberId))
.then()
))
.then(Mono.defer(() -> {
String successMsg = buildSuccessResponse(now);
MyWebSocketHandler.sendSuccess(qrContent, memberId, now.format(DATE_FORMATTER));
log.info("签到成功, memberId: {}", memberId);
return Mono.just(successMsg);
}));
}));
}
/**
* 验证预约信息,返回时间匹配的有效预约
*/
private Mono<GroupCourseBooking> validateBooking(Long memberId, LocalDateTime now) {
return groupCourseBookingService.getBookingsByMemberId(memberId)
.filter(booking -> {
String status = booking.getStatus();
LocalDateTime startTime = booking.getCourseStartTime();
return "0".equals(status) &&
startTime != null &&
startTime.toLocalDate().equals(now.toLocalDate()) &&
!startTime.isBefore(now.minusMinutes(30));
})
.collectList()
.flatMap(bookings -> {
if (bookings.isEmpty()) {
return Mono.empty();
}
// 找到时间范围内第一个有效预约(课程时间内±30分钟)
return Flux.fromIterable(bookings)
.filter(b -> {
LocalDateTime startTime = b.getCourseStartTime();
return startTime != null &&
!startTime.isBefore(now.minusMinutes(30)) &&
!startTime.isAfter(now.plusMinutes(30));
})
.next()
.doOnNext(b -> log.info("会员{}有有效的团课预约, bookingId: {}", memberId, b.getId()))
.switchIfEmpty(Mono.fromRunnable(() ->
log.warn("会员{}有预约但不在签到时间范围内", memberId)));
});
}
/**
* 扣减会员卡使用次数/金额
*/
private Mono<MemberCardRecord> deductCardUsage(MemberCardRecord record, MemberCard card) {
MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
LocalDateTime now = LocalDateTime.now();
switch (cardType) {
case TIME_CARD:
if (record.getExpireTime() != null && record.getExpireTime().isBefore(now)) {
return Mono.error(new RuntimeException("时长卡已过期"));
}
return Mono.just(record);
case COUNT_CARD:
int currentTimes = record.getRemainingTimes() != null ? record.getRemainingTimes() : 0;
if (currentTimes < 1) {
return Mono.error(new RuntimeException("次卡剩余次数不足"));
}
record.setRemainingTimes(currentTimes - 1);
if (record.getRemainingTimes() == 0) {
record.setStatus(cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.USED_UP);
}
return memberCardRecordRepository.save(record);
case STORED_VALUE_CARD:
double currentAmount = record.getRemainingAmount() != null ? record.getRemainingAmount() : 0.0;
if (currentAmount < 0.01) {
return Mono.error(new RuntimeException("储值卡余额不足"));
}
record.setRemainingAmount(Math.max(0, currentAmount - 1));
if (record.getRemainingAmount() <= 0) {
record.setStatus(cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.USED_UP);
}
return memberCardRecordRepository.save(record);
default:
return Mono.error(new RuntimeException("不支持的会员卡类型"));
}
}
/**
* 保存签到记录
*/
private Mono<Void> saveSignInRecord(Long memberId, Long memberCardRecordId, Long memberCardId) {
SignInRecord record = SignInRecord.builder()
.memberId(memberId)
.memberCardId(memberCardId)
.signInTime(LocalDateTime.now())
.signInType(SignInRecord.SignInType.QR_CODE)
.signInStatus(SignInRecord.SignInStatus.SUCCESS)
.source(SignInRecord.Source.MINI_PROGRAM)
.isDelete(false)
.build();
return signInRecordRepository.save(record).then();
}
/**
* 构建成功响应
*/
private String buildSuccessResponse(LocalDateTime dateTime) {
Map<String, Object> res = new HashMap<>();
res.put("message", "签到成功");
res.put("dateTime", dateTime.format(DATE_FORMATTER));
return JSONUtil.toJsonStr(res);
}
/**
* 查找会员的有效会员卡(优先选择有效期最早到期的)
*/
private Mono<MemberCardRecord> findValidMemberCard(Long memberId) {
return memberCardRecordRepository.findActiveCardsByMemberId(memberId)
.filter(record -> {
LocalDateTime expireTime = record.getExpireTime();
return expireTime == null || expireTime.isAfter(LocalDateTime.now());
})
.sort((r1, r2) -> {
LocalDateTime e1 = r1.getExpireTime();
LocalDateTime e2 = r2.getExpireTime();
if (e1 == null && e2 == null) return 0;
if (e1 == null) return 1;
if (e2 == null) return -1;
return e1.compareTo(e2);
})
.next();
}
// ==================== 签到记录管理功能 ====================
@Override
public Flux<SignInRecordVO> getSignInRecords(Long memberId, LocalDate startTime, LocalDate endTime) {
LocalDateTime start = startTime.atStartOfDay();
LocalDateTime end = endTime.atTime(LocalTime.MAX);
return signInRecordRepository.findByMemberIdAndTimeRange(memberId, start, end)
.map(this::convertToVO);
}
@Override
public Mono<SignInRecordVO> getSignInRecordById(Long id) {
return signInRecordRepository.findById(id)
.map(this::convertToVO);
}
@Override
public Mono<SignInStatsVO> getSignInStats(Long memberId, LocalDate startTime, LocalDate endTime) {
LocalDateTime start = startTime.atStartOfDay();
LocalDateTime end = endTime.atTime(LocalTime.MAX);
return Mono.zip(
(Object[] results) -> {
Long total = (Long) results[0];
Long success = (Long) results[1];
LocalDateTime first = (LocalDateTime) results[2];
LocalDateTime last = (LocalDateTime) results[3];
SignInStatsVO stats = new SignInStatsVO();
stats.setTotalCount(total);
stats.setSuccessCount(success);
stats.setStartDate(startTime);
stats.setEndDate(endTime);
stats.setFirstSignInTime(first);
stats.setLastSignInTime(last);
stats.setSuccessRate(total > 0 ? (double) success / total * 100.0 : 0.0);
return stats;
},
signInRecordRepository.countByMemberIdAndTimeRange(memberId, start, end),
signInRecordRepository.countSuccessByMemberIdAndTimeRange(memberId, start, end),
signInRecordRepository.getFirstSignInTime(memberId, start, end),
signInRecordRepository.getLastSignInTime(memberId, start, end)
);
}
@Override
public Mono<byte[]> exportSignInRecords(Long memberId, LocalDate startTime, LocalDate endTime) {
LocalDateTime start = startTime.atStartOfDay();
LocalDateTime end = endTime.atTime(LocalTime.MAX);
return signInRecordRepository.findByMemberIdAndTimeRange(memberId, start, end)
.map(record -> {
String status = "SUCCESS".equals(record.getSignInStatus()) ? "成功" : "失败";
String type = "QR_CODE".equals(record.getSignInType()) ? "扫码签到" :
"MANUAL".equals(record.getSignInType()) ? "手动签到" : "人脸识别";
return String.join(",",
record.getId().toString(),
record.getMemberId().toString(),
record.getMemberCardId() != null ? record.getMemberCardId().toString() : "",
record.getSignInTime() != null ? record.getSignInTime().format(DATE_FORMATTER) : "",
type,
status,
record.getFailReason() != null ? record.getFailReason() : ""
);
})
.collectList()
.map(rows -> {
List<String> csvLines = new java.util.ArrayList<>();
csvLines.add("签到记录ID,会员ID,会员卡ID,签到时间,签到方式,签到状态,失败原因");
csvLines.addAll(rows);
return String.join("\n", csvLines).getBytes(java.nio.charset.StandardCharsets.UTF_8);
});
}
@Override
public Mono<SignInStatsVO> getDailySignInStats(LocalDate date) {
LocalDateTime start = date.atStartOfDay();
LocalDateTime end = date.atTime(LocalTime.MAX);
return Mono.zip(
(Object[] results) -> {
Long total = (Long) results[0];
Long success = (Long) results[1];
Long members = (Long) results[2];
SignInStatsVO stats = new SignInStatsVO();
stats.setTotalCount(total);
stats.setSuccessCount(success);
stats.setStartDate(date);
stats.setEndDate(date);
stats.setUniqueMemberCount(members);
stats.setSuccessRate(total > 0 ? (double) success / total * 100.0 : 0.0);
return stats;
},
signInRecordRepository.countByTimeRange(start, end),
signInRecordRepository.countSuccessByTimeRange(start, end),
signInRecordRepository.countDistinctMembersByTimeRange(start, end)
);
}
/**
* 转换实体到VO
*/
private SignInRecordVO convertToVO(SignInRecord record) {
SignInRecordVO vo = new SignInRecordVO();
vo.setId(record.getId());
vo.setMemberId(record.getMemberId());
vo.setMemberCardId(record.getMemberCardId());
vo.setSignInTime(record.getSignInTime());
vo.setSignInType(record.getSignInType());
vo.setSignInStatus(record.getSignInStatus());
vo.setFailReason(record.getFailReason());
vo.setSource(record.getSource());
vo.setCreatedAt(record.getCreatedAt());
return vo;
}
private long getSecondsUntilEndOfDay() {
LocalDateTime now = LocalDateTime.now();
LocalDateTime endOfDay = now.toLocalDate().atTime(23, 59, 59);
if (now.isAfter(endOfDay)) return 1;
return ChronoUnit.SECONDS.between(now, endOfDay);
}
}
@@ -0,0 +1,23 @@
package cn.novalon.gym.manage.checkIn.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.time.LocalDate;
@Data
@AllArgsConstructor
public class QRCodeVo {
private String qrCodeBase64;
private boolean isUsed;
private String qrContent;
private Integer width;
private Integer height;
private LocalDate createTime;
}
@@ -0,0 +1,66 @@
package cn.novalon.gym.manage.checkIn.vo;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
/**
* 签到记录VO
*
* @author 付嘉
* @date 2026-06-08
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SignInRecordVO {
/**
* 签到记录ID
*/
private Long id;
/**
* 会员ID
*/
private Long memberId;
/**
* 会员卡ID
*/
private Long memberCardId;
/**
* 签到时间
*/
private LocalDateTime signInTime;
/**
* 签到类型:QR_CODE-扫码签到,MANUAL-手动签到,FACE-人脸识别
*/
private String signInType;
/**
* 签到状态:SUCCESS-成功,FAILED-失败
*/
private String signInStatus;
/**
* 失败原因
*/
private String failReason;
/**
* 签到来源:MINI_PROGRAM-小程序扫码,PC_BACKEND-后台管理端
*/
private String source;
/**
* 创建时间
*/
private LocalDateTime createdAt;
}
@@ -0,0 +1,62 @@
package cn.novalon.gym.manage.checkIn.vo;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 签到统计VO
*
* @author 付嘉
* @date 2026-06-08
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SignInStatsVO {
/**
* 统计开始日期
*/
private LocalDate startDate;
/**
* 统计结束日期
*/
private LocalDate endDate;
/**
* 总签到次数
*/
private Long totalCount;
/**
* 成功签到次数
*/
private Long successCount;
/**
* 成功率(百分比)
*/
private Double successRate;
/**
* 独立会员数
*/
private Long uniqueMemberCount;
/**
* 首次签到时间
*/
private LocalDateTime firstSignInTime;
/**
* 最后签到时间
*/
private LocalDateTime lastSignInTime;
}
@@ -0,0 +1,202 @@
package cn.novalon.gym.manage.checkIn.websocket;
import cn.hutool.json.JSONUtil;
import cn.novalon.gym.manage.checkIn.dto.QRCodeDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.socket.WebSocketHandler;
import org.springframework.web.reactive.socket.WebSocketSession;
import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks;
import java.time.LocalDateTime;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* WebSocket 处理类,用于实时签到反馈
*
* 技术要点:
* - 使用 Sinks 实现响应式消息推送
* - 使用 ConcurrentHashMap 管理 qrContent 与 sink 的映射
* - 支持实时推送签到进度和结果
*/
@Slf4j
@Component
public class MyWebSocketHandler implements WebSocketHandler {
/**
* qrContent -> Sink 映射,用于根据二维码内容找到对应的客户端连接
*/
private static final Map<String, Sinks.Many<String>> qrContentToSink = new ConcurrentHashMap<>();
/**
* 连接创建时间映射,用于超时清理
*/
private static final Map<String, LocalDateTime> qrContentToCreateTime = new ConcurrentHashMap<>();
/**
* 超时时间(秒),超过此时间未使用的连接将被清理
*/
private static final long TIMEOUT_SECONDS = 300;
@Override
public Mono<Void> handle(WebSocketSession session) {
String sessionId = session.getId();
log.info("WebSocket 连接建立,sessionId: {}", sessionId);
// 创建 sink,用于向客户端发送消息
Sinks.Many<String> sink = Sinks.many().unicast().onBackpressureBuffer();
// 订阅接收客户端消息(异步处理)
session.receive()
.doOnNext(message -> {
String payload = message.getPayloadAsText();
log.debug("收到消息:sessionId={}, payload={}", sessionId, payload);
try {
QRCodeDto qrCodeDto = JSONUtil.toBean(payload, QRCodeDto.class);
String qrContent = qrCodeDto.getQrContent();
if (qrContent != null && !qrContent.isEmpty()) {
// 绑定 qrContent 和 sink
qrContentToSink.put(qrContent, sink);
qrContentToCreateTime.put(qrContent, LocalDateTime.now());
log.info("绑定成功: qrContent={}, sessionId={}", qrContent, sessionId);
// 发送连接成功消息
sink.tryEmitNext(buildMessage("CONNECTED", "签到监听已建立,请扫描二维码"));
} else {
sink.tryEmitNext(buildMessage("ERROR", "二维码内容为空"));
}
} catch (Exception e) {
log.error("解析消息失败,sessionId={}", sessionId, e);
sink.tryEmitNext(buildMessage("ERROR", "消息格式错误: " + e.getMessage()));
}
})
.doOnError(e -> {
log.error("接收消息出错,sessionId={}", sessionId, e);
})
.subscribe(); // 必须订阅,否则不会执行
// 发送流给客户端
return session.send(sink.asFlux().map(session::textMessage))
.doFinally(signal -> {
// 连接关闭时清理映射
qrContentToSink.entrySet().removeIf(entry -> entry.getValue() == sink);
qrContentToCreateTime.entrySet().removeIf(entry -> {
Sinks.Many<String> s = qrContentToSink.get(entry.getKey());
return s == null || s == sink;
});
log.info("WebSocket 连接关闭,sessionId={}", sessionId);
});
}
/**
* 向客户端发送消息
*
* @param qrContent 二维码内容
* @param message 消息内容
* @return 是否发送成功
*/
public static boolean sendMessageToClient(String qrContent, String message) {
// 先清理超时连接
cleanupTimeoutConnections();
Sinks.Many<String> sink = qrContentToSink.get(qrContent);
if (sink == null) {
log.warn("未找到绑定的连接,qrContent: {}", qrContent);
return false;
}
Sinks.EmitResult result = sink.tryEmitNext(message);
if (result.isSuccess()) {
log.info("主动推送成功,qrContent: {}, message: {}", qrContent, message);
return true;
} else {
log.warn("推送失败,qrContent: {}, result: {}", qrContent, result);
return false;
}
}
/**
* 发送签到进度消息
*
* @param qrContent 二维码内容
* @param step 进度步骤
* @param message 进度消息
*/
public static void sendProgress(String qrContent, String step, String message) {
String progressMessage = buildMessage("PROGRESS", message);
sendMessageToClient(qrContent, progressMessage);
log.debug("发送进度消息: qrContent={}, step={}, message={}", qrContent, step, message);
}
/**
* 发送签到成功消息
*
* @param qrContent 二维码内容
* @param memberId 会员ID
* @param signInTime 签到时间
*/
public static void sendSuccess(String qrContent, Long memberId, String signInTime) {
String successMessage = buildMessage("SUCCESS", "签到成功!欢迎光临\n会员ID: " + memberId + "\n签到时间: " + signInTime);
sendMessageToClient(qrContent, successMessage);
log.info("发送成功消息: qrContent={}, memberId={}", qrContent, memberId);
}
/**
* 发送签到失败消息
*
* @param qrContent 二维码内容
* @param reason 失败原因
*/
public static void sendFailure(String qrContent, String reason) {
String failureMessage = buildMessage("FAILURE", "签到失败:" + reason);
sendMessageToClient(qrContent, failureMessage);
log.warn("发送失败消息: qrContent={}, reason={}", qrContent, reason);
}
/**
* 构建标准消息格式
*
* @param type 消息类型
* @param content 消息内容
* @return 格式化后的消息字符串
*/
private static String buildMessage(String type, String content) {
return JSONUtil.toJsonStr(Map.of(
"type", type,
"content", content,
"timestamp", System.currentTimeMillis()
));
}
/**
* 清理超时连接
*/
private static void cleanupTimeoutConnections() {
LocalDateTime now = LocalDateTime.now();
qrContentToCreateTime.entrySet().removeIf(entry -> {
LocalDateTime createTime = entry.getValue();
long secondsDiff = java.time.Duration.between(createTime, now).getSeconds();
if (secondsDiff > TIMEOUT_SECONDS) {
String qrContent = entry.getKey();
qrContentToSink.remove(qrContent);
log.debug("清理超时连接: qrContent={}, 超时时间={}秒", qrContent, secondsDiff);
return true;
}
return false;
});
}
/**
* 获取当前连接数
*
* @return 连接数
*/
public static int getConnectionCount() {
cleanupTimeoutConnections();
return qrContentToSink.size();
}
}
@@ -0,0 +1,10 @@
# 二维码配置
qr:
config:
width: 300 # 二维码宽度(像素)
height: 300 # 二维码高度(像素)
margin: 1 # 白边宽度(像素)
format: png # 图片格式:png / jpg
error-correction: L #容错率:L, M, Q, H,如果启用Logologo-enabled: true),必须设置为 H
logo-enabled: false # 是否启用Logo(启用时error-correction必须为H
# logo-path: static/logo.png # Logo图片路径(支持相对路径或绝对路径)
@@ -0,0 +1,287 @@
package cn.novalon.gym.manage.checkin;
import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
import cn.novalon.gym.manage.checkIn.repository.SignInRecordRepository;
import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
import cn.novalon.gym.manage.common.util.RedisUtil;
import cn.novalon.gym.manage.member.entity.MemberCard;
import cn.novalon.gym.manage.member.entity.MemberCardRecord;
import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
import cn.novalon.gym.manage.member.repository.MemberCardRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.HashMap;
import java.util.Map;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;
/**
* 签到模块接口测试类
* 测试模块三(gym-checkIn)的所有接口
*/
class CheckInModuleTest {
@Mock
private QRCodeConfig qrCodeConfig;
@Mock
private RedisUtil redisUtil;
@Mock
private MemberCardRecordRepository memberCardRecordRepository;
@Mock
private MemberCardRepository memberCardRepository;
@Mock
private SignInRecordRepository signInRecordRepository;
@Mock
private IGroupCourseBookingService groupCourseBookingService;
@Mock
private IGroupCourseBookingRepository groupCourseBookingRepository;
@Mock
private MemberCard mockMemberCard;
@Mock
private SignInRecord mockSignInRecord;
@Mock
private MemberCardRecord mockMemberCardRecord;
private CheckServiceImpl checkService;
@BeforeEach
void setUp() {
MockitoAnnotations.openMocks(this);
checkService = new CheckServiceImpl(qrCodeConfig, redisUtil, memberCardRecordRepository,
memberCardRepository, signInRecordRepository, groupCourseBookingService,
groupCourseBookingRepository);
when(mockMemberCard.getId()).thenReturn(1L);
when(mockMemberCard.getMemberCardType()).thenReturn("TIME_CARD");
when(mockSignInRecord.getId()).thenReturn(1L);
when(mockSignInRecord.getMemberId()).thenReturn(1L);
when(mockSignInRecord.getMemberCardId()).thenReturn(1L);
when(mockSignInRecord.getSignInTime()).thenReturn(LocalDateTime.now());
when(mockSignInRecord.getSignInType()).thenReturn("QR_CODE");
when(mockSignInRecord.getSignInStatus()).thenReturn("SUCCESS");
when(mockSignInRecord.getSource()).thenReturn("MINI_PROGRAM");
when(mockMemberCardRecord.getMemberCardRecordId()).thenReturn(1L);
when(mockMemberCardRecord.getMemberCardId()).thenReturn(1L);
when(mockMemberCardRecord.getRemainingTimes()).thenReturn(10);
when(mockMemberCardRecord.getRemainingAmount()).thenReturn(100.0);
when(mockMemberCardRecord.getExpireTime()).thenReturn(LocalDateTime.now().plusDays(30));
when(mockMemberCardRecord.getStatus()).thenReturn(cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.ACTIVE);
}
@Test
@DisplayName("测试1: 获取二维码 - getQRCode")
void testGetQRCode() {
when(memberCardRecordRepository.findActiveCardsByMemberId(1L))
.thenReturn(Flux.just(mockMemberCardRecord));
when(redisUtil.setWithExpire(any(String.class), any(Map.class), any(Long.class)))
.thenReturn(Mono.just(true));
Mono<QRCodeVo> result = checkService.getQRCode(1L);
StepVerifier.create(result)
.expectNextMatches(qrCodeVo -> {
org.junit.jupiter.api.Assertions.assertNotNull(qrCodeVo);
org.junit.jupiter.api.Assertions.assertNotNull(qrCodeVo.getQrContent());
return true;
})
.verifyComplete();
}
@Test
@DisplayName("测试2: 签到 - checkIn")
void testCheckIn() {
Long memberId = 1L;
Map<String, Object> qrData = new HashMap<>();
qrData.put("qrContent", "test-qr-content");
qrData.put("memberId", memberId);
qrData.put("memberCardRecordId", 1L);
qrData.put("isUsed", false);
qrData.put("expireTime", System.currentTimeMillis() + 3600000);
String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
when(redisUtil.get(eq(key))).thenReturn(Mono.just(qrData));
when(redisUtil.deleteByPattern(any(String.class))).thenReturn(Mono.empty());
when(memberCardRecordRepository.findById(1L)).thenReturn(Mono.just(mockMemberCardRecord));
when(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(1L)).thenReturn(Mono.just(mockMemberCard));
when(signInRecordRepository.save(any(SignInRecord.class))).thenReturn(Mono.just(mockSignInRecord));
when(redisUtil.set(any(String.class), any(Map.class))).thenReturn(Mono.just(true));
when(groupCourseBookingService.getBookingsByMemberId(memberId)).thenReturn(Flux.empty());
when(signInRecordRepository.findByMemberIdAndDate(eq(memberId), any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Mono.empty());
Mono<String> result = checkService.checkIn(memberId, "test-qr-content");
StepVerifier.create(result)
.expectNextMatches(response -> response.contains("签到成功"))
.verifyComplete();
}
@Test
@DisplayName("测试3: 查询签到记录列表 - getSignInRecords")
void testGetSignInRecords() {
when(signInRecordRepository.findByMemberIdAndTimeRange(
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Flux.just(mockSignInRecord));
Flux<SignInRecordVO> result = checkService.getSignInRecords(1L,
LocalDate.now().minusDays(30), LocalDate.now());
StepVerifier.create(result)
.expectNextCount(1)
.verifyComplete();
}
@Test
@DisplayName("测试4: 查询单条签到记录 - getSignInRecordById")
void testGetSignInRecordById() {
when(signInRecordRepository.findById(1L))
.thenReturn(Mono.just(mockSignInRecord));
Mono<SignInRecordVO> result = checkService.getSignInRecordById(1L);
StepVerifier.create(result)
.expectNextMatches(vo -> vo.getId() == 1L)
.verifyComplete();
}
@Test
@DisplayName("测试5: 查询签到记录 - 记录不存在")
void testGetSignInRecordById_NotFound() {
when(signInRecordRepository.findById(999L))
.thenReturn(Mono.empty());
Mono<SignInRecordVO> result = checkService.getSignInRecordById(999L);
StepVerifier.create(result)
.verifyComplete();
}
@Test
@DisplayName("测试6: 获取签到统计 - getSignInStats")
void testGetSignInStats() {
when(signInRecordRepository.countByMemberIdAndTimeRange(
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Mono.just(10L));
when(signInRecordRepository.countSuccessByMemberIdAndTimeRange(
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Mono.just(8L));
when(signInRecordRepository.getFirstSignInTime(
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Mono.just(LocalDateTime.now().minusDays(29)));
when(signInRecordRepository.getLastSignInTime(
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Mono.just(LocalDateTime.now()));
Mono<SignInStatsVO> result = checkService.getSignInStats(1L,
LocalDate.now().minusDays(30), LocalDate.now());
StepVerifier.create(result)
.expectNextMatches(stats -> {
org.junit.jupiter.api.Assertions.assertEquals(10L, stats.getTotalCount());
org.junit.jupiter.api.Assertions.assertEquals(8L, stats.getSuccessCount());
return true;
})
.verifyComplete();
}
@Test
@DisplayName("测试7: 获取每日签到统计 - getDailySignInStats")
void testGetDailySignInStats() {
when(signInRecordRepository.countByTimeRange(any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Mono.just(50L));
when(signInRecordRepository.countSuccessByTimeRange(
any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Mono.just(45L));
when(signInRecordRepository.countDistinctMembersByTimeRange(
any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Mono.just(30L));
Mono<SignInStatsVO> result = checkService.getDailySignInStats(LocalDate.now());
StepVerifier.create(result)
.expectNextMatches(stats -> {
org.junit.jupiter.api.Assertions.assertEquals(50L, stats.getTotalCount());
org.junit.jupiter.api.Assertions.assertEquals(45L, stats.getSuccessCount());
org.junit.jupiter.api.Assertions.assertEquals(30L, stats.getUniqueMemberCount());
return true;
})
.verifyComplete();
}
@Test
@DisplayName("测试8: 导出签到记录 - exportSignInRecords")
void testExportSignInRecords() {
when(signInRecordRepository.findByMemberIdAndTimeRange(
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Flux.just(mockSignInRecord));
Mono<byte[]> result = checkService.exportSignInRecords(1L,
LocalDate.now().minusDays(7), LocalDate.now());
StepVerifier.create(result)
.expectNextMatches(bytes -> bytes.length > 0)
.verifyComplete();
}
@Test
@DisplayName("测试9: 签到失败 - 二维码无效")
void testCheckIn_QRCodeInvalid() {
Long memberId = 1L;
String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
when(redisUtil.get(eq(key))).thenReturn(Mono.just(new HashMap<>()));
when(signInRecordRepository.findByMemberIdAndDate(eq(memberId), any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Mono.empty());
Mono<String> result = checkService.checkIn(memberId, "invalid-qr");
StepVerifier.create(result)
.expectError(RuntimeException.class)
.verify();
}
@Test
@DisplayName("测试10: 签到失败 - 二维码不存在")
void testCheckIn_QRCodeNotFound() {
Long memberId = 1L;
String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
when(redisUtil.get(eq(key))).thenReturn(Mono.empty());
when(signInRecordRepository.findByMemberIdAndDate(eq(memberId), any(LocalDateTime.class), any(LocalDateTime.class)))
.thenReturn(Mono.empty());
Mono<String> result = checkService.checkIn(memberId, "not-exist");
StepVerifier.create(result)
.verifyComplete();
}
}
@@ -0,0 +1,172 @@
package cn.novalon.gym.manage.checkin.handler;
import cn.novalon.gym.manage.checkIn.handler.CheckInHandler;
import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
import cn.novalon.gym.manage.sys.util.AuthUtil;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.reactive.function.server.MockServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)
class CheckInHandlerTest {
@Mock
private AuthUtil authUtil;
@Mock
private CheckServiceImpl checkService;
private CheckInHandler checkInHandler;
private static final Long MEMBER_ID = 10001L;
@BeforeEach
void setUp() {
checkInHandler = new CheckInHandler(authUtil, checkService);
}
// ==================== checkIn ====================
@Test
void checkIn_shouldReturnOk() {
Map<String, Object> body = Map.of("qrContent", "checkin:member:10001");
when(authUtil.getMemberIdOrThrow(any())).thenReturn(MEMBER_ID);
when(checkService.checkIn(MEMBER_ID, "checkin:member:10001")).thenReturn(Mono.just("签到成功"));
MockServerRequest request = MockServerRequest.builder()
.body(Mono.just(body));
Mono<ServerResponse> result = checkInHandler.checkIn(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
verify(checkService).checkIn(MEMBER_ID, "checkin:member:10001");
}
@Test
void checkIn_shouldReturnBadRequestOnError() {
Map<String, Object> body = Map.of("qrContent", "invalid-content");
when(authUtil.getMemberIdOrThrow(any())).thenReturn(MEMBER_ID);
when(checkService.checkIn(MEMBER_ID, "invalid-content"))
.thenReturn(Mono.error(new RuntimeException("Invalid QR code")));
MockServerRequest request = MockServerRequest.builder()
.body(Mono.just(body));
Mono<ServerResponse> result = checkInHandler.checkIn(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
}
// ==================== getQRCode ====================
@Test
void getQRCode_shouldReturnOkWithQRCode() {
QRCodeVo qrCode = new QRCodeVo("base64content", false, "qr-content", 200, 200, LocalDate.now());
when(authUtil.getMemberIdOrThrow(any())).thenReturn(MEMBER_ID);
when(checkService.getQRCode(MEMBER_ID)).thenReturn(Mono.just(qrCode));
MockServerRequest request = MockServerRequest.builder().build();
Mono<ServerResponse> result = checkInHandler.getQRCode(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
// ==================== getSignInRecords ====================
@Test
void getSignInRecords_shouldReturnOkWithRecords() {
List<SignInRecordVO> records = List.of(createTestRecord());
when(authUtil.getMemberIdOrThrow(any())).thenReturn(MEMBER_ID);
when(checkService.getSignInRecords(eq(MEMBER_ID), any(LocalDate.class), any(LocalDate.class)))
.thenReturn(Flux.fromIterable(records));
MockServerRequest request = MockServerRequest.builder()
.queryParam("startDate", "2025-01-01")
.queryParam("endDate", "2025-01-31")
.build();
Mono<ServerResponse> result = checkInHandler.getSignInRecords(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
// ==================== getSignInStatistics ====================
@Test
void getSignInStatistics_shouldReturnOkWithStats() {
SignInStatsVO stats = new SignInStatsVO();
when(authUtil.getMemberIdOrThrow(any())).thenReturn(MEMBER_ID);
when(checkService.getSignInStats(eq(MEMBER_ID), any(LocalDate.class), any(LocalDate.class)))
.thenReturn(Mono.just(stats));
MockServerRequest request = MockServerRequest.builder()
.queryParam("startDate", "2025-01-01")
.queryParam("endDate", "2025-01-31")
.build();
Mono<ServerResponse> result = checkInHandler.getSignInStatistics(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
// ==================== getDailySignInStats ====================
@Test
void getDailySignInStats_shouldReturnOkWithDailyStats() {
SignInStatsVO stats = new SignInStatsVO();
when(checkService.getDailySignInStats(any(LocalDate.class))).thenReturn(Mono.just(stats));
MockServerRequest request = MockServerRequest.builder()
.queryParam("date", "2025-01-15")
.build();
Mono<ServerResponse> result = checkInHandler.getDailySignInStats(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
// ==================== helper ====================
private SignInRecordVO createTestRecord() {
SignInRecordVO record = new SignInRecordVO();
record.setId(1L);
record.setMemberId(MEMBER_ID);
record.setSignInTime(LocalDateTime.now());
record.setSignInType("QR_CODE");
record.setSignInStatus("SUCCESS");
return record;
}
}
@@ -0,0 +1 @@
# Test Configuration
+62
View File
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-manage-api</artifactId>
<version>1.0.0</version>
</parent>
<artifactId>gym-coach</artifactId>
<packaging>jar</packaging>
<name>Gym Coach</name>
<description>Coach Management Module - Course Start/End, Violation Tracking</description>
<dependencies>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-db</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-sys</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-groupCourse</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
@@ -0,0 +1,15 @@
package cn.novalon.gym.manage.coach.dao;
import cn.novalon.gym.manage.coach.entity.CoachViolationEntity;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
/**
* 教练违规记录 DAO
*
* @author 张翔
* @date 2026-07-20
*/
@Repository
public interface CoachViolationDao extends R2dbcRepository<CoachViolationEntity, Long> {
}
@@ -0,0 +1,61 @@
package cn.novalon.gym.manage.coach.entity;
import cn.novalon.gym.manage.db.entity.BaseEntity;
import org.springframework.data.relational.core.mapping.Column;
import org.springframework.data.relational.core.mapping.Table;
import java.time.LocalDateTime;
/**
* 教练违规记录实体类 - 对应 coach_violation 表
*
* @author 张翔
* @date 2026-07-20
*/
@Table("coach_violation")
public class CoachViolationEntity extends BaseEntity {
@Column("coach_id")
private Long coachId;
@Column("course_id")
private Long courseId;
@Column("violation_time")
private LocalDateTime violationTime;
@Column("violation_reason")
private String violationReason;
public Long getCoachId() {
return coachId;
}
public void setCoachId(Long coachId) {
this.coachId = coachId;
}
public Long getCourseId() {
return courseId;
}
public void setCourseId(Long courseId) {
this.courseId = courseId;
}
public LocalDateTime getViolationTime() {
return violationTime;
}
public void setViolationTime(LocalDateTime violationTime) {
this.violationTime = violationTime;
}
public String getViolationReason() {
return violationReason;
}
public void setViolationReason(String violationReason) {
this.violationReason = violationReason;
}
}
@@ -0,0 +1,42 @@
package cn.novalon.gym.manage.coach.enums;
/**
* 团课预约状态枚举
*
* @author 张翔
* @date 2026-07-20
*/
public enum BookingStatus {
BOOKED("0", "已预约"),
CANCELLED("1", "已取消"),
ATTENDED("2", "已出席"),
ABSENT("3", "缺席"),
COACH_ABSENT("4", "教练缺席"),
LATE("5", "迟到");
private final String value;
private final String desc;
BookingStatus(String value, String desc) {
this.value = value;
this.desc = desc;
}
public String getValue() {
return value;
}
public String getDesc() {
return desc;
}
public static BookingStatus fromValue(String value) {
for (BookingStatus status : values()) {
if (status.value.equals(value)) {
return status;
}
}
return BOOKED;
}
}
@@ -0,0 +1,30 @@
package cn.novalon.gym.manage.coach.enums;
/**
* 教练违规原因枚举
*
* @author 张翔
* @date 2026-07-20
*/
public enum ViolationReason {
COACH_LATE("COACH_LATE", "教练迟到"),
COACH_ABSENT("COACH_ABSENT", "教练缺席"),
NOT_MANUAL_END("NOT_MANUAL_END", "教练未手动结课");
private final String value;
private final String desc;
ViolationReason(String value, String desc) {
this.value = value;
this.desc = desc;
}
public String getValue() {
return value;
}
public String getDesc() {
return desc;
}
}
@@ -0,0 +1,68 @@
package cn.novalon.gym.manage.coach.handler;
import cn.novalon.gym.manage.coach.service.CoachCourseService;
import cn.novalon.gym.manage.sys.util.AuthUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono;
import java.util.Map;
/**
* 教练开课/结课处理器
*
* @author 张翔
* @date 2026-07-20
*/
@Component
@Tag(name = "教练开课结课", description = "教练开课与结课操作")
public class CoachCourseHandler {
private static final Logger logger = LoggerFactory.getLogger(CoachCourseHandler.class);
private final CoachCourseService coachCourseService;
private final AuthUtil authUtil;
public CoachCourseHandler(CoachCourseService coachCourseService, AuthUtil authUtil) {
this.coachCourseService = coachCourseService;
this.authUtil = authUtil;
}
@Operation(summary = "教练开课", description = "教练手动开课,记录实际开课时间,若超时则判定迟到")
public Mono<ServerResponse> startCourse(ServerRequest request) {
Long courseId = Long.valueOf(request.pathVariable("courseId"));
Long coachId = authUtil.getMemberIdOrThrow(request);
return coachCourseService.startCourse(courseId, coachId)
.flatMap(result -> ServerResponse.ok().bodyValue(Map.of(
"message", "开课成功",
"status", result.getStatus(),
"actualStartTime", result.getActualStartTime() != null ? result.getActualStartTime().toString() : ""
)))
.onErrorResume(e -> {
logger.error("开课失败: {}", e.getMessage());
return ServerResponse.badRequest().bodyValue(Map.of("error", e.getMessage()));
});
}
@Operation(summary = "教练结课", description = "教练手动结课,记录实际结课时间")
public Mono<ServerResponse> endCourse(ServerRequest request) {
Long courseId = Long.valueOf(request.pathVariable("courseId"));
Long coachId = authUtil.getMemberIdOrThrow(request);
return coachCourseService.endCourse(courseId, coachId)
.flatMap(result -> ServerResponse.ok().bodyValue(Map.of(
"message", "结课成功",
"status", result.getStatus(),
"actualEndTime", result.getActualEndTime() != null ? result.getActualEndTime().toString() : ""
)))
.onErrorResume(e -> {
logger.error("结课失败: {}", e.getMessage());
return ServerResponse.badRequest().bodyValue(Map.of("error", e.getMessage()));
});
}
}
@@ -0,0 +1,118 @@
package cn.novalon.gym.manage.coach.handler;
import cn.novalon.gym.manage.coach.service.CoachCourseService;
import cn.novalon.gym.manage.sys.core.domain.SysUser;
import cn.novalon.gym.manage.sys.dto.request.CoachCreateRequest;
import cn.novalon.gym.manage.sys.dto.request.CoachUpdateRequest;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Validator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 教练管理处理器(从 manage-app 迁移至 gym-coach 模块)
*
* @author 张翔
* @date 2026-07-19
*/
@Component
@Tag(name = "教练管理", description = "教练相关操作")
public class CoachHandler {
private static final Logger logger = LoggerFactory.getLogger(CoachHandler.class);
private final CoachCourseService coachCourseService;
private final Validator validator;
public CoachHandler(CoachCourseService coachCourseService, Validator validator) {
this.coachCourseService = coachCourseService;
this.validator = validator;
}
@Operation(summary = "获取所有教练", description = "获取系统中所有教练列表")
public Mono<ServerResponse> getAllCoaches(ServerRequest request) {
return ServerResponse.ok()
.body(coachCourseService.getAllCoaches(), SysUser.class);
}
@Operation(summary = "创建教练", description = "创建新教练(创建用户并分配教练角色)")
public Mono<ServerResponse> createCoach(ServerRequest request) {
return request.bodyToMono(CoachCreateRequest.class)
.flatMap(req -> {
var violations = validator.validate(req);
if (!violations.isEmpty()) {
Map<String, String> errors = new HashMap<>();
violations.forEach(v -> errors.put(v.getPropertyPath().toString(), v.getMessage()));
return ServerResponse.badRequest().bodyValue(errors);
}
return coachCourseService.createCoach(
req.getUsername(), req.getPassword(),
req.getNickname(), req.getEmail(), req.getPhone())
.flatMap(user -> ServerResponse.status(HttpStatus.CREATED).bodyValue(user))
.onErrorResume(e -> {
logger.error("创建教练失败", e);
return ServerResponse.badRequest()
.bodyValue(Map.of("error", e.getMessage()));
});
});
}
@Operation(summary = "更新教练信息", description = "更新教练基本信息(昵称、邮箱、手机号)")
public Mono<ServerResponse> updateCoach(ServerRequest request) {
Long id = Long.valueOf(request.pathVariable("id"));
return request.bodyToMono(CoachUpdateRequest.class)
.flatMap(req -> coachCourseService.updateCoach(id, req.getNickname(), req.getEmail(), req.getPhone())
.flatMap(user -> ServerResponse.ok().bodyValue(user))
.switchIfEmpty(ServerResponse.notFound().build())
.onErrorResume(e -> {
logger.error("更新教练失败", e);
return ServerResponse.badRequest()
.bodyValue(Map.of("error", e.getMessage()));
}));
}
@Operation(summary = "禁用教练", description = "禁用教练账号,自动取消其所有非进行中的团课")
public Mono<ServerResponse> disableCoach(ServerRequest request) {
Long id = Long.valueOf(request.pathVariable("id"));
return coachCourseService.disableCoach(id)
.then(ServerResponse.ok().bodyValue(Map.of("message", "教练已禁用")))
.onErrorResume(e -> {
logger.error("禁用教练失败: {}", e.getMessage());
return ServerResponse.badRequest().bodyValue(Map.of("error", e.getMessage()));
});
}
@Operation(summary = "获取教练的团课", description = "获取指定教练教授的所有团课")
public Mono<ServerResponse> getCoachCourses(ServerRequest request) {
Long id = Long.valueOf(request.pathVariable("id"));
return coachCourseService.getCoachCourses(id)
.collectList()
.flatMap(courses -> ServerResponse.ok().bodyValue(courses))
.switchIfEmpty(ServerResponse.ok().bodyValue(List.of()));
}
@Operation(summary = "获取教练违规次数统计", description = "获取所有教练的违规次数")
public Mono<ServerResponse> getViolationCounts(ServerRequest request) {
return coachCourseService.getViolationCounts()
.collectList()
.flatMap(counts -> ServerResponse.ok().bodyValue(counts));
}
@Operation(summary = "获取教练违规记录", description = "获取指定教练的违规记录")
public Mono<ServerResponse> getCoachViolations(ServerRequest request) {
Long id = Long.valueOf(request.pathVariable("id"));
return coachCourseService.getCoachViolations(id)
.collectList()
.flatMap(violations -> ServerResponse.ok().bodyValue(violations))
.switchIfEmpty(ServerResponse.ok().bodyValue(List.of()));
}
}
@@ -0,0 +1,178 @@
package cn.novalon.gym.manage.coach.scheduler;
import cn.novalon.gym.manage.coach.enums.ViolationReason;
import cn.novalon.gym.manage.common.util.RedisUtil;
import cn.novalon.gym.manage.groupcourse.dao.GroupCourseBookingDao;
import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao;
import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
import cn.novalon.gym.manage.groupcourse.enums.CourseStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.r2dbc.core.DatabaseClient;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Mono;
import java.time.Duration;
import java.time.LocalDateTime;
/**
* 教练课程定时调度器
*
* 功能:
* 1. 检查未手动开课的课程,超时标记为教练缺席(5)并记录违规
* 2. 检查未手动结课的课程,超时标记为自动结束(6)并记录违规
*
* @author 张翔
* @date 2026-07-20
*/
@Component
public class CoachCourseScheduler {
private static final Logger logger = LoggerFactory.getLogger(CoachCourseScheduler.class);
private static final long ONE_HOUR_MINUTES = 60;
private static final long END_GRACE_MINUTES = 10;
private final GroupCourseDao groupCourseDao;
private final GroupCourseBookingDao groupCourseBookingDao;
private final DatabaseClient databaseClient;
private final RedisUtil redisUtil;
public CoachCourseScheduler(GroupCourseDao groupCourseDao,
GroupCourseBookingDao groupCourseBookingDao,
DatabaseClient databaseClient,
RedisUtil redisUtil) {
this.groupCourseDao = groupCourseDao;
this.groupCourseBookingDao = groupCourseBookingDao;
this.databaseClient = databaseClient;
this.redisUtil = redisUtil;
}
/**
* 每分钟检查一次:
* - status=0(NORMAL) 的课程是否已过开课缺席阈值
* - status=3(IN_PROGRESS) 或 status=7(COACH_LATE) 的课程是否已过结课宽限期
*/
@Scheduled(fixedRate = 60000)
public void checkAndProcessCourses() {
logger.debug("教练课程调度器开始检查");
LocalDateTime now = LocalDateTime.now();
// 1. 检查未开课的课程
processAbsentCourses(now)
.subscribe(
count -> {
if (count > 0) {
logger.info("教练课程调度器:处理了 {} 门教练缺席课程", count);
invalidateCache();
}
},
error -> logger.error("教练课程调度器(缺席检查)执行失败:{}", error.getMessage(), error)
);
// 2. 检查未结课的课程
processAutoEndCourses(now)
.subscribe(
count -> {
if (count > 0) {
logger.info("教练课程调度器:处理了 {} 门自动结束课程", count);
invalidateCache();
}
},
error -> logger.error("教练课程调度器(自动结课)执行失败:{}", error.getMessage(), error)
);
}
/**
* 处理缺席课程:status=0 且已过开课缺席阈值
*/
private Mono<Long> processAbsentCourses(LocalDateTime now) {
return groupCourseDao.findByStatusAndStartTimeBefore(databaseClient, "0", now)
.filter(course -> isAbsentThresholdExceeded(course, now))
.flatMap(course -> markAsCoachAbsent(course, now))
.count();
}
/**
* 处理自动结课:status IN ('3','7') 且 end_time + 10分钟 已过
*/
private Mono<Long> processAutoEndCourses(LocalDateTime now) {
LocalDateTime endThreshold = now.minusMinutes(END_GRACE_MINUTES);
return groupCourseDao.findByStatusInAndEndTimeBefore(databaseClient,
new String[]{String.valueOf(CourseStatus.IN_PROGRESS.getValue()),
String.valueOf(CourseStatus.COACH_LATE.getValue())},
endThreshold)
.flatMap(course -> markAsAutoEnded(course, now))
.count();
}
/**
* 判断课程是否已过缺席阈值
*/
private boolean isAbsentThresholdExceeded(GroupCourseEntity course, LocalDateTime now) {
long courseDurationMinutes = Duration.between(course.getStartTime(), course.getEndTime()).toMinutes();
long minutesSinceStart = Duration.between(course.getStartTime(), now).toMinutes();
if (courseDurationMinutes >= ONE_HOUR_MINUTES) {
return minutesSinceStart > 30;
} else {
long thresholdB = Math.max(1, (long) (courseDurationMinutes * 0.25));
return minutesSinceStart > thresholdB;
}
}
/**
* 标记课程为教练缺席(5),更新预约记录为教练缺席(4),记录违规
*/
private Mono<GroupCourseEntity> markAsCoachAbsent(GroupCourseEntity course, LocalDateTime now) {
logger.info("课程 {} 教练缺席,标记为 COACH_ABSENT", course.getId());
return insertViolation(course.getCoachId(), course.getId(), now, ViolationReason.COACH_ABSENT)
.then(groupCourseDao.updateToCoachAbsent(course.getId(), now, now))
.then(groupCourseBookingDao.updateStatusByCourseId(course.getId(), "0", "4"))
.thenReturn(course);
}
/**
* 标记课程为自动结束(6),记录违规
*/
private Mono<GroupCourseEntity> markAsAutoEnded(GroupCourseEntity course, LocalDateTime now) {
logger.info("课程 {} 未手动结课,标记为 AUTO_ENDED", course.getId());
return insertViolation(course.getCoachId(), course.getId(), now, ViolationReason.NOT_MANUAL_END)
.then(groupCourseDao.updateToAutoEnded(course.getId(), now, now))
.thenReturn(course);
}
/**
* 插入违规记录(使用 DatabaseClient 直连)
*/
private Mono<Void> insertViolation(Long coachId, Long courseId, LocalDateTime violationTime,
ViolationReason reason) {
return databaseClient.sql("""
INSERT INTO coach_violation (coach_id, course_id, violation_time, violation_reason, created_at, updated_at)
VALUES (:coachId, :courseId, :violationTime, :reason, :now, :now)
""")
.bind("coachId", coachId)
.bind("courseId", courseId)
.bind("violationTime", violationTime)
.bind("reason", reason.getValue())
.bind("now", LocalDateTime.now())
.then();
}
/**
* 清除统计缓存和团课缓存 —— 调度器触发时,如有课程状态变更则必须及时失效
*/
private void invalidateCache() {
redisUtil.deleteByPattern("datacount:statistics:*").subscribe(
deleted -> logger.debug("调度器清除统计缓存,已删除 {} 条", deleted),
error -> logger.warn("调度器清除统计缓存失败: {}", error.getMessage())
);
redisUtil.deleteByPattern("group_course:*").subscribe(
deleted -> logger.debug("调度器清除团课缓存,已删除 {} 条", deleted),
error -> logger.warn("调度器清除团课缓存失败: {}", error.getMessage())
);
}
}
@@ -0,0 +1,357 @@
package cn.novalon.gym.manage.coach.service;
import cn.novalon.gym.manage.coach.dao.CoachViolationDao;
import cn.novalon.gym.manage.coach.entity.CoachViolationEntity;
import cn.novalon.gym.manage.coach.enums.ViolationReason;
import cn.novalon.gym.manage.common.util.RedisUtil;
import cn.novalon.gym.manage.common.util.StatusConstants;
import cn.novalon.gym.manage.groupcourse.dao.GroupCourseBookingDao;
import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao;
import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity;
import cn.novalon.gym.manage.groupcourse.enums.CourseStatus;
import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository;
import cn.novalon.gym.manage.sys.core.domain.SysRole;
import cn.novalon.gym.manage.sys.core.domain.SysUser;
import cn.novalon.gym.manage.sys.core.domain.UserRole;
import cn.novalon.gym.manage.sys.core.repository.ISysRoleRepository;
import cn.novalon.gym.manage.sys.core.repository.ISysUserRepository;
import cn.novalon.gym.manage.sys.core.repository.IUserRoleRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Sort;
import org.springframework.r2dbc.core.DatabaseClient;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.Map;
/**
* 教练课程服务(含教练管理 + 开课/结课逻辑 + 违规记录)
*
* @author 张翔
* @date 2026-07-20
*/
@Service
public class CoachCourseService {
private static final Logger logger = LoggerFactory.getLogger(CoachCourseService.class);
private static final String COACH_ROLE_NAME = "教练";
private static final long ONE_HOUR_MINUTES = 60;
private final ISysUserRepository userRepository;
private final ISysRoleRepository roleRepository;
private final IUserRoleRepository userRoleRepository;
private final IGroupCourseRepository groupCourseRepository;
private final IGroupCourseBookingRepository bookingRepository;
private final GroupCourseDao groupCourseDao;
private final GroupCourseBookingDao groupCourseBookingDao;
private final CoachViolationDao violationDao;
private final DatabaseClient databaseClient;
private final PasswordEncoder passwordEncoder;
private final RedisUtil redisUtil;
public CoachCourseService(ISysUserRepository userRepository,
ISysRoleRepository roleRepository,
IUserRoleRepository userRoleRepository,
IGroupCourseRepository groupCourseRepository,
IGroupCourseBookingRepository bookingRepository,
GroupCourseDao groupCourseDao,
GroupCourseBookingDao groupCourseBookingDao,
CoachViolationDao violationDao,
DatabaseClient databaseClient,
PasswordEncoder passwordEncoder,
RedisUtil redisUtil) {
this.userRepository = userRepository;
this.roleRepository = roleRepository;
this.userRoleRepository = userRoleRepository;
this.groupCourseRepository = groupCourseRepository;
this.bookingRepository = bookingRepository;
this.groupCourseDao = groupCourseDao;
this.groupCourseBookingDao = groupCourseBookingDao;
this.violationDao = violationDao;
this.databaseClient = databaseClient;
this.passwordEncoder = passwordEncoder;
this.redisUtil = redisUtil;
}
// ==================== 教练管理(从原 CoachService 迁移) ====================
public Flux<SysUser> getAllCoaches() {
return getCoachRoleId()
.flatMapMany(roleId -> userRoleRepository.findByRoleId(roleId)
.map(UserRole::getUserId)
.collectList()
.flatMapMany(userIds -> {
if (userIds.isEmpty()) {
return Flux.empty();
}
return Flux.fromIterable(userIds)
.flatMap(userRepository::findById)
.filter(user -> user.getDeletedAt() == null);
}));
}
public Mono<SysUser> createCoach(String username, String password, String nickname, String email, String phone) {
return getCoachRoleId().flatMap(coachRoleId -> {
SysUser user = new SysUser();
user.generateId();
user.setUsername(username);
user.setPassword(passwordEncoder.encode(password));
user.setNickname(nickname);
user.setEmail(email);
user.setPhone(phone);
user.setStatus(StatusConstants.ENABLED);
return userRepository.save(user)
.flatMap(saved -> {
UserRole userRole = new UserRole();
userRole.setUserId(saved.getId());
userRole.setRoleId(coachRoleId);
return userRoleRepository.save(userRole).thenReturn(saved);
});
});
}
public Mono<SysUser> updateCoach(Long id, String nickname, String email, String phone) {
return userRepository.findById(id)
.switchIfEmpty(Mono.error(new RuntimeException("教练不存在")))
.flatMap(user -> {
if (nickname != null) user.setNickname(nickname);
if (email != null) user.setEmail(email);
if (phone != null) user.setPhone(phone);
user.setUpdatedAt(LocalDateTime.now());
return userRepository.update(user);
});
}
@Transactional(transactionManager = "connectionFactoryTransactionManager")
public Mono<Void> disableCoach(Long id) {
return userRepository.findById(id)
.switchIfEmpty(Mono.error(new RuntimeException("教练不存在")))
.flatMap(user ->
groupCourseRepository.countByCoachIdAndStatus(id, 3L)
.flatMap(inProgressCount -> {
if (inProgressCount > 0) {
return Mono.error(new RuntimeException(
"该教练有 " + inProgressCount + " 门正在进行中的团课,无法禁用"));
}
return groupCourseRepository.cancelCoursesByCoachIdExceptStatus(id, 3L)
.then();
})
.then(Mono.defer(() -> {
user.setStatus(StatusConstants.DISABLED);
user.setUpdatedAt(LocalDateTime.now());
return userRepository.update(user).then();
}))
)
.then(invalidateStatisticsCache());
}
public Flux<GroupCourse> getCoachCourses(Long coachId) {
return groupCourseRepository.findByCoachId(coachId, Sort.by(Sort.Direction.DESC, "startTime"))
.flatMap(course ->
bookingRepository.countValidBookings(course.getId())
.map(count -> {
course.setCurrentMembers(count.intValue());
return course;
})
.defaultIfEmpty(course)
);
}
public Mono<Long> getCoachRoleId() {
return roleRepository.findByRoleName(COACH_ROLE_NAME)
.map(SysRole::getId)
.switchIfEmpty(Mono.error(new RuntimeException("教练角色未找到,请先执行数据库迁移")));
}
// ==================== 开课逻辑 ====================
/**
* 教练手动开课
* 判定逻辑:
* - 长课时(>=1h): 10分钟内正常,10~30分钟迟到,>30分钟拒绝
* - 短课时(<1h): 10%时长内正常,10%~25%迟到,>25%拒绝
*/
public Mono<GroupCourseEntity> startCourse(Long courseId, Long coachId) {
return groupCourseDao.findByIdIsAndDeletedAtIsNull(courseId)
.switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
.flatMap(course -> {
// 验证教练身份
if (!course.getCoachId().equals(coachId)) {
return Mono.error(new RuntimeException("您不是该课程的教练,无权开课"));
}
// 验证课程状态:只有 NORMAL(0) 可以开课
if (!CourseStatus.NORMAL.getValue().equals(course.getStatus())) {
return Mono.error(new RuntimeException("当前课程状态不允许开课,当前状态: " + course.getStatus()));
}
LocalDateTime now = LocalDateTime.now();
long courseDurationMinutes = Duration.between(course.getStartTime(), course.getEndTime()).toMinutes();
if (courseDurationMinutes >= ONE_HOUR_MINUTES) {
return handleLongCourseStart(course, now);
} else {
return handleShortCourseStart(course, now, courseDurationMinutes);
}
});
}
private Mono<GroupCourseEntity> handleLongCourseStart(GroupCourseEntity course, LocalDateTime now) {
long minutesSinceStart = Duration.between(course.getStartTime(), now).toMinutes();
if (minutesSinceStart < 0) {
return Mono.error(new RuntimeException("课程尚未到开课时间"));
}
if (minutesSinceStart <= 10) {
// 正常开课
return doStartCourse(course, now, CourseStatus.IN_PROGRESS, null);
}
if (minutesSinceStart <= 30) {
// 教练迟到
return recordViolation(course.getCoachId(), course.getId(), now, ViolationReason.COACH_LATE)
.then(doStartCourse(course, now, CourseStatus.COACH_LATE, ViolationReason.COACH_LATE));
}
// >30分钟,拒绝(调度器应已标记为缺席)
return Mono.error(new RuntimeException("已超过开课时间30分钟,无法开课"));
}
private Mono<GroupCourseEntity> handleShortCourseStart(GroupCourseEntity course, LocalDateTime now,
long courseDurationMinutes) {
long minutesSinceStart = Duration.between(course.getStartTime(), now).toMinutes();
long thresholdA = Math.max(1, (long) (courseDurationMinutes * 0.10));
long thresholdB = Math.max(1, (long) (courseDurationMinutes * 0.25));
if (minutesSinceStart < 0) {
return Mono.error(new RuntimeException("课程尚未到开课时间"));
}
if (minutesSinceStart <= thresholdA) {
// 正常开课
return doStartCourse(course, now, CourseStatus.IN_PROGRESS, null);
}
if (minutesSinceStart <= thresholdB) {
// 教练迟到
return recordViolation(course.getCoachId(), course.getId(), now, ViolationReason.COACH_LATE)
.then(doStartCourse(course, now, CourseStatus.COACH_LATE, ViolationReason.COACH_LATE));
}
// >thresholdB,拒绝
return Mono.error(new RuntimeException("已超过开课时间,无法开课"));
}
private Mono<GroupCourseEntity> doStartCourse(GroupCourseEntity course, LocalDateTime now,
CourseStatus newStatus, ViolationReason violationReason) {
course.setStatus(newStatus.getValue());
course.setActualStartTime(now);
course.setUpdatedAt(now);
return groupCourseDao.updateStartInfo(course.getId(), String.valueOf(newStatus.getValue()), now, now)
.then(groupCourseDao.findByIdIsAndDeletedAtIsNull(course.getId()))
.flatMap(entity -> invalidateStatisticsCache().thenReturn(entity));
}
// ==================== 结课逻辑 ====================
/**
* 教练手动结课
* 可在 IN_PROGRESS(3) 或 COACH_LATE(7) 状态下结课
* 必须在标注结课时间 + 10分钟内
*/
public Mono<GroupCourseEntity> endCourse(Long courseId, Long coachId) {
return groupCourseDao.findByIdIsAndDeletedAtIsNull(courseId)
.switchIfEmpty(Mono.error(new RuntimeException("团课不存在")))
.flatMap(course -> {
// 验证教练身份
if (!course.getCoachId().equals(coachId)) {
return Mono.error(new RuntimeException("您不是该课程的教练,无权结课"));
}
// 验证状态:IN_PROGRESS(3) 或 COACH_LATE(7)
Long status = course.getStatus();
if (!CourseStatus.IN_PROGRESS.getValue().equals(status)
&& !CourseStatus.COACH_LATE.getValue().equals(status)) {
return Mono.error(new RuntimeException("当前课程状态不允许结课,当前状态: " + status));
}
LocalDateTime now = LocalDateTime.now();
long minutesAfterEnd = Duration.between(course.getEndTime(), now).toMinutes();
if (minutesAfterEnd > 10) {
return Mono.error(new RuntimeException("已超过结课时间10分钟,请等待系统自动结课"));
}
course.setStatus(CourseStatus.ENDED.getValue());
course.setActualEndTime(now);
course.setUpdatedAt(now);
return groupCourseDao.updateEndInfo(course.getId(), String.valueOf(CourseStatus.ENDED.getValue()), now, now)
.then(groupCourseDao.findByIdIsAndDeletedAtIsNull(course.getId()))
.flatMap(entity -> invalidateStatisticsCache().thenReturn(entity));
});
}
// ==================== 违规记录 ====================
/**
* 记录教练违规行为(使用 DatabaseClient 直连,避免 R2DBC Entity 映射问题)
*/
public Mono<Void> recordViolation(Long coachId, Long courseId, LocalDateTime violationTime,
ViolationReason reason) {
LocalDateTime now = LocalDateTime.now();
return databaseClient.sql("""
INSERT INTO coach_violation (coach_id, course_id, violation_time, violation_reason, created_at, updated_at)
VALUES (:coachId, :courseId, :violationTime, :reason, :now, :now)
""")
.bind("coachId", coachId)
.bind("courseId", courseId)
.bind("violationTime", violationTime)
.bind("reason", reason.getValue())
.bind("now", now)
.then();
}
// ==================== 违规查询 ====================
/**
* 获取所有教练的违规次数统计
*/
public Flux<Map<String, Object>> getViolationCounts() {
return databaseClient.sql("""
SELECT coach_id, COUNT(*) AS count
FROM coach_violation
WHERE deleted_at IS NULL
GROUP BY coach_id
""")
.fetch()
.all();
}
/**
* 获取指定教练的违规记录
*/
public Flux<Map<String, Object>> getCoachViolations(Long coachId) {
return databaseClient.sql("""
SELECT v.*, gc.course_name
FROM coach_violation v
LEFT JOIN group_course gc ON v.course_id = gc.id AND gc.deleted_at IS NULL
WHERE v.coach_id = :coachId AND v.deleted_at IS NULL
ORDER BY v.violation_time DESC
""")
.bind("coachId", coachId)
.fetch()
.all();
}
/**
* 清除统计缓存和团课缓存 —— 课程状态变更后调用,返回 Mono 确保链式执行
*/
private Mono<Void> invalidateStatisticsCache() {
return redisUtil.deleteByPattern("datacount:statistics:*")
.then(redisUtil.deleteByPattern("group_course:*"))
.doOnNext(count -> {})
.then();
}
}
@@ -0,0 +1,62 @@
package cn.novalon.gym.manage.coach.entity;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import java.time.LocalDateTime;
import static org.assertj.core.api.Assertions.assertThat;
@DisplayName("CoachViolationEntity 单元测试")
class CoachViolationEntityTest {
@Test
@DisplayName("无参构造和setter/getter应正确设置和读取coachId")
void shouldSetAndGetCoachId() {
CoachViolationEntity entity = new CoachViolationEntity();
entity.setCoachId(100L);
assertThat(entity.getCoachId()).isEqualTo(100L);
}
@Test
@DisplayName("无参构造和setter/getter应正确设置和读取courseId")
void shouldSetAndGetCourseId() {
CoachViolationEntity entity = new CoachViolationEntity();
entity.setCourseId(200L);
assertThat(entity.getCourseId()).isEqualTo(200L);
}
@Test
@DisplayName("无参构造和setter/getter应正确设置和读取violationTime")
void shouldSetAndGetViolationTime() {
CoachViolationEntity entity = new CoachViolationEntity();
LocalDateTime time = LocalDateTime.of(2026, 7, 20, 14, 30, 0);
entity.setViolationTime(time);
assertThat(entity.getViolationTime()).isEqualTo(time);
}
@Test
@DisplayName("无参构造和setter/getter应正确设置和读取violationReason")
void shouldSetAndGetViolationReason() {
CoachViolationEntity entity = new CoachViolationEntity();
entity.setViolationReason("COACH_LATE");
assertThat(entity.getViolationReason()).isEqualTo("COACH_LATE");
}
@Test
@DisplayName("所有字段应可正常设置和读取")
void shouldSetAndGetAllFieldsCorrectly() {
CoachViolationEntity entity = new CoachViolationEntity();
LocalDateTime time = LocalDateTime.of(2026, 7, 22, 9, 0, 0);
entity.setCoachId(1L);
entity.setCourseId(2L);
entity.setViolationTime(time);
entity.setViolationReason("COACH_ABSENT");
assertThat(entity.getCoachId()).isEqualTo(1L);
assertThat(entity.getCourseId()).isEqualTo(2L);
assertThat(entity.getViolationTime()).isEqualTo(time);
assertThat(entity.getViolationReason()).isEqualTo("COACH_ABSENT");
}
}
@@ -0,0 +1,63 @@
package cn.novalon.gym.manage.coach.enums;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import static org.assertj.core.api.Assertions.assertThat;
@DisplayName("ViolationReason 枚举单元测试")
class CoachEnumsTest {
@Test
@DisplayName("COACH_LATE应具有正确的name和description")
void coachLateShouldHaveCorrectValueAndDesc() {
assertThat(ViolationReason.COACH_LATE.getValue()).isEqualTo("COACH_LATE");
assertThat(ViolationReason.COACH_LATE.getDesc()).isEqualTo("教练迟到");
}
@Test
@DisplayName("COACH_ABSENT应具有正确的name和description")
void coachAbsentShouldHaveCorrectValueAndDesc() {
assertThat(ViolationReason.COACH_ABSENT.getValue()).isEqualTo("COACH_ABSENT");
assertThat(ViolationReason.COACH_ABSENT.getDesc()).isEqualTo("教练缺席");
}
@Test
@DisplayName("NOT_MANUAL_END应具有正确的name和description")
void notManualEndShouldHaveCorrectValueAndDesc() {
assertThat(ViolationReason.NOT_MANUAL_END.getValue()).isEqualTo("NOT_MANUAL_END");
assertThat(ViolationReason.NOT_MANUAL_END.getDesc()).isEqualTo("教练未手动结课");
}
@Test
@DisplayName("枚举值总数应为3个")
void shouldHaveThreeValues() {
assertThat(ViolationReason.values()).hasSize(3);
}
@ParameterizedTest
@EnumSource(ViolationReason.class)
@DisplayName("每个枚举值的getValue和getDesc均不应为空")
void everyEnumShouldHaveNonEmptyValueAndDesc(ViolationReason reason) {
assertThat(reason.getValue()).isNotBlank();
assertThat(reason.getDesc()).isNotBlank();
}
@Test
@DisplayName("name()方法应返回枚举常量名称")
void nameShouldReturnEnumConstantName() {
assertThat(ViolationReason.COACH_LATE.name()).isEqualTo("COACH_LATE");
assertThat(ViolationReason.COACH_ABSENT.name()).isEqualTo("COACH_ABSENT");
assertThat(ViolationReason.NOT_MANUAL_END.name()).isEqualTo("NOT_MANUAL_END");
}
@Test
@DisplayName("valueOf应正确解析枚举常量名称")
void valueOfShouldParseCorrectly() {
assertThat(ViolationReason.valueOf("COACH_LATE")).isEqualTo(ViolationReason.COACH_LATE);
assertThat(ViolationReason.valueOf("COACH_ABSENT")).isEqualTo(ViolationReason.COACH_ABSENT);
assertThat(ViolationReason.valueOf("NOT_MANUAL_END")).isEqualTo(ViolationReason.NOT_MANUAL_END);
}
}
@@ -0,0 +1,176 @@
package cn.novalon.gym.manage.coach.handler;
import cn.novalon.gym.manage.coach.service.CoachCourseService;
import cn.novalon.gym.manage.sys.core.domain.SysUser;
import cn.novalon.gym.manage.groupcourse.domain.GroupCourse;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.reactive.function.server.MockServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import jakarta.validation.Validator;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)
class CoachHandlerTest {
@Mock
private CoachCourseService coachCourseService;
@Mock
private Validator validator;
private CoachHandler coachHandler;
@BeforeEach
void setUp() {
coachHandler = new CoachHandler(coachCourseService, validator);
}
// ==================== getAllCoaches ====================
@Test
void getAllCoaches_shouldReturnOkWithCoachList() {
SysUser coach = mock(SysUser.class);
when(coachCourseService.getAllCoaches()).thenReturn(Flux.just(coach));
MockServerRequest request = MockServerRequest.builder().build();
Mono<ServerResponse> result = coachHandler.getAllCoaches(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
verify(coachCourseService).getAllCoaches();
}
@Test
void getAllCoaches_shouldReturnOkWhenEmptyList() {
when(coachCourseService.getAllCoaches()).thenReturn(Flux.empty());
MockServerRequest request = MockServerRequest.builder().build();
Mono<ServerResponse> result = coachHandler.getAllCoaches(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
// ==================== getCoachCourses ====================
@Test
void getCoachCourses_shouldReturnOkWithCourses() {
GroupCourse course = mock(GroupCourse.class);
when(coachCourseService.getCoachCourses(anyLong())).thenReturn(Flux.just(course));
MockServerRequest request = MockServerRequest.builder()
.pathVariable("id", "1")
.build();
Mono<ServerResponse> result = coachHandler.getCoachCourses(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
@Test
void getCoachCourses_shouldReturnOkWhenEmpty() {
when(coachCourseService.getCoachCourses(anyLong())).thenReturn(Flux.empty());
MockServerRequest request = MockServerRequest.builder()
.pathVariable("id", "999")
.build();
Mono<ServerResponse> result = coachHandler.getCoachCourses(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
// ==================== disableCoach ====================
@Test
void disableCoach_shouldReturnOkWhenDisabled() {
when(coachCourseService.disableCoach(anyLong())).thenReturn(Mono.empty());
MockServerRequest request = MockServerRequest.builder()
.pathVariable("id", "1")
.build();
Mono<ServerResponse> result = coachHandler.disableCoach(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
@Test
void disableCoach_shouldReturnBadRequestOnError() {
when(coachCourseService.disableCoach(anyLong()))
.thenReturn(Mono.error(new RuntimeException("Coach not found")));
MockServerRequest request = MockServerRequest.builder()
.pathVariable("id", "999")
.build();
Mono<ServerResponse> result = coachHandler.disableCoach(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
}
// ==================== getViolationCounts ====================
@Test
void getViolationCounts_shouldReturnOk() {
when(coachCourseService.getViolationCounts()).thenReturn(Flux.empty());
MockServerRequest request = MockServerRequest.builder().build();
Mono<ServerResponse> result = coachHandler.getViolationCounts(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
// ==================== getCoachViolations ====================
@Test
void getCoachViolations_shouldReturnOkWithViolations() {
when(coachCourseService.getCoachViolations(anyLong())).thenReturn(Flux.just(Map.of("violationId", 1, "reason", "迟到")));
MockServerRequest request = MockServerRequest.builder()
.pathVariable("id", "1")
.build();
Mono<ServerResponse> result = coachHandler.getCoachViolations(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
@Test
void getCoachViolations_shouldReturnEmptyListWhenNone() {
when(coachCourseService.getCoachViolations(anyLong())).thenReturn(Flux.empty());
MockServerRequest request = MockServerRequest.builder()
.pathVariable("id", "999")
.build();
Mono<ServerResponse> result = coachHandler.getCoachViolations(request);
ServerResponse response = result.block();
assertThat(response.statusCode()).isEqualTo(HttpStatus.OK);
}
}
+33
View File
@@ -0,0 +1,33 @@
HELP.md
target/
.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
### VS Code ###
.vscode/
@@ -0,0 +1,3 @@
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
+125
View File
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-manage-api</artifactId>
<version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-dataCount</artifactId>
<version>1.0.0</version>
<name>gym-dataCount</name>
<description>Data Statistics Module for Gym Management</description>
<properties>
<java.version>21</java.version>
</properties>
<dependencies>
<!-- Common模块 -->
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-common</artifactId>
<version>${project.version}</version>
</dependency>
<!-- 数据库模块 -->
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>manage-db</artifactId>
<version>${project.version}</version>
</dependency>
<!-- WebFlux -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<!-- R2dbc -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-r2dbc</artifactId>
</dependency>
<!-- Redis -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- Validation -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<!-- Swagger -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
</dependency>
<!-- POI for Excel export -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
</dependency>
<!-- Fix commons-compress version for POI compatibility -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
<!-- Gym Modules -->
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-member</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-groupCourse</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.novalon.gym.manage</groupId>
<artifactId>gym-checkIn</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Test -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>21</source>
<target>21</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,15 @@
package cn.novalon.gym.manage.datacount.config;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
/**
* 数据统计模块自动配置
*
* @author system
* @date 2026-06-09
*/
@AutoConfiguration
@ComponentScan(basePackages = "cn.novalon.gym.manage.datacount")
public class DataCountAutoConfiguration {
}
@@ -0,0 +1,355 @@
package cn.novalon.gym.manage.datacount.dao;
import org.springframework.r2dbc.core.DatabaseClient;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
import java.util.Map;
/**
* 数据统计 DAO - 使用 DatabaseClient 执行跨表聚合查询
*
* @author system
* @date 2026-06-09
*/
@Repository
public class DataStatisticsDao {
private final DatabaseClient databaseClient;
public DataStatisticsDao(DatabaseClient databaseClient) {
this.databaseClient = databaseClient;
}
/**
* 统计指定时间范围内新增会员数
*/
public Mono<Long> countNewMembers(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT COUNT(*) FROM member_user WHERE created_at >= :startTime AND created_at < :endTime AND is_deleted = false")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 统计总会员数
*/
public Mono<Long> countTotalMembers() {
return databaseClient.sql("SELECT COUNT(*) FROM member_user WHERE is_deleted = false")
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 统计指定时间范围内的签到次数
*/
public Mono<Long> countSignIns(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT COUNT(*) FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time < :endTime AND is_delete = false")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 统计指定时间范围内的成功签到次数
*/
public Mono<Long> countSuccessSignIns(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT COUNT(*) FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time < :endTime AND sign_in_status = 'SUCCESS' AND is_delete = false")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 统计指定时间范围内签到的独立会员数
*/
public Mono<Long> countDistinctSignInMembers(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT COUNT(DISTINCT member_id) FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time < :endTime AND is_delete = false")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 统计指定时间范围内的预约数
*/
public Mono<Long> countBookings(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT COUNT(*) FROM group_course_booking WHERE booking_time >= :startTime AND booking_time < :endTime AND deleted_at IS NULL")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 统计指定时间范围内的取消预约数
*/
public Mono<Long> countCancelBookings(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT COUNT(*) FROM group_course_booking WHERE booking_time >= :startTime AND booking_time < :endTime AND status = '1' AND deleted_at IS NULL")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 统计指定时间范围内的出席预约数
*/
public Mono<Long> countAttendBookings(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT COUNT(*) FROM group_course_booking WHERE booking_time >= :startTime AND booking_time < :endTime AND status = '2' AND deleted_at IS NULL")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 统计指定时间范围内的缺席预约数
*/
public Mono<Long> countAbsentBookings(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT COUNT(*) FROM group_course_booking WHERE booking_time >= :startTime AND booking_time < :endTime AND status = '3' AND deleted_at IS NULL")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 统计指定时间范围内有预约的独立会员数
*/
public Mono<Long> countDistinctBookingMembers(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT COUNT(DISTINCT member_id) FROM group_course_booking WHERE booking_time >= :startTime AND booking_time < :endTime AND deleted_at IS NULL")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 统计指定时间范围内取消预约的独立会员数
*/
public Mono<Long> countDistinctCancelMembers(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT COUNT(DISTINCT member_id) FROM group_course_booking WHERE booking_time >= :startTime AND booking_time < :endTime AND status = '1' AND deleted_at IS NULL")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/**
* 按签到类型统计次数
*/
public Flux<SignInTypeCount> countSignInsByType(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("SELECT sign_in_type as type, COUNT(*) as count FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time < :endTime AND is_delete = false GROUP BY sign_in_type")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> {
SignInTypeCount result = new SignInTypeCount();
result.setType(row.get("type", String.class));
result.setCount(row.get("count", Long.class));
return result;
})
.all();
}
/**
* 签到类型计数结果
*/
public static class SignInTypeCount {
private String type;
private Long count;
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public Long getCount() {
return count;
}
public void setCount(Long count) {
this.count = count;
}
}
// ========== 教练相关统计 ==========
/** 统计教练总数(角色为"教练"的用户) */
public Mono<Long> countTotalCoaches() {
return databaseClient.sql("""
SELECT COUNT(*) FROM sys_user u
INNER JOIN user_role ur ON u.id = ur.user_id
INNER JOIN sys_role sr ON ur.role_id = sr.id
WHERE sr.role_key = 'coach' AND u.deleted_at IS NULL
""")
.map(row -> row.get(0, Long.class))
.one();
}
/** 统计违规总数(时间范围) */
public Mono<Long> countTotalViolations(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("""
SELECT COUNT(*) FROM coach_violation
WHERE violation_time >= :startTime AND violation_time < :endTime AND deleted_at IS NULL
""")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/** 按违规类型统计次数 */
public Flux<Map<String, Object>> countViolationsByReason(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("""
SELECT violation_reason, COUNT(*) AS count
FROM coach_violation
WHERE violation_time >= :startTime AND violation_time < :endTime AND deleted_at IS NULL
GROUP BY violation_reason
""")
.bind("startTime", startTime)
.bind("endTime", endTime)
.fetch()
.all();
}
/** 统计有违规记录的教练数 */
public Mono<Long> countViolatedCoaches(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("""
SELECT COUNT(DISTINCT coach_id) FROM coach_violation
WHERE violation_time >= :startTime AND violation_time < :endTime AND deleted_at IS NULL
""")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
/** 统计区间内开课的团课数 */
public Mono<Long> countCourses(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("""
SELECT COUNT(*) FROM group_course
WHERE start_time >= :startTime AND start_time < :endTime AND deleted_at IS NULL
""")
.bind("startTime", startTime)
.bind("endTime", endTime)
.map(row -> row.get(0, Long.class))
.one();
}
// ========== 教练业绩统计 ==========
/**
* 获取所有教练基本信息(ID、昵称、用户名)
*/
public reactor.core.publisher.Flux<java.util.Map<String, Object>> getAllCoachesWithInfo() {
return databaseClient.sql("""
SELECT u.id, u.nickname, u.username
FROM sys_user u
INNER JOIN user_role ur ON u.id = ur.user_id
INNER JOIN sys_role sr ON ur.role_id = sr.id
WHERE sr.role_key = 'coach' AND u.deleted_at IS NULL
ORDER BY u.id
""")
.fetch()
.all();
}
/**
* 按教练统计已完成课程数(status=2或6)
*/
public reactor.core.publisher.Flux<java.util.Map<String, Object>> countCompletedCoursesByCoach(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("""
SELECT coach_id, COUNT(*) AS count
FROM group_course
WHERE start_time >= :startTime AND start_time < :endTime
AND status IN ('2', '6') AND deleted_at IS NULL
GROUP BY coach_id
""")
.bind("startTime", startTime)
.bind("endTime", endTime)
.fetch()
.all();
}
/**
* 按教练统计出席人次(通过团课关联,booking.status='2'
*/
public reactor.core.publisher.Flux<java.util.Map<String, Object>> countAttendedStudentsByCoach(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("""
SELECT gc.coach_id, COUNT(*) AS count
FROM group_course_booking b
INNER JOIN group_course gc ON b.course_id = gc.id
WHERE b.status = '2' AND b.deleted_at IS NULL
AND gc.deleted_at IS NULL
AND gc.start_time >= :startTime AND gc.start_time < :endTime
GROUP BY gc.coach_id
""")
.bind("startTime", startTime)
.bind("endTime", endTime)
.fetch()
.all();
}
/**
* 按教练统计总非取消预约数(用于计算出勤率分母)
*/
public reactor.core.publisher.Flux<java.util.Map<String, Object>> countTotalBookingsByCoach(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("""
SELECT gc.coach_id, COUNT(*) AS count
FROM group_course_booking b
INNER JOIN group_course gc ON b.course_id = gc.id
WHERE b.status != '1' AND b.deleted_at IS NULL
AND gc.deleted_at IS NULL
AND gc.start_time >= :startTime AND gc.start_time < :endTime
GROUP BY gc.coach_id
""")
.bind("startTime", startTime)
.bind("endTime", endTime)
.fetch()
.all();
}
/**
* 按教练获取满员率明细(每个已完成课程的出席人数和最大容量)
*/
public reactor.core.publisher.Flux<java.util.Map<String, Object>> getFillRateDetailByCoach(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("""
SELECT gc.coach_id, gc.max_members, COUNT(b.id) AS attended
FROM group_course gc
LEFT JOIN group_course_booking b ON gc.id = b.course_id AND b.status = '2' AND b.deleted_at IS NULL
WHERE gc.start_time >= :startTime AND gc.start_time < :endTime
AND gc.status IN ('2', '6') AND gc.deleted_at IS NULL
GROUP BY gc.coach_id, gc.id, gc.max_members
""")
.bind("startTime", startTime)
.bind("endTime", endTime)
.fetch()
.all();
}
/**
* 按教练统计违规次数
*/
public reactor.core.publisher.Flux<java.util.Map<String, Object>> countViolationsByCoach(LocalDateTime startTime, LocalDateTime endTime) {
return databaseClient.sql("""
SELECT coach_id, COUNT(*) AS count
FROM coach_violation
WHERE violation_time >= :startTime AND violation_time < :endTime AND deleted_at IS NULL
GROUP BY coach_id
""")
.bind("startTime", startTime)
.bind("endTime", endTime)
.fetch()
.all();
}
}
@@ -0,0 +1,64 @@
package cn.novalon.gym.manage.datacount.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 预约数据统计结果
*
* @author system
* @date 2026-06-09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BookingStatistics {
/**
* 统计日期
*/
private String statDate;
/**
* 新增预约数
*/
private Long newBookings;
/**
* 取消预约数
*/
private Long cancelBookings;
/**
* 出席预约数
*/
private Long attendBookings;
/**
* 缺席预约数
*/
private Long absentBookings;
/**
* 预约出席率
*/
private Double attendanceRate;
/**
* 取消率
*/
private Double cancelRate;
/**
* 预约人数(独立会员数)
*/
private Long bookingMembers;
/**
* 取消人数(独立会员数)
*/
private Long cancelMembers;
}
@@ -0,0 +1,49 @@
package cn.novalon.gym.manage.datacount.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 教练个人业绩
*
* @author system
* @date 2026-07-22
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class CoachPerformance {
/** 教练ID */
private Long coachId;
/** 教练昵称 */
private String coachName;
/** 教练头像 */
private String avatar;
/** 授课量(已完成课程数) */
private Long completedCourses;
/** 出席人次 */
private Long attendedStudents;
/** 总非取消预约数 */
private Long totalBookings;
/** 出勤率(百分比) */
private Double attendanceRate;
/** 满员率(百分比) */
private Double fillRate;
/** 违规次数 */
private Long violationCount;
/** 综合评分 */
private Double compositeScore;
}
@@ -0,0 +1,40 @@
package cn.novalon.gym.manage.datacount.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 教练统计数据
*
* @author 张翔
* @date 2026-07-20
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class CoachStatistics {
/** 教练总数 */
private Long totalCoaches;
/** 违规总数 */
private Long totalViolations;
/** 迟到次数 */
private Long lateCount;
/** 缺席次数 */
private Long absentCount;
/** 未手动结课次数 */
private Long notManualEndCount;
/** 有违规记录的教练数 */
private Long violatedCoaches;
/** 统计区间内开课的团课数 */
private Long totalCourses;
}
@@ -0,0 +1,85 @@
package cn.novalon.gym.manage.datacount.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
/**
* 数据统计结果域对象
*
* @author system
* @date 2026-06-09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DataStatistics {
/**
* 统计类型:MEMBER-会员统计,BOOKING-预约统计,SIGN_IN-签到统计
*/
private String statType;
/**
* 统计周期:DAY-日统计,WEEK-周统计,MONTH-月统计
*/
private String periodType;
/**
* 统计日期(DAY时为具体日期,WEEK时为周开始日期,MONTH时为月份第一天)
*/
private LocalDateTime statDate;
/**
* 统计数据值
*/
private Long count;
/**
* 关联ID(如会员ID等)
*/
private Long relatedId;
/**
* 扩展数据(JSON格式存储额外信息)
*/
private String extraData;
/**
* 统计周期常量
*/
public static final class PeriodType {
/** 日统计 */
public static final String DAY = "DAY";
/** 周统计 */
public static final String WEEK = "WEEK";
/** 月统计 */
public static final String MONTH = "MONTH";
/** 近30天 */
public static final String LAST_30_DAYS = "LAST_30_DAYS";
/** 近90天 */
public static final String LAST_90_DAYS = "LAST_90_DAYS";
/** 今年 */
public static final String YEAR = "YEAR";
private PeriodType() {}
}
/**
* 统计类型常量
*/
public static final class StatType {
/** 会员统计 */
public static final String MEMBER = "MEMBER";
/** 预约统计 */
public static final String BOOKING = "BOOKING";
/** 签到统计 */
public static final String SIGN_IN = "SIGN_IN";
private StatType() {}
}
}
@@ -0,0 +1,54 @@
package cn.novalon.gym.manage.datacount.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 会员数据统计结果
*
* @author system
* @date 2026-06-09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class MemberStatistics {
/**
* 统计日期
*/
private String statDate;
/**
* 新增会员数
*/
private Long newMembers;
/**
* 活跃会员数(当天有签到或预约的会员)
*/
private Long activeMembers;
/**
* 累计会员总数
*/
private Long totalMembers;
/**
* 今日签到会员数
*/
private Long signInMembers;
/**
* 今日预约会员数
*/
private Long bookingMembers;
/**
* 今日取消预约会员数
*/
private Long cancelBookingMembers;
}
@@ -0,0 +1,64 @@
package cn.novalon.gym.manage.datacount.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 签到数据统计结果
*
* @author system
* @date 2026-06-09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SignInStatistics {
/**
* 统计日期
*/
private String statDate;
/**
* 签到总次数
*/
private Long totalSignIns;
/**
* 成功签到次数
*/
private Long successSignIns;
/**
* 失败签到次数
*/
private Long failedSignIns;
/**
* 签到成功率
*/
private Double successRate;
/**
* 签到人数(独立会员数)
*/
private Long signInMembers;
/**
* 扫码签到次数
*/
private Long qrCodeSignIns;
/**
* 手动签到次数
*/
private Long manualSignIns;
/**
* 人脸识别签到次数
*/
private Long faceSignIns;
}
@@ -0,0 +1,52 @@
package cn.novalon.gym.manage.datacount.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
/**
* 统计数据查询请求
*
* @author system
* @date 2026-06-09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class StatisticsQuery {
/**
* 统计类型:MEMBER-会员统计,BOOKING-预约统计,SIGN_IN-签到统计
* 空表示所有类型
*/
private String statType;
/**
* 统计周期:DAY-日统计,WEEK-周统计,MONTH-月统计
*/
private String periodType;
/**
* 开始时间
*/
private LocalDateTime startTime;
/**
* 结束时间
*/
private LocalDateTime endTime;
/**
* 分页页码
*/
private Integer page;
/**
* 每页大小
*/
private Integer size;
}
@@ -0,0 +1,49 @@
package cn.novalon.gym.manage.datacount.domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 统计数据汇总
*
* @author system
* @date 2026-06-09
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class StatisticsSummary {
/**
* 统计日期
*/
private String statDate;
/**
* 会员统计数据
*/
private MemberStatistics memberStatistics;
/**
* 预约统计数据
*/
private BookingStatistics bookingStatistics;
/**
* 签到统计数据
*/
private SignInStatistics signInStatistics;
/**
* 教练统计数据
*/
private CoachStatistics coachStatistics;
/**
* 统计数据生成时间
*/
private String generatedAt;
}
@@ -0,0 +1,101 @@
package cn.novalon.gym.manage.datacount.handler;
import cn.novalon.gym.manage.datacount.domain.CoachPerformance;
import cn.novalon.gym.manage.datacount.domain.StatisticsQuery;
import cn.novalon.gym.manage.datacount.service.IDataStatisticsService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
* 教练业绩 Handler
*
* @author system
* @date 2026-07-22
*/
@Component
@Tag(name = "教练业绩", description = "教练业绩统计相关操作")
public class CoachPerformanceHandler {
private static final Logger log = LoggerFactory.getLogger(CoachPerformanceHandler.class);
@Autowired
private IDataStatisticsService dataStatisticsService;
@Operation(summary = "获取教练业绩排行榜", description = "获取所有教练的业绩排名(按综合评分降序)")
public Mono<ServerResponse> getCoachPerformanceRanking(ServerRequest request) {
StatisticsQuery query = buildQueryFromRequest(request);
return dataStatisticsService.getCoachPerformanceList(query)
.collectList()
.flatMap(list -> ServerResponse.ok().bodyValue(list))
.onErrorResume(e -> {
log.error("获取教练业绩排行榜失败", e);
return ServerResponse.ok().bodyValue(java.util.List.of());
});
}
@Operation(summary = "获取指定教练业绩", description = "获取单个教练的业绩详情")
public Mono<ServerResponse> getCoachPerformanceById(ServerRequest request) {
Long coachId = Long.parseLong(request.pathVariable("coachId"));
StatisticsQuery query = buildQueryFromRequest(request);
return dataStatisticsService.getCoachPerformanceById(coachId, query)
.flatMap(p -> ServerResponse.ok().bodyValue(p))
.onErrorResume(e -> {
log.error("获取教练{}业绩失败", coachId, e);
return ServerResponse.ok().bodyValue(
CoachPerformance.builder().coachId(coachId).coachName("获取失败").build());
});
}
@Operation(summary = "获取当前教练业绩", description = "当前登录的教练查看自己的业绩")
public Mono<ServerResponse> getMyPerformance(ServerRequest request) {
return request.queryParam("coachId")
.map(coachIdStr -> {
Long coachId = Long.parseLong(coachIdStr);
StatisticsQuery query = buildQueryFromRequest(request);
return dataStatisticsService.getCoachPerformanceById(coachId, query)
.flatMap(p -> ServerResponse.ok().bodyValue(p));
})
.orElse(ServerResponse.badRequest().bodyValue("缺少 coachId 参数"));
}
private StatisticsQuery buildQueryFromRequest(ServerRequest request) {
StatisticsQuery.StatisticsQueryBuilder builder = StatisticsQuery.builder();
request.queryParam("statType").ifPresent(builder::statType);
request.queryParam("periodType").ifPresent(builder::periodType);
request.queryParam("startTime").ifPresent(startTimeStr -> {
try {
builder.startTime(LocalDateTime.parse(startTimeStr, DateTimeFormatter.ISO_LOCAL_DATE_TIME));
} catch (Exception e) {
try {
builder.startTime(LocalDateTime.parse(startTimeStr));
} catch (Exception ignored) {
}
}
});
request.queryParam("endTime").ifPresent(endTimeStr -> {
try {
builder.endTime(LocalDateTime.parse(endTimeStr, DateTimeFormatter.ISO_LOCAL_DATE_TIME));
} catch (Exception e) {
try {
builder.endTime(LocalDateTime.parse(endTimeStr));
} catch (Exception ignored) {
}
}
});
return builder.build();
}
}
@@ -0,0 +1,125 @@
package cn.novalon.gym.manage.datacount.handler;
import cn.novalon.gym.manage.datacount.domain.*;
import cn.novalon.gym.manage.datacount.service.IDataStatisticsService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.server.ServerRequest;
import org.springframework.web.reactive.function.server.ServerResponse;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
* 数据统计 Handler
*
* @author system
* @date 2026-06-09
*/
@Component
@Tag(name = "数据统计", description = "数据统计相关操作")
public class DataStatisticsHandler {
@Autowired
private IDataStatisticsService dataStatisticsService;
@Operation(summary = "获取综合统计数据", description = "获取会员、预约、签到综合统计数据")
public Mono<ServerResponse> getStatisticsSummary(ServerRequest request) {
StatisticsQuery query = buildQueryFromRequest(request);
return dataStatisticsService.getStatisticsSummaryWithCache(query)
.flatMap(summary -> ServerResponse.ok().bodyValue(summary))
.onErrorResume(e -> {
StatisticsSummary errorSummary = StatisticsSummary.builder()
.statDate(LocalDateTime.now().toLocalDate().toString())
.generatedAt(LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME))
.build();
return ServerResponse.ok().bodyValue(errorSummary);
});
}
@Operation(summary = "获取会员统计数据", description = "获取会员统计数据")
public Mono<ServerResponse> getMemberStatistics(ServerRequest request) {
StatisticsQuery query = buildQueryFromRequest(request);
return dataStatisticsService.getMemberStatistics(query)
.flatMap(stats -> ServerResponse.ok().bodyValue(stats))
.onErrorResume(e -> ServerResponse.ok().bodyValue(MemberStatistics.builder().statDate(query.getStartTime() != null ? query.getStartTime().toLocalDate().toString() : LocalDateTime.now().toLocalDate().toString()).build()));
}
@Operation(summary = "获取预约统计数据", description = "获取预约统计数据")
public Mono<ServerResponse> getBookingStatistics(ServerRequest request) {
StatisticsQuery query = buildQueryFromRequest(request);
return dataStatisticsService.getBookingStatistics(query)
.flatMap(stats -> ServerResponse.ok().bodyValue(stats))
.onErrorResume(e -> ServerResponse.ok().bodyValue(BookingStatistics.builder().statDate(query.getStartTime() != null ? query.getStartTime().toLocalDate().toString() : LocalDateTime.now().toLocalDate().toString()).build()));
}
@Operation(summary = "获取签到统计数据", description = "获取签到统计数据")
public Mono<ServerResponse> getSignInStatistics(ServerRequest request) {
StatisticsQuery query = buildQueryFromRequest(request);
return dataStatisticsService.getSignInStatistics(query)
.flatMap(stats -> ServerResponse.ok().bodyValue(stats))
.onErrorResume(e -> ServerResponse.ok().bodyValue(SignInStatistics.builder().statDate(query.getStartTime() != null ? query.getStartTime().toLocalDate().toString() : LocalDateTime.now().toLocalDate().toString()).build()));
}
@Operation(summary = "查询历史统计数据", description = "查询历史统计数据")
public Mono<ServerResponse> queryHistoricalStatistics(ServerRequest request) {
StatisticsQuery query = buildQueryFromRequest(request);
return dataStatisticsService.queryHistoricalStatistics(query)
.collectList()
.flatMap(stats -> ServerResponse.ok().bodyValue(stats));
}
@Operation(summary = "导出统计数据", description = "导出统计数据为Excel文件")
public Mono<ServerResponse> exportStatistics(ServerRequest request) {
StatisticsQuery query = buildQueryFromRequest(request);
return dataStatisticsService.exportStatistics(query)
.flatMap(bytes -> {
String filename = "statistics_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + ".xlsx";
return ServerResponse.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"")
.contentType(MediaType.parseMediaType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"))
.bodyValue(bytes);
})
.onErrorResume(e -> ServerResponse.ok().bodyValue("导出失败: " + e.getMessage()));
}
private StatisticsQuery buildQueryFromRequest(ServerRequest request) {
StatisticsQuery.StatisticsQueryBuilder builder = StatisticsQuery.builder();
request.queryParam("statType").ifPresent(builder::statType);
request.queryParam("periodType").ifPresent(builder::periodType);
request.queryParam("startTime").ifPresent(startTimeStr -> {
try {
builder.startTime(LocalDateTime.parse(startTimeStr, DateTimeFormatter.ISO_LOCAL_DATE_TIME));
} catch (Exception e) {
try {
builder.startTime(LocalDateTime.parse(startTimeStr));
} catch (Exception ignored) {
}
}
});
request.queryParam("endTime").ifPresent(endTimeStr -> {
try {
builder.endTime(LocalDateTime.parse(endTimeStr, DateTimeFormatter.ISO_LOCAL_DATE_TIME));
} catch (Exception e) {
try {
builder.endTime(LocalDateTime.parse(endTimeStr));
} catch (Exception ignored) {
}
}
});
return builder.build();
}
}
@@ -0,0 +1,109 @@
package cn.novalon.gym.manage.datacount.scheduler;
import cn.novalon.gym.manage.datacount.domain.DataStatistics;
import cn.novalon.gym.manage.datacount.service.IDataStatisticsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Mono;
import java.time.LocalDate;
/**
* 数据统计定时任务
* 每日凌晨执行统计数据更新
*
* @author system
* @date 2026-06-09
*/
@Component
public class DataStatisticsScheduler {
private static final Logger log = LoggerFactory.getLogger(DataStatisticsScheduler.class);
@Autowired
private IDataStatisticsService dataStatisticsService;
/**
* 每日凌晨2点执行前一天的日统计数据
* 使用cron表达式: 0 0 2 * * ?
*/
@Scheduled(cron = "0 0 2 * * ?")
public void executeDailyStatistics() {
LocalDate yesterday = LocalDate.now().minusDays(1);
log.info("Starting daily statistics task for date: {}", yesterday);
dataStatisticsService.executeDailyStatistics(yesterday)
.subscribe(
null,
error -> log.error("Daily statistics task failed for date: {}", yesterday, error),
() -> log.info("Daily statistics task completed for date: {}", yesterday)
);
}
/**
* 每周一凌晨3点执行上周的周统计数据
* 使用cron表达式: 0 0 3 ? * MON
*/
@Scheduled(cron = "0 0 3 ? * MON")
public void executeWeeklyStatistics() {
LocalDate lastWeek = LocalDate.now().minusWeeks(1);
log.info("Starting weekly statistics task for week of: {}", lastWeek);
// 执行上周每天的统计数据汇总
LocalDate weekStart = lastWeek.with(java.time.temporal.TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY));
LocalDate weekEnd = lastWeek.with(java.time.temporal.TemporalAdjusters.nextOrSame(java.time.DayOfWeek.SUNDAY));
for (LocalDate date = weekStart; !date.isAfter(weekEnd); date = date.plusDays(1)) {
final LocalDate statDate = date;
dataStatisticsService.executeDailyStatistics(statDate)
.block();
}
log.info("Weekly statistics task completed for week: {} - {}", weekStart, weekEnd);
}
/**
* 每月1日凌晨3点执行上个月的月统计数据
* 使用cron表达式: 0 0 3 1 * ?
*/
@Scheduled(cron = "0 0 3 1 * ?")
public void executeMonthlyStatistics() {
LocalDate lastMonth = LocalDate.now().minusMonths(1);
log.info("Starting monthly statistics task for month: {}", lastMonth.getMonth());
// 执行上个月每天的统计数据补全
LocalDate startOfMonth = lastMonth.withDayOfMonth(1);
LocalDate endOfMonth = lastMonth.with(java.time.temporal.TemporalAdjusters.lastDayOfMonth());
for (LocalDate date = startOfMonth; !date.isAfter(endOfMonth); date = date.plusDays(1)) {
final LocalDate statDate = date;
dataStatisticsService.executeDailyStatistics(statDate)
.block();
}
log.info("Monthly statistics task completed for month: {}", lastMonth.getMonth());
}
/**
* 每月15日凌晨4点清理30天前的旧统计数据
* 使用cron表达式: 0 0 4 15 * ?
*/
@Scheduled(cron = "0 0 4 15 * ?")
public void cleanupOldStatistics() {
LocalDate cutoffDate = LocalDate.now().minusDays(30);
log.info("Starting cleanup old statistics task, removing data before: {}", cutoffDate);
// 清理Redis中的旧统计数据
String pattern = "datacount:statistics:*:" + cutoffDate.toString();
cn.novalon.gym.manage.common.util.RedisUtil redisUtil = null;
try {
// 这里可以通过注入的service来清理,但当前实现使用Redis缓存30天自动过期
log.info("Old statistics cleanup completed, cutoff date: {}", cutoffDate);
} catch (Exception e) {
log.error("Failed to cleanup old statistics", e);
}
}
}
@@ -0,0 +1,95 @@
package cn.novalon.gym.manage.datacount.service;
import cn.novalon.gym.manage.datacount.domain.*;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
/**
* 数据统计服务接口
*
* @author system
* @date 2026-06-09
*/
public interface IDataStatisticsService {
/**
* 获取会员统计数据
*
* @param query 查询条件
* @return 会员统计数据
*/
Mono<MemberStatistics> getMemberStatistics(StatisticsQuery query);
/**
* 获取预约统计数据
*
* @param query 查询条件
* @return 预约统计数据
*/
Mono<BookingStatistics> getBookingStatistics(StatisticsQuery query);
/**
* 获取签到统计数据
*
* @param query 查询条件
* @return 签到统计数据
*/
Mono<SignInStatistics> getSignInStatistics(StatisticsQuery query);
/**
* 获取综合统计数据(包含会员、预约、签到)
*
* @param query 查询条件
* @return 综合统计数据
*/
Mono<StatisticsSummary> getStatisticsSummary(StatisticsQuery query);
/**
* 查询历史统计数据
*
* @param query 查询条件
* @return 历史统计数据列表
*/
Flux<DataStatistics> queryHistoricalStatistics(StatisticsQuery query);
/**
* 执行每日统计数据更新(定时任务调用)
*
* @param statDate 统计日期
* @return 更新结果
*/
Mono<Void> executeDailyStatistics(java.time.LocalDate statDate);
/**
* 导出统计数据为Excel
*
* @param query 查询条件
* @return Excel文件的字节数组
*/
Mono<byte[]> exportStatistics(StatisticsQuery query);
/**
* 获取统计数据(带缓存)
*
* @param query 查询条件
* @return 统计数据
*/
Mono<StatisticsSummary> getStatisticsSummaryWithCache(StatisticsQuery query);
/**
* 获取教练业绩排行榜
*
* @param query 查询条件
* @return 教练业绩列表(按综合评分降序)
*/
reactor.core.publisher.Flux<CoachPerformance> getCoachPerformanceList(StatisticsQuery query);
/**
* 获取单个教练业绩
*
* @param coachId 教练ID
* @param query 查询条件
* @return 单个教练业绩
*/
Mono<CoachPerformance> getCoachPerformanceById(Long coachId, StatisticsQuery query);
}
@@ -0,0 +1,686 @@
package cn.novalon.gym.manage.datacount.service.impl;
import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
import cn.novalon.gym.manage.common.util.RedisUtil;
import cn.novalon.gym.manage.datacount.dao.DataStatisticsDao;
import cn.novalon.gym.manage.datacount.domain.*;
import cn.novalon.gym.manage.datacount.service.IDataStatisticsService;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono;
import java.io.ByteArrayOutputStream;
import java.time.DayOfWeek;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 数据统计服务实现类
*
* @author system
* @date 2026-06-09
*/
@Service
public class DataStatisticsServiceImpl implements IDataStatisticsService {
private static final Logger log = LoggerFactory.getLogger(DataStatisticsServiceImpl.class);
private static final String CACHE_KEY_PREFIX = "datacount:statistics:";
private static final long CACHE_EXPIRE_SECONDS = 3600; // 1小时
@Autowired
private DataStatisticsDao dataStatisticsDao;
@Autowired
private RedisUtil redisUtil;
@Autowired
private ObjectMapper objectMapper;
@Value("${datacount.cache.expire-seconds:3600}")
private long cacheExpireSeconds = 3600;
@Override
public Mono<MemberStatistics> getMemberStatistics(StatisticsQuery query) {
LocalDateTime startTime = getStartTime(query);
LocalDateTime endTime = getEndTime(query);
Mono<Long> newMembersMono = dataStatisticsDao.countNewMembers(startTime, endTime);
Mono<Long> totalMembersMono = dataStatisticsDao.countTotalMembers();
Mono<Long> signInMembersMono = dataStatisticsDao.countDistinctSignInMembers(startTime, endTime);
Mono<Long> bookingMembersMono = dataStatisticsDao.countDistinctBookingMembers(startTime, endTime);
Mono<Long> cancelMembersMono = dataStatisticsDao.countDistinctCancelMembers(startTime, endTime);
return Mono.zip(newMembersMono, totalMembersMono, signInMembersMono, bookingMembersMono, cancelMembersMono)
.map(tuple -> {
long newMembers = tuple.getT1() != null ? tuple.getT1() : 0L;
long totalMembers = tuple.getT2() != null ? tuple.getT2() : 0L;
long signInMembers = tuple.getT3() != null ? tuple.getT3() : 0L;
long bookingMembers = tuple.getT4() != null ? tuple.getT4() : 0L;
long cancelMembers = tuple.getT5() != null ? tuple.getT5() : 0L;
// 活跃会员数 = 有签到的 + 有预约的(去重后大概值)
long activeMembers = signInMembers + bookingMembers;
return MemberStatistics.builder()
.statDate(startTime.toLocalDate().toString())
.newMembers(newMembers)
.activeMembers(activeMembers)
.totalMembers(totalMembers)
.signInMembers(signInMembers)
.bookingMembers(bookingMembers)
.cancelBookingMembers(cancelMembers)
.build();
});
}
@Override
public Mono<BookingStatistics> getBookingStatistics(StatisticsQuery query) {
LocalDateTime startTime = getStartTime(query);
LocalDateTime endTime = getEndTime(query);
Mono<Long> totalMono = dataStatisticsDao.countBookings(startTime, endTime);
Mono<Long> cancelMono = dataStatisticsDao.countCancelBookings(startTime, endTime);
Mono<Long> attendMono = dataStatisticsDao.countAttendBookings(startTime, endTime);
Mono<Long> absentMono = dataStatisticsDao.countAbsentBookings(startTime, endTime);
Mono<Long> bookingMembersMono = dataStatisticsDao.countDistinctBookingMembers(startTime, endTime);
Mono<Long> cancelMembersMono = dataStatisticsDao.countDistinctCancelMembers(startTime, endTime);
return Mono.zip(totalMono, cancelMono, attendMono, absentMono, bookingMembersMono, cancelMembersMono)
.map(tuple -> {
long total = tuple.getT1() != null ? tuple.getT1() : 0L;
long cancel = tuple.getT2() != null ? tuple.getT2() : 0L;
long attend = tuple.getT3() != null ? tuple.getT3() : 0L;
long absent = tuple.getT4() != null ? tuple.getT4() : 0L;
long bookingMembers = tuple.getT5() != null ? tuple.getT5() : 0L;
long cancelMembers = tuple.getT6() != null ? tuple.getT6() : 0L;
double attendanceRate = total > 0 ? (double) attend / total * 100 : 0;
double cancelRate = total > 0 ? (double) cancel / total * 100 : 0;
return BookingStatistics.builder()
.statDate(startTime.toLocalDate().toString())
.newBookings(total)
.cancelBookings(cancel)
.attendBookings(attend)
.absentBookings(absent)
.attendanceRate(Math.round(attendanceRate * 100.0) / 100.0)
.cancelRate(Math.round(cancelRate * 100.0) / 100.0)
.bookingMembers(bookingMembers)
.cancelMembers(cancelMembers)
.build();
});
}
@Override
public Mono<SignInStatistics> getSignInStatistics(StatisticsQuery query) {
LocalDateTime startTime = getStartTime(query);
LocalDateTime endTime = getEndTime(query);
Mono<Long> totalMono = dataStatisticsDao.countSignIns(startTime, endTime);
Mono<Long> successMono = dataStatisticsDao.countSuccessSignIns(startTime, endTime);
Mono<Long> distinctMembersMono = dataStatisticsDao.countDistinctSignInMembers(startTime, endTime);
return Mono.zip(totalMono, successMono, distinctMembersMono)
.flatMap(tuple -> {
long total = tuple.getT1() != null ? tuple.getT1() : 0L;
long success = tuple.getT2() != null ? tuple.getT2() : 0L;
long distinctMembers = tuple.getT3() != null ? tuple.getT3() : 0L;
double successRate = total > 0 ? (double) success / total * 100 : 0;
return dataStatisticsDao.countSignInsByType(startTime, endTime)
.collectMap(
DataStatisticsDao.SignInTypeCount::getType,
DataStatisticsDao.SignInTypeCount::getCount
)
.defaultIfEmpty(new HashMap<>())
.map(typeCountMap -> {
long qrCode = getCountByType(typeCountMap, SignInRecord.SignInType.QR_CODE);
long manual = getCountByType(typeCountMap, SignInRecord.SignInType.MANUAL);
long face = getCountByType(typeCountMap, SignInRecord.SignInType.FACE);
return SignInStatistics.builder()
.statDate(startTime.toLocalDate().toString())
.totalSignIns(total)
.successSignIns(success)
.failedSignIns(total - success)
.successRate(Math.round(successRate * 100.0) / 100.0)
.signInMembers(distinctMembers)
.qrCodeSignIns(qrCode)
.manualSignIns(manual)
.faceSignIns(face)
.build();
});
});
}
private long getCountByType(Map<String, Long> typeCountMap, String type) {
Long count = typeCountMap.get(type);
return count != null ? count : 0L;
}
private Mono<CoachStatistics> getCoachStatistics(StatisticsQuery query) {
LocalDateTime startTime = getStartTime(query);
LocalDateTime endTime = getEndTime(query);
Mono<Long> totalCoachesMono = dataStatisticsDao.countTotalCoaches();
Mono<Long> totalViolationsMono = dataStatisticsDao.countTotalViolations(startTime, endTime);
Mono<Long> violatedCoachesMono = dataStatisticsDao.countViolatedCoaches(startTime, endTime);
Mono<Long> totalCoursesMono = dataStatisticsDao.countCourses(startTime, endTime);
Mono<Map<String, Long>> violationByReasonMono = dataStatisticsDao.countViolationsByReason(startTime, endTime)
.collectMap(row -> (String) row.get("violation_reason"),
row -> ((Number) row.get("count")).longValue());
return Mono.zip(totalCoachesMono, totalViolationsMono, violatedCoachesMono, totalCoursesMono, violationByReasonMono)
.map(tuple -> {
Map<String, Long> reasonMap = tuple.getT5();
return CoachStatistics.builder()
.totalCoaches(tuple.getT1())
.totalViolations(tuple.getT2())
.lateCount(reasonMap.getOrDefault("COACH_LATE", 0L))
.absentCount(reasonMap.getOrDefault("COACH_ABSENT", 0L))
.notManualEndCount(reasonMap.getOrDefault("NOT_MANUAL_END", 0L))
.violatedCoaches(tuple.getT3())
.totalCourses(tuple.getT4())
.build();
});
}
@Override
public Mono<StatisticsSummary> getStatisticsSummary(StatisticsQuery query) {
Mono<MemberStatistics> memberStatsMono = getMemberStatistics(query);
Mono<BookingStatistics> bookingStatsMono = getBookingStatistics(query);
Mono<SignInStatistics> signInStatsMono = getSignInStatistics(query);
Mono<CoachStatistics> coachStatsMono = getCoachStatistics(query);
return Mono.zip(memberStatsMono, bookingStatsMono, signInStatsMono, coachStatsMono)
.map(tuple -> StatisticsSummary.builder()
.statDate(LocalDateTime.now().toLocalDate().toString())
.memberStatistics(tuple.getT1())
.bookingStatistics(tuple.getT2())
.signInStatistics(tuple.getT3())
.coachStatistics(tuple.getT4())
.generatedAt(LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME))
.build());
}
@Override
public reactor.core.publisher.Flux<DataStatistics> queryHistoricalStatistics(StatisticsQuery query) {
// 历史统计数据查询(从Redis缓存中获取)
String cacheKey = buildCacheKey(query);
return redisUtil.get(cacheKey, String.class)
.flatMapMany(json -> {
try {
java.util.List<DataStatistics> stats = objectMapper.readValue(json,
objectMapper.getTypeFactory().constructCollectionType(java.util.List.class, DataStatistics.class));
return reactor.core.publisher.Flux.fromIterable(stats);
} catch (Exception e) {
log.error("Failed to parse historical statistics from cache", e);
return reactor.core.publisher.Flux.empty();
}
})
.switchIfEmpty(reactor.core.publisher.Flux.empty());
}
@Override
public Mono<Void> executeDailyStatistics(LocalDate statDate) {
log.info("Executing daily statistics for date: {}", statDate);
LocalDateTime dayStart = statDate.atStartOfDay();
LocalDateTime dayEnd = statDate.plusDays(1).atStartOfDay();
StatisticsQuery query = StatisticsQuery.builder()
.startTime(dayStart)
.endTime(dayEnd)
.build();
Mono<MemberStatistics> memberStatsMono = getMemberStatistics(query);
Mono<BookingStatistics> bookingStatsMono = getBookingStatistics(query);
Mono<SignInStatistics> signInStatsMono = getSignInStatistics(query);
return Mono.zip(memberStatsMono, bookingStatsMono, signInStatsMono)
.flatMap(tuple -> {
MemberStatistics memberStats = tuple.getT1();
BookingStatistics bookingStats = tuple.getT2();
SignInStatistics signInStats = tuple.getT3();
String dateStr = statDate.toString();
String memberKey = CACHE_KEY_PREFIX + "member:" + dateStr;
String bookingKey = CACHE_KEY_PREFIX + "booking:" + dateStr;
String signInKey = CACHE_KEY_PREFIX + "signin:" + dateStr;
try {
String memberJson = objectMapper.writeValueAsString(memberStats);
String bookingJson = objectMapper.writeValueAsString(bookingStats);
String signInJson = objectMapper.writeValueAsString(signInStats);
return reactor.core.publisher.Flux.merge(
redisUtil.setWithExpire(memberKey, memberJson, Duration.ofDays(30).getSeconds()),
redisUtil.setWithExpire(bookingKey, bookingJson, Duration.ofDays(30).getSeconds()),
redisUtil.setWithExpire(signInKey, signInJson, Duration.ofDays(30).getSeconds())
).then();
} catch (Exception e) {
log.error("Failed to serialize statistics data", e);
return Mono.empty();
}
})
.then()
.doOnSuccess(v -> log.info("Daily statistics completed for date: {}", statDate))
.doOnError(e -> log.error("Failed to execute daily statistics for date: {}", statDate, e));
}
@Override
public Mono<byte[]> exportStatistics(StatisticsQuery query) {
return getStatisticsSummary(query)
.flatMap(summary -> {
try (Workbook workbook = new XSSFWorkbook()) {
Sheet sheet = workbook.createSheet("数据统计报表");
CellStyle headerStyle = workbook.createCellStyle();
Font headerFont = workbook.createFont();
headerFont.setBold(true);
headerStyle.setFont(headerFont);
createMainSheet(sheet, summary, headerStyle);
Sheet memberSheet = workbook.createSheet("会员统计");
createMemberStatisticsSheet(memberSheet, summary.getMemberStatistics(), headerStyle);
Sheet bookingSheet = workbook.createSheet("预约统计");
createBookingStatisticsSheet(bookingSheet, summary.getBookingStatistics(), headerStyle);
Sheet signInSheet = workbook.createSheet("签到统计");
createSignInStatisticsSheet(signInSheet, summary.getSignInStatistics(), headerStyle);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
workbook.write(outputStream);
return Mono.just(outputStream.toByteArray());
} catch (Exception e) {
log.error("Failed to export statistics", e);
return Mono.error(e);
}
});
}
private void createMainSheet(Sheet sheet, StatisticsSummary summary, CellStyle headerStyle) {
int rowNum = 0;
Row row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("统计项");
row.createCell(1).setCellValue("数值");
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("统计日期");
row.createCell(1).setCellValue(summary.getStatDate());
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("新增会员数");
row.createCell(1).setCellValue(summary.getMemberStatistics().getNewMembers());
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("活跃会员数");
row.createCell(1).setCellValue(summary.getMemberStatistics().getActiveMembers());
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("累计会员总数");
row.createCell(1).setCellValue(summary.getMemberStatistics().getTotalMembers());
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("新增预约数");
row.createCell(1).setCellValue(summary.getBookingStatistics().getNewBookings());
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("预约出席率");
row.createCell(1).setCellValue(summary.getBookingStatistics().getAttendanceRate() + "%");
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("签到总次数");
row.createCell(1).setCellValue(summary.getSignInStatistics().getTotalSignIns());
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("签到成功率");
row.createCell(1).setCellValue(summary.getSignInStatistics().getSuccessRate() + "%");
sheet.autoSizeColumn(0);
sheet.autoSizeColumn(1);
}
private void createMemberStatisticsSheet(Sheet sheet, MemberStatistics stats, CellStyle headerStyle) {
int rowNum = 0;
Row row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("统计项");
row.createCell(1).setCellValue("数值");
String[][] data = {
{"统计日期", stats.getStatDate()},
{"新增会员数", String.valueOf(stats.getNewMembers())},
{"活跃会员数", String.valueOf(stats.getActiveMembers())},
{"累计会员总数", String.valueOf(stats.getTotalMembers())},
{"今日签到会员数", String.valueOf(stats.getSignInMembers())},
{"今日预约会员数", String.valueOf(stats.getBookingMembers())},
{"今日取消预约会员数", String.valueOf(stats.getCancelBookingMembers())}
};
for (String[] rowData : data) {
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue(rowData[0]);
row.createCell(1).setCellValue(rowData[1]);
}
sheet.autoSizeColumn(0);
sheet.autoSizeColumn(1);
}
private void createBookingStatisticsSheet(Sheet sheet, BookingStatistics stats, CellStyle headerStyle) {
int rowNum = 0;
Row row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("统计项");
row.createCell(1).setCellValue("数值");
String[][] data = {
{"统计日期", stats.getStatDate()},
{"新增预约数", String.valueOf(stats.getNewBookings())},
{"取消预约数", String.valueOf(stats.getCancelBookings())},
{"出席预约数", String.valueOf(stats.getAttendBookings())},
{"缺席预约数", String.valueOf(stats.getAbsentBookings())},
{"预约出席率", stats.getAttendanceRate() + "%"},
{"取消率", stats.getCancelRate() + "%"},
{"预约人数", String.valueOf(stats.getBookingMembers())},
{"取消人数", String.valueOf(stats.getCancelMembers())}
};
for (String[] rowData : data) {
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue(rowData[0]);
row.createCell(1).setCellValue(rowData[1]);
}
sheet.autoSizeColumn(0);
sheet.autoSizeColumn(1);
}
private void createSignInStatisticsSheet(Sheet sheet, SignInStatistics stats, CellStyle headerStyle) {
int rowNum = 0;
Row row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue("统计项");
row.createCell(1).setCellValue("数值");
String[][] data = {
{"统计日期", stats.getStatDate()},
{"签到总次数", String.valueOf(stats.getTotalSignIns())},
{"成功签到次数", String.valueOf(stats.getSuccessSignIns())},
{"失败签到次数", String.valueOf(stats.getFailedSignIns())},
{"签到成功率", stats.getSuccessRate() + "%"},
{"签到人数", String.valueOf(stats.getSignInMembers())},
{"扫码签到次数", String.valueOf(stats.getQrCodeSignIns())},
{"手动签到次数", String.valueOf(stats.getManualSignIns())},
{"人脸识别签到次数", String.valueOf(stats.getFaceSignIns())}
};
for (String[] rowData : data) {
row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue(rowData[0]);
row.createCell(1).setCellValue(rowData[1]);
}
sheet.autoSizeColumn(0);
sheet.autoSizeColumn(1);
}
@Override
public Mono<StatisticsSummary> getStatisticsSummaryWithCache(StatisticsQuery query) {
String cacheKey = buildCacheKey(query);
return redisUtil.get(cacheKey, StatisticsSummary.class)
.switchIfEmpty(
getStatisticsSummary(query)
.flatMap(summary -> {
try {
String json = objectMapper.writeValueAsString(summary);
return redisUtil.setWithExpire(cacheKey, json, cacheExpireSeconds)
.thenReturn(summary);
} catch (Exception e) {
log.error("Failed to serialize statistics summary", e);
return Mono.just(summary);
}
})
);
}
private String buildCacheKey(StatisticsQuery query) {
StringBuilder keyBuilder = new StringBuilder(CACHE_KEY_PREFIX);
keyBuilder.append("summary:");
if (query.getStartTime() != null) {
keyBuilder.append(query.getStartTime().toLocalDate().toString());
}
if (query.getEndTime() != null) {
keyBuilder.append("_").append(query.getEndTime().toLocalDate().toString());
}
if (query.getStatType() != null) {
keyBuilder.append("_").append(query.getStatType());
}
if (query.getPeriodType() != null) {
keyBuilder.append("_").append(query.getPeriodType());
}
return keyBuilder.toString();
}
private LocalDateTime getStartTime(StatisticsQuery query) {
if (query.getStartTime() != null) {
return query.getStartTime();
}
LocalDate today = LocalDate.now();
String periodType = query.getPeriodType();
if (DataStatistics.PeriodType.WEEK.equals(periodType)) {
return today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).atStartOfDay();
} else if (DataStatistics.PeriodType.MONTH.equals(periodType)) {
return today.withDayOfMonth(1).atStartOfDay();
} else if (DataStatistics.PeriodType.LAST_30_DAYS.equals(periodType)) {
return today.minusDays(29).atStartOfDay();
} else if (DataStatistics.PeriodType.LAST_90_DAYS.equals(periodType)) {
return today.minusDays(89).atStartOfDay();
} else if (DataStatistics.PeriodType.YEAR.equals(periodType)) {
return today.withDayOfYear(1).atStartOfDay();
} else {
return today.atStartOfDay();
}
}
private LocalDateTime getEndTime(StatisticsQuery query) {
if (query.getEndTime() != null) {
return query.getEndTime();
}
LocalDate today = LocalDate.now();
String periodType = query.getPeriodType();
if (DataStatistics.PeriodType.WEEK.equals(periodType)) {
return today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)).atTime(23, 59, 59);
} else if (DataStatistics.PeriodType.MONTH.equals(periodType)) {
return today.with(TemporalAdjusters.lastDayOfMonth()).atTime(23, 59, 59);
} else if (DataStatistics.PeriodType.LAST_30_DAYS.equals(periodType)
|| DataStatistics.PeriodType.LAST_90_DAYS.equals(periodType)
|| DataStatistics.PeriodType.YEAR.equals(periodType)) {
return LocalDateTime.now();
} else {
return LocalDateTime.now();
}
}
// ========== 教练业绩统计 ==========
@Override
public reactor.core.publisher.Flux<CoachPerformance> getCoachPerformanceList(StatisticsQuery query) {
LocalDateTime startTime = getStartTime(query);
LocalDateTime endTime = getEndTime(query);
// 1. 获取所有教练基本信息
Mono<Map<Long, Map<String, Object>>> coachesMono = dataStatisticsDao.getAllCoachesWithInfo()
.collectMap(row -> ((Number) row.get("id")).longValue(), row -> row);
// 2. 各教练授课量
Mono<Map<Long, Long>> coursesMono = dataStatisticsDao.countCompletedCoursesByCoach(startTime, endTime)
.collectMap(row -> ((Number) row.get("coach_id")).longValue(),
row -> ((Number) row.get("count")).longValue());
// 3. 各教练出席人次
Mono<Map<Long, Long>> attendedMono = dataStatisticsDao.countAttendedStudentsByCoach(startTime, endTime)
.collectMap(row -> ((Number) row.get("coach_id")).longValue(),
row -> ((Number) row.get("count")).longValue());
// 4. 各教练总预约数(非取消)
Mono<Map<Long, Long>> totalBookingsMono = dataStatisticsDao.countTotalBookingsByCoach(startTime, endTime)
.collectMap(row -> ((Number) row.get("coach_id")).longValue(),
row -> ((Number) row.get("count")).longValue());
// 5. 满员率明细(collectMultimap 返回 Collection<V> 而非 List<V>
Mono<Map<Long, Collection<FillRateItem>>> fillRateMono = dataStatisticsDao.getFillRateDetailByCoach(startTime, endTime)
.map(row -> new FillRateItem(
((Number) row.get("coach_id")).longValue(),
((Number) row.get("max_members")).intValue(),
((Number) row.get("attended")).longValue()
))
.collectMultimap(FillRateItem::coachId);
// 6. 各教练违规次数
Mono<Map<Long, Long>> violationsMono = dataStatisticsDao.countViolationsByCoach(startTime, endTime)
.collectMap(row -> ((Number) row.get("coach_id")).longValue(),
row -> ((Number) row.get("count")).longValue());
return Mono.zip(coachesMono, coursesMono, attendedMono, totalBookingsMono, fillRateMono, violationsMono)
.flatMapMany(tuple -> {
Map<Long, Map<String, Object>> coaches = tuple.getT1();
Map<Long, Long> coursesMap = tuple.getT2();
Map<Long, Long> attendedMap = tuple.getT3();
Map<Long, Long> totalBookingsMap = tuple.getT4();
Map<Long, Collection<FillRateItem>> fillRateMap = tuple.getT5();
Map<Long, Long> violationsMap = tuple.getT6();
// 计算最大授课量(用于归一化)
long maxCourses = coursesMap.values().stream().mapToLong(Long::longValue).max().orElse(1L);
List<CoachPerformance> performances = coaches.keySet().stream()
.map(coachId -> {
Map<String, Object> coachInfo = coaches.get(coachId);
long courses = coursesMap.getOrDefault(coachId, 0L);
long attended = attendedMap.getOrDefault(coachId, 0L);
long totalBookings = totalBookingsMap.getOrDefault(coachId, 0L);
long violations = violationsMap.getOrDefault(coachId, 0L);
double attendanceRate = totalBookings > 0
? (double) attended / totalBookings * 100 : 0;
double fillRate = calculateFillRate(fillRateMap.getOrDefault(coachId, List.of()));
double normalizedCourses = maxCourses > 0
? (double) courses / maxCourses * 100 : 0;
double compositeScore = normalizedCourses * 0.4
+ attendanceRate * 0.3 + fillRate * 0.3;
return CoachPerformance.builder()
.coachId(coachId)
.coachName(getString(coachInfo, "nickname", getString(coachInfo, "username", "")))
.avatar(getString(coachInfo, "avatar", null))
.completedCourses(courses)
.attendedStudents(attended)
.totalBookings(totalBookings)
.attendanceRate(Math.round(attendanceRate * 100.0) / 100.0)
.fillRate(Math.round(fillRate * 100.0) / 100.0)
.violationCount(violations)
.compositeScore(Math.round(compositeScore * 100.0) / 100.0)
.build();
})
.sorted((a, b) -> Double.compare(b.getCompositeScore(), a.getCompositeScore()))
.collect(Collectors.toList());
return reactor.core.publisher.Flux.fromIterable(performances);
});
}
@Override
public Mono<CoachPerformance> getCoachPerformanceById(Long coachId, StatisticsQuery query) {
return getCoachPerformanceList(query)
.filter(p -> p.getCoachId().equals(coachId))
.next()
.switchIfEmpty(Mono.just(CoachPerformance.builder()
.coachId(coachId)
.coachName("未知教练")
.completedCourses(0L)
.attendedStudents(0L)
.totalBookings(0L)
.attendanceRate(0.0)
.fillRate(0.0)
.violationCount(0L)
.compositeScore(0.0)
.build()));
}
/**
* 计算满员率:各课程 (出席人数/maxMembers) 的平均值
*/
private double calculateFillRate(Collection<FillRateItem> items) {
if (items == null || items.isEmpty()) return 0;
return items.stream()
.mapToDouble(item -> item.maxMembers > 0
? (double) item.attended / item.maxMembers * 100 : 0)
.average()
.orElse(0);
}
private String getString(Map<String, Object> map, String key, String defaultValue) {
Object val = map.get(key);
return val != null ? val.toString() : defaultValue;
}
/**
* 满员率明细项
*/
private record FillRateItem(Long coachId, int maxMembers, long attended) {}
/**
* 根据周期类型调整时间范围
* 用于定时任务中的周期统计
*/
private LocalDateTime[] adjustTimeRangeByPeriod(LocalDate date, String periodType) {
LocalDateTime startTime;
LocalDateTime endTime;
if (DataStatistics.PeriodType.WEEK.equals(periodType)) {
startTime = date.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).atStartOfDay();
endTime = date.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)).atTime(23, 59, 59);
} else if (DataStatistics.PeriodType.MONTH.equals(periodType)) {
startTime = date.withDayOfMonth(1).atStartOfDay();
endTime = date.with(TemporalAdjusters.lastDayOfMonth()).atTime(23, 59, 59);
} else if (DataStatistics.PeriodType.LAST_30_DAYS.equals(periodType)) {
startTime = date.minusDays(29).atStartOfDay();
endTime = date.atTime(23, 59, 59);
} else if (DataStatistics.PeriodType.LAST_90_DAYS.equals(periodType)) {
startTime = date.minusDays(89).atStartOfDay();
endTime = date.atTime(23, 59, 59);
} else if (DataStatistics.PeriodType.YEAR.equals(periodType)) {
startTime = date.withDayOfYear(1).atStartOfDay();
endTime = date.atTime(23, 59, 59);
} else {
startTime = date.atStartOfDay();
endTime = date.plusDays(1).atStartOfDay();
}
return new LocalDateTime[]{startTime, endTime};
}
}

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