Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 liwentao
|
7e4035e0ae | ||
|
liwentao
|
e19324d0ef | ||
 future
|
e0e707edcb | ||
|
liwentao
|
8ab528a74b | ||
|
liwentao
|
de7a359ead | ||
|
future
|
fbb41911a2 | ||
|
future
|
223a427614 | ||
|
future
|
78c80c4b1d |
@@ -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
|
||||||
@@ -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
|
||||||
@@ -0,0 +1,252 @@
|
|||||||
|
<?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>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>
|
||||||
+43
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
+46
@@ -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 = "";
|
||||||
|
}
|
||||||
+43
@@ -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("-", "");
|
||||||
|
}
|
||||||
|
}
|
||||||
+13
@@ -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;
|
||||||
|
}
|
||||||
+209
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
+193
@@ -0,0 +1,193 @@
|
|||||||
|
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.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 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)));
|
||||||
|
}
|
||||||
|
}
|
||||||
+101
@@ -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);
|
||||||
|
}
|
||||||
+81
@@ -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);
|
||||||
|
}
|
||||||
+439
@@ -0,0 +1,439 @@
|
|||||||
|
package cn.novalon.gym.manage.checkIn.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
|
import cn.hutool.json.JSONUtil;
|
||||||
|
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.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 cn.hutool.extra.qrcode.QrCodeUtil;
|
||||||
|
import cn.hutool.extra.qrcode.QrConfig;
|
||||||
|
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 static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Mono<QRCodeVo> getQRCode(Long memberId) {
|
||||||
|
log.info("开始查询会员信息, memberId: {}", memberId);
|
||||||
|
|
||||||
|
return findValidMemberCard(memberId)
|
||||||
|
.flatMap(cardRecord -> {
|
||||||
|
log.info("会员信息查询完成, memberCardRecordId: {}", cardRecord.getMemberCardRecordId());
|
||||||
|
|
||||||
|
log.info("开始生成二维码");
|
||||||
|
String qrContent = QRRedisKey.generateQrcodeContent();
|
||||||
|
Map<String, Object> redisMap = new HashMap<>();
|
||||||
|
redisMap.put("qrContent", qrContent);
|
||||||
|
redisMap.put("isUsed", false);
|
||||||
|
redisMap.put("memberId", memberId);
|
||||||
|
redisMap.put("memberCardRecordId", cardRecord.getMemberCardRecordId());
|
||||||
|
|
||||||
|
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());
|
||||||
|
}));
|
||||||
|
})
|
||||||
|
.switchIfEmpty(Mono.error(new RuntimeException("该会员没有可用的会员卡")));
|
||||||
|
}
|
||||||
|
|
||||||
|
@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 = ((Number) map.get("memberCardRecordId")).longValue();
|
||||||
|
|
||||||
|
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_CARD", "正在验证会员卡...");
|
||||||
|
|
||||||
|
return memberCardRecordRepository.findById(memberCardRecordId)
|
||||||
|
.switchIfEmpty(Mono.defer(() -> {
|
||||||
|
MyWebSocketHandler.sendFailure(qrContent, "会员卡记录不存在");
|
||||||
|
return Mono.error(new RuntimeException("会员卡记录不存在"));
|
||||||
|
}))
|
||||||
|
.flatMap(cardRecord -> {
|
||||||
|
if (!"ACTIVE".equals(cardRecord.getStatus().name())) {
|
||||||
|
MyWebSocketHandler.sendFailure(qrContent, "会员卡状态不正确");
|
||||||
|
return Mono.error(new RuntimeException("会员卡状态不正确"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cardRecord.getExpireTime() != null && cardRecord.getExpireTime().isBefore(now)) {
|
||||||
|
MyWebSocketHandler.sendFailure(qrContent, "会员卡已过期");
|
||||||
|
return Mono.error(new RuntimeException("会员卡已过期"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 发送实时进度通知
|
||||||
|
MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "会员卡验证通过，正在检查预约信息...");
|
||||||
|
|
||||||
|
// 检查是否有需要签到的团课预约
|
||||||
|
return validateBooking(memberId, now)
|
||||||
|
.then(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(cardRecord.getMemberCardId())
|
||||||
|
.switchIfEmpty(Mono.defer(() -> {
|
||||||
|
MyWebSocketHandler.sendFailure(qrContent, "会员卡类型不存在");
|
||||||
|
return Mono.error(new RuntimeException("会员卡类型不存在"));
|
||||||
|
}))
|
||||||
|
.flatMap(card -> {
|
||||||
|
// 发送实时进度通知
|
||||||
|
MyWebSocketHandler.sendProgress(qrContent, "DEDUCT_USAGE", "正在扣减会员卡次数...");
|
||||||
|
|
||||||
|
return deductCardUsage(cardRecord, card)
|
||||||
|
.flatMap(updatedRecord -> {
|
||||||
|
redisMap.put("isUsed", true);
|
||||||
|
redisMap.put("checkInTime", now.format(DATE_FORMATTER));
|
||||||
|
|
||||||
|
return saveSignInRecord(memberId, cardRecord.getMemberCardRecordId(), card.getMemberCardId())
|
||||||
|
.then(redisUtil.set(RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(), redisMap))
|
||||||
|
.then(Mono.defer(() -> {
|
||||||
|
String successMsg = buildSuccessResponse(now);
|
||||||
|
MyWebSocketHandler.sendSuccess(qrContent, memberId, now.format(DATE_FORMATTER));
|
||||||
|
log.info("签到成功, memberId: {}, cardRecordId: {}", memberId, memberCardRecordId);
|
||||||
|
return Mono.just(successMsg);
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 验证预约信息
|
||||||
|
*/
|
||||||
|
private Mono<Void> 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();
|
||||||
|
}
|
||||||
|
boolean hasValidBooking = bookings.stream()
|
||||||
|
.anyMatch(b -> {
|
||||||
|
LocalDateTime startTime = b.getCourseStartTime();
|
||||||
|
return startTime != null &&
|
||||||
|
!startTime.isBefore(now.minusMinutes(30)) &&
|
||||||
|
!startTime.isAfter(now.plusMinutes(30));
|
||||||
|
});
|
||||||
|
if (hasValidBooking) {
|
||||||
|
log.info("会员{}有有效的团课预约", memberId);
|
||||||
|
} else {
|
||||||
|
log.warn("会员{}有预约但不在签到时间范围内", memberId);
|
||||||
|
}
|
||||||
|
return Mono.empty();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 扣减会员卡使用次数/金额
|
||||||
|
*/
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
+23
@@ -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;
|
||||||
|
}
|
||||||
+66
@@ -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;
|
||||||
|
}
|
||||||
+62
@@ -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;
|
||||||
|
}
|
||||||
+202
@@ -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，如果启用Logo（logo-enabled: true），必须设置为 H
|
||||||
|
logo-enabled: false # 是否启用Logo（启用时error-correction必须为H）
|
||||||
|
# logo-path: static/logo.png # Logo图片路径（支持相对路径或绝对路径）
|
||||||
+281
@@ -0,0 +1,281 @@
|
|||||||
|
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.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 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);
|
||||||
|
|
||||||
|
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(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 @@
|
|||||||
|
# Test Configuration
|
||||||
@@ -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
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
<?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>
|
||||||
|
<version>5.2.5</version>
|
||||||
|
</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.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</project>
|
||||||
+15
@@ -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 {
|
||||||
|
}
|
||||||
+183
@@ -0,0 +1,183 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 数据统计 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+64
@@ -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;
|
||||||
|
}
|
||||||
+79
@@ -0,0 +1,79 @@
|
|||||||
|
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";
|
||||||
|
|
||||||
|
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() {}
|
||||||
|
}
|
||||||
|
}
|
||||||
+54
@@ -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;
|
||||||
|
}
|
||||||
+64
@@ -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;
|
||||||
|
}
|
||||||
+52
@@ -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;
|
||||||
|
}
|
||||||
+44
@@ -0,0 +1,44 @@
|
|||||||
|
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 String generatedAt;
|
||||||
|
}
|
||||||
+125
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
+109
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+78
@@ -0,0 +1,78 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
+513
@@ -0,0 +1,513 @@
|
|||||||
|
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.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 数据统计服务实现类
|
||||||
|
*
|
||||||
|
* @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;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Mono<StatisticsSummary> getStatisticsSummary(StatisticsQuery query) {
|
||||||
|
Mono<MemberStatistics> memberStatsMono = getMemberStatistics(query);
|
||||||
|
Mono<BookingStatistics> bookingStatsMono = getBookingStatistics(query);
|
||||||
|
Mono<SignInStatistics> signInStatsMono = getSignInStatistics(query);
|
||||||
|
|
||||||
|
return Mono.zip(memberStatsMono, bookingStatsMono, signInStatsMono)
|
||||||
|
.map(tuple -> StatisticsSummary.builder()
|
||||||
|
.statDate(LocalDateTime.now().toLocalDate().toString())
|
||||||
|
.memberStatistics(tuple.getT1())
|
||||||
|
.bookingStatistics(tuple.getT2())
|
||||||
|
.signInStatistics(tuple.getT3())
|
||||||
|
.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 {
|
||||||
|
// 日统计：当天零点
|
||||||
|
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)) {
|
||||||
|
// 周统计：本周日 23:59:59
|
||||||
|
return today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)).atTime(23, 59, 59);
|
||||||
|
} else if (DataStatistics.PeriodType.MONTH.equals(periodType)) {
|
||||||
|
// 月统计：本月最后一天 23:59:59
|
||||||
|
return today.with(TemporalAdjusters.lastDayOfMonth()).atTime(23, 59, 59);
|
||||||
|
} else {
|
||||||
|
// 日统计：当前时间
|
||||||
|
return LocalDateTime.now();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据周期类型调整时间范围
|
||||||
|
* 用于定时任务中的周期统计
|
||||||
|
*/
|
||||||
|
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 {
|
||||||
|
startTime = date.atStartOfDay();
|
||||||
|
endTime = date.plusDays(1).atStartOfDay();
|
||||||
|
}
|
||||||
|
|
||||||
|
return new LocalDateTime[]{startTime, endTime};
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
cn.novalon.gym.manage.datacount.config.DataCountAutoConfiguration
|
||||||
+152
-200
File diff suppressed because one or more lines are too long
@@ -43,6 +43,16 @@
|
|||||||
<artifactId>gym-member</artifactId>
|
<artifactId>gym-member</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>cn.novalon.gym.manage</groupId>
|
||||||
|
<artifactId>gym-checkIn</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>cn.novalon.gym.manage</groupId>
|
||||||
|
<artifactId>gym-dataCount</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
|||||||
+2
-4
@@ -7,10 +7,7 @@ import org.springframework.boot.CommandLineRunner;
|
|||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDetailsServiceAutoConfiguration;
|
import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDetailsServiceAutoConfiguration;
|
||||||
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.ComponentScan;
|
|
||||||
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
|
|
||||||
import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
|
import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
|
||||||
import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
|
import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
|
||||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||||
@@ -26,7 +23,8 @@ import java.util.List;
|
|||||||
"cn.novalon.gym.manage.sys.audit.repository" ,
|
"cn.novalon.gym.manage.sys.audit.repository" ,
|
||||||
"cn.novalon.gym.manage.gymmembercard.dao",
|
"cn.novalon.gym.manage.gymmembercard.dao",
|
||||||
"cn.novalon.gym.manage.member.repository",
|
"cn.novalon.gym.manage.member.repository",
|
||||||
"cn.novalon.gym.manage.groupcourse.dao"
|
"cn.novalon.gym.manage.groupcourse.dao",
|
||||||
|
"cn.novalon.gym.manage.checkIn.repository"
|
||||||
})
|
})
|
||||||
@EnableReactiveElasticsearchRepositories(basePackages = "cn.novalon.gym.manage.member.es.repository")
|
@EnableReactiveElasticsearchRepositories(basePackages = "cn.novalon.gym.manage.member.es.repository")
|
||||||
public class ManageApplication {
|
public class ManageApplication {
|
||||||
|
|||||||
+33
-2
@@ -1,6 +1,8 @@
|
|||||||
package cn.novalon.gym.manage.app.config;
|
package cn.novalon.gym.manage.app.config;
|
||||||
|
|
||||||
|
|
||||||
|
import cn.novalon.gym.manage.checkIn.handler.CheckInHandler;
|
||||||
|
import cn.novalon.gym.manage.datacount.handler.DataStatisticsHandler;
|
||||||
import cn.novalon.gym.manage.file.handler.SysFileHandler;
|
import cn.novalon.gym.manage.file.handler.SysFileHandler;
|
||||||
import cn.novalon.gym.manage.groupcourse.handler.GroupCourseBookingHandler;
|
import cn.novalon.gym.manage.groupcourse.handler.GroupCourseBookingHandler;
|
||||||
import cn.novalon.gym.manage.groupcourse.handler.GroupCourseHandler;
|
import cn.novalon.gym.manage.groupcourse.handler.GroupCourseHandler;
|
||||||
@@ -66,7 +68,9 @@ public class SystemRouter {
|
|||||||
MemberCardRecordHandler memberCardRecordHandler,
|
MemberCardRecordHandler memberCardRecordHandler,
|
||||||
MemberCardTransactionHandler memberCardTransactionHandler,
|
MemberCardTransactionHandler memberCardTransactionHandler,
|
||||||
GroupCourseHandler groupCourseHandler,
|
GroupCourseHandler groupCourseHandler,
|
||||||
GroupCourseBookingHandler groupCourseBookingHandler) {
|
GroupCourseBookingHandler groupCourseBookingHandler,
|
||||||
|
CheckInHandler checkInHandler,
|
||||||
|
DataStatisticsHandler dataStatisticsHandler) {
|
||||||
|
|
||||||
return route()
|
return route()
|
||||||
// ========== 诊断路由 ==========
|
// ========== 诊断路由 ==========
|
||||||
@@ -272,9 +276,36 @@ public class SystemRouter {
|
|||||||
.POST("/api/groupCourse/book", groupCourseBookingHandler::bookCourse)
|
.POST("/api/groupCourse/book", groupCourseBookingHandler::bookCourse)
|
||||||
.POST("/api/groupCourse/booking/{bookingId}/cancel", groupCourseBookingHandler::cancelBooking)
|
.POST("/api/groupCourse/booking/{bookingId}/cancel", groupCourseBookingHandler::cancelBooking)
|
||||||
.GET("/api/groupCourse/bookings/member/{memberId}", groupCourseBookingHandler::getBookingsByMemberId)
|
.GET("/api/groupCourse/bookings/member/{memberId}", groupCourseBookingHandler::getBookingsByMemberId)
|
||||||
.GET("/api/groupCourse/bookings/{bookingId}", groupCourseBookingHandler::getBookingById)
|
|
||||||
.GET("/api/groupCourse/bookings/course/{courseId}", groupCourseBookingHandler::getBookingsByCourseId)
|
.GET("/api/groupCourse/bookings/course/{courseId}", groupCourseBookingHandler::getBookingsByCourseId)
|
||||||
|
.GET("/api/groupCourse/bookings/{bookingId}", groupCourseBookingHandler::getBookingById)
|
||||||
|
|
||||||
|
// ========= 签到模块路由 ==========
|
||||||
|
// ===== 签到核心功能 =====
|
||||||
|
.POST("/api/checkIn", checkInHandler::checkIn)
|
||||||
|
.GET("/api/checkIn/qrcode", checkInHandler::getQRCode)
|
||||||
|
|
||||||
|
// ===== 签到记录管理 =====
|
||||||
|
.GET("/api/checkIn/records", checkInHandler::getSignInRecords)
|
||||||
|
.GET("/api/checkIn/records/{id}", checkInHandler::getSignInRecordById)
|
||||||
|
|
||||||
|
// ===== 签到统计 =====
|
||||||
|
.GET("/api/checkIn/statistics", checkInHandler::getSignInStatistics)
|
||||||
|
.GET("/api/checkIn/daily-stats", checkInHandler::getDailySignInStats)
|
||||||
|
|
||||||
|
// ===== 签到数据导出 =====
|
||||||
|
.GET("/api/checkIn/records/export", checkInHandler::exportSignInRecords)
|
||||||
|
|
||||||
|
// ========================================
|
||||||
|
// ========== 数据统计模块路由 ============
|
||||||
|
// ========================================
|
||||||
|
|
||||||
|
// ===== 数据统计核心功能 =====
|
||||||
|
.GET("/api/datacount/summary", dataStatisticsHandler::getStatisticsSummary)
|
||||||
|
.GET("/api/datacount/member", dataStatisticsHandler::getMemberStatistics)
|
||||||
|
.GET("/api/datacount/booking", dataStatisticsHandler::getBookingStatistics)
|
||||||
|
.GET("/api/datacount/signin", dataStatisticsHandler::getSignInStatistics)
|
||||||
|
.GET("/api/datacount/history", dataStatisticsHandler::queryHistoricalStatistics)
|
||||||
|
.GET("/api/datacount/export", dataStatisticsHandler::exportStatistics)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ spring:
|
|||||||
name: gym-manage-api
|
name: gym-manage-api
|
||||||
main:
|
main:
|
||||||
allow-bean-definition-overriding: true
|
allow-bean-definition-overriding: true
|
||||||
|
web-application-type: reactive
|
||||||
cache:
|
cache:
|
||||||
type: none
|
type: none
|
||||||
autoconfigure:
|
autoconfigure:
|
||||||
|
|||||||
@@ -56,6 +56,10 @@
|
|||||||
<artifactId>spring-boot-starter-test</artifactId>
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.data</groupId>
|
||||||
|
<artifactId>spring-data-redis</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
+64
@@ -0,0 +1,64 @@
|
|||||||
|
package cn.novalon.gym.manage.common.constant;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Redis 缓存 Key 常量类
|
||||||
|
* 统一管理项目中所有 Redis 缓存的 key 前缀
|
||||||
|
*
|
||||||
|
* @author auto-generated
|
||||||
|
* @date 2026-05-30
|
||||||
|
*/
|
||||||
|
public final class RedisKeyConstants {
|
||||||
|
|
||||||
|
private RedisKeyConstants() {
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== 会员模块 ====================
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会员信息缓存
|
||||||
|
* 格式：member:info:{memberId}
|
||||||
|
*/
|
||||||
|
public static final String MEMBER_INFO = "member:info:";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会员详情缓存
|
||||||
|
* 格式：member:detail:{memberId}
|
||||||
|
*/
|
||||||
|
public static final String MEMBER_DETAIL = "member:detail:";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会员卡类型缓存
|
||||||
|
* 格式：member:card:{memberCardId}
|
||||||
|
*/
|
||||||
|
public static final String MEMBER_CARD = "member:card:";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会员卡记录缓存（包含剩余次数/金额）
|
||||||
|
* 格式：member:card:record:{recordId}
|
||||||
|
*/
|
||||||
|
public static final String MEMBER_CARD_RECORD = "member:card:record:";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会员退款申请缓存
|
||||||
|
* 格式：member:refund:{recordId}
|
||||||
|
*/
|
||||||
|
public static final String MEMBER_REFUND = "member:refund:";
|
||||||
|
|
||||||
|
// ==================== 签到模块 ====================
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户当日二维码缓存
|
||||||
|
* 格式：qrcode:user:daily:{userId}:{date}
|
||||||
|
* 示例：qrcode:user:daily:1:2026-05-30
|
||||||
|
*/
|
||||||
|
public static final String QRCODE_USER_DAILY = "qrcode:user:daily:";
|
||||||
|
|
||||||
|
// ==================== 微信模块 ====================
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 微信 access_token 缓存
|
||||||
|
* 格式：wechat:access_token:{appType}
|
||||||
|
* appType: miniapp(小程序), mp(公众号)
|
||||||
|
*/
|
||||||
|
public static final String WECHAT_ACCESS_TOKEN = "wechat:access_token:";
|
||||||
|
}
|
||||||
+74
@@ -0,0 +1,74 @@
|
|||||||
|
-- ============================================
|
||||||
|
-- 会员到店签到记录表
|
||||||
|
-- 版本: V13
|
||||||
|
-- 描述: 创建sign_in_record表，用于记录会员签到信息
|
||||||
|
-- ============================================
|
||||||
|
|
||||||
|
-- 创建签到记录表
|
||||||
|
CREATE TABLE IF NOT EXISTS sign_in_record (
|
||||||
|
id BIGSERIAL PRIMARY KEY, -- 自增主键
|
||||||
|
member_id BIGINT NOT NULL, -- 会员ID，关联member表
|
||||||
|
member_card_id BIGINT, -- 签到时使用的会员卡ID
|
||||||
|
sign_in_time TIMESTAMP NOT NULL, -- 签到入场时间
|
||||||
|
sign_in_type VARCHAR(20) NOT NULL, -- 签到方式：QR_CODE-扫码签到，MANUAL-手动签到，FACE-人脸识别
|
||||||
|
sign_in_status VARCHAR(20) NOT NULL DEFAULT 'SUCCESS', -- 签到状态：SUCCESS-成功，FAILED-失败
|
||||||
|
verification_details TEXT, -- JSON格式，存储会员卡验证时的快照数据
|
||||||
|
fail_reason VARCHAR(500), -- 失败时的具体原因文案
|
||||||
|
operator_id BIGINT, -- 操作人ID（前台人员），自助签到时为NULL
|
||||||
|
operator_name VARCHAR(100), -- 操作人姓名冗余
|
||||||
|
device_info VARCHAR(200), -- 签到设备标识或型号
|
||||||
|
ip_address VARCHAR(50), -- 客户端IP地址
|
||||||
|
source VARCHAR(20) NOT NULL, -- 签到来源：MINI_PROGRAM-小程序扫码，PC_BACKEND-后台管理端
|
||||||
|
is_delete BOOLEAN DEFAULT FALSE, -- 软删除标识：false-未删除，true-已删除
|
||||||
|
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -- 记录创建时间
|
||||||
|
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP -- 记录更新时间
|
||||||
|
);
|
||||||
|
|
||||||
|
-- 创建索引
|
||||||
|
-- 会员ID索引（加速按会员查询签到记录）
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_sign_in_record_member_id ON sign_in_record(member_id);
|
||||||
|
|
||||||
|
-- 签到时间索引（加速按时间范围查询）
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_sign_in_record_sign_in_time ON sign_in_record(sign_in_time);
|
||||||
|
|
||||||
|
-- 签到状态索引（加速按状态筛选）
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_sign_in_record_sign_in_status ON sign_in_record(sign_in_status);
|
||||||
|
|
||||||
|
-- 会员卡ID索引（加速按会员卡查询）
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_sign_in_record_member_card_id ON sign_in_record(member_card_id);
|
||||||
|
|
||||||
|
-- 操作人ID索引（加速按操作人查询）
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_sign_in_record_operator_id ON sign_in_record(operator_id);
|
||||||
|
|
||||||
|
-- 签到来源索引（加速按来源统计）
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_sign_in_record_source ON sign_in_record(source);
|
||||||
|
|
||||||
|
-- 软删除索引（加速查询未删除的记录）
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_sign_in_record_is_delete ON sign_in_record(is_delete);
|
||||||
|
|
||||||
|
-- 复合索引：会员ID + 签到时间（加速会员签到历史查询）
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_sign_in_record_member_time ON sign_in_record(member_id, sign_in_time);
|
||||||
|
|
||||||
|
-- 复合索引：签到状态 + 签到时间（加速统计数据查询）
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_sign_in_record_status_time ON sign_in_record(sign_in_status, sign_in_time);
|
||||||
|
|
||||||
|
-- 添加表注释
|
||||||
|
COMMENT ON TABLE sign_in_record IS '会员到店签到记录表';
|
||||||
|
|
||||||
|
-- 添加字段注释
|
||||||
|
COMMENT ON COLUMN sign_in_record.id IS '自增主键';
|
||||||
|
COMMENT ON COLUMN sign_in_record.member_id IS '会员ID，关联member表';
|
||||||
|
COMMENT ON COLUMN sign_in_record.member_card_id IS '签到时使用的会员卡ID';
|
||||||
|
COMMENT ON COLUMN sign_in_record.sign_in_time IS '签到入场时间';
|
||||||
|
COMMENT ON COLUMN sign_in_record.sign_in_type IS '签到方式：QR_CODE-扫码签到，MANUAL-手动签到，FACE-人脸识别';
|
||||||
|
COMMENT ON COLUMN sign_in_record.sign_in_status IS '签到状态：SUCCESS-成功，FAILED-失败';
|
||||||
|
COMMENT ON COLUMN sign_in_record.verification_details IS 'JSON格式，存储会员卡验证时的快照数据';
|
||||||
|
COMMENT ON COLUMN sign_in_record.fail_reason IS '失败时的具体原因文案';
|
||||||
|
COMMENT ON COLUMN sign_in_record.operator_id IS '操作人ID（前台人员），自助签到时为NULL';
|
||||||
|
COMMENT ON COLUMN sign_in_record.operator_name IS '操作人姓名冗余';
|
||||||
|
COMMENT ON COLUMN sign_in_record.device_info IS '签到设备标识或型号';
|
||||||
|
COMMENT ON COLUMN sign_in_record.ip_address IS '客户端IP地址';
|
||||||
|
COMMENT ON COLUMN sign_in_record.source IS '签到来源：MINI_PROGRAM-小程序扫码，PC_BACKEND-后台管理端';
|
||||||
|
COMMENT ON COLUMN sign_in_record.is_delete IS '软删除标识：false-未删除，true-已删除';
|
||||||
|
COMMENT ON COLUMN sign_in_record.created_at IS '记录创建时间';
|
||||||
|
COMMENT ON COLUMN sign_in_record.updated_at IS '记录更新时间';
|
||||||
+120
@@ -0,0 +1,120 @@
|
|||||||
|
-- 数据统计模块测试数据
|
||||||
|
-- 用于测试会员、预约、签到统计接口
|
||||||
|
|
||||||
|
-- 插入测试会员数据
|
||||||
|
INSERT INTO member_user (id, member_no, nickname, phone, created_at, updated_at, is_deleted) VALUES
|
||||||
|
(1001, 'M20260601001', '张三', '13800138001', '2026-06-01 08:00:00', '2026-06-01 08:00:00', false),
|
||||||
|
(1002, 'M20260601002', '李四', '13800138002', '2026-06-01 09:00:00', '2026-06-01 09:00:00', false),
|
||||||
|
(1003, 'M20260602003', '王五', '13800138003', '2026-06-02 10:00:00', '2026-06-02 10:00:00', false),
|
||||||
|
(1004, 'M20260603004', '赵六', '13800138004', '2026-06-03 11:00:00', '2026-06-03 11:00:00', false),
|
||||||
|
(1005, 'M20260609005', '钱七', '13800138005', '2026-06-09 08:00:00', '2026-06-09 08:00:00', false),
|
||||||
|
(1006, 'M20260609006', '孙八', '13800138006', '2026-06-09 09:00:00', '2026-06-09 09:00:00', false),
|
||||||
|
(1007, 'M20260609007', '周九', '13800138007', '2026-06-09 10:00:00', '2026-06-09 10:00:00', false),
|
||||||
|
(1008, 'M20260604008', '吴十', '13800138008', '2026-06-04 14:00:00', '2026-06-04 14:00:00', false),
|
||||||
|
(1009, 'M20260605009', '郑十一', '13800138009', '2026-06-05 15:00:00', '2026-06-05 15:00:00', false),
|
||||||
|
(1010, 'M20260606010', '王十二', '13800138010', '2026-06-06 16:00:00', '2026-06-06 16:00:00', false),
|
||||||
|
(1011, 'M20260607011', '陈十三', '13800138011', '2026-06-07 17:00:00', '2026-06-07 17:00:00', false),
|
||||||
|
(1012, 'M20260608012', '刘十四', '13800138012', '2026-06-08 18:00:00', '2026-06-08 18:00:00', false)
|
||||||
|
ON CONFLICT (id) DO NOTHING;
|
||||||
|
|
||||||
|
-- 插入测试签到记录数据 (今天的数据)
|
||||||
|
INSERT INTO sign_in_record (id, member_id, sign_in_time, sign_in_type, sign_in_status, source, is_delete) VALUES
|
||||||
|
(2001, 1001, '2026-06-09 08:00:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2002, 1002, '2026-06-09 08:15:00', 'MANUAL', 'SUCCESS', 'PC_BACKEND', false),
|
||||||
|
(2003, 1003, '2026-06-09 08:30:00', 'FACE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2004, 1004, '2026-06-09 09:00:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2005, 1005, '2026-06-09 09:15:00', 'MANUAL', 'SUCCESS', 'PC_BACKEND', false),
|
||||||
|
(2006, 1006, '2026-06-09 09:30:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2007, 1007, '2026-06-09 10:00:00', 'FACE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2008, 1008, '2026-06-09 10:15:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2009, 1009, '2026-06-09 10:30:00', 'MANUAL', 'SUCCESS', 'PC_BACKEND', false),
|
||||||
|
(2010, 1010, '2026-06-09 11:00:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2011, 1011, '2026-06-09 11:15:00', 'FACE', 'FAIL', 'MINI_PROGRAM', false),
|
||||||
|
(2012, 1012, '2026-06-09 11:30:00', 'MANUAL', 'SUCCESS', 'PC_BACKEND', false)
|
||||||
|
ON CONFLICT (id) DO NOTHING;
|
||||||
|
|
||||||
|
-- 插入测试签到记录数据 (昨天的数据)
|
||||||
|
INSERT INTO sign_in_record (id, member_id, sign_in_time, sign_in_type, sign_in_status, source, is_delete) VALUES
|
||||||
|
(2013, 1001, '2026-06-08 07:30:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2014, 1002, '2026-06-08 08:00:00', 'MANUAL', 'SUCCESS', 'PC_BACKEND', false),
|
||||||
|
(2015, 1003, '2026-06-08 08:30:00', 'FACE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2016, 1004, '2026-06-08 09:00:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2017, 1005, '2026-06-08 09:30:00', 'MANUAL', 'SUCCESS', 'PC_BACKEND', false),
|
||||||
|
(2018, 1006, '2026-06-08 10:00:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2019, 1007, '2026-06-08 10:30:00', 'FACE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2020, 1008, '2026-06-08 11:00:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false)
|
||||||
|
ON CONFLICT (id) DO NOTHING;
|
||||||
|
|
||||||
|
-- 插入测试签到记录数据 (前天的数据)
|
||||||
|
INSERT INTO sign_in_record (id, member_id, sign_in_time, sign_in_type, sign_in_status, source, is_delete) VALUES
|
||||||
|
(2021, 1001, '2026-06-07 07:00:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2022, 1002, '2026-06-07 07:30:00', 'MANUAL', 'SUCCESS', 'PC_BACKEND', false),
|
||||||
|
(2023, 1003, '2026-06-07 08:00:00', 'FACE', 'FAIL', 'MINI_PROGRAM', false),
|
||||||
|
(2024, 1004, '2026-06-07 08:30:00', 'QR_CODE', 'SUCCESS', 'MINI_PROGRAM', false),
|
||||||
|
(2025, 1005, '2026-06-07 09:00:00', 'MANUAL', 'SUCCESS', 'PC_BACKEND', false)
|
||||||
|
ON CONFLICT (id) DO NOTHING;
|
||||||
|
|
||||||
|
-- 插入测试团课数据
|
||||||
|
INSERT INTO group_course (id, course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, created_at, updated_at) VALUES
|
||||||
|
(3001, '瑜伽入门', 1, 1, '2026-06-09 08:00:00', '2026-06-09 09:00:00', 20, 15, 0, '健身房A区', 'https://example.com/yoga.jpg', '适合初学者的瑜伽课程', '2026-06-01 10:00:00', '2026-06-01 10:00:00'),
|
||||||
|
(3002, '动感单车', 2, 2, '2026-06-09 09:30:00', '2026-06-09 10:30:00', 25, 20, 0, '健身房B区', 'https://example.com/spinning.jpg', '高强度有氧运动', '2026-06-01 11:00:00', '2026-06-01 11:00:00'),
|
||||||
|
(3003, '普拉提', 3, 1, '2026-06-09 14:00:00', '2026-06-09 15:00:00', 15, 10, 0, '健身房C区', 'https://example.com/pilates.jpg', '核心力量训练', '2026-06-01 12:00:00', '2026-06-01 12:00:00')
|
||||||
|
ON CONFLICT (id) DO NOTHING;
|
||||||
|
|
||||||
|
-- 插入测试团课预约数据 (今天的数据)
|
||||||
|
INSERT INTO group_course_booking (id, member_id, member_card_id, course_id, booking_time, status, created_at, updated_at) VALUES
|
||||||
|
(4001, 1001, 1, 3001, '2026-06-09 08:00:00', '2', '2026-06-08 20:00:00', '2026-06-09 08:30:00'),
|
||||||
|
(4002, 1002, 2, 3001, '2026-06-09 08:00:00', '2', '2026-06-08 21:00:00', '2026-06-09 08:30:00'),
|
||||||
|
(4003, 1003, 3, 3001, '2026-06-09 08:00:00', '3', '2026-06-08 22:00:00', '2026-06-09 09:00:00'),
|
||||||
|
(4004, 1004, 4, 3002, '2026-06-09 09:30:00', '2', '2026-06-08 19:00:00', '2026-06-09 09:30:00'),
|
||||||
|
(4005, 1005, 5, 3002, '2026-06-09 09:30:00', '1', '2026-06-08 20:30:00', '2026-06-09 09:00:00'),
|
||||||
|
(4006, 1006, 6, 3002, '2026-06-09 09:30:00', '2', '2026-06-08 21:30:00', '2026-06-09 09:30:00'),
|
||||||
|
(4007, 1007, 7, 3003, '2026-06-09 14:00:00', '2', '2026-06-08 22:30:00', '2026-06-09 14:00:00'),
|
||||||
|
(4008, 1008, 8, 3003, '2026-06-09 14:00:00', '3', '2026-06-09 08:00:00', '2026-06-09 14:00:00'),
|
||||||
|
(4009, 1009, 9, 3003, '2026-06-09 14:00:00', '2', '2026-06-09 09:00:00', '2026-06-09 14:00:00'),
|
||||||
|
(4010, 1010, 10, 3001, '2026-06-09 08:00:00', '2', '2026-06-09 07:00:00', '2026-06-09 08:00:00'),
|
||||||
|
(4011, 1011, 11, 3002, '2026-06-09 09:30:00', '1', '2026-06-09 08:30:00', '2026-06-09 09:00:00'),
|
||||||
|
(4012, 1012, 12, 3003, '2026-06-09 14:00:00', '2', '2026-06-09 10:00:00', '2026-06-09 14:00:00')
|
||||||
|
ON CONFLICT (id) DO NOTHING;
|
||||||
|
|
||||||
|
-- 插入测试团课预约数据 (昨天的数据)
|
||||||
|
INSERT INTO group_course_booking (id, member_id, member_card_id, course_id, booking_time, status, created_at, updated_at) VALUES
|
||||||
|
(4013, 1001, 1, 3001, '2026-06-08 08:00:00', '2', '2026-06-07 20:00:00', '2026-06-08 08:30:00'),
|
||||||
|
(4014, 1002, 2, 3001, '2026-06-08 08:00:00', '2', '2026-06-07 21:00:00', '2026-06-08 08:30:00'),
|
||||||
|
(4015, 1003, 3, 3002, '2026-06-08 09:30:00', '3', '2026-06-07 22:00:00', '2026-06-08 09:30:00'),
|
||||||
|
(4016, 1004, 4, 3002, '2026-06-08 09:30:00', '2', '2026-06-07 19:00:00', '2026-06-08 09:30:00'),
|
||||||
|
(4017, 1005, 5, 3003, '2026-06-08 14:00:00', '1', '2026-06-07 20:30:00', '2026-06-08 13:00:00'),
|
||||||
|
(4018, 1006, 6, 3003, '2026-06-08 14:00:00', '2', '2026-06-07 21:30:00', '2026-06-08 14:00:00')
|
||||||
|
ON CONFLICT (id) DO NOTHING;
|
||||||
|
|
||||||
|
-- 插入测试团课预约数据 (前天的数据)
|
||||||
|
INSERT INTO group_course_booking (id, member_id, member_card_id, course_id, booking_time, status, created_at, updated_at) VALUES
|
||||||
|
(4019, 1001, 1, 3002, '2026-06-07 09:30:00', '2', '2026-06-06 20:00:00', '2026-06-07 09:30:00'),
|
||||||
|
(4020, 1002, 2, 3002, '2026-06-07 09:30:00', '2', '2026-06-06 21:00:00', '2026-06-07 09:30:00'),
|
||||||
|
(4021, 1003, 3, 3003, '2026-06-07 14:00:00', '2', '2026-06-06 22:00:00', '2026-06-07 14:00:00'),
|
||||||
|
(4022, 1004, 4, 3003, '2026-06-07 14:00:00', '3', '2026-06-06 19:00:00', '2026-06-07 14:00:00')
|
||||||
|
ON CONFLICT (id) DO NOTHING;
|
||||||
|
|
||||||
|
-- 预期统计结果 (今日):
|
||||||
|
-- 会员统计:
|
||||||
|
-- 新增会员: 3 (1005, 1006, 1007)
|
||||||
|
-- 活跃会员: 12 (所有会员今日或近期有活动)
|
||||||
|
-- 总会员数: 12
|
||||||
|
-- 签到会员: 12
|
||||||
|
-- 预约会员: 9
|
||||||
|
-- 取消会员: 2
|
||||||
|
|
||||||
|
-- 预约统计:
|
||||||
|
-- 总预约: 12
|
||||||
|
-- 取消: 2
|
||||||
|
-- 出席: 8
|
||||||
|
-- 缺席: 2
|
||||||
|
-- 出席率: 8/10 = 80%
|
||||||
|
-- 取消率: 2/12 = 16.67%
|
||||||
|
|
||||||
|
-- 签到统计:
|
||||||
|
-- 总签到: 12
|
||||||
|
-- 成功: 11
|
||||||
|
-- 失败: 1
|
||||||
|
-- 成功率: 11/12 = 91.67%
|
||||||
|
-- 类型分布: QR_CODE=5, MANUAL=4, FACE=3
|
||||||
+1
@@ -61,6 +61,7 @@ public class JwtAuthenticationFilter extends AbstractGatewayFilterFactory<JwtAut
|
|||||||
path.equals("/api/member/auth/miniapp/login") ||
|
path.equals("/api/member/auth/miniapp/login") ||
|
||||||
path.equals("/api/member/auth/mp/callback") ||
|
path.equals("/api/member/auth/mp/callback") ||
|
||||||
path.equals("/api/auth/login") ||
|
path.equals("/api/auth/login") ||
|
||||||
|
path.startsWith("/api/checkIn/") ||
|
||||||
path.startsWith("/actuator/info");
|
path.startsWith("/actuator/info");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -63,7 +63,8 @@ public class RbacAuthorizationFilter extends AbstractGatewayFilterFactory<RbacAu
|
|||||||
private boolean isPublicPath(String path) {
|
private boolean isPublicPath(String path) {
|
||||||
return path.startsWith("/api/auth/") ||
|
return path.startsWith("/api/auth/") ||
|
||||||
path.equals("/actuator/health") ||
|
path.equals("/actuator/health") ||
|
||||||
path.startsWith("/actuator/info");
|
path.startsWith("/actuator/info") ||
|
||||||
|
path.startsWith("/api/checkIn/");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Config {
|
public static class Config {
|
||||||
|
|||||||
+3
-1
@@ -56,7 +56,9 @@ public class SecurityConfig {
|
|||||||
.pathMatchers("/api/admin/member/**").permitAll()
|
.pathMatchers("/api/admin/member/**").permitAll()
|
||||||
.pathMatchers("/api/member-cards/**").permitAll()
|
.pathMatchers("/api/member-cards/**").permitAll()
|
||||||
.pathMatchers("/api/member-card-records/**").permitAll()
|
.pathMatchers("/api/member-card-records/**").permitAll()
|
||||||
.pathMatchers("/api/member-card-transactions/**").permitAll();
|
.pathMatchers("/**").permitAll()
|
||||||
|
.pathMatchers("/api/member-card-transactions/**").permitAll()
|
||||||
|
.pathMatchers("/api/checkIn/**").permitAll();
|
||||||
|
|
||||||
|
|
||||||
if (isDevOrTest) {
|
if (isDevOrTest) {
|
||||||
|
|||||||
@@ -44,6 +44,8 @@
|
|||||||
<module>manage-file</module>
|
<module>manage-file</module>
|
||||||
<module>gym-member</module>
|
<module>gym-member</module>
|
||||||
<module>gym-groupCourse</module>
|
<module>gym-groupCourse</module>
|
||||||
|
<module>gym-checkIn</module>
|
||||||
|
<module>gym-dataCount</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
|
|||||||
Reference in New Issue
Block a user