diff --git a/YD_AllHeartRates.Api/Mqtt/MqttBackgroundService.cs b/YD_AllHeartRates.Api/Mqtt/MqttBackgroundService.cs index d9a8a24..cef03df 100644 --- a/YD_AllHeartRates.Api/Mqtt/MqttBackgroundService.cs +++ b/YD_AllHeartRates.Api/Mqtt/MqttBackgroundService.cs @@ -212,7 +212,16 @@ namespace YD_AllHeartRates.Api.Mqtt var totalData = _caching.Get(jumpKey) ?? new JumpRopeData { + Id = jumpData.Id, StudentNo = jumpData.StudentNo, + ClassId = jumpData.ClassId, + ClassName = jumpData.ClassName, + Code = jumpData.Code, + GradeId = jumpData.GradeId, + GradeName = jumpData.GradeName, + SchoolCode = jumpData.SchoolCode, + Sex = jumpData.Sex, + StudentName = jumpData.StudentName, JumpValue = 0, ErrorNumber = 0, QuantityOfElectricity = jumpData.QuantityOfElectricity, @@ -362,23 +371,19 @@ namespace YD_AllHeartRates.Api.Mqtt { try { - if ((DateTime.Now - _lastJumpRopeSaveTime).TotalSeconds < 600) + if ((DateTime.Now - _lastJumpRopeSaveTime).TotalSeconds < 60) return; var today = DateTime.Today; var dateStr = today.ToString("yyyyMMdd"); - var studentNos = RedisHelper.SMembers($"jumpRope:active:{dateStr}"); - - if (studentNos == null || studentNos.Length == 0) - return; + var keys = RedisHelper.Keys($"jumpRope:active:*:{dateStr}"); using var scope = _scopeFactory.CreateScope(); var dbContext = scope.ServiceProvider.GetRequiredService(); - foreach (var studentNo in studentNos) + foreach (var key in keys) { - var cacheKey = $"jumpRope:active:{studentNo}:{dateStr}"; - var data = _caching.Get(cacheKey); + var data = _caching.Get(key); if (data == null || string.IsNullOrWhiteSpace(data.StudentNo)) continue; 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 d15e644..ecf2e9c 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+83b0a0b2711f789f4185bdfb416752add0ad7fed")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d050410b4b408994ca1c9d7c01c1c3c65a0c35f8")] [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 eeac5aa..d336c19 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 @@ -3300c3316a91487d4a3e54535ac38625dbd521ded9b0ad8d5c828df0da4f398e +fd5d16723371e9533b9278925799289d0ca07c958290a8d765748dccd151aa1e 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 378f360..8fec26e 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 629b543..6aad3fc 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 ba98840..1d263bd 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 2cabe40..27fbb10 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 2cabe40..27fbb10 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