YD/YD_YiLu.Api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

通信

Browse Source
This commit is contained in:
tanglong 2026-04-02 13:53:26 +08:00
parent 24d6349a22
commit 04165aacc7
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
YD_YiLu/Controllers/DeviceSyncController.cs
View File

@ -39,7 +39,9 @@ namespace YD_YiLu.Api.Controllers
dto.PageSize = 10; dto.PageSize = 10;
if (dto.PageIndex < 1) if (dto.PageIndex < 1)
dto.PageIndex = 1; dto.PageIndex = 1;
return await _deviceSyncService.UserPageAsync(dto); var res = await _deviceSyncService.UserPageAsync(dto);
return res;
} }
/// <summary> /// <summary>

29
YD_YiLu/Services/Impl/DeviceSyncService.cs
View File

@ -22,11 +22,10 @@ namespace YD_YiLu.Api.Services.Impl
public async Task<int?> GetOrgIdByDeviceAsync(string deviceSerial) public async Task<int?> GetOrgIdByDeviceAsync(string deviceSerial)
{ {
var device = await _context.YL_Device.FirstOrDefaultAsync(x => var device = await _context.YL_Device.FirstOrDefaultAsync(x => x.SerialNumber == deviceSerial);
x.AndroidId == deviceSerial || x.SerialNumber == deviceSerial); if (device?.OrgId != null)
if (device?.OrgId != null) return device.OrgId; return device.OrgId;
var school = await _context.School.FirstOrDefaultAsync(); else return 0;
return school?.Id;
} }
public async Task<DeviceSyncUserPageResponseDto> UserPageAsync(DeviceSyncUserPageRequestDto dto) public async Task<DeviceSyncUserPageResponseDto> UserPageAsync(DeviceSyncUserPageRequestDto dto)
@ -37,9 +36,9 @@ namespace YD_YiLu.Api.Services.Impl
string schoolCode = await _context.School.Where(x => x.Id == orgId).Select(x => x.SchoolCode).FirstAsync(); string schoolCode = await _context.School.Where(x => x.Id == orgId).Select(x => x.SchoolCode).FirstAsync();
var query = _context.Student.Where(x => x.SchoolCode == schoolCode); var query = _context.Student.Where(x => x.SchoolCode == schoolCode);
if (dto.UserType == 1) query = query.Where(x => false); //if (dto.UserType == 1) query = query.Where(x => false);
else if (dto.UserType == 2) { } //else if (dto.UserType == 2) { }
else if (dto.UserType == 3) query = query.Where(x => false); //else if (dto.UserType == 3) query = query.Where(x => false);
var total = await query.CountAsync(); var total = await query.CountAsync();
var pageIndex = dto.PageIndex < 1 ? 1 : dto.PageIndex; var pageIndex = dto.PageIndex < 1 ? 1 : dto.PageIndex;
@ -55,14 +54,14 @@ namespace YD_YiLu.Api.Services.Impl
UserType = 2, UserType = 2,
Username = s.StudentNo, Username = s.StudentNo,
Nickname = s.StudentName, Nickname = s.StudentName,
OrganizationId = s.ClassId ?? 0,
OrganizationName = s.ClassName ?? "",
GradeName = "", GradeName = "",
OrganizationId = s.Id,
OrganizationName = s.ClassName ?? "",
FacePictureUrl = s.Photo ?? "", FacePictureUrl = s.Photo ?? "",
Identity = "学生", Identity = "学生",
Gender = s.Sex == 1 ? "男" : "女", Gender = s.Sex == 1 ? "男" : "女",
Birthday = s.Birthday.HasValue ? s.Birthday.Value.ToString("yyyy-MM-dd") : "", Birthday = s.Birthday.HasValue ? s.Birthday.Value.ToString("yyyy-MM-dd") : "",
UserSerial = s.StudentNo UserSerial = s.StudentNo,
}) })
.ToListAsync(); .ToListAsync();
@ -197,10 +196,10 @@ namespace YD_YiLu.Api.Services.Impl
var student = await _context.Student.FindAsync(ts.StudentId); var student = await _context.Student.FindAsync(ts.StudentId);
var recentTrains = await (from t in _context.XW_TrainStudents var recentTrains = await (from t in _context.XW_TrainStudents
join td in _context.XW_SportsTestData on t.XW_SportsTestDataId equals td.Id join td in _context.XW_SportsTestData on t.XW_SportsTestDataId equals td.Id
where t.StudentId == ts.StudentId && td.ProjectId == train.ProjectId where t.StudentId == ts.StudentId && td.ProjectId == train.ProjectId
orderby t.CreateTime descending orderby t.CreateTime descending
select new CountListItem { TrainId = td.Id, Score = t.Achievement.ToString(), Time = t.CreateTime ?? "" }) select new CountListItem { TrainId = td.Id, Score = t.Achievement.ToString(), Time = t.CreateTime ?? "" })
.Take(10) .Take(10)
.ToListAsync(); .ToListAsync();

2
YD_YiLu/SmartSportsEntitys/YL_Device.cs
View File

@ -105,6 +105,6 @@ namespace VOL.Entity.DomainModels.XinWei
/// 备注 /// 备注
/// </summary> /// </summary>
[MaxLength(500)] [MaxLength(500)]
public string Remark { get; set; } public string? Remark { get; set; }
} }
} }