diff --git a/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs b/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs index aebb476..92263a7 100644 --- a/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs +++ b/YD_AllHeartRates.Api/Services/Impl/HeartRateReportService.cs @@ -71,7 +71,7 @@ namespace YD_AllHeartRates.Api.Services.Impl var cacheKey = $"HeartRateData_{schoolCode}"; var data = _caching.Get>(cacheKey); - if (data == null) + if (data == null || data.Count == 0) { data = await _userContext.HeartRateData .Where(x => x.SchoolCode == schoolCode && x.ScoreTime > dayStart && x.ScoreTime <= dayEnd) @@ -82,7 +82,7 @@ namespace YD_AllHeartRates.Api.Services.Impl } res.SportsData.OnlineDevicesCount = data.GroupBy(x => x.StudentNo).Count(); - + res.SportsData.AvgHeartRate = (int)data.Select(x => x.Value).DefaultIfEmpty(0).Average(); var durationsByStudent = HeartRateReportHelper.CalculateDurations( @@ -155,7 +155,7 @@ namespace YD_AllHeartRates.Api.Services.Impl // 先尝试从缓存读取 var allData = _caching.Get>(cacheKey); - if (allData == null) + if (allData == null|| allData.Count==0) { allData = await _userContext.HeartRateData .Where(x => x.SchoolCode == schoolCode && x.ScoreTime > dayStart && x.ScoreTime <= dayEnd) @@ -167,7 +167,7 @@ namespace YD_AllHeartRates.Api.Services.Impl var data = allData.Where(x => x.GradeId == gradeId).ToList(); - res.SportsData.OnlineDevicesCount = data.GroupBy(x => x.StudentNo).Count(); + res.SportsData.OnlineDevicesCount = data.GroupBy(x => x.StudentNo).Count(); res.SportsData.AvgHeartRate = (int)data.Select(x => x.Value).DefaultIfEmpty(0).Average(); @@ -237,7 +237,7 @@ namespace YD_AllHeartRates.Api.Services.Impl // 先尝试从缓存读取 var allData = _caching.Get>(cacheKey); - if (allData == null) + if (allData == null || allData.Count == 0) { allData = await _userContext.HeartRateData .Where(x => x.SchoolCode == schoolCode && x.ScoreTime > dayStart && x.ScoreTime <= dayEnd) @@ -292,7 +292,7 @@ namespace YD_AllHeartRates.Api.Services.Impl // 先尝试从缓存读取 var allData = _caching.Get>(cacheKey); - if (allData == null) + if (allData == null || allData.Count == 0) { allData = await _userContext.HeartRateData .Where(x => x.SchoolCode == schoolCode && x.ScoreTime > dayStart && x.ScoreTime <= dayEnd) diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs index 90b9a40..af66e36 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+580d586b2d20254267b1182a8ceff393c252da81")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4be147ed0cb397741b6ca580b8b7ce5452603a18")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache index b72df2b..900b486 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -d0fd70ca558eb27a63b8502db6933ff8d4d403e75a3eb07f44cb84badd7aeaea +06c8e83f866dbe7a14cff35782bb4ee85519838545231f3e9dabb994b6d2fb17 diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll index e6726fd..1520333 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb index a6d6eb7..d10f674 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.pdb differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe b/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe index 745d335..2924217 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe and b/YD_AllHeartRates.Api/obj/Debug/net6.0/apphost.exe differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll index 45b7c2d..e08415c 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/ref/YD_AllHeartRates.Api.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll index 45b7c2d..e08415c 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/refint/YD_AllHeartRates.Api.dll differ