diff --git a/Server/YD_XinWei.Commons/Utils/Util.cs b/Server/YD_XinWei.Commons/Utils/Util.cs
index 688fab1..8d6e830 100644
--- a/Server/YD_XinWei.Commons/Utils/Util.cs
+++ b/Server/YD_XinWei.Commons/Utils/Util.cs
@@ -108,6 +108,13 @@ namespace YD_XinWei.Commons.Utils
return true;
return str.ToString() == "";
}
+ public static string ConvertSecondsToMinutes(this int? totalSeconds)
+ {
+ if (totalSeconds == null || totalSeconds < 0) return "0分0秒";
+ int minutes = totalSeconds.Value / 60;
+ int seconds = totalSeconds.Value % 60;
+ return $"{minutes}分{seconds}秒";
+ }
}
}
diff --git a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll
index b11a04d..1491d12 100644
Binary files a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb
index bbd11c8..8b4f02e 100644
Binary files a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb differ
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 60af9e5..e211731 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+e81823ef15e02c113f3f600253339ecd8a261df3")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2b2125ad0e1121cb29ce52823500492b72804ef4")]
[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 7e7330e..033436f 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 @@
-b903a1b136d5569b0948134d6f61053d4944399d42dfb7e425ea178fbb7f8900
+1e484a3d27e1f74ec57800a8e338f80e589ab5dd7be8d21d9704353e315b0fd3
diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll
index b11a04d..1491d12 100644
Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb
index bbd11c8..8b4f02e 100644
Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb differ
diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json
index 50eefee..85ba19d 100644
--- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json
+++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json
@@ -1 +1 @@
-{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=e81823ef15e02c113f3f600253339ecd8a261df3&path=/*"}}
\ No newline at end of file
+{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=2b2125ad0e1121cb29ce52823500492b72804ef4&path=/*"}}
\ No newline at end of file
diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll
index 892b39a..6317d57 100644
Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll
index 892b39a..6317d57 100644
Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user b/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user
index fe488df..a9b09ba 100644
--- a/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/Server/YD_XinWei/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<_PublishTargetUrl>C:\Users\Administrator\Desktop\web
- True|2025-03-03T01:48:28.0446948Z||;True|2025-03-03T09:47:48.0506237+08:00||;True|2025-03-03T00:03:13.7940731+08:00||;True|2025-03-03T00:00:20.5217808+08:00||;True|2025-02-28T11:24:13.9529058+08:00||;True|2025-02-28T09:52:09.1224260+08:00||;True|2025-02-28T09:09:07.6159508+08:00||;True|2025-02-28T09:03:19.5987556+08:00||;True|2025-02-27T17:59:35.8321576+08:00||;True|2025-02-27T16:51:44.0193039+08:00||;True|2025-02-27T15:48:03.7178463+08:00||;True|2025-02-27T15:39:09.5704225+08:00||;True|2025-02-27T15:39:01.0906094+08:00||;True|2025-02-27T15:35:52.5141530+08:00||;True|2025-02-27T15:22:55.6480561+08:00||;True|2025-02-25T15:05:56.3704383+08:00||;True|2025-02-25T13:21:45.5812878+08:00||;True|2025-02-25T13:13:06.3991346+08:00||;True|2025-02-25T11:07:59.4322341+08:00||;True|2025-02-24T17:36:36.0385118+08:00||;True|2025-02-24T17:35:30.9660778+08:00||;True|2025-02-20T19:00:03.7732903+08:00||;True|2025-02-20T15:23:37.7886196+08:00||;False|2025-02-20T15:22:58.3942454+08:00||;True|2025-02-14T15:16:29.2049523+08:00||;True|2025-02-14T15:16:20.2358210+08:00||;True|2025-02-14T13:35:25.1397559+08:00||;True|2025-02-14T09:28:15.0882633+08:00||;True|2025-02-13T14:51:00.7069070+08:00||;True|2025-02-13T13:14:19.5524368+08:00||;True|2025-02-12T15:43:03.6376536+08:00||;True|2025-02-12T15:30:37.0534250+08:00||;True|2025-02-12T15:19:48.3629666+08:00||;True|2025-02-12T15:15:46.5702121+08:00||;True|2025-02-12T10:25:29.9566462+08:00||;True|2025-02-12T10:25:23.6583245+08:00||;False|2025-02-12T10:24:25.4235783+08:00||;True|2024-10-08T10:27:01.3672443+08:00||;True|2024-10-08T10:16:00.0834614+08:00||;
+ True|2025-03-03T08:41:37.7278763Z||;True|2025-03-03T16:34:04.0026009+08:00||;True|2025-03-03T16:24:01.4887542+08:00||;True|2025-03-03T15:24:09.5376627+08:00||;True|2025-03-03T14:32:46.5288364+08:00||;True|2025-03-03T14:18:41.8795454+08:00||;True|2025-03-03T13:39:33.1620349+08:00||;True|2025-03-03T13:13:48.7851364+08:00||;True|2025-03-03T09:48:28.0446948+08:00||;True|2025-03-03T09:47:48.0506237+08:00||;True|2025-03-03T00:03:13.7940731+08:00||;True|2025-03-03T00:00:20.5217808+08:00||;True|2025-02-28T11:24:13.9529058+08:00||;True|2025-02-28T09:52:09.1224260+08:00||;True|2025-02-28T09:09:07.6159508+08:00||;True|2025-02-28T09:03:19.5987556+08:00||;True|2025-02-27T17:59:35.8321576+08:00||;True|2025-02-27T16:51:44.0193039+08:00||;True|2025-02-27T15:48:03.7178463+08:00||;True|2025-02-27T15:39:09.5704225+08:00||;True|2025-02-27T15:39:01.0906094+08:00||;True|2025-02-27T15:35:52.5141530+08:00||;True|2025-02-27T15:22:55.6480561+08:00||;True|2025-02-25T15:05:56.3704383+08:00||;True|2025-02-25T13:21:45.5812878+08:00||;True|2025-02-25T13:13:06.3991346+08:00||;True|2025-02-25T11:07:59.4322341+08:00||;True|2025-02-24T17:36:36.0385118+08:00||;True|2025-02-24T17:35:30.9660778+08:00||;True|2025-02-20T19:00:03.7732903+08:00||;True|2025-02-20T15:23:37.7886196+08:00||;False|2025-02-20T15:22:58.3942454+08:00||;True|2025-02-14T15:16:29.2049523+08:00||;True|2025-02-14T15:16:20.2358210+08:00||;True|2025-02-14T13:35:25.1397559+08:00||;True|2025-02-14T09:28:15.0882633+08:00||;True|2025-02-13T14:51:00.7069070+08:00||;True|2025-02-13T13:14:19.5524368+08:00||;True|2025-02-12T15:43:03.6376536+08:00||;True|2025-02-12T15:30:37.0534250+08:00||;True|2025-02-12T15:19:48.3629666+08:00||;True|2025-02-12T15:15:46.5702121+08:00||;True|2025-02-12T10:25:29.9566462+08:00||;True|2025-02-12T10:25:23.6583245+08:00||;False|2025-02-12T10:24:25.4235783+08:00||;True|2024-10-08T10:27:01.3672443+08:00||;True|2024-10-08T10:16:00.0834614+08:00||;
\ No newline at end of file
diff --git a/Server/YD_XinWei/Services/Impl/XinWeiService.cs b/Server/YD_XinWei/Services/Impl/XinWeiService.cs
index 911280f..7c29dfb 100644
--- a/Server/YD_XinWei/Services/Impl/XinWeiService.cs
+++ b/Server/YD_XinWei/Services/Impl/XinWeiService.cs
@@ -12,6 +12,8 @@ using YD_XinWei.Commons.Dto.Common;
using YD_XinWei.Commons.Dto.HomeWork;
using YD_XinWei.Commons.Dto.Open;
using YD_XinWei.Commons.Dto.School;
+using YD_XinWei.Commons;
+using YD_XinWei.Commons.Utils;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace YD_XinWei.Api.Services.Impl
@@ -78,7 +80,6 @@ namespace YD_XinWei.Api.Services.Impl
IsOpen = x.IsOpen,
IsShow = x.IsShow,
ProjectName = x.ProjectName
-
}).ToListAsync();
return res;
@@ -361,9 +362,46 @@ namespace YD_XinWei.Api.Services.Impl
///
///
///
- public Task GradeRankingGet(int studentId, int trainId)
+ public async Task GradeRankingGet(int studentId, int trainId)
{
- throw new NotImplementedException();
+ var res = new GradeRankingVo();
+
+ var now = DateTime.UtcNow;
+ var firstDayOfMonth = new DateTime(now.Year, now.Month, 1);
+ var lastDayOfMonth = firstDayOfMonth.AddMonths(1).AddDays(-1);
+
+
+ var studentResults = await _sportsContext.XW_TrainStudents.Where(x => x.XW_SportsTestDataId == trainId)
+ .Select(x => new
+ {
+ x.GradeId,
+ x.StudentId,
+ x.StudentName,
+ x.Rating,
+ x.CreateTime,
+ x.Score
+ }).ToListAsync();
+
+ var student = studentResults.FirstOrDefault(x => x.StudentId == studentId);
+
+ if (student == null)
+ {
+ return res;
+ }
+ var rankedResults = studentResults
+ .Where(x => x.GradeId == student.GradeId &&
+ DateTime.TryParse(x.CreateTime, out var createTime) &&
+ createTime >= firstDayOfMonth && createTime <= lastDayOfMonth)
+ .OrderByDescending(x => x.Score)
+ .Select((x, index) => new { x.StudentId, Rank = index + 1 })
+ .ToList();
+
+ var studentRank = rankedResults.FirstOrDefault(x => x.StudentId == student.StudentId)?.Rank.ToString() ?? "无数据";
+
+ res.Rating = student.Rating.ToString() ?? "无数据";
+ res.MonthRanking = studentRank;
+
+ return res;
}
///
@@ -413,15 +451,15 @@ namespace YD_XinWei.Api.Services.Impl
{
TrainStudentId = x.Id,
ClassName = x.ClassName,
- CreateTime = x.CreateTime,
- Achievement = x.Achievement.ToString(),
- Rating = x.Rating.ToString(),
- Score = x.Score.ToString(),
- Sex = x.Sex.ToString(),
+ CreateTime = x.CreateTime ?? "无数据",
+ Achievement = x.Achievement.ToString() ?? "无数据",
+ Rating = x.Rating.ToString() ?? "无数据",
+ Score = x.Score.ToString() ?? "无数据",
+ Sex = x.Sex == 1 ? "男" : "女",
StudentName = x.StudentName,
TouristFlag = false,
DoubleFlag = false,
- })
+ }).OrderByDescending(x => x.CreateTime)
.ToListAsync();
res.Total = total;
@@ -431,7 +469,6 @@ namespace YD_XinWei.Api.Services.Impl
}
-
///
/// 历史记录详细
///
@@ -439,18 +476,57 @@ namespace YD_XinWei.Api.Services.Impl
///
public async Task TrainAnalysisHistoryDetail(HistoryDetailRequestDto dto)
{
+ var trainModel = await _sportsContext.XW_TrainStudents.Where(x => x.Id == dto.TrainStudentId).Select(x => new { x.XW_SportsTestDataId, x.StudentId }).FirstAsync();
+
+ var stuHeadUrl = await _sportsContext.Student.Where(x => x.Id == trainModel.StudentId).Select(x => x.Photo).FirstOrDefaultAsync();
+
+ var trainName = await _sportsContext.XW_SportsTestData.Where(x => x.Id == trainModel.XW_SportsTestDataId).Select(x => x.ProjectName).FirstOrDefaultAsync();
+
+ var now = DateTime.UtcNow;
+ var firstDayOfMonth = new DateTime(now.Year, now.Month, 1);
+ var lastDayOfMonth = firstDayOfMonth.AddMonths(1).AddDays(-1);
+
+
+ var studentResults = await _sportsContext.XW_TrainStudents.Where(x => x.XW_SportsTestDataId == trainModel.XW_SportsTestDataId)
+ .Select(x => new
+ {
+ x.GradeId,
+ x.StudentId,
+ x.StudentName,
+ x.Rating,
+ x.CreateTime,
+ x.Score
+ }).ToListAsync();
+
+ var student = studentResults.FirstOrDefault(x => x.StudentId == trainModel.StudentId);
+
+ if (student == null)
+ {
+ return null;
+ }
+
+ var rankedResults = studentResults
+ .Where(x => x.GradeId == student.GradeId &&
+ DateTime.TryParse(x.CreateTime, out var createTime) &&
+ createTime >= firstDayOfMonth && createTime <= lastDayOfMonth)
+ .OrderByDescending(x => x.Score)
+ .Select((x, index) => new { x.StudentId, Rank = index + 1 })
+ .ToList();
+
+ var studentRank = rankedResults.FirstOrDefault(x => x.StudentId == student.StudentId)?.Rank.ToString() ?? "无数据";
+
var res = await _sportsContext.XW_TrainStudents.Where(x => x.Id == dto.TrainStudentId).Include(x => x.TrainViolationsBO).Select(x => new TrainAnalusisVo()
{
- Achievement = x.Achievement.ToString(),
+ Achievement = x.Achievement.ToString() ?? "无数据",
ClassName = x.ClassName,
- GradeRanking = x.Ranking.ToString(),
- HeadImgUrl = "",
- ProjectName = "",
- Rating = x.Rating.ToString(),
- Score = x.Score.ToString(),
- Sex = x.Sex.ToString(),
+ GradeRanking = studentRank,
+ HeadImgUrl = stuHeadUrl,
+ ProjectName = trainName,
+ Rating = x.Rating.ToString() ?? "无数据",
+ Score = x.Score.ToString() ?? "无数据",
+ Sex = x.Sex == 1 ? "男" : "女",
StudentName = x.StudentName,
- Times = x.ErrorCount.ToString(),
+ Times = $"{x.ErrorTime.ConvertSecondsToMinutes()}/{x.ErrorCount}",
ViolationsNumber = x.TrainViolationsBO.Count(),
TrainViolationsVo = x.TrainViolationsBO.Select(x => new TrainViolationsVo()
{
@@ -463,6 +539,8 @@ namespace YD_XinWei.Api.Services.Impl
}).FirstOrDefaultAsync();
+
+
return res;
}
@@ -485,6 +563,7 @@ namespace YD_XinWei.Api.Services.Impl
var studentResults = await _sportsContext.XW_TrainStudents.Where(x => trainIds.Contains(x.XW_SportsTestDataId))
.Select(x => new
{
+ x.Id,
x.ClassName,
x.StudentId,
x.StudentName,
@@ -512,12 +591,13 @@ namespace YD_XinWei.Api.Services.Impl
.Select((x, index) => new { x, Rank = index + 1 })
.ToList();
+ var stuHeadUrl = await _sportsContext.Student.Where(x => x.Id == student.StudentId).Select(x => x.Photo).FirstOrDefaultAsync();
var res = new TrainHistoryPersonVo()
{
ClassName = student.ClassName,
- HeadImgUrl = "",
- Sex = student.Sex?.ToString() ?? "无数据",
+ HeadImgUrl = stuHeadUrl,
+ Sex = student.Sex == 1 ? "男" : "女",
StudentName = student.StudentName,
HistoryBestScore = studentResults.Max(x => x.Score)?.ToString() ?? "无数据",
HistoryRanking = rankedResults.FirstOrDefault(x => x.x.Score == student.Score)?.Rank.ToString() ?? "-1",
@@ -573,16 +653,16 @@ namespace YD_XinWei.Api.Services.Impl
.Take(dto.PageSize)
.Select(x => new PersonAnalysisVo()
{
- TrainStudentId = x.StudentId,
+ TrainStudentId = x.Id,
ClassName = x.ClassName,
- CreateTime = x.CreateTime,
- Achievement = x.Achievement.ToString(),
- Rating = x.Rating.ToString(),
- Score = x.Score.ToString(),
- Sex = x.Sex.ToString(),
+ CreateTime = x.CreateTime ?? "无数据",
+ Achievement = x.Achievement.ToString() ?? "无数据",
+ Rating = x.Rating.ToString() ?? "无数据",
+ Score = x.Score.ToString() ?? "无数据",
+ Sex = x.Sex == 1 ? "男" : "女",
StudentName = x.StudentName,
DoubleFlag = false,
- })
+ }).OrderByDescending(x => x.CreateTime)
.ToListAsync();
res.Total = total;
@@ -658,7 +738,7 @@ namespace YD_XinWei.Api.Services.Impl
{
Name = x.StudentName,
ClassName = x.ClassName,
- Achievement = x.Achievement.ToString()
+ Achievement = x.Achievement.ToString() ?? "无数据"
}).OrderByDescending(x => x.Achievement)
.ToList();
diff --git a/Server/YD_XinWei/Services/Interface/IXinWeiService.cs b/Server/YD_XinWei/Services/Interface/IXinWeiService.cs
index 0aace73..e89afb5 100644
--- a/Server/YD_XinWei/Services/Interface/IXinWeiService.cs
+++ b/Server/YD_XinWei/Services/Interface/IXinWeiService.cs
@@ -122,5 +122,8 @@ namespace YD_XinWei.Api.Services.Interface
///
Task ScoreRanking(ScoreRankingDto dto);
+
+
+
}
}
diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs
index 5fa66b1..c023cb1 100644
--- a/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs
+++ b/Server/YD_XinWei/SmartSportsEntitys/XW_TrainStudents.cs
@@ -15,7 +15,7 @@ namespace VOL.Entity.DomainModels.XinWei
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Display(Description = "主键Id")]
[Comment("Id")]
- public int? Id { get; set; }
+ public int Id { get; set; }
///
diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll
index 83e16fd..56ffa67 100644
Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe
index ffe4612..b186a85 100644
Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe differ
diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb
index 5352d42..f28dbcd 100644
Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb differ
diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll
index b11a04d..1491d12 100644
Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb
index bbd11c8..8b4f02e 100644
Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb differ
diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll
index a6df53a..3cb598f 100644
Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb
index 163104d..62b68e5 100644
Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb differ
diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll
index b11a04d..1491d12 100644
Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb
index bbd11c8..8b4f02e 100644
Binary files a/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/linux-x64/YD_XinWei.Commons.pdb differ
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 67203d1..bf6fd0c 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+e81823ef15e02c113f3f600253339ecd8a261df3")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2b2125ad0e1121cb29ce52823500492b72804ef4")]
[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 1e3d978..e390001 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 @@
-48ae5cc3890150a99121b87b71767723628c58096e50d505c2f597352fab8fc2
+b123c2daca944ac3b90ac51314702eef7a056e81b752746cf6e26e895fbd1a85
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 964ab70..0bfa482 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll
index 83e16fd..56ffa67 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb
index 5352d42..f28dbcd 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json
index 50eefee..85ba19d 100644
--- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json
+++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json
@@ -1 +1 @@
-{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=e81823ef15e02c113f3f600253339ecd8a261df3&path=/*"}}
\ No newline at end of file
+{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=2b2125ad0e1121cb29ce52823500492b72804ef4&path=/*"}}
\ No newline at end of file
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe
index ffe4612..b186a85 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe and b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll
index a6df53a..3cb598f 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb
index 163104d..62b68e5 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Api.pdb differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll
index b11a04d..1491d12 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.dll differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb
index bbd11c8..8b4f02e 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/PubTmp/Out/YD_XinWei.Commons.pdb differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs
index 67203d1..bf6fd0c 100644
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/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+e81823ef15e02c113f3f600253339ecd8a261df3")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2b2125ad0e1121cb29ce52823500492b72804ef4")]
[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/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache
index 1e3d978..e390001 100644
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfoInputs.cache
@@ -1 +1 @@
-48ae5cc3890150a99121b87b71767723628c58096e50d505c2f597352fab8fc2
+b123c2daca944ac3b90ac51314702eef7a056e81b752746cf6e26e895fbd1a85
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache
index 964ab70..0bfa482 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.csproj.AssemblyReference.cache differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll
index a6df53a..3cb598f 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb
index 163104d..62b68e5 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.pdb differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json
index 50eefee..85ba19d 100644
--- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json
+++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.sourcelink.json
@@ -1 +1 @@
-{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=e81823ef15e02c113f3f600253339ecd8a261df3&path=/*"}}
\ No newline at end of file
+{"documents":{"C:\\Users\\Administrator\\Desktop\\xwcode\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=2b2125ad0e1121cb29ce52823500492b72804ef4&path=/*"}}
\ No newline at end of file
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll
index 9ee8e19..4e89e40 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/ref/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll
index 9ee8e19..4e89e40 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/refint/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll
index 540103d..5018730 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll differ
diff --git a/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll
index 540103d..5018730 100644
Binary files a/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll differ