dfef
This commit is contained in:
parent
4be147ed0c
commit
bb7d737743
@ -71,7 +71,7 @@ namespace YD_AllHeartRates.Api.Services.Impl
|
|||||||
var cacheKey = $"HeartRateData_{schoolCode}";
|
var cacheKey = $"HeartRateData_{schoolCode}";
|
||||||
var data = _caching.Get<List<HeartRateData>>(cacheKey);
|
var data = _caching.Get<List<HeartRateData>>(cacheKey);
|
||||||
|
|
||||||
if (data == null)
|
if (data == null || data.Count == 0)
|
||||||
{
|
{
|
||||||
data = await _userContext.HeartRateData
|
data = await _userContext.HeartRateData
|
||||||
.Where(x => x.SchoolCode == schoolCode && x.ScoreTime > dayStart && x.ScoreTime <= dayEnd)
|
.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.OnlineDevicesCount = data.GroupBy(x => x.StudentNo).Count();
|
||||||
|
|
||||||
res.SportsData.AvgHeartRate = (int)data.Select(x => x.Value).DefaultIfEmpty(0).Average();
|
res.SportsData.AvgHeartRate = (int)data.Select(x => x.Value).DefaultIfEmpty(0).Average();
|
||||||
|
|
||||||
var durationsByStudent = HeartRateReportHelper.CalculateDurations(
|
var durationsByStudent = HeartRateReportHelper.CalculateDurations(
|
||||||
@ -155,7 +155,7 @@ namespace YD_AllHeartRates.Api.Services.Impl
|
|||||||
// 先尝试从缓存读取
|
// 先尝试从缓存读取
|
||||||
var allData = _caching.Get<List<HeartRateData>>(cacheKey);
|
var allData = _caching.Get<List<HeartRateData>>(cacheKey);
|
||||||
|
|
||||||
if (allData == null)
|
if (allData == null|| allData.Count==0)
|
||||||
{
|
{
|
||||||
allData = await _userContext.HeartRateData
|
allData = await _userContext.HeartRateData
|
||||||
.Where(x => x.SchoolCode == schoolCode && x.ScoreTime > dayStart && x.ScoreTime <= dayEnd)
|
.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();
|
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();
|
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<List<HeartRateData>>(cacheKey);
|
var allData = _caching.Get<List<HeartRateData>>(cacheKey);
|
||||||
|
|
||||||
if (allData == null)
|
if (allData == null || allData.Count == 0)
|
||||||
{
|
{
|
||||||
allData = await _userContext.HeartRateData
|
allData = await _userContext.HeartRateData
|
||||||
.Where(x => x.SchoolCode == schoolCode && x.ScoreTime > dayStart && x.ScoreTime <= dayEnd)
|
.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<List<HeartRateData>>(cacheKey);
|
var allData = _caching.Get<List<HeartRateData>>(cacheKey);
|
||||||
|
|
||||||
if (allData == null)
|
if (allData == null || allData.Count == 0)
|
||||||
{
|
{
|
||||||
allData = await _userContext.HeartRateData
|
allData = await _userContext.HeartRateData
|
||||||
.Where(x => x.SchoolCode == schoolCode && x.ScoreTime > dayStart && x.ScoreTime <= dayEnd)
|
.Where(x => x.SchoolCode == schoolCode && x.ScoreTime > dayStart && x.ScoreTime <= dayEnd)
|
||||||
|
@ -14,7 +14,7 @@ using System.Reflection;
|
|||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")]
|
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Api")]
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
[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.AssemblyProductAttribute("YD_AllHeartRates.Api")]
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")]
|
[assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Api")]
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||||
|
@ -1 +1 @@
|
|||||||
d0fd70ca558eb27a63b8502db6933ff8d4d403e75a3eb07f44cb84badd7aeaea
|
06c8e83f866dbe7a14cff35782bb4ee85519838545231f3e9dabb994b6d2fb17
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user