diff --git a/src/Snap.Hutao.Server/Snap.Hutao.Server/Controller/RoleCombatController.cs b/src/Snap.Hutao.Server/Snap.Hutao.Server/Controller/RoleCombatController.cs index 87b00a7..6f1d6c6 100644 --- a/src/Snap.Hutao.Server/Snap.Hutao.Server/Controller/RoleCombatController.cs +++ b/src/Snap.Hutao.Server/Snap.Hutao.Server/Controller/RoleCombatController.cs @@ -88,13 +88,9 @@ public async Task Upload([FromBody] SimpleRoleCombatRecord record } [HttpGet("Statistics")] - public IActionResult GetStatistics([FromQuery(Name = "Last")] bool last = false) + public IActionResult GetStatistics() { int scheduleId = RoleCombatScheduleId.GetForNow(); - if (last) - { - scheduleId--; - } string key = $"RoleCombatStatistics:{scheduleId}"; if (memoryCache.TryGetValue(key, out RoleCombatStatisticsItem? data)) diff --git a/src/Snap.Hutao.Server/Snap.Hutao.Server/Model/RoleCombat/RoleCombatStatisticsItem.cs b/src/Snap.Hutao.Server/Snap.Hutao.Server/Model/RoleCombat/RoleCombatStatisticsItem.cs index 8749c82..ccaa2f1 100644 --- a/src/Snap.Hutao.Server/Snap.Hutao.Server/Model/RoleCombat/RoleCombatStatisticsItem.cs +++ b/src/Snap.Hutao.Server/Snap.Hutao.Server/Model/RoleCombat/RoleCombatStatisticsItem.cs @@ -7,7 +7,11 @@ namespace Snap.Hutao.Server.Model.RoleCombat; public sealed class RoleCombatStatisticsItem { + public int ScheduleId { get; set; } + public int RecordTotal { get; set; } + public long Timestamp { get; set; } + public List> BackupAvatarRates { get; set; } = default!; } \ No newline at end of file diff --git a/src/Snap.Hutao.Server/Snap.Hutao.Server/Service/RoleCombat/RoleCombatService.cs b/src/Snap.Hutao.Server/Snap.Hutao.Server/Service/RoleCombat/RoleCombatService.cs index 884b8ba..113c757 100644 --- a/src/Snap.Hutao.Server/Snap.Hutao.Server/Service/RoleCombat/RoleCombatService.cs +++ b/src/Snap.Hutao.Server/Snap.Hutao.Server/Service/RoleCombat/RoleCombatService.cs @@ -47,7 +47,9 @@ public async Task RunAsync() int total = await Task.Run(() => RunCore(resultMap)).ConfigureAwait(false); RoleCombatStatisticsItem item = new() { + ScheduleId = RoleCombatScheduleId.GetForNow(), RecordTotal = total, + Timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), BackupAvatarRates = resultMap.Select(kvp => new Model.Legacy.ItemRate(kvp.Key, kvp.Value / (double)total)).ToList(), };