yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Browse Source
This commit is contained in:
cheche
2024-03-05 10:16:20 +08:00
parent d280d035e2 fde0c2394e
commit 6bdcb9124f
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Basic/Device/Request/DeviceOnlineAndofflineRequest.cs
View File

@@ -2,7 +2,7 @@
namespace Dlhis.Basic.Device.Request
{
public class DeviceOnlineAndofflineRequest :PageDto
public class DeviceOnlineAndofflineRequest : PageDto
{
public bool IsOnAndOff { get; set; }
}

2
Src/Dlhis.ScheduledTask/CommonJobs/HeartbeatJob.cs
View File

@@ -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);
}
}
}

28
Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
View File

@@ -24,32 +24,34 @@ public class DeviceUploadLogService : IDeviceUploadLogService
public async Task<Pagination<DeviceUploadLogResponse>> GetPageAsync(DeviceUploadLogPageRequest request)
{
var page = await _dbContext.Queryable<DeviceUploadLogEntity>()
.LeftJoin<GainfoEntity>((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<GainfoEntity>().ToListAsync();
page.Data.ForEach(item =>
{
_ = int.TryParse(item.OriginUserUniqueNo, out var userId);
//var gainfos = await _dbContext.Queryable<GainfoEntity>().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;
}

3
Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs
View File

@@ -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);
}