revert: roll back signature quality period trends

This commit is contained in:
hectorzhao
2026-08-09 23:24:50 +08:00
parent e0c8f82bcf
commit 232d1c22a3
11 changed files with 38 additions and 393 deletions
+3 -21
View File
@@ -677,7 +677,6 @@ describe('OperationsService', () => {
averageArrivalMs: 1200, averageArrivalMs: 1200,
rowCount: 12, rowCount: 12,
}]) }])
.mockResolvedValueOnce([{ count: 4 }])
.mockResolvedValueOnce([ .mockResolvedValueOnce([
{ {
signatureId: 'signature-1', signatureId: 'signature-1',
@@ -728,18 +727,6 @@ describe('OperationsService', () => {
averageArrivalMs: 1800, averageArrivalMs: 1800,
}, },
]); ]);
prisma.$queryRaw.mockResolvedValueOnce([
{
signatureId: 'signature-1',
channelId: 'channel-1',
channelName: '通道一',
carrier: 'mobile',
date: '2026-07-24',
businessMessageCount: 3,
deliveredMessageCount: 2,
deliveryRate: 66.7,
},
]);
const service = new OperationsService(prisma as never); const service = new OperationsService(prisma as never);
await expect(service.signatureQuality({ await expect(service.signatureQuality({
@@ -749,7 +736,6 @@ describe('OperationsService', () => {
pageSize: 5, pageSize: 5,
})).resolves.toEqual({ })).resolves.toEqual({
date: '2026-07-24', date: '2026-07-24',
selectedDaySignatureCount: 4,
items: [expect.objectContaining({ items: [expect.objectContaining({
signatureId: 'signature-1', signatureId: 'signature-1',
signatureName: '【测试签名】', signatureName: '【测试签名】',
@@ -777,31 +763,27 @@ describe('OperationsService', () => {
expect.objectContaining({ channelId: 'channel-1', carrier: 'mobile', drainageState: 'with', total: 4 }), expect.objectContaining({ channelId: 'channel-1', carrier: 'mobile', drainageState: 'with', total: 4 }),
expect.objectContaining({ channelId: 'channel-2', carrier: 'telecom', drainageState: 'without', total: 2 }), expect.objectContaining({ channelId: 'channel-2', carrier: 'telecom', drainageState: 'without', total: 2 }),
], ],
dailyBreakdowns: [
expect.objectContaining({ channelId: 'channel-1', carrier: 'mobile', date: '2026-07-24', businessMessageCount: 3 }),
],
})], })],
total: 12, total: 12,
page: 2, page: 2,
pageSize: 5, pageSize: 5,
}); });
expect(prisma.$queryRaw).toHaveBeenCalledTimes(5); expect(prisma.$queryRaw).toHaveBeenCalledTimes(3);
}); });
it('does not query channel details when the selected date has no registered signatures', async () => { it('does not query channel details when the selected date has no registered signatures', async () => {
const prisma = createPrismaMock(); const prisma = createPrismaMock();
prisma.$queryRaw.mockResolvedValueOnce([]).mockResolvedValueOnce([{ count: 0 }]); prisma.$queryRaw.mockResolvedValueOnce([]);
const service = new OperationsService(prisma as never); const service = new OperationsService(prisma as never);
await expect(service.signatureQuality({ date: '2026-07-24' })).resolves.toEqual({ await expect(service.signatureQuality({ date: '2026-07-24' })).resolves.toEqual({
date: '2026-07-24', date: '2026-07-24',
selectedDaySignatureCount: 0,
items: [], items: [],
total: 0, total: 0,
page: 1, page: 1,
pageSize: 10, pageSize: 10,
}); });
expect(prisma.$queryRaw).toHaveBeenCalledTimes(2); expect(prisma.$queryRaw).toHaveBeenCalledTimes(1);
}); });
it('returns trace details and reconciliation diffs', async () => { it('returns trace details and reconciliation diffs', async () => {
+5 -58
View File
@@ -316,13 +316,11 @@ async sendQuality(date?: string) {
} }
async signatureQuality(query: SignatureQualityQuery) { async signatureQuality(query: SignatureQualityQuery) {
const day = qualityBusinessDay(query.date); const day = qualityBusinessDay(query.date);
// The selected date is an inclusive business cutoff, so a 30-day window starts 29 full days earlier.
const thirtyDayStartAt = new Date(day.startAt.getTime() - 29 * 24 * 60 * 60 * 1000);
const page = positiveInteger(query.page, 1); const page = positiveInteger(query.page, 1);
const pageSize = Math.min(50, positiveInteger(query.pageSize, 10)); const pageSize = Math.min(50, positiveInteger(query.pageSize, 10));
const keyword = query.keyword?.trim() || null; const keyword = query.keyword?.trim() || null;
const keywordPattern = keyword ? `%${keyword}%` : null; const keywordPattern = keyword ? `%${keyword}%` : null;
const [summaries, selectedDaySignatureRows] = await Promise.all([this.prisma.$queryRaw<Array<{ const summaries = await this.prisma.$queryRaw<Array<{
signatureId: string; signatureId: string;
signatureName: string; signatureName: string;
tenantId: string; tenantId: string;
@@ -353,7 +351,7 @@ async signatureQuality(query: SignatureQualityQuery) {
END AS arrival_ms END AS arrival_ms
FROM "SmsMessageRecord" message FROM "SmsMessageRecord" message
WHERE message."signatureId" IS NOT NULL WHERE message."signatureId" IS NOT NULL
AND message."queuedAt" >= ${thirtyDayStartAt} AND message."queuedAt" >= ${day.startAt}
AND message."queuedAt" < ${day.endAt} AND message."queuedAt" < ${day.endAt}
) )
SELECT SELECT
@@ -415,13 +413,7 @@ async signatureQuality(query: SignatureQualityQuery) {
ORDER BY total DESC, signature.name ORDER BY total DESC, signature.name
LIMIT ${pageSize} LIMIT ${pageSize}
OFFSET ${(page - 1) * pageSize} OFFSET ${(page - 1) * pageSize}
`), this.prisma.$queryRaw<Array<{ count: number }>>(Prisma.sql` `);
SELECT COUNT(DISTINCT message."signatureId")::integer AS count
FROM "SmsMessageRecord" message
WHERE message."signatureId" IS NOT NULL
AND message."queuedAt" >= ${day.startAt}
AND message."queuedAt" < ${day.endAt}
`)]);
const signatureIds = summaries.map((item) => item.signatureId); const signatureIds = summaries.map((item) => item.signatureId);
const drainageBreakdowns = signatureIds.length === 0 const drainageBreakdowns = signatureIds.length === 0
? [] ? []
@@ -494,7 +486,7 @@ async signatureQuality(query: SignatureQualityQuery) {
) failed_receipt ON TRUE ) failed_receipt ON TRUE
WHERE message."signatureId" IN (${Prisma.join(signatureIds)}) WHERE message."signatureId" IN (${Prisma.join(signatureIds)})
AND submit."submitStatus" IN ('accepted', 'rejected', 'timeout') AND submit."submitStatus" IN ('accepted', 'rejected', 'timeout')
AND COALESCE(submit."submittedAt", submit."createdAt") >= ${thirtyDayStartAt} AND COALESCE(submit."submittedAt", submit."createdAt") >= ${day.startAt}
AND COALESCE(submit."submittedAt", submit."createdAt") < ${day.endAt} AND COALESCE(submit."submittedAt", submit."createdAt") < ${day.endAt}
), classified AS ( ), classified AS (
SELECT SELECT
@@ -572,54 +564,11 @@ async signatureQuality(query: SignatureQualityQuery) {
))::integer AS "averageArrivalMs" ))::integer AS "averageArrivalMs"
FROM "SmsMessageRecord" message FROM "SmsMessageRecord" message
WHERE message."signatureId" IN (${Prisma.join(signatureIds)}) WHERE message."signatureId" IN (${Prisma.join(signatureIds)})
AND message."queuedAt" >= ${thirtyDayStartAt} AND message."queuedAt" >= ${day.startAt}
AND message."queuedAt" < ${day.endAt} AND message."queuedAt" < ${day.endAt}
GROUP BY message."signatureId", COALESCE(NULLIF(message.carrier, ''), 'unknown') GROUP BY message."signatureId", COALESCE(NULLIF(message.carrier, ''), 'unknown')
ORDER BY message."signatureId", COUNT(*) DESC, carrier ORDER BY message."signatureId", COUNT(*) DESC, carrier
`); `);
const dailyBreakdowns = signatureIds.length === 0
? []
: await this.prisma.$queryRaw<Array<{
signatureId: string;
channelId: string;
channelName: string;
carrier: string;
date: string;
businessMessageCount: number;
deliveredMessageCount: number;
deliveryRate: number;
}>>(Prisma.sql`
SELECT
message."signatureId" AS "signatureId",
COALESCE(message."channelId", 'unassigned') AS "channelId",
COALESCE(channel.name, '未分配通道') AS "channelName",
COALESCE(NULLIF(message.carrier, ''), 'unknown') AS carrier,
TO_CHAR((message."queuedAt" AT TIME ZONE 'UTC') AT TIME ZONE 'Asia/Shanghai', 'YYYY-MM-DD') AS date,
COUNT(*)::integer AS "businessMessageCount",
COUNT(*) FILTER (
WHERE message.status = 'delivered'
OR message."receiptStatus" = 'delivered'
)::integer AS "deliveredMessageCount",
ROUND(
COUNT(*) FILTER (
WHERE message.status = 'delivered'
OR message."receiptStatus" = 'delivered'
) * 100.0 / COUNT(*),
1
)::double precision AS "deliveryRate"
FROM "SmsMessageRecord" message
LEFT JOIN "SmsChannel" channel ON channel.id = message."channelId"
WHERE message."signatureId" IN (${Prisma.join(signatureIds)})
AND message."queuedAt" >= ${thirtyDayStartAt}
AND message."queuedAt" < ${day.endAt}
GROUP BY
message."signatureId",
COALESCE(message."channelId", 'unassigned'),
COALESCE(channel.name, '未分配通道'),
COALESCE(NULLIF(message.carrier, ''), 'unknown'),
TO_CHAR((message."queuedAt" AT TIME ZONE 'UTC') AT TIME ZONE 'Asia/Shanghai', 'YYYY-MM-DD')
ORDER BY message."signatureId", date, "channelId", carrier
`);
const items = summaries.map(({ rowCount: _rowCount, ...summary }) => { const items = summaries.map(({ rowCount: _rowCount, ...summary }) => {
const signatureDrainageBreakdowns = drainageBreakdowns.filter((item) => item.signatureId === summary.signatureId); const signatureDrainageBreakdowns = drainageBreakdowns.filter((item) => item.signatureId === summary.signatureId);
const signatureBreakdowns = aggregateChannelCarrierRows(signatureDrainageBreakdowns); const signatureBreakdowns = aggregateChannelCarrierRows(signatureDrainageBreakdowns);
@@ -629,12 +578,10 @@ async signatureQuality(query: SignatureQualityQuery) {
carrierOverview: carrierOverview.filter((item) => item.signatureId === summary.signatureId), carrierOverview: carrierOverview.filter((item) => item.signatureId === summary.signatureId),
breakdowns: signatureBreakdowns, breakdowns: signatureBreakdowns,
drainageBreakdowns: signatureDrainageBreakdowns, drainageBreakdowns: signatureDrainageBreakdowns,
dailyBreakdowns: dailyBreakdowns.filter((item) => item.signatureId === summary.signatureId),
}; };
}); });
return { return {
date: day.key, date: day.key,
selectedDaySignatureCount: selectedDaySignatureRows[0]?.count ?? 0,
items, items,
total: summaries[0]?.rowCount ?? 0, total: summaries[0]?.rowCount ?? 0,
page, page,
+1 -1
View File
@@ -132,7 +132,7 @@
"group": "quality", "group": "quality",
"isPrivate": false, "isPrivate": false,
"signatureSha256": "6b9c3761674cb0d01000caca5e12cf91a6e526757592ffb783fc673c178b204c", "signatureSha256": "6b9c3761674cb0d01000caca5e12cf91a6e526757592ffb783fc673c178b204c",
"bodySha256": "d07df712d2adadd05462914715f284e0215afbd0309fe276f78d2ac90a5aa0b7" "bodySha256": "a7203deb5a8c7c3b6f6afaf83a55bb1ff45a0bf198f86a2158868c4b8c759b2d"
}, },
{ {
"name": "auditLogs", "name": "auditLogs",
@@ -1998,10 +1998,3 @@
- 运营端“短信通道组管理”在通道组名称条件之外增加“通道”筛选。选定一个通道后,只展示成员配置中真实包含该`channelId`的未删除通道组;与通道组名称同时输入时按两个条件取交集。 - 运营端“短信通道组管理”在通道组名称条件之外增加“通道”筛选。选定一个通道后,只展示成员配置中真实包含该`channelId`的未删除通道组;与通道组名称同时输入时按两个条件取交集。
- 通道选项必须来自真实通道API,不使用静态列表、Mock或localStorage。页面首次加载时通道组与通道两个独立请求并行执行;选项同时展示通道名称和编码,已删除通道明确标记“已删除”。未加入任何通道组的真实通道仍可选择,选中后结果为零而不得隐藏该选项。 - 通道选项必须来自真实通道API,不使用静态列表、Mock或localStorage。页面首次加载时通道组与通道两个独立请求并行执行;选项同时展示通道名称和编码,已删除通道明确标记“已删除”。未加入任何通道组的真实通道仍可选择,选中后结果为零而不得隐藏该选项。
- 通道选择控件必须为通用下拉可搜索控件,支持按通道名称或编码搜索;“全部通道”表示不按通道限制,点击“重置”必须同时清空通道组名称和通道条件并回到第一页。 - 通道选择控件必须为通用下拉可搜索控件,支持按通道名称或编码搜索;“全部通道”表示不按通道限制,点击“重置”必须同时清空通道组名称和通道条件并回到第一页。
## 签名发送质量多周期趋势(2026-08-09)
- 运营端原“数据统计”菜单更名为“签名发送质量”,路由保持`/admin/analytics`兼容。日期控件保留并明确为“统计截止日”;近3日、近7日、近30日均包含所选截止日当天,例如截止日为8月6日时,近3日为8月4日至8月6日。
- 页面增加“当天发送签名数量”指标,按所选截止日内存在真实`SmsMessageRecord`且关联已登记`signatureId`的不同签名去重统计;搜索关键字不改变该全局当天指标。
- 签名列表候选范围为截至所选日期的近30日,截止日当天没有发送但此前29日有发送的签名仍须出现。签名详情按“签名 × 消息最终归属通道 × 号码运营商”展示近3/7/30日的发送业务条数、到达业务条数和到达率。业务条数以`SmsMessageRecord`为唯一计数单位,长短信分片和同一短信的通道补发尝试不得重复放大;到达率为到达业务条数除以发送业务条数,分母为0时显示0%。
- 点击任一通道、运营商和周期组合的“查看趋势”,必须展示该周期每个自然日的发送业务条数、到达业务条数和到达率折线;无数据日期补0,首尾日期与所选周期严格一致并包含截止日当天。数据必须来自真实后端和PostgreSQL,不得使用Mock、静态数据或localStorage。
-6
View File
@@ -4000,12 +4000,6 @@ npm run verify:phase8
| TC-ANALYTICS-SIGNATURE-011 | 点击“查看明细” | 打开右侧详情抽屉,展示运营商概览及通道×运营商矩阵;Esc、关闭按钮和遮罩均可关闭 | | TC-ANALYTICS-SIGNATURE-011 | 点击“查看明细” | 打开右侧详情抽屉,展示运营商概览及通道×运营商矩阵;Esc、关闭按钮和遮罩均可关闭 |
| TC-ANALYTICS-SIGNATURE-012 | 所选日期没有已登记签名发送 | 返回真实空状态,不显示演示或历史日期数据 | | TC-ANALYTICS-SIGNATURE-012 | 所选日期没有已登记签名发送 | 返回真实空状态,不显示演示或历史日期数据 |
| TC-ANALYTICS-SIGNATURE-013 | 同一运营商的一条业务短信首通道失败后切换通道并最终送达 | 运营商概览计1条业务短信、最终成功率为100%;通道矩阵仍分别记录两次真实提交 | | TC-ANALYTICS-SIGNATURE-013 | 同一运营商的一条业务短信首通道失败后切换通道并最终送达 | 运营商概览计1条业务短信、最终成功率为100%;通道矩阵仍分别记录两次真实提交 |
| TC-ANALYTICS-SIGNATURE-014 | 统计截止日选择8月6日,查看近3/7/30日 | 统计范围分别为8月4日至6日、7月31日至8月6日、7月8日至8月6日,三段均包含8月6日当天 |
| TC-ANALYTICS-SIGNATURE-015 | 同一签名同一天存在长短信分片和跨通道补发,再查看通道×运营商多周期质量 | 每个业务消息按最终归属通道只计1条,不按分片或提交尝试重复计数;发送数、到达数和到达率与真实消息记录一致 |
| TC-ANALYTICS-SIGNATURE-016 | 点击任一通道、运营商的近3日“查看趋势” | 折线固定展示含截止日在内的3个自然日,逐日包含发送业务条数、到达业务条数和到达率,无数据日期显示0 |
| TC-ANALYTICS-SIGNATURE-017 | 当天多个消息使用同一签名、另有消息使用第二个签名,并输入签名搜索条件 | “当天发送签名数量”为2且不受搜索条件影响;未关联`signatureId`的消息不计入 |
| TC-ANALYTICS-SIGNATURE-018 | 检查运营端导航、面包屑和日期控件 | 菜单与面包屑显示“签名发送质量”,日期控件语义为“统计截止日”,原`/admin/analytics`路由仍可访问 |
| TC-ANALYTICS-SIGNATURE-019 | 某签名在截止日当天无发送、但此前29日内有发送 | 该签名仍出现在近30日列表并可查看对应周期数据;“当天发送签名数量”不计入该签名 |
# 列表后端分页与响应性能测试(2026-07-28) # 列表后端分页与响应性能测试(2026-07-28)
## TC-LIST-PERF-001 短信记录真实后端分页 ## TC-LIST-PERF-001 短信记录真实后端分页
+8 -17
View File
@@ -3373,21 +3373,12 @@ git diff --check
- 9条active供应商通道发布重启后6条为`connected 1/1`;“会员营销-富泷”“移动物业-富泷”“联电物业-富泷”3条仍返回`connect response status: auth failed`。本轮未修改其账号、密码、启停状态或连接参数,只保留并报告供应商真实返回。 - 9条active供应商通道发布重启后6条为`connected 1/1`;“会员营销-富泷”“移动物业-富泷”“联电物业-富泷”3条仍返回`connect response status: auth failed`。本轮未修改其账号、密码、启停状态或连接参数,只保留并报告供应商真实返回。
- 发布依赖审计仍报告根项目3项high、API项目3项moderate和4项high;专用安全缓解门禁通过,未执行可能破坏兼容性的自动升级。本次没有执行任何真实模板、签名、通道或通道组删除,未发送、补发或重投短信,未修改企业余额、客户连接或供应商通道配置。 - 发布依赖审计仍报告根项目3项high、API项目3项moderate和4项high;专用安全缓解门禁通过,未执行可能破坏兼容性的自动升级。本次没有执行任何真实模板、签名、通道或通道组删除,未发送、补发或重投短信,未修改企业余额、客户连接或供应商通道配置。
## 2026-08-09 签名发送质量多周期趋势(本地验证完成) ## 2026-08-09 签名发送质量多周期趋势完整回滚
- 运营端菜单及面包屑更名为“签名发送质量”,日期控件明确为统计截止日。近3/7/30日全部包含截止日当天;前端以自然日补齐趋势日期,不因数据库无记录而省略日期点 - 按用户明确要求撤回`35de17a2d44702d3ec3e839362a37d6f2bf26c89`及其部署记录`e0c8f82bcfc21d4707c0ec168d19808959fcfd46`。预生产运行目录已精确切回上一版本`78b839f468f053ea3a1299e56418077b0dc11c99`;被撤回版本完整保留于`/opt/cmpp-platform.rolled-back-35de17a2-20260809-rollback`,没有删除恢复资产
- `GET /api/admin/operations/signature-quality`将签名列表候选及列表概览扩展为截至所选日期的近30日,并增加当天发送签名去重数,以及当前分页签名近30日按最终通道、运营商、自然日聚合的真实业务短信统计。截止日当天无发送但此前29日有发送的签名仍可查询;统计直接读取`SmsMessageRecord`,不按长短信分片或`SmsSubmitRecord`补发尝试重复计数 - 本次发布未新增migration,预生产仍为83条已完成migration,因此没有恢复数据库备份,避免覆盖发布后正常产生的短信、回执和业务数据。回滚前Redis Stream消费者1、`pending=0``lag=0`;运行目录切换仅停止并按Gateway、API、Nginx顺序重启服务
- 签名详情新增“通道 × 运营商业务质量”表,逐组合展示近3/7/30日发送业务条数、到达业务条数和到达率;点击周期打开双轴折线图,展示逐日发送、到达和到达率。原单日运营商概览、通道提交矩阵和按引流切分继续保留,避免改变既有提交尝试诊断口径 - 回滚后API、Gateway、Nginx、PostgreSQL和MinIO均为activeRedis PONG,内部API/Gateway健康通过;公网运营登录、客户端登录及API health均为HTTP 200,发布后API/Gateway无error级journalRedis Stream继续为`pending=0``lag=0`
- 页面新增“当天发送签名数量”指标,按截止日内关联已登记签名的不同`signatureId`去重,且不受列表关键字筛选影响。未增加数据库字段或migration - 9条active供应商通道回滚重启后6条为connected;“会员营销-富泷”“移动物业-富泷”“联电物业-富泷”3条恢复为此前已记录的供应商`connect response status: auth failed`状态。本次未修改其连接配置,仅记录真实返回
- Node.js v24下运营统计专项1 suite / 28 tests通过;API正式TypeScript构建、前端TypeScript及Vite v8.1.5生产构建通过(2535 modules,仅保留既有约2.04MB单chunk提示);`operations-r2`结构契约已按本次明确修改的`signatureQuality`行为更新并重新通过。发布与预生产只读验收结果待完成后补记 - Git使用`git revert --no-commit`反向撤销上述两个提交,不使用`reset``checkout`覆盖工作区。恢复后的业务源码、需求文档、测试用例和结构契约与`608662a`(即`78b839f4`功能版本加其部署记录)一致,仅追加本回滚记录
- 发布前通过SSH对预生产PostgreSQL执行同口径只读探测:北京时间2026-08-09当天共有3个已登记签名、218条业务消息;近30日按签名、最终通道、运营商和北京时间自然日分组SQL成功执行并返回真实数据,未修改数据库或触发短信发送 - 回滚后运营统计专项1 suite / 28 tests通过,API正式TypeScript构建、前端TypeScript和Vite v8.1.5生产构建通过(2535 modules,仅既有约2.04MB单chunk提示),依赖安全缓解门禁及`git diff --check`通过。`operations-r2`字节哈希门禁在完全恢复上一版本内容后仍受该文件历史混合CRLF/LF行尾影响而误报,Git归一化内容与`608662a`无差异;未为通过门禁改写上一版结构契约哈希
- 回滚没有发送、补发或重投真实短信,没有修改数据库记录、企业余额、通道账号、密码、启停状态或客户连接;受保护的构建缓存、`outputs/`和空文件`=`继续不提交、不删除。
## 2026-08-09 签名发送质量多周期趋势预生产发布记录(`35de17a2`
- 本需求11个有效源码、测试、结构契约和文档文件提交为`35de17a2d44702d3ec3e839362a37d6f2bf26c89`并推送`origin/main`。首次推送遇到远端HTTP认证失败,未改动或输出凭据,使用既有凭据助手安全重试后成功;受保护的`api/tsconfig.build.tsbuildinfo`、根目录`tsconfig.tsbuildinfo``outputs/`和空文件`=`未提交、未删除。
- 精确Git归档`outputs/cmpp-35de17a2-20260809-225544.tar.gz`为2169000字节,本地与服务器SHA-256均为`1100ecf742c87f50faf48abbfb088a0a2ae26a03e2cae33b044fb5254d3d5f3e`,服务器tar完整性校验通过。
- 发布前恢复资产位于`/opt/cmpp-platform-backups/releases/20260809-225544-before-35de17a2`。PostgreSQL备份为16763214字节、SHA-256=`023c5286e6ce6852af69de8e76a0a851eb5dfed21d95acc627ff66e345c6a02f`;运行源码为2130043字节、SHA-256=`7cfa9541d4c2eafd4a11d40eef0ea530dcf7ff45708c5892c0f085891b218a84`;环境文件为895字节、SHA-256=`7a26d83b062f9d7e9503e2a987f39a899510f8981be63be997bccfc988fbbc60`。备份目录为0700,文件及校验单为0600gzip、tar和SHA-256校验均通过;上一完整运行目录保留为`/opt/cmpp-platform.previous-20260809-225544`
- 标准`tools/deploy/production-deploy.sh`成功完成依赖安装、安全缓解门禁、Prisma generate/migrate、前端/API/Gateway构建、Nginx校验及服务重启。预生产仍为83条已完成migration、无待执行项,最终`.deployed-commit=35de17a2d44702d3ec3e839362a37d6f2bf26c89`。远程封装脚本仅在部署主体成功后最后读取标记时受PowerShell行尾字符影响返回非零;当时失败恢复钩子已解除,随后直接读取部署标记、运行目录和服务状态确认未发生回滚,也未产生failed目录。
- 部署后API、Gateway、Nginx、PostgreSQL、MinIO均为activeRedis PONG,内部API/Gateway健康和PostgreSQL readiness通过,无failed systemd unitRedis Stream消费者1、`pending=0``lag=0`API/Gateway发布后无error级journal。公网运营登录、客户端登录、API health及客户Swagger均为HTTP 200API独立域名根路径为404,未认证签名质量接口为401。
- 运行前端产物已包含“签名发送质量”和“当天发送签名数量”,运行API产物已包含`selectedDaySignatureCount`及近30日真实业务数据逻辑。浏览器验收阶段内置浏览器两次访问预生产域名均由其网络层返回`ERR_CONNECTION_CLOSED`,但服务器侧同URL均为200;本轮未绕过图形验证码、未伪造登录态,因此登录后日期切换、详情表和折线图视觉交互保留为后续人工验收项。
- 9条active通道发布重启后8条为connected;“会员营销-富泷”仍返回供应商`connect response status: auth failed`。本轮未修改任何通道账号、密码、启停状态或连接参数。发布全程未发送、补发或重投真实短信,未修改企业余额、客户连接或业务配置。
-13
View File
@@ -65,17 +65,6 @@ export type SignatureCarrierBusinessQualityStat = {
averageArrivalMs?: number | null; averageArrivalMs?: number | null;
}; };
export type SignatureChannelCarrierDailyQualityStat = {
signatureId: string;
channelId: string;
channelName: string;
carrier: string;
date: string;
businessMessageCount: number;
deliveredMessageCount: number;
deliveryRate: number;
};
export type SignatureChannelQualityItem = { export type SignatureChannelQualityItem = {
signatureId: string; signatureId: string;
signatureName: string; signatureName: string;
@@ -94,12 +83,10 @@ export type SignatureChannelQualityItem = {
carrierOverview: SignatureCarrierBusinessQualityStat[]; carrierOverview: SignatureCarrierBusinessQualityStat[];
breakdowns: SignatureChannelCarrierQualityStat[]; breakdowns: SignatureChannelCarrierQualityStat[];
drainageBreakdowns: SignatureChannelCarrierDrainageQualityStat[]; drainageBreakdowns: SignatureChannelCarrierDrainageQualityStat[];
dailyBreakdowns: SignatureChannelCarrierDailyQualityStat[];
}; };
export type SignatureChannelQualityResponse = { export type SignatureChannelQualityResponse = {
date: string; date: string;
selectedDaySignatureCount: number;
items: SignatureChannelQualityItem[]; items: SignatureChannelQualityItem[];
total: number; total: number;
page: number; page: number;
+20 -150
View File
@@ -4,12 +4,11 @@ import {
adminApi, adminApi,
type SendQualityResponse, type SendQualityResponse,
type SignatureChannelCarrierQualityStat, type SignatureChannelCarrierQualityStat,
type SignatureChannelCarrierDailyQualityStat,
type SignatureChannelQualityItem, type SignatureChannelQualityItem,
type SignatureChannelQualityResponse, type SignatureChannelQualityResponse,
} from '@/api/adminApi'; } from '@/api/adminApi';
import { Breadcrumb, Button, Chart, Input, Pagination, Table, Tag, type TableColumn } from '@/components/ui'; import { Breadcrumb, Button, Chart, Input, Pagination, Table, Tag, type TableColumn } from '@/components/ui';
import { createBarOption, createPieOption, createQualityTrendOption } from '@/theme/chartOptions'; import { createBarOption, createPieOption } from '@/theme/chartOptions';
import { successRateClassName } from '@/utils/successRate'; import { successRateClassName } from '@/utils/successRate';
const carrierOrder = ['mobile', 'unicom', 'telecom', 'unknown']; const carrierOrder = ['mobile', 'unicom', 'telecom', 'unknown'];
@@ -26,13 +25,6 @@ const carrierLabels: Record<string, string> = {
unknown: '未知', unknown: '未知',
}; };
type TrendSelection = {
channelId: string;
channelName: string;
carrier: string;
days: 3 | 7 | 30;
};
export function AdminAnalyticsPage() { export function AdminAnalyticsPage() {
const [statisticsDate, setStatisticsDate] = useState(() => shanghaiDateKey()); const [statisticsDate, setStatisticsDate] = useState(() => shanghaiDateKey());
const [quality, setQuality] = useState<SendQualityResponse | null>(null); const [quality, setQuality] = useState<SendQualityResponse | null>(null);
@@ -112,48 +104,48 @@ export function AdminAnalyticsPage() {
}, },
{ {
key: 'businessTotal', key: 'businessTotal',
title: '近30日业务短信', title: '业务短信',
width: '110px', width: '110px',
align: 'right', align: 'right',
render: (record) => record.total.toLocaleString('zh-CN'), render: (record) => record.total.toLocaleString('zh-CN'),
}, },
{ {
key: 'channelSubmitTotal', key: 'channelSubmitTotal',
title: '近30日通道提交', title: '通道提交',
width: '110px', width: '110px',
align: 'right', align: 'right',
render: (record) => record.channelSubmitTotal.toLocaleString('zh-CN'), render: (record) => record.channelSubmitTotal.toLocaleString('zh-CN'),
}, },
{ {
key: 'successCount', key: 'successCount',
title: '近30日送达', title: '送达成功',
width: '110px', width: '110px',
align: 'right', align: 'right',
render: (record) => <span className="quality-number quality-number--success">{record.successCount.toLocaleString('zh-CN')}</span>, render: (record) => <span className="quality-number quality-number--success">{record.successCount.toLocaleString('zh-CN')}</span>,
}, },
{ {
key: 'failureCount', key: 'failureCount',
title: '近30日送达失败', title: '送达失败',
width: '110px', width: '110px',
align: 'right', align: 'right',
render: (record) => <span className="quality-number quality-number--danger">{record.failureCount.toLocaleString('zh-CN')}</span>, render: (record) => <span className="quality-number quality-number--danger">{record.failureCount.toLocaleString('zh-CN')}</span>,
}, },
{ {
key: 'submitFailureCount', key: 'submitFailureCount',
title: '近30日提交失败', title: '提交失败',
width: '110px', width: '110px',
align: 'right', align: 'right',
render: (record) => <span className="quality-number quality-number--warning">{record.submitFailureCount.toLocaleString('zh-CN')}</span>, render: (record) => <span className="quality-number quality-number--warning">{record.submitFailureCount.toLocaleString('zh-CN')}</span>,
}, },
{ {
key: 'successRate', key: 'successRate',
title: '近30日成功率', title: '成功率',
width: '170px', width: '170px',
render: (record) => <QualityRate value={record.successRate} />, render: (record) => <QualityRate value={record.successRate} />,
}, },
{ {
key: 'averageArrivalMs', key: 'averageArrivalMs',
title: '近30日平均到达', title: '平均到达时间',
width: '140px', width: '140px',
align: 'right', align: 'right',
render: (record) => formatDuration(record.averageArrivalMs), render: (record) => formatDuration(record.averageArrivalMs),
@@ -183,11 +175,11 @@ export function AdminAnalyticsPage() {
<section className="page-stack"> <section className="page-stack">
<div className="page-heading"> <div className="page-heading">
<div> <div>
<Breadcrumb items={['签名发送质量']} /> <Breadcrumb items={['数据统计']} />
</div> </div>
<div className="page-actions"> <div className="page-actions">
<Input <Input
aria-label="统计截止日" aria-label="统计日"
max={shanghaiDateKey()} max={shanghaiDateKey()}
onChange={(event) => setStatisticsDate(event.target.value)} onChange={(event) => setStatisticsDate(event.target.value)}
type="date" type="date"
@@ -206,11 +198,6 @@ export function AdminAnalyticsPage() {
<strong>{quality?.summary.total.toLocaleString('zh-CN') ?? 0}</strong> <strong>{quality?.summary.total.toLocaleString('zh-CN') ?? 0}</strong>
<small></small> <small></small>
</div> </div>
<div className="surface metric-card">
<span></span>
<strong>{signatureQuality?.selectedDaySignatureCount.toLocaleString('zh-CN') ?? 0}</strong>
<small>{effectiveDate} </small>
</div>
<div className="surface metric-card"> <div className="surface metric-card">
<span>{effectiveDate} </span> <span>{effectiveDate} </span>
<strong>{(quality?.summary.successRate ?? 0).toFixed(1)}%</strong> <strong>{(quality?.summary.successRate ?? 0).toFixed(1)}%</strong>
@@ -245,11 +232,11 @@ export function AdminAnalyticsPage() {
<div className="signature-quality-card__heading"> <div className="signature-quality-card__heading">
<div> <div>
<div className="section-heading__title"> <div className="section-heading__title">
<h2></h2> <h2></h2>
<Tag tone="info"></Tag> <Tag tone="info"></Tag>
</div> </div>
<p className="muted"> <p className="muted">
{signatureQuality?.date ?? effectiveDate} 3/7/30 {signatureQuality?.date ?? effectiveDate}
</p> </p>
</div> </div>
<div className="signature-quality-card__query"> <div className="signature-quality-card__query">
@@ -267,12 +254,12 @@ export function AdminAnalyticsPage() {
</div> </div>
<div className="signature-quality-card__note"> <div className="signature-quality-card__note">
<strong></strong> <strong></strong>
3 7 30 2629
</div> </div>
<Table <Table
columns={signatureColumns} columns={signatureColumns}
data={signatureQuality?.items ?? []} data={signatureQuality?.items ?? []}
emptyText={loading ? '正在加载签名统计…' : '截至所选日期的近30日暂无已登记签名发送数据'} emptyText={loading ? '正在加载签名统计…' : '所选日期暂无已登记签名发送数据'}
pagination={false} pagination={false}
rowKey="signatureId" rowKey="signatureId"
/> />
@@ -311,7 +298,6 @@ function SignatureQualityDrawer({
onClose: () => void; onClose: () => void;
}) { }) {
const [matrixMode, setMatrixMode] = useState<'overall' | 'drainage'>('overall'); const [matrixMode, setMatrixMode] = useState<'overall' | 'drainage'>('overall');
const [trendSelection, setTrendSelection] = useState<TrendSelection | null>(null);
const carriers = item.carrierOverview const carriers = item.carrierOverview
.map((carrier) => ({ .map((carrier) => ({
...carrier, ...carrier,
@@ -332,10 +318,6 @@ function SignatureQualityDrawer({
.map((entry) => [entry.channelId, entry.channelName])).entries()] .map((entry) => [entry.channelId, entry.channelName])).entries()]
.map(([channelId, channelName]) => ({ channelId, channelName })); .map(([channelId, channelName]) => ({ channelId, channelName }));
const visibleCarriers = carrierOrder.filter((carrier) => item.breakdowns.some((entry) => normalizeCarrier(entry.carrier) === carrier)); const visibleCarriers = carrierOrder.filter((carrier) => item.breakdowns.some((entry) => normalizeCarrier(entry.carrier) === carrier));
const businessQualityRows = [...new Map(item.dailyBreakdowns.map((entry) => [
`${entry.channelId}:${normalizeCarrier(entry.carrier)}`,
{ channelId: entry.channelId, channelName: entry.channelName, carrier: normalizeCarrier(entry.carrier) },
])).values()];
return ( return (
<div className="signature-quality-drawer__backdrop" onMouseDown={(event) => { <div className="signature-quality-drawer__backdrop" onMouseDown={(event) => {
@@ -353,56 +335,17 @@ function SignatureQualityDrawer({
<div className="signature-quality-drawer__body"> <div className="signature-quality-drawer__body">
<div className="signature-quality-overview"> <div className="signature-quality-overview">
<QualityMetric label="近30日业务短信" value={item.total.toLocaleString('zh-CN')} /> <QualityMetric label="业务短信" value={item.total.toLocaleString('zh-CN')} />
<QualityMetric label="近30日通道提交" value={item.channelSubmitTotal.toLocaleString('zh-CN')} /> <QualityMetric label="通道提交" value={item.channelSubmitTotal.toLocaleString('zh-CN')} />
<QualityMetric label="近30日最终成功率" value={`${item.successRate.toFixed(1)}%`} valueClassName={successRateClassName(item.successRate)} /> <QualityMetric label="最终成功率" value={`${item.successRate.toFixed(1)}%`} valueClassName={successRateClassName(item.successRate)} />
<QualityMetric label="近30日平均到达时间" value={formatDuration(item.averageArrivalMs)} /> <QualityMetric label="平均到达时间" value={formatDuration(item.averageArrivalMs)} />
</div> </div>
<section className="signature-quality-section">
<div className="signature-quality-section__heading">
<div>
<h3> × </h3>
<p></p>
</div>
</div>
<div className="signature-business-quality-table">
<table>
<thead><tr><th></th><th></th>{([3, 7, 30] as const).map((days) => <th key={days}> {days} </th>)}</tr></thead>
<tbody>
{businessQualityRows.map((row) => (
<tr key={`${row.channelId}:${row.carrier}`}>
<th>{row.channelName}</th>
<td><Tag tone={carrierTagTone(row.carrier)}>{carrierLabel(row.carrier)}</Tag></td>
{([3, 7, 30] as const).map((days) => {
const metric = aggregateBusinessQuality(item.dailyBreakdowns, row.channelId, row.carrier, date, days);
return (
<td key={days}>
<button
className="signature-business-quality-metric"
onClick={() => setTrendSelection({ ...row, days })}
type="button"
>
<strong>{metric.sent.toLocaleString('zh-CN')} / {metric.delivered.toLocaleString('zh-CN')}</strong>
<span className={successRateClassName(metric.rate)}>{metric.rate.toFixed(1)}%</span>
<small></small>
</button>
</td>
);
})}
</tr>
))}
{businessQualityRows.length === 0 ? <tr><td colSpan={5}> 30 </td></tr> : null}
</tbody>
</table>
</div>
</section>
<section className="signature-quality-section"> <section className="signature-quality-section">
<div className="signature-quality-section__heading"> <div className="signature-quality-section__heading">
<div> <div>
<h3></h3> <h3></h3>
<p>30</p> <p></p>
</div> </div>
</div> </div>
<div className="signature-carrier-grid"> <div className="signature-carrier-grid">
@@ -427,7 +370,7 @@ function SignatureQualityDrawer({
<div> <div>
<h3> × </h3> <h3> × </h3>
<p>{matrixMode === 'overall' <p>{matrixMode === 'overall'
? '整体口径展示近30日该组合全部真实提交;“—”表示该期间没有真实提交。' ? '整体口径展示该组合全部真实提交;“—”表示所选日期没有真实提交。'
: '固定按含引流、不含引流、未检测三行及移动、联通、电信三列展示;没有真实提交的组合显示 0。'}</p> : '固定按含引流、不含引流、未检测三行及移动、联通、电信三列展示;没有真实提交的组合显示 0。'}</p>
</div> </div>
<div className="page-actions"><Button onClick={() => setMatrixMode('overall')} size="sm" variant={matrixMode === 'overall' ? 'primary' : 'ghost'}></Button><Button onClick={() => setMatrixMode('drainage')} size="sm" variant={matrixMode === 'drainage' ? 'primary' : 'ghost'}></Button></div> <div className="page-actions"><Button onClick={() => setMatrixMode('overall')} size="sm" variant={matrixMode === 'overall' ? 'primary' : 'ghost'}></Button><Button onClick={() => setMatrixMode('drainage')} size="sm" variant={matrixMode === 'drainage' ? 'primary' : 'ghost'}></Button></div>
@@ -488,84 +431,11 @@ function SignatureQualityDrawer({
</p> </p>
</div> </div>
{trendSelection ? (
<SignatureQualityTrend
date={date}
entries={item.dailyBreakdowns}
onClose={() => setTrendSelection(null)}
selection={trendSelection}
signatureName={item.signatureName}
/>
) : null}
</aside> </aside>
</div> </div>
); );
} }
function SignatureQualityTrend({
date,
entries,
onClose,
selection,
signatureName,
}: {
date: string;
entries: SignatureChannelCarrierDailyQualityStat[];
onClose: () => void;
selection: TrendSelection;
signatureName: string;
}) {
const dates = inclusiveDateKeys(date, selection.days);
const points = dates.map((dateKey) => entries.find((entry) => (
entry.date === dateKey
&& entry.channelId === selection.channelId
&& normalizeCarrier(entry.carrier) === selection.carrier
)));
const option = createQualityTrendOption({
labels: dates.map((dateKey) => dateKey.slice(5)),
sent: points.map((point) => point?.businessMessageCount ?? 0),
delivered: points.map((point) => point?.deliveredMessageCount ?? 0),
rates: points.map((point) => point?.deliveryRate ?? 0),
});
return (
<div className="signature-quality-trend" role="dialog" aria-modal="true" aria-label="签名发送质量趋势">
<div className="signature-quality-trend__heading">
<div><h3>{signatureName} · {selection.days} </h3><p>{selection.channelName} · {carrierLabel(selection.carrier)} · {dates[0]} {date}</p></div>
<button aria-label="关闭趋势图" onClick={onClose} type="button"><X size={18} /></button>
</div>
<Chart height={360} option={option} />
<p className="muted">线 0% </p>
</div>
);
}
function aggregateBusinessQuality(
entries: SignatureChannelCarrierDailyQualityStat[],
channelId: string,
carrier: string,
date: string,
days: 3 | 7 | 30,
) {
const includedDates = new Set(inclusiveDateKeys(date, days));
const relevant = entries.filter((entry) => (
entry.channelId === channelId
&& normalizeCarrier(entry.carrier) === carrier
&& includedDates.has(entry.date)
));
const sent = relevant.reduce((sum, entry) => sum + entry.businessMessageCount, 0);
const delivered = relevant.reduce((sum, entry) => sum + entry.deliveredMessageCount, 0);
return { sent, delivered, rate: sent === 0 ? 0 : delivered * 100 / sent };
}
function inclusiveDateKeys(endDate: string, days: number) {
const [year, month, day] = endDate.split('-').map(Number);
const end = new Date(Date.UTC(year, month - 1, day));
return Array.from({ length: days }, (_, index) => {
const current = new Date(end.getTime() - (days - index - 1) * 24 * 60 * 60 * 1000);
return current.toISOString().slice(0, 10);
});
}
function QualityMetric({ label, value, valueClassName }: { label: string; value: string; valueClassName?: string }) { function QualityMetric({ label, value, valueClassName }: { label: string; value: string; valueClassName?: string }) {
return ( return (
<div className="signature-quality-metric"> <div className="signature-quality-metric">
+1 -1
View File
@@ -105,7 +105,7 @@ function AdminAuthenticatedLayout({ session }: { session: LoginSession }) {
{ label: '运营看板', to: '/admin', icon: Gauge }, { label: '运营看板', to: '/admin', icon: Gauge },
{ label: '发送监控', to: '/admin/monitor', icon: Activity }, { label: '发送监控', to: '/admin/monitor', icon: Activity },
{ label: '网关异常', to: '/admin/gateway-submit-exceptions', icon: AlertTriangle }, { label: '网关异常', to: '/admin/gateway-submit-exceptions', icon: AlertTriangle },
{ label: '签名发送质量', to: '/admin/analytics', icon: BarChart3 }, { label: '数据统计', to: '/admin/analytics', icon: BarChart3 },
], ],
}, },
{ {
-95
View File
@@ -6767,101 +6767,6 @@
font-size: 13px; font-size: 13px;
} }
.signature-business-quality-table {
border: 1px solid var(--color-border);
border-radius: var(--radius-md);
overflow: auto;
}
.signature-business-quality-table table {
border-collapse: collapse;
min-width: 820px;
width: 100%;
}
.signature-business-quality-table th,
.signature-business-quality-table td {
border-bottom: 1px solid var(--color-border);
padding: var(--space-3);
text-align: left;
vertical-align: middle;
}
.signature-business-quality-table thead th {
background: var(--color-surface-muted);
color: var(--color-text-muted);
font-size: 13px;
}
.signature-business-quality-table tbody tr:last-child > * {
border-bottom: 0;
}
.signature-business-quality-metric {
background: transparent;
border: 0;
cursor: pointer;
display: grid;
gap: 3px;
padding: 0;
text-align: left;
}
.signature-business-quality-metric strong {
color: var(--color-text-strong);
}
.signature-business-quality-metric span {
font-weight: 600;
}
.signature-business-quality-metric small {
color: var(--color-primary);
}
.signature-business-quality-metric:hover small {
text-decoration: underline;
}
.signature-quality-trend {
background: var(--color-surface);
border: 1px solid var(--color-border);
border-radius: var(--radius-xl);
box-shadow: var(--shadow-lg);
left: 50%;
max-width: 880px;
padding: var(--space-5);
position: absolute;
top: 50%;
transform: translate(-50%, -50%);
width: min(88%, 880px);
z-index: 2;
}
.signature-quality-trend__heading {
align-items: flex-start;
display: flex;
justify-content: space-between;
}
.signature-quality-trend__heading h3,
.signature-quality-trend__heading p {
margin: 0;
}
.signature-quality-trend__heading p {
color: var(--color-text-muted);
margin-top: var(--space-1);
}
.signature-quality-trend__heading button {
background: transparent;
border: 0;
color: var(--color-text-muted);
cursor: pointer;
padding: var(--space-2);
}
.signature-carrier-grid { .signature-carrier-grid {
display: grid; display: grid;
gap: var(--space-3); gap: var(--space-3);
-24
View File
@@ -31,30 +31,6 @@ export function createLineOption(params: {
}; };
} }
export function createQualityTrendOption(params: {
labels: string[];
sent: number[];
delivered: number[];
rates: number[];
}): EChartsOption {
return {
color: [...chartPalette],
grid: { left: 12, right: 18, top: 42, bottom: 8, containLabel: true },
legend: { top: 0, right: 0, textStyle: { color: themeColors.textMuted } },
tooltip: { trigger: 'axis' },
xAxis: { type: 'category', data: params.labels, ...axisStyle },
yAxis: [
{ type: 'value', name: '业务条数', minInterval: 1, ...axisStyle },
{ type: 'value', name: '到达率', min: 0, max: 100, ...axisStyle, axisLabel: { formatter: '{value}%', color: themeColors.textMuted } },
],
series: [
{ name: '发送业务条数', data: params.sent, type: 'line', smooth: true, symbolSize: 6, lineStyle: { width: 3 } },
{ name: '到达业务条数', data: params.delivered, type: 'line', smooth: true, symbolSize: 6, lineStyle: { width: 3 } },
{ name: '到达率', data: params.rates, type: 'line', yAxisIndex: 1, smooth: true, symbolSize: 6, lineStyle: { width: 3 } },
],
};
}
export function createBarOption(params: { export function createBarOption(params: {
labels: string[]; labels: string[];
series: Array<{ name: string; data: number[] }>; series: Array<{ name: string; data: number[] }>;