From 3feec35b442a4807dc37f3f1e80cd9e25d6b34dd Mon Sep 17 00:00:00 2001 From: tanglong <842690096@qq.com> Date: Wed, 7 Jan 2026 18:20:34 +0800 Subject: [PATCH] xinwei --- .../net6.0/YD_XinWei.Commons.AssemblyInfo.cs | 2 +- ...YD_XinWei.Commons.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0/YD_XinWei.Commons.assets.cache | Bin 13888 -> 13888 bytes .../Services/Impl/LargeScreenService.cs | 88 +++++++++--------- .../net6.0/YD_XinWei.Api.AssemblyInfo.cs | 2 +- .../YD_XinWei.Api.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 +- .../Debug/net6.0/YD_XinWei.Api.assets.cache | Bin 44848 -> 44848 bytes ..._XinWei.Api.csproj.AssemblyReference.cache | Bin 22579 -> 20406 bytes 10 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs index 8768b26..c696339 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+35ad95bd6885f10ef9d0d18bc76609fc1773a39d")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7bdd3b25d3197213802b19b367c9c9e6ecba10ba")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache index 8acb93d..e614be2 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache @@ -1 +1 @@ -b0094d31d93d158b8a715e64c9aa2a1dc33706a1b2d46d99732ddf981a165f5d +2cc8d2f686463f07a5c8fe465cc6425ba843827a96c0faadb12d0611a515735a diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.GeneratedMSBuildEditorConfig.editorconfig b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.GeneratedMSBuildEditorConfig.editorconfig index 5d8183a..53105b3 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.GeneratedMSBuildEditorConfig.editorconfig +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.GeneratedMSBuildEditorConfig.editorconfig @@ -10,7 +10,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = YD_XinWei.Commons -build_property.ProjectDir = D:\Git\YD\YD_XinWei.Api\Server\YD_XinWei.Commons\ +build_property.ProjectDir = C:\Users\tangl\Desktop\Git\YD_XinWei\Server\YD_XinWei.Commons\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 6.0 diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.assets.cache b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.assets.cache index 2f1d8cc3a738a9f66e1ec40e38ea78a4ba0d063d..9d6a6add7c59db32d9227776910a7d2499387634 100644 GIT binary patch delta 58 zcmX?*b09}Iz}wxChk=2?d6Vx4=L3~HQqKP0*dxETVf$J;t#rFysgKd(kGI=qpPZlt OR5Y1UHh<%sC8hw@2^d-c delta 58 zcmX?*b09}Iz}wxChk=3NruQoGl;S_FVsd+C-q^+D-*2-$bo)C6Bg(I diff --git a/Server/YD_XinWei/Services/Impl/LargeScreenService.cs b/Server/YD_XinWei/Services/Impl/LargeScreenService.cs index 9cd50c1..15b45f8 100644 --- a/Server/YD_XinWei/Services/Impl/LargeScreenService.cs +++ b/Server/YD_XinWei/Services/Impl/LargeScreenService.cs @@ -83,29 +83,56 @@ namespace YD_XinWei.Api.Services.Impl var sportsTestDataKey = $"SportsTestData_{schoolCode}"; var studentListKey = $"StudentList_{schoolCode}"; - //var studentList = _caching.Get>(studentListKey); + var studentList = _caching.Get>(studentListKey); - //if (studentList == null || studentList.Count == 0) - //{ - // studentList = await _sportsContext.Student.Where(x => x.SchoolCode == schoolCode).Select(x => new StudentListDto - // { - // StudentNo = x.StudentNo, - // Sex = x.Sex, - // Photo = x.Photo ?? "" - // }).ToListAsync(); - // //_caching.AddObject(studentListKey, studentList, 3600); - //} - - var studentList = await _sportsContext.Student.Where(x => x.SchoolCode == schoolCode).Select(x => new StudentListDto + if (studentList == null || studentList.Count == 0) { - StudentNo = x.StudentNo, - Sex = x.Sex, - Photo = x.Photo ?? "" - }).ToListAsync(); + studentList = await _sportsContext.Student.Where(x => x.SchoolCode == schoolCode).Select(x => new StudentListDto + { + StudentNo = x.StudentNo, + Sex = x.Sex, + Photo = x.Photo ?? "" + }).ToListAsync(); + _caching.AddObject(studentListKey, studentList, 3600); + } + + //var studentList = await _sportsContext.Student.Where(x => x.SchoolCode == schoolCode).Select(x => new StudentListDto + //{ + // StudentNo = x.StudentNo, + // Sex = x.Sex, + // Photo = x.Photo ?? "" + //}).ToListAsync(); res.BasicInfo.FemaleCount = studentList.Count(x => x.Sex == 2); res.BasicInfo.MaleCount = studentList.Count(x => x.Sex == 1); + var sportsTestData = _caching.Get>(sportsTestDataKey); + + if (sportsTestData == null || sportsTestData.Count == 0) + { + sportsTestData = await _sportsContext.SportsTestValue.Where(x => x.SchoolCode == schoolCode && x.DataSource == DataSource.XW) + .Select(x => new SportsTestDataDto() + { + SchoolCode = x.SchoolCode, + CategoryValue = x.CategoryValue, + ClassId = x.ClassId, + ClassName = x.ClassName, + GradeId = x.GradeId, + GradeName = x.GradeName, + TeacherId = x.TeacherId, + StudentNo = x.StudentNo, + StudentName = x.StudentName, + Sex = x.Sex, + ScoreTime = x.ScoreTime, + Height = x.Height, + Weight = x.Weight, + Value = x.Value, + Score = x.Score, + Rank = x.Rank + }).ToListAsync(); + _caching.AddObject(sportsTestDataKey, sportsTestData, 60); + } + //var sportsTestData = _caching.Get>(sportsTestDataKey); //if (sportsTestData == null || sportsTestData.Count == 0) @@ -133,33 +160,6 @@ namespace YD_XinWei.Api.Services.Impl // //_caching.AddObject(sportsTestDataKey, sportsTestData, 60); //} - var sportsTestData = _caching.Get>(sportsTestDataKey); - - if (sportsTestData == null || sportsTestData.Count == 0) - { - sportsTestData = await _sportsContext.SportsTestValue.Where(x => x.SchoolCode == schoolCode && x.DataSource == DataSource.XW) - .Select(x => new SportsTestDataDto() - { - SchoolCode = x.SchoolCode, - CategoryValue = x.CategoryValue, - ClassId = x.ClassId, - ClassName = x.ClassName, - GradeId = x.GradeId, - GradeName = x.GradeName, - TeacherId = x.TeacherId, - StudentNo = x.StudentNo, - StudentName = x.StudentName, - Sex = x.Sex, - ScoreTime = x.ScoreTime, - Height = x.Height, - Weight = x.Weight, - Value = x.Value, - Score = x.Score, - Rank = x.Rank - }).ToListAsync(); - //_caching.AddObject(sportsTestDataKey, sportsTestData, 60); - } - var bestScoreData = sportsTestData .GroupBy(x => x.StudentNo) .Select(g => g.OrderByDescending(x => x.Score).First()) diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs index 2c4951f..b0f5434 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+35ad95bd6885f10ef9d0d18bc76609fc1773a39d")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7bdd3b25d3197213802b19b367c9c9e6ecba10ba")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache index a6ec8a1..3889689 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -8fcb698e781269d044bd4e8633786876937f11fe32cf7dcaeb9e1a6cad1302da +34384d21dca01e788acaeaa1d2e1fe004164bf6f5d12e402f2069e4a31083347 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.GeneratedMSBuildEditorConfig.editorconfig b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.GeneratedMSBuildEditorConfig.editorconfig index ae96087..e02ceb6 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.GeneratedMSBuildEditorConfig.editorconfig +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.GeneratedMSBuildEditorConfig.editorconfig @@ -11,13 +11,13 @@ build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = YD_XinWei.Api build_property.RootNamespace = YD_XinWei.Api -build_property.ProjectDir = D:\Git\YD\YD_XinWei.Api\Server\YD_XinWei\ +build_property.ProjectDir = C:\Users\tangl\Desktop\Git\YD_XinWei\Server\YD_XinWei\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = D:\Git\YD\YD_XinWei.Api\Server\YD_XinWei +build_property.MSBuildProjectDirectory = C:\Users\tangl\Desktop\Git\YD_XinWei\Server\YD_XinWei build_property._RazorSourceGeneratorDebug = build_property.EffectiveAnalysisLevelStyle = 6.0 build_property.EnableCodeStyleSeverity = diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache index 9c5c375d18d4d1eb146958feb9d4545ce2ffe4bc..587919e8c575b752bbbb0f592d3f634e82020b88 100644 GIT binary patch delta 51 zcmV-30L=fe-U6`R0w_>RM?nk#008+w0WL9ypxpd#!M_>fbGjl;yK1_FkeJnJVjl2E JjCZjp2(Kxs7N`IK delta 51 zcmV-30L=fe-U6`R0w_>RM?nk#006~p4nWy~F~I(++ZGe2z9*$#FB(lHqNzQuBYl-Y J)A+F{2(Jx_6+i$0 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache index f909eabd02416ee259278b83628311e31f4d5764..700567e04ebdb29db72f6e8f43a490790d32a2cc 100644 GIT binary patch delta 101 zcmdnIfpOb>Mr}4mMFs{2#uR6(n9$NKrAny@*W@JIXY5PV zh@t-ik;T-3PO#9bq7qU!HWt`m?7)J=z>LIF&cSsY<*D+?a%|`B^S09{K@9Z&en$N4XDVAm-@|F|vsgdu zu9ujqk}9W6w>-vVK*mjbXYA5&_L;>^B>-aguyuFpXm8ywW86X5JMn0H`)mOS3$2NJ z(lvwWMCW<-oT&JTNj1u8lXMd)0z}A+37DAGb;gxmZy=En@_jnS}5jDtT(R`18Ztz2E+N-LgLoMPm;+ zH!xUt8HfqhaI7yGRiQrZIe-J%9CJC3sr~}zHVu`ft>Vw*UP-4dE z2WKEaM)+H-a_)U(yYqkNhR}7VXGS_bvp^Ky5H<3mLe1Y7RUB8RH$SlT=K*n${SjXS zd8+OOTzs)>uvDrmW_MH11tqxQm&qo_wleCRgO7l