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

fix 调试大华设备对接

Browse Source
This commit is contained in:
liguoyang
2024-01-24 20:46:55 +08:00
parent a36ff46722
commit 51c80a242e
19 changed files with 368 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,14 +23,13 @@ public class DeviceUploadLogService : IDeviceUploadLogService
{
var page = await _dbContext.Queryable<DeviceUploadLogEntity>()
.LeftJoin<GainfoEntity>((deviceUp, ga) => deviceUp.UserUniqueNo == ga.No)
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, deviceUp => deviceUp.UploadTime >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, deviceUp => deviceUp.UploadTime <= request.SearchDateTimePeriod.End)
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, deviceUp => deviceUp.RaiseDateTime >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, deviceUp => deviceUp.RaiseDateTime <= request.SearchDateTimePeriod.End)
.Select((deviceUp, ga) => new DeviceUploadLogResponse
{
DeviceUniqueNo = deviceUp.DeviceUniqueNo,
Id = deviceUp.Id,
Ip = deviceUp.Ip,
UploadTime = deviceUp.UploadTime,
RaiseDateTime = deviceUp.RaiseDateTime,
UserNo = ga.No,
UserCode = ga.Code,
UserName = ga.Name,
@@ -49,7 +48,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
var entity = new DeviceUploadLogEntity
{
DeviceUniqueNo = request.DeviceUniqueNo,
UploadTime = request.UploadTime,
// UploadTime = request.UploadTime,
UserUniqueNo = request.UserUniqueNo,
TenantId = device.TenantId,
};
@@ -63,23 +62,26 @@ public class DeviceUploadLogService : IDeviceUploadLogService
var nos = requests.Select(x => x.DeviceUniqueNo).ToList();
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => nos.Contains(x.UniqueNo)).ToListAsync();
var records = requests.GroupBy(x => x.DeviceUniqueNo).Select(x =>
{
var device = devices.FirstOrDefault(item => item.UniqueNo == x.Key);
if (device != null)
{
return x.AsEnumerable().Select(item => new DeviceUploadLogEntity
{
DeviceUniqueNo = x.Key,
UserUniqueNo = item.UserUniqueNo,
UploadTime = item.UploadTime,
TenantId = device.TenantId,
var records = requests.GroupBy(x => x.DeviceUniqueNo).SelectMany(x =>
{
var device = devices.FirstOrDefault(item => item.UniqueNo == x.Key);
if (device != null)
{
return x.AsEnumerable().Select(item => new DeviceUploadLogEntity
{
DeviceUniqueNo = x.Key,
UserUniqueNo = item.UserUniqueNo,
RaiseDateTime = item.RaiseDateTime,
SerialNo = item.SerialNo,
Type = item.Type,
TenantId = device.TenantId,
}).ToList();
}
}).ToList();
}
return null;
}).Where(x => x != null).ToList();
return null;
}).Where(x => x != null).ToList();
await _dbContext.InsertAsync(records);
}