feat(channel-monitor): aggregate history to daily rollups + soft delete
明细只保留 1 天,超过 1 天聚合到新表 channel_monitor_daily_rollups(按 monitor_id/model/bucket_date 维度),聚合保留 30 天。两张表都用 SoftDeleteMixin 软删除(DELETE 自动改为 UPDATE deleted_at = NOW())。 聚合 + 清理任务由 OpsCleanupService 的 cron 统一调度,与运维监控的清理共享 schedule(默认 0 2 * * *)和 leader lock。ChannelMonitorRunner 的 cleanupLoop 被移除,只保留 dueCheckLoop。 读取路径 ComputeAvailability* 改为 UNION 明细(今天 deleted_at IS NULL)+ 聚合(过去 windowDays 天 deleted_at IS NULL),SUM(ok)/SUM(total) 自然加权 计算可用率,AVG latency 用 SUM(sum_latency_ms)/SUM(count_latency)。 watermark 表 channel_monitor_aggregation_watermark 单行(id=1),记录 last_aggregated_date,重启后从该日期 +1 继续聚合,首次为 nil 则从 today - 30d 开始回填,单次最多 35 天上限避免长事务。 raw SQL 的 ListLatestPerModel / ListLatestForMonitorIDs / ListRecentHistoryForMonitors 都补上 deleted_at IS NULL 过滤(SoftDeleteMixin interceptor 只对 ent query 生效)。 bump version to 0.1.114.28 GroupBadge 在 MonitorKeyPickerDialog 中复用平台主题色 + 倍率/专属倍率 (顺手优化)。
This commit is contained in:
@@ -113,6 +113,7 @@
|
||||
:loading="myKeysLoading"
|
||||
:keys="myActiveKeys"
|
||||
:provider="form.provider"
|
||||
:user-group-rates="userGroupRates"
|
||||
@close="showKeyPicker = false"
|
||||
@pick="pickMyKey"
|
||||
/>
|
||||
@@ -125,6 +126,7 @@ import { useAppStore } from '@/stores/app'
|
||||
import { extractApiErrorMessage } from '@/utils/apiError'
|
||||
import { adminAPI } from '@/api/admin'
|
||||
import { keysAPI } from '@/api/keys'
|
||||
import { userGroupsAPI } from '@/api/groups'
|
||||
import type {
|
||||
ChannelMonitor,
|
||||
CreateParams,
|
||||
@@ -175,6 +177,7 @@ const submitting = ref(false)
|
||||
const showKeyPicker = ref(false)
|
||||
const myKeysLoading = ref(false)
|
||||
const myActiveKeys = ref<ApiKey[]>([])
|
||||
const userGroupRates = ref<Record<number, number>>({})
|
||||
|
||||
interface MonitorForm {
|
||||
name: string
|
||||
@@ -263,7 +266,10 @@ async function openMyKeyPicker() {
|
||||
if (myActiveKeys.value.length > 0) return
|
||||
myKeysLoading.value = true
|
||||
try {
|
||||
const res = await keysAPI.list(1, 100, { status: 'active' })
|
||||
const [res, rates] = await Promise.all([
|
||||
keysAPI.list(1, 100, { status: 'active' }),
|
||||
userGroupsAPI.getUserGroupRates(),
|
||||
])
|
||||
const items = res.items || []
|
||||
const now = Date.now()
|
||||
myActiveKeys.value = items.filter(k => {
|
||||
@@ -271,6 +277,7 @@ async function openMyKeyPicker() {
|
||||
if (!k.expires_at) return true
|
||||
return new Date(k.expires_at).getTime() > now
|
||||
})
|
||||
userGroupRates.value = rates
|
||||
} catch (err: unknown) {
|
||||
appStore.showError(extractApiErrorMessage(err, t('admin.channelMonitor.form.noActiveKey')))
|
||||
} finally {
|
||||
|
||||
@@ -47,9 +47,14 @@
|
||||
<td class="px-3 py-2 font-medium text-gray-900 dark:text-white">{{ k.name }}</td>
|
||||
<td class="px-3 py-2 font-mono text-xs text-gray-500 dark:text-gray-400">{{ maskApiKey(k.key) }}</td>
|
||||
<td class="px-3 py-2">
|
||||
<span v-if="k.group" class="inline-flex items-center rounded-md bg-gray-100 px-2 py-0.5 text-xs text-gray-700 dark:bg-dark-700 dark:text-gray-300">
|
||||
{{ k.group.name }}
|
||||
</span>
|
||||
<GroupBadge
|
||||
v-if="k.group"
|
||||
:name="k.group.name"
|
||||
:platform="k.group.platform"
|
||||
:subscription-type="k.group.subscription_type"
|
||||
:rate-multiplier="k.group.rate_multiplier"
|
||||
:user-rate-multiplier="userGroupRates[k.group.id]"
|
||||
/>
|
||||
<span v-else class="text-xs text-gray-400">—</span>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -73,14 +78,18 @@ import { useI18n } from 'vue-i18n'
|
||||
import type { ApiKey } from '@/types'
|
||||
import type { Provider } from '@/api/admin/channelMonitor'
|
||||
import BaseDialog from '@/components/common/BaseDialog.vue'
|
||||
import GroupBadge from '@/components/common/GroupBadge.vue'
|
||||
import { maskApiKey } from '@/utils/maskApiKey'
|
||||
|
||||
const props = defineProps<{
|
||||
const props = withDefaults(defineProps<{
|
||||
show: boolean
|
||||
loading: boolean
|
||||
keys: ApiKey[]
|
||||
provider: Provider
|
||||
}>()
|
||||
userGroupRates?: Record<number, number>
|
||||
}>(), {
|
||||
userGroupRates: () => ({}),
|
||||
})
|
||||
|
||||
defineEmits<{
|
||||
(e: 'close'): void
|
||||
|
||||
Reference in New Issue
Block a user