From fde0c2394ea9751259950a95975ab37f6a5779b6 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 5 Mar 2024 10:03:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Request/DeviceOnlineAndofflineRequest.cs | 2 +- .../CommonJobs/HeartbeatJob.cs | 2 +- .../Implements/DeviceUploadLogService.cs | 28 ++++++++++--------- .../Services/Implements/UserService.cs | 3 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Src/Dlhis.Basic/Device/Request/DeviceOnlineAndofflineRequest.cs b/Src/Dlhis.Basic/Device/Request/DeviceOnlineAndofflineRequest.cs index 14b9b1b5..0100289f 100644 --- a/Src/Dlhis.Basic/Device/Request/DeviceOnlineAndofflineRequest.cs +++ b/Src/Dlhis.Basic/Device/Request/DeviceOnlineAndofflineRequest.cs @@ -2,7 +2,7 @@ namespace Dlhis.Basic.Device.Request { - public class DeviceOnlineAndofflineRequest :PageDto + public class DeviceOnlineAndofflineRequest : PageDto { public bool IsOnAndOff { get; set; } } diff --git a/Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs b/Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs index a8bd8579..ed994038 100644 --- a/Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs +++ b/Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs @@ -42,7 +42,7 @@ public class HeartbeatJob } catch (Exception ex) { - _logger.LogError(ex, "心跳设备失败:{message}", ex.Message); + _logger.LogError(ex, "心跳设备失败:{no}. {message}", device.UniqueNo, ex.Message); } } } diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index f8c0a199..775d130d 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -24,32 +24,34 @@ public class DeviceUploadLogService : IDeviceUploadLogService public async Task> GetPageAsync(DeviceUploadLogPageRequest request) { var page = await _dbContext.Queryable() + .LeftJoin((deviceUp, ga) => deviceUp.UserUniqueNo == ga.Code) .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, deviceUp => deviceUp.RaiseDateTime >= request.SearchDateTimePeriod.Start) .WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, deviceUp => deviceUp.RaiseDateTime <= request.SearchDateTimePeriod.End) + .WhereIF(request.Search.IsPresent(), (deviceUp, ga) => ga.Code.Contains(request.Search) || ga.Name.Contains(request.Search) || deviceUp.DeviceUniqueNo.Contains(request.Search)) .OrderBy(deviceUp => deviceUp.CreateTime, OrderByType.Desc) - .Select((deviceUp) => new DeviceUploadLogResponse + .Select((deviceUp, ga) => new DeviceUploadLogResponse { OriginUserUniqueNo = deviceUp.UserUniqueNo, DeviceUniqueNo = deviceUp.DeviceUniqueNo, Id = deviceUp.Id, RaiseDateTime = deviceUp.RaiseDateTime, SerialNo = deviceUp.SerialNo, - //UserNo = ga.No, - //UserCode = ga.Code, - //UserName = ga.Name, + UserNo = ga.No, + UserCode = ga.Code, + UserName = ga.Name, }) .ToPageListAsync(request); - var gainfos = await _dbContext.Queryable().ToListAsync(); - page.Data.ForEach(item => - { - _ = int.TryParse(item.OriginUserUniqueNo, out var userId); + //var gainfos = await _dbContext.Queryable().ToListAsync(); + //page.Data.ForEach(item => + //{ + // _ = int.TryParse(item.OriginUserUniqueNo, out var userId); - var gainfo = gainfos.FirstOrDefault(x => x.No == item.OriginUserUniqueNo || x.Id == userId || x.Code == item.OriginUserUniqueNo); - item.UserNo = gainfo?.No; - item.UserCode = gainfo?.Code; - item.UserName = gainfo?.Name; - }); + // var gainfo = gainfos.FirstOrDefault(x => x.No == item.OriginUserUniqueNo || x.Id == userId || x.Code == item.OriginUserUniqueNo); + // item.UserNo = gainfo?.No; + // item.UserCode = gainfo?.Code; + // item.UserName = gainfo?.Name; + //}); return page; } diff --git a/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs b/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs index 88394f60..55877e73 100644 --- a/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs +++ b/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs @@ -32,7 +32,8 @@ public class UserService : IUserService ) .Select((x, ur, r) => new UserResponse { - Id = x.Id + Id = x.Id, + Role = r.Name }, true) .ToPageListAsync(request); }