diff --git a/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index b73af13..11c2d41 100644 Binary files a/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ diff --git a/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml b/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml index 176a7a1..158c443 100644 --- a/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml +++ b/YD_AllHeartRates.Api/FakesAssemblies/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml @@ -1369,6 +1369,12 @@ 设置 DevicePageListDto.set_DeviceType(DevicePageListDto this, Int32 value) 的 填充码 + + 设置 DevicePageListDto.get_Id(DevicePageListDto this) 的 填充码 + + + 设置 DevicePageListDto.set_Id(DevicePageListDto this, Int32 value) 的 填充码 + 设置 DevicePageListDto.get_IsBind(DevicePageListDto this) 的 填充码 @@ -1411,6 +1417,12 @@ 设置 DevicePageListDto.set_DeviceType(DevicePageListDto this, Int32 value) 的 填充码 + + 设置 DevicePageListDto.get_Id(DevicePageListDto this) 的 填充码 + + + 设置 DevicePageListDto.set_Id(DevicePageListDto this, Int32 value) 的 填充码 + 设置 DevicePageListDto.get_IsBind(DevicePageListDto this) 的 填充码 @@ -2968,12 +2980,24 @@ 为所有实例成员定义填充码 + + 设置 HeartRateDataDto.get_HeartRateOnlineCount(HeartRateDataDto this) 的 填充码 + + + 设置 HeartRateDataDto.set_HeartRateOnlineCount(HeartRateDataDto this, Int32 value) 的 填充码 + 设置 HeartRateDataDto.get_High(HeartRateDataDto this) 的 填充码 设置 HeartRateDataDto.set_High(HeartRateDataDto this, Int32 value) 的 填充码 + + 设置 HeartRateDataDto.get_JumpingRopeOnLineCount(HeartRateDataDto this) 的 填充码 + + + 设置 HeartRateDataDto.set_JumpingRopeOnLineCount(HeartRateDataDto this, Int32 value) 的 填充码 + 设置 HeartRateDataDto.get_Low(HeartRateDataDto this) 的 填充码 @@ -3016,12 +3040,24 @@ 设置 HeartRateDataDto.HeartRateDataDto(HeartRateDataDto this) 的 填充码 + + 设置 HeartRateDataDto.get_HeartRateOnlineCount(HeartRateDataDto this) 的 填充码 + + + 设置 HeartRateDataDto.set_HeartRateOnlineCount(HeartRateDataDto this, Int32 value) 的 填充码 + 设置 HeartRateDataDto.get_High(HeartRateDataDto this) 的 填充码 设置 HeartRateDataDto.set_High(HeartRateDataDto this, Int32 value) 的 填充码 + + 设置 HeartRateDataDto.get_JumpingRopeOnLineCount(HeartRateDataDto this) 的 填充码 + + + 设置 HeartRateDataDto.set_JumpingRopeOnLineCount(HeartRateDataDto this, Int32 value) 的 填充码 + 设置 HeartRateDataDto.get_Low(HeartRateDataDto this) 的 填充码 @@ -3076,36 +3112,12 @@ 设置 SchoolDto.set_HeartRateAllCount(SchoolDto this, Int32 value) 的 填充码 - - 设置 SchoolDto.get_HeartRateOfflineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_HeartRateOfflineCount(SchoolDto this, Int32 value) 的 填充码 - - - 设置 SchoolDto.get_HeartRateOnlineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_HeartRateOnlineCount(SchoolDto this, Int32 value) 的 填充码 - 设置 SchoolDto.get_JumpingRopeAllCount(SchoolDto this) 的 填充码 设置 SchoolDto.set_JumpingRopeAllCount(SchoolDto this, Int32 value) 的 填充码 - - 设置 SchoolDto.get_JumpingRopeOfflineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_JumpingRopeOfflineCount(SchoolDto this, Int32 value) 的 填充码 - - - 设置 SchoolDto.get_JumpingRopeOnLineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_JumpingRopeOnLineCount(SchoolDto this, Int32 value) 的 填充码 - 设置 SchoolDto.get_Name(SchoolDto this) 的 填充码 @@ -3142,36 +3154,12 @@ 设置 SchoolDto.set_HeartRateAllCount(SchoolDto this, Int32 value) 的 填充码 - - 设置 SchoolDto.get_HeartRateOfflineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_HeartRateOfflineCount(SchoolDto this, Int32 value) 的 填充码 - - - 设置 SchoolDto.get_HeartRateOnlineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_HeartRateOnlineCount(SchoolDto this, Int32 value) 的 填充码 - 设置 SchoolDto.get_JumpingRopeAllCount(SchoolDto this) 的 填充码 设置 SchoolDto.set_JumpingRopeAllCount(SchoolDto this, Int32 value) 的 填充码 - - 设置 SchoolDto.get_JumpingRopeOfflineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_JumpingRopeOfflineCount(SchoolDto this, Int32 value) 的 填充码 - - - 设置 SchoolDto.get_JumpingRopeOnLineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_JumpingRopeOnLineCount(SchoolDto this, Int32 value) 的 填充码 - 设置 SchoolDto.get_Name(SchoolDto this) 的 填充码 @@ -4624,6 +4612,9 @@ 设置 MemoryCaching.Get(MemoryCaching this, String key) 的 填充码 + + 设置 MemoryCaching.GetSetCount(MemoryCaching this, String key) 的 填充码 + 设置 MemoryCaching.Get(MemoryCaching this, String cacheKey) 的 填充码 @@ -4678,6 +4669,9 @@ 设置 MemoryCaching.Get(MemoryCaching this, String key) 的 填充码 + + 设置 MemoryCaching.GetSetCount(MemoryCaching this, String key) 的 填充码 + 设置 MemoryCaching.Get(MemoryCaching this, String cacheKey) 的 填充码 @@ -4744,6 +4738,9 @@ 设置 RedisCacheService.Get(RedisCacheService this, String key) 的 填充码 + + 设置 RedisCacheService.GetSetCount(RedisCacheService this, String key) 的 填充码 + 设置 RedisCacheService.Get(RedisCacheService this, String key) 的 填充码 @@ -4792,6 +4789,9 @@ 设置 RedisCacheService.Get(RedisCacheService this, String key) 的 填充码 + + 设置 RedisCacheService.GetSetCount(RedisCacheService this, String key) 的 填充码 + 设置 RedisCacheService.Get(RedisCacheService this, String key) 的 填充码 @@ -4834,6 +4834,9 @@ 设置 Get(ICaching this, String key) 的存根 + + 设置 ICaching.GetSetCount(ICaching this, String key) 的 stub + 设置 ICaching.Get(ICaching this, String key) 的 stub @@ -4873,6 +4876,9 @@ 设置 ICaching.Get(ICaching this, String key) 的 存根 + + 设置 ICaching.GetSetCount(ICaching this, String key) 的 存根 + 设置 ICaching.LPush(ICaching this, String key, String val) 的 存根 diff --git a/YD_AllHeartRates.Api/Mqtt/MqttBackgroundService.cs b/YD_AllHeartRates.Api/Mqtt/MqttBackgroundService.cs index 1f13cfd..eeef06d 100644 --- a/YD_AllHeartRates.Api/Mqtt/MqttBackgroundService.cs +++ b/YD_AllHeartRates.Api/Mqtt/MqttBackgroundService.cs @@ -159,11 +159,12 @@ namespace YD_AllHeartRates.Api.Mqtt heartRateEntities.Add(entity); var heartRateKey = $"heartRate:{student.StudentNo}"; - _caching.AddObject(heartRateKey, entity, 600); // 10分钟缓存 + _caching.AddObject(heartRateKey, entity, 60); // 1分钟缓存 // 更新学校学生编号集合(Set) var studentSetKey = $"school:{student.SchoolCode}:students"; RedisHelper.SAdd(studentSetKey, student.StudentNo); // 自动去重 + RedisHelper.Expire(studentSetKey, 60); } foreach (var ble in jumpRopeList) @@ -221,7 +222,7 @@ namespace YD_AllHeartRates.Api.Mqtt } var studentSetKey = $"school:{student.SchoolCode}:students"; var jumpKey = $"jumpRope:{student.StudentNo}"; - _caching.AddObject(jumpKey, jumpData, 600); + _caching.AddObject(jumpKey, jumpData, 60); RedisHelper.SAdd(studentSetKey, student.StudentNo); } diff --git a/YD_AllHeartRates.Api/Services/Impl/LargeScreenService.cs b/YD_AllHeartRates.Api/Services/Impl/LargeScreenService.cs index c69233b..e318e30 100644 --- a/YD_AllHeartRates.Api/Services/Impl/LargeScreenService.cs +++ b/YD_AllHeartRates.Api/Services/Impl/LargeScreenService.cs @@ -1,6 +1,7 @@  using AutoMapper; using Microsoft.EntityFrameworkCore; +using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime; using System.Drawing; using System.Reflection.PortableExecutable; using YD_AllHeartRates.Api.Context; @@ -70,7 +71,6 @@ namespace YD_AllHeartRates.Api.Services.Impl res.Grade = grades; - var devices = await _sportsContext.Device.Where(x => x.SchoolCode == schoolCode).ToListAsync(); var heartRateDevices = devices.Where(x => x.DeviceType == 1).ToList(); @@ -79,60 +79,6 @@ namespace YD_AllHeartRates.Api.Services.Impl res.HeartRateAllCount = heartRateDevices.Count(); res.JumpingRopeAllCount = jumpingRopeDevices.Count(); - var tenMinutesAgo = DateTime.Now.AddMinutes(-10); - - #region 心率 - var heartRateData = _userContext.HeartRateData - .Where(x => x.SchoolCode == schoolCode && x.ScoreTime >= tenMinutesAgo) - .ToList(); - var onlineHeartRateDeviceCodes = heartRateData - .Select(x => x.Code) - .Distinct() - .ToHashSet(); - - // 在线设备 - var onlineHeartRateDevices = heartRateDevices - .Where(x => onlineHeartRateDeviceCodes.Contains(x.Code)) - .ToList(); - - // 离线设备 = 所有心率设备 - 在线设备 - var offlineHeartRateDevices = heartRateDevices - .Where(x => !onlineHeartRateDeviceCodes.Contains(x.Code)) - .ToList(); - - // 设置返回值或继续处理 - res.HeartRateOnlineCount = onlineHeartRateDevices.Count; - res.HeartRateOfflineCount = offlineHeartRateDevices.Count; - - #endregion - - #region 跳绳 - - var jumpRopeData = _userContext.JumpRopeData - .Where(x => x.SchoolCode == schoolCode && x.ScoreTime >= tenMinutesAgo) - .ToList(); - - var onlineJumpRopeDeviceCodes = jumpRopeData - .Select(x => x.Code) - .Distinct() - .ToHashSet(); - - // 在线设备 - var onlineJumpRopeDevices = jumpingRopeDevices - .Where(x => onlineJumpRopeDeviceCodes.Contains(x.Code)) - .ToList(); - - // 离线设备 = 所有心率设备 - 在线设备 - var offlineJumpRopeDevices = jumpingRopeDevices - .Where(x => !onlineJumpRopeDeviceCodes.Contains(x.Code)) - .ToList(); - - // 设置返回值或继续处理 - res.JumpingRopeOnLineCount = onlineJumpRopeDevices.Count; - res.JumpingRopeOfflineCount = offlineJumpRopeDevices.Count; - - #endregion - return res; } @@ -145,7 +91,15 @@ namespace YD_AllHeartRates.Api.Services.Impl var res = new HeartRateDataDto(); var now = DateTime.Now; - var tenMinutesAgo = now.AddMinutes(-10); + var tenMinutesAgo = now.AddMinutes(-1); + + // 在线心率设备 + int onlineHeartRateCount = RedisHelper.Keys("heartRate:*").Length; + res.HeartRateOnlineCount = onlineHeartRateCount; + + // 在线跳绳设备 + int onlineJumpRopeCount = RedisHelper.Keys("jumpRope:*").Length; + res.JumpingRopeOnLineCount = onlineJumpRopeCount; // 1. 构建缓存 key string studentListKey = $"students:{schoolCode}:{classId}"; @@ -183,7 +137,7 @@ namespace YD_AllHeartRates.Api.Services.Impl .FirstOrDefaultAsync(); if (heartRate != null) - _caching.AddObject(heartRateKey, heartRate, 600); + _caching.AddObject(heartRateKey, heartRate, 60); } // ❗跳绳缓存未命中 → 单独查数据库 @@ -195,16 +149,30 @@ namespace YD_AllHeartRates.Api.Services.Impl .FirstOrDefaultAsync(); if (jumpRope != null) - _caching.AddObject(jumpRopeKey, jumpRope, 600); + _caching.AddObject(jumpRopeKey, jumpRope, 60); } // 心率强度判断 int strength = heartRate?.Strength ?? 0; - if (strength < 50) warmUp++; - else if (strength < 60) low++; - else if (strength < 70) medium++; - else if (strength < 85) high++; - else warning++; + + switch (strength) + { + case > 0 and < 50: + warmUp++; + break; + case >= 50 and < 60: + low++; + break; + case >= 60 and < 70: + medium++; + break; + case >= 70 and < 85: + high++; + break; + case >= 85: + warning++; + break; + } res.StudentList.Add(new StudentDto { @@ -218,12 +186,13 @@ namespace YD_AllHeartRates.Api.Services.Impl }); } - int total = studentList.Count == 0 ? 1 : studentList.Count; - res.WarmUp = (int)Math.Round(warmUp * 100.0 / total); - res.Low = (int)Math.Round(low * 100.0 / total); - res.Medium = (int)Math.Round(medium * 100.0 / total); - res.High = (int)Math.Round(high * 100.0 / total); - res.Warning = (int)Math.Round(warning * 100.0 / total); + int total = RedisHelper.Keys("heartRate:*").Length; + + res.WarmUp = total == 0 ? 0 : (int)Math.Round(warmUp * 100.0 / total); + res.Low = total == 0 ? 0 : (int)Math.Round(low * 100.0 / total); + res.Medium = total == 0 ? 0 : (int)Math.Round(medium * 100.0 / total); + res.High = total == 0 ? 0 : (int)Math.Round(high * 100.0 / total); + res.Warning = total == 0 ? 0 : (int)Math.Round(warning * 100.0 / total); return res; } diff --git a/YD_AllHeartRates.Api/Startup.cs b/YD_AllHeartRates.Api/Startup.cs index 7e64fa6..6f4be32 100644 --- a/YD_AllHeartRates.Api/Startup.cs +++ b/YD_AllHeartRates.Api/Startup.cs @@ -75,7 +75,7 @@ namespace YD_AllHeartRates.Api services.AddSingleton(new MqttFactory().CreateMqttClient()); // ③ 后台批量写库服务 - //services.AddHostedService(); + services.AddHostedService(); services.AddSingleton(); diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json b/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json index ad0cd82..2338fe1 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/EndpointInfo/YD_AllHeartRates.Api.json @@ -825,6 +825,10 @@ "DevicePageListDto": { "type": "object", "properties": { + "id": { + "type": "integer", + "format": "int32" + }, "code": { "type": "string", "nullable": true @@ -964,6 +968,14 @@ "HeartRateDataDto": { "type": "object", "properties": { + "heartRateOnlineCount": { + "type": "integer", + "format": "int32" + }, + "jumpingRopeOnLineCount": { + "type": "integer", + "format": "int32" + }, "warmUp": { "type": "integer", "format": "int32" @@ -1029,26 +1041,10 @@ "type": "integer", "format": "int32" }, - "heartRateOnlineCount": { - "type": "integer", - "format": "int32" - }, - "heartRateOfflineCount": { - "type": "integer", - "format": "int32" - }, "jumpingRopeAllCount": { "type": "integer", "format": "int32" }, - "jumpingRopeOnLineCount": { - "type": "integer", - "format": "int32" - }, - "jumpingRopeOfflineCount": { - "type": "integer", - "format": "int32" - }, "grade": { "type": "array", "items": { diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index b73af13..11c2d41 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb index dfe555a..98a7e05 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml index 176a7a1..158c443 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/b/YD_AllHeartRates.Commons.1.0.0.0.Fakes.xml @@ -1369,6 +1369,12 @@ 设置 DevicePageListDto.set_DeviceType(DevicePageListDto this, Int32 value) 的 填充码 + + 设置 DevicePageListDto.get_Id(DevicePageListDto this) 的 填充码 + + + 设置 DevicePageListDto.set_Id(DevicePageListDto this, Int32 value) 的 填充码 + 设置 DevicePageListDto.get_IsBind(DevicePageListDto this) 的 填充码 @@ -1411,6 +1417,12 @@ 设置 DevicePageListDto.set_DeviceType(DevicePageListDto this, Int32 value) 的 填充码 + + 设置 DevicePageListDto.get_Id(DevicePageListDto this) 的 填充码 + + + 设置 DevicePageListDto.set_Id(DevicePageListDto this, Int32 value) 的 填充码 + 设置 DevicePageListDto.get_IsBind(DevicePageListDto this) 的 填充码 @@ -2968,12 +2980,24 @@ 为所有实例成员定义填充码 + + 设置 HeartRateDataDto.get_HeartRateOnlineCount(HeartRateDataDto this) 的 填充码 + + + 设置 HeartRateDataDto.set_HeartRateOnlineCount(HeartRateDataDto this, Int32 value) 的 填充码 + 设置 HeartRateDataDto.get_High(HeartRateDataDto this) 的 填充码 设置 HeartRateDataDto.set_High(HeartRateDataDto this, Int32 value) 的 填充码 + + 设置 HeartRateDataDto.get_JumpingRopeOnLineCount(HeartRateDataDto this) 的 填充码 + + + 设置 HeartRateDataDto.set_JumpingRopeOnLineCount(HeartRateDataDto this, Int32 value) 的 填充码 + 设置 HeartRateDataDto.get_Low(HeartRateDataDto this) 的 填充码 @@ -3016,12 +3040,24 @@ 设置 HeartRateDataDto.HeartRateDataDto(HeartRateDataDto this) 的 填充码 + + 设置 HeartRateDataDto.get_HeartRateOnlineCount(HeartRateDataDto this) 的 填充码 + + + 设置 HeartRateDataDto.set_HeartRateOnlineCount(HeartRateDataDto this, Int32 value) 的 填充码 + 设置 HeartRateDataDto.get_High(HeartRateDataDto this) 的 填充码 设置 HeartRateDataDto.set_High(HeartRateDataDto this, Int32 value) 的 填充码 + + 设置 HeartRateDataDto.get_JumpingRopeOnLineCount(HeartRateDataDto this) 的 填充码 + + + 设置 HeartRateDataDto.set_JumpingRopeOnLineCount(HeartRateDataDto this, Int32 value) 的 填充码 + 设置 HeartRateDataDto.get_Low(HeartRateDataDto this) 的 填充码 @@ -3076,36 +3112,12 @@ 设置 SchoolDto.set_HeartRateAllCount(SchoolDto this, Int32 value) 的 填充码 - - 设置 SchoolDto.get_HeartRateOfflineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_HeartRateOfflineCount(SchoolDto this, Int32 value) 的 填充码 - - - 设置 SchoolDto.get_HeartRateOnlineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_HeartRateOnlineCount(SchoolDto this, Int32 value) 的 填充码 - 设置 SchoolDto.get_JumpingRopeAllCount(SchoolDto this) 的 填充码 设置 SchoolDto.set_JumpingRopeAllCount(SchoolDto this, Int32 value) 的 填充码 - - 设置 SchoolDto.get_JumpingRopeOfflineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_JumpingRopeOfflineCount(SchoolDto this, Int32 value) 的 填充码 - - - 设置 SchoolDto.get_JumpingRopeOnLineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_JumpingRopeOnLineCount(SchoolDto this, Int32 value) 的 填充码 - 设置 SchoolDto.get_Name(SchoolDto this) 的 填充码 @@ -3142,36 +3154,12 @@ 设置 SchoolDto.set_HeartRateAllCount(SchoolDto this, Int32 value) 的 填充码 - - 设置 SchoolDto.get_HeartRateOfflineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_HeartRateOfflineCount(SchoolDto this, Int32 value) 的 填充码 - - - 设置 SchoolDto.get_HeartRateOnlineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_HeartRateOnlineCount(SchoolDto this, Int32 value) 的 填充码 - 设置 SchoolDto.get_JumpingRopeAllCount(SchoolDto this) 的 填充码 设置 SchoolDto.set_JumpingRopeAllCount(SchoolDto this, Int32 value) 的 填充码 - - 设置 SchoolDto.get_JumpingRopeOfflineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_JumpingRopeOfflineCount(SchoolDto this, Int32 value) 的 填充码 - - - 设置 SchoolDto.get_JumpingRopeOnLineCount(SchoolDto this) 的 填充码 - - - 设置 SchoolDto.set_JumpingRopeOnLineCount(SchoolDto this, Int32 value) 的 填充码 - 设置 SchoolDto.get_Name(SchoolDto this) 的 填充码 @@ -4624,6 +4612,9 @@ 设置 MemoryCaching.Get(MemoryCaching this, String key) 的 填充码 + + 设置 MemoryCaching.GetSetCount(MemoryCaching this, String key) 的 填充码 + 设置 MemoryCaching.Get(MemoryCaching this, String cacheKey) 的 填充码 @@ -4678,6 +4669,9 @@ 设置 MemoryCaching.Get(MemoryCaching this, String key) 的 填充码 + + 设置 MemoryCaching.GetSetCount(MemoryCaching this, String key) 的 填充码 + 设置 MemoryCaching.Get(MemoryCaching this, String cacheKey) 的 填充码 @@ -4744,6 +4738,9 @@ 设置 RedisCacheService.Get(RedisCacheService this, String key) 的 填充码 + + 设置 RedisCacheService.GetSetCount(RedisCacheService this, String key) 的 填充码 + 设置 RedisCacheService.Get(RedisCacheService this, String key) 的 填充码 @@ -4792,6 +4789,9 @@ 设置 RedisCacheService.Get(RedisCacheService this, String key) 的 填充码 + + 设置 RedisCacheService.GetSetCount(RedisCacheService this, String key) 的 填充码 + 设置 RedisCacheService.Get(RedisCacheService this, String key) 的 填充码 @@ -4834,6 +4834,9 @@ 设置 Get(ICaching this, String key) 的存根 + + 设置 ICaching.GetSetCount(ICaching this, String key) 的 stub + 设置 ICaching.Get(ICaching this, String key) 的 stub @@ -4873,6 +4876,9 @@ 设置 ICaching.Get(ICaching this, String key) 的 存根 + + 设置 ICaching.GetSetCount(ICaching this, String key) 的 存根 + 设置 ICaching.LPush(ICaching this, String key, String val) 的 存根 diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ah b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ah index f368e35..ffcb7c9 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ah +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ah @@ -1 +1 @@ -7def3707 \ No newline at end of file +149dafaa \ No newline at end of file diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ch b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ch index 33dec56..00320dc 100644 --- a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ch +++ b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.ch @@ -1 +1 @@ -ONwTLhkGOhz/28wj7kAwt2jbsNLGmVJjqL1QibQUlKE=WWmIfOUbyYPYdKFHlVpzo+vbEnfIsJNTTcG8+oWdtSc= \ No newline at end of file +0uohCQ6UbfHd8G7ilvHCC/sDgU9t3aeppmjszUtaN84=WWmIfOUbyYPYdKFHlVpzo+vbEnfIsJNTTcG8+oWdtSc= \ No newline at end of file diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.cs b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.cs index 4e269ad..076d38a 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.cs and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/f.cs differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index b73af13..11c2d41 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb index dfe555a..98a7e05 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/YD_AllHeartRates.Commons.1.0.0.0.Fakes.pdb differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/ref/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/ref/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index 11e136f..ba6cdaf 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/ref/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/ref/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/refint/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/refint/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll index 11e136f..ba6cdaf 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/refint/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll and b/YD_AllHeartRates.Api/obj/Debug/net6.0/Fakes/ydahrc/o/net6.0/refint/YD_AllHeartRates.Commons.1.0.0.0.Fakes.dll differ 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 56d0483..e3b4863 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+7e1bbaab315f2ae7502343f72735413eb2ac9405")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c98c4b2a74890d0bb616aad014ba75a84433e906")] [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 b5885b1..282e36a 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 @@ -24d6911f3a4f57a1e85f43b3126d306b828d7978fb41f33c0e9f8a99145f7176 +4c39aab942c93310bbce5068bcc5d00989b6b795a1b2889442bc4bd9ead58b4f diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache index 0fb005b..d12a2fa 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csproj.AssemblyReference.cache differ diff --git a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache index e06497d..e5035a5 100644 Binary files a/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache and b/YD_AllHeartRates.Api/obj/Debug/net6.0/YD_AllHeartRates.Api.csprojFakesResolveAssemblyReference.cache differ 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 18f94d6..28785a9 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 78859c5..5496eb4 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 3946892..183dc4d 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 a84cfe1..837abe4 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 a84cfe1..837abe4 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 diff --git a/YD_AllHeartRates.Commons/Dto/LargeScreen/HeartRateDataDto.cs b/YD_AllHeartRates.Commons/Dto/LargeScreen/HeartRateDataDto.cs index 1f84e6d..41e1e97 100644 --- a/YD_AllHeartRates.Commons/Dto/LargeScreen/HeartRateDataDto.cs +++ b/YD_AllHeartRates.Commons/Dto/LargeScreen/HeartRateDataDto.cs @@ -11,6 +11,25 @@ namespace YD_AllHeartRates.Commons.Dto.LargeScreen /// public class HeartRateDataDto { + /// + /// 在线心率设备数量 + /// + public int HeartRateOnlineCount { get; set; } + + /// + /// 离线心率设备数量 + /// + //public int HeartRateOfflineCount { get; set; } + + /// + /// 在线跳绳设备数量 + /// + public int JumpingRopeOnLineCount { get; set; } + + /// + /// 离线跳绳设备数量 + /// + //public int JumpingRopeOfflineCount { get; set; } /// /// 基本热身 /// diff --git a/YD_AllHeartRates.Commons/Dto/LargeScreen/SchoolDto.cs b/YD_AllHeartRates.Commons/Dto/LargeScreen/SchoolDto.cs index 00ff427..5162a66 100644 --- a/YD_AllHeartRates.Commons/Dto/LargeScreen/SchoolDto.cs +++ b/YD_AllHeartRates.Commons/Dto/LargeScreen/SchoolDto.cs @@ -25,31 +25,11 @@ namespace YD_AllHeartRates.Commons.Dto.LargeScreen /// public int HeartRateAllCount { get; set; } - /// - /// 在线心率设备数量 - /// - public int HeartRateOnlineCount { get; set; } - - /// - /// 离线心率设备数量 - /// - public int HeartRateOfflineCount { get; set; } - /// /// 所有跳绳设备数量 /// public int JumpingRopeAllCount { get; set; } - /// - /// 在线跳绳设备数量 - /// - public int JumpingRopeOnLineCount { get; set; } - - /// - /// 离线跳绳设备数量 - /// - public int JumpingRopeOfflineCount { get; set; } - /// /// 年级集合 /// diff --git a/YD_AllHeartRates.Commons/MemoryCaches/ICaching.cs b/YD_AllHeartRates.Commons/MemoryCaches/ICaching.cs index 48178ef..1662cba 100644 --- a/YD_AllHeartRates.Commons/MemoryCaches/ICaching.cs +++ b/YD_AllHeartRates.Commons/MemoryCaches/ICaching.cs @@ -87,5 +87,12 @@ namespace YD_AllHeartRates.Commons.MemoryCaches /// 缓存Key /// string Get(string key); + + /// + /// 获取集合中元素个数 + /// + /// + /// + int GetSetCount(string key); } } diff --git a/YD_AllHeartRates.Commons/MemoryCaches/MemoryCaching.cs b/YD_AllHeartRates.Commons/MemoryCaches/MemoryCaching.cs index f3870fb..5ca64fd 100644 --- a/YD_AllHeartRates.Commons/MemoryCaches/MemoryCaching.cs +++ b/YD_AllHeartRates.Commons/MemoryCaches/MemoryCaching.cs @@ -98,5 +98,10 @@ namespace YD_AllHeartRates.Commons.MemoryCaches { throw new NotImplementedException(); } + + public int GetSetCount(string key) + { + throw new NotImplementedException(); + } } } diff --git a/YD_AllHeartRates.Commons/MemoryCaches/RedisCacheService.cs b/YD_AllHeartRates.Commons/MemoryCaches/RedisCacheService.cs index 18e3720..877a6d2 100644 --- a/YD_AllHeartRates.Commons/MemoryCaches/RedisCacheService.cs +++ b/YD_AllHeartRates.Commons/MemoryCaches/RedisCacheService.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace YD_AllHeartRates.Commons.MemoryCaches +namespace YD_AllHeartRates.Commons.MemoryCaches { /// /// 实例化缓存接口ICaching @@ -123,5 +123,10 @@ namespace YD_AllHeartRates.Commons.MemoryCaches public void Dispose() { } + + public int GetSetCount(string key) + { + return (int)RedisHelper.SCard(key); + } } } diff --git a/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll b/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll index 513efe2..7a86944 100644 Binary files a/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll and b/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.dll differ diff --git a/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb b/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb index 632bf6c..141c40b 100644 Binary files a/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb and b/YD_AllHeartRates.Commons/bin/Debug/net6.0/YD_AllHeartRates.Commons.pdb differ diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs index 3fc0b3d..df47069 100644 --- a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs +++ b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d519db60065b57bb45c944c9712771e34f5a400e")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c98c4b2a74890d0bb616aad014ba75a84433e906")] [assembly: System.Reflection.AssemblyProductAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_AllHeartRates.Commons")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache index 00c3f22..04882d7 100644 --- a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache +++ b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.AssemblyInfoInputs.cache @@ -1 +1 @@ -7b2bf23081d834e2ce2a9fc41cc27e53006e31644d5a7528d5f7ab365ea6bfcd +668b81ff389a83759bfd187d7c13f10ac2622c7ff6839336f1132ba32a93a9fb diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.dll b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.dll index 513efe2..7a86944 100644 Binary files a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.dll and b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.dll differ diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.pdb b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.pdb index 632bf6c..141c40b 100644 Binary files a/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.pdb and b/YD_AllHeartRates.Commons/obj/Debug/net6.0/YD_AllHeartRates.Commons.pdb differ diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/ref/YD_AllHeartRates.Commons.dll b/YD_AllHeartRates.Commons/obj/Debug/net6.0/ref/YD_AllHeartRates.Commons.dll index 40635c5..31a9611 100644 Binary files a/YD_AllHeartRates.Commons/obj/Debug/net6.0/ref/YD_AllHeartRates.Commons.dll and b/YD_AllHeartRates.Commons/obj/Debug/net6.0/ref/YD_AllHeartRates.Commons.dll differ diff --git a/YD_AllHeartRates.Commons/obj/Debug/net6.0/refint/YD_AllHeartRates.Commons.dll b/YD_AllHeartRates.Commons/obj/Debug/net6.0/refint/YD_AllHeartRates.Commons.dll index 40635c5..31a9611 100644 Binary files a/YD_AllHeartRates.Commons/obj/Debug/net6.0/refint/YD_AllHeartRates.Commons.dll and b/YD_AllHeartRates.Commons/obj/Debug/net6.0/refint/YD_AllHeartRates.Commons.dll differ