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

feat 通行记录支持外包查询

Browse Source
This commit is contained in:
liguoyang
2024-11-08 11:54:25 +08:00
parent 82666e5d19
commit 83ea3d7093
4 changed files with 108 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogPageRequest.cs
View File

@@ -21,7 +21,7 @@ public class DeviceUploadLogPageRequest : PageDto, IValidatableObject
/// <summary>
/// 是否为外包
/// </summary>
public bool? IsOutSource { get; set; }
public bool? IsOutsource { get; set; }
/// <summary>
/// 日期范围查询

15
Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs
View File

@@ -12,9 +12,13 @@ public class DeviceUploadLogResponse
public string DeviceUniqueNo { get; set; }
/// <summary>
/// 设备供应商
/// 外包供应商
/// </summary>
public string Supplier { get; set; }
public string OutsourceSupplier { get; set; }
public string SapUserCode { get; set; }
public string SapUserName { get; set; }
/// <summary>
/// 设备部署点
@@ -42,10 +46,11 @@ public class DeviceUploadLogResponse
/// </summary>
public DateTime RaiseDateTime { get; set; }
/// <summary>
/// 记录创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 序列号
/// </summary>
@@ -64,4 +69,4 @@ public class DeviceUploadLogResponse
/// 是否有效
/// </summary>
public bool Status { get; set; }
}
}

19
Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/IDeviceUploadLogService.cs
View File

@@ -7,10 +7,25 @@ namespace Dlhis.ScheduledTask.DeviceUploadLog.Services;
public interface IDeviceUploadLogService : IScopeDependency
{
/// <summary>
/// 上传通行记录
/// </summary>
/// <param name="requests"></param>
/// <returns></returns>
Task UploadLogsAsync(List<DeviceUploadLogUploadRequest> requests);
/// <summary>
/// 查询通行记录分页
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task<Pagination<DeviceUploadLogResponse>> GetPageAsync(DeviceUploadLogPageRequest request);
Task UploadLogsAsync(List<DeviceUploadLogUploadRequest> requests);
/// <summary>
/// 获取我个人的通行记录
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task<List<DeviceUploadLogResponse>> GetMyRecordsAsync(DeviceUploadLogMyRecordRequest request);
Task QiaoqiaoGaoshiqingAsync(DeviceUploadLogSecretAddRequest request);

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

@@ -23,6 +23,59 @@ public class DeviceUploadLogService : IDeviceUploadLogService
_dbContext = dbContext;
_currentUser = currentUser;
}
public async Task UploadLogsAsync(List<DeviceUploadLogUploadRequest> requests)
{
var deviceUniqueNos = requests.Select(x => x.DeviceUniqueNo).Distinct().ToList();
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceUniqueNos.Contains(x.UniqueNo)).ToListAsync();
var existsDeviceUniqueNos = devices.Select(x => x.UniqueNo).ToList();
var inserts = new List<DeviceUploadLogEntity>();
foreach (var request in requests.Where(x => existsDeviceUniqueNos.Contains(x.DeviceUniqueNo)))
{
if (await _dbContext.Queryable<DeviceUploadLogEntity>().Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo
&& x.SerialNo == request.SerialNo
&& x.RaiseDateTime == request.RaiseDateTime).AnyAsync())
{
continue;
}
if (request.CardNo.IsPresent() && request.UserUniqueNo != request.CardNo)
{
//UserUniqueNo为老系统档案号(自动生成),CardNo为工号
if (await _dbContext.Queryable<OldDeviceGainfoEntity>()
.Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo)
.Where(x => x.No == request.UserUniqueNo && x.Code == request.CardNo)
.Select(x => x.Code)
.AnyAsync())
{
request.UserUniqueNo = request.CardNo;
}
}
var device = devices.First(x => x.UniqueNo == request.DeviceUniqueNo);
inserts.Add(new DeviceUploadLogEntity
{
DeviceUniqueNo = request.DeviceUniqueNo,
UserUniqueNo = request.UserUniqueNo,
RaiseDateTime = request.RaiseDateTime,
SerialNo = request.SerialNo,
Type = device.Type == DeviceTypeEnumType.Attendance
? DeviceUploadLogTypeEnumType.Attendance
: device.Type == DeviceTypeEnumType.Door && device.AsAttendance
? DeviceUploadLogTypeEnumType.Attendance
: DeviceUploadLogTypeEnumType.Door,
TenantId = device.TenantId,
Status = request.Status ?? true,
CreatedBy = 1,
ModifiedBy = 1,
});
}
await _dbContext.InsertAsync(inserts);
}
public async Task<List<DeviceUploadLogResponse>> GetMyRecordsAsync(DeviceUploadLogMyRecordRequest request)
@@ -39,7 +92,6 @@ public class DeviceUploadLogService : IDeviceUploadLogService
.Select((log, d) => new DeviceUploadLogResponse
{
OriginUserUniqueNo = log.UserUniqueNo,
Supplier = d.Supplier,
DeviceUniqueNo = log.DeviceUniqueNo,
Id = log.Id,
RaiseDateTime = log.RaiseDateTime,
@@ -99,89 +151,42 @@ public class DeviceUploadLogService : IDeviceUploadLogService
};
return await _dbContext.Queryable<DeviceUploadLogEntity>()
.LeftJoin<DeviceEntity>((deviceUp, device) => deviceUp.DeviceUniqueNo == device.UniqueNo)
.LeftJoin<GainfoEntity>((deviceUp, device, ga) => deviceUp.UserUniqueNo == ga.Code)
.Where((deviceUp, device) => deviceUp.Type == type)
.WhereIF(request.Sync.HasValue, deviceUp => deviceUp.Sync == request.Sync)
.Where(deviceUp => !SqlFunc.IsNullOrEmpty(deviceUp.UserUniqueNo))
.WhereIF(request.SearchDateTimePeriod.HasValue(), deviceUp => deviceUp.RaiseDateTime >= request.SearchDateTimePeriod.Start && deviceUp.RaiseDateTime <= request.SearchDateTimePeriod.End)
.WhereIF(request.IsOutSource.HasValue && request.IsOutSource.Value, deviceUp => SqlFunc.Subqueryable<OutsourceEntity>().Where(x => x.Code == deviceUp.UserUniqueNo).Any())
.WhereIF(request.IsOutSource.HasValue && !request.IsOutSource.Value, deviceUp => SqlFunc.Subqueryable<OutsourceEntity>().Where(x => x.Code == deviceUp.UserUniqueNo).NotAny())
.WhereIF(request.Search.IsPresent(), (deviceUp, device, ga) =>
.LeftJoin<DeviceEntity>((x, device) => x.DeviceUniqueNo == device.UniqueNo)
.LeftJoin<GainfoEntity>((x, device, ga) => x.UserUniqueNo == ga.Code)
.LeftJoin<OutsourceEntity>((x, device, ga, os) => x.UserUniqueNo == os.Code)
.WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.RaiseDateTime >= request.SearchDateTimePeriod.Start && x.RaiseDateTime <= request.SearchDateTimePeriod.End)
.Where((x, device) => x.Type == type && !SqlFunc.IsNullOrEmpty(x.UserUniqueNo))
.WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync)
.WhereIF(request.IsOutsource.HasValue && request.IsOutsource.Value,
x => SqlFunc.Subqueryable<OutsourceEntity>().Where(p => p.Code == x.UserUniqueNo).Any())
.WhereIF(request.IsOutsource.HasValue && !request.IsOutsource.Value,
x => SqlFunc.Subqueryable<OutsourceEntity>().Where(p => p.Code == x.UserUniqueNo).NotAny())
.WhereIF(request.Search.IsPresent(), (x, device, ga, os) =>
ga.Code == request.Search
|| ga.Name == request.Search
|| deviceUp.DeviceUniqueNo == request.Search
|| x.DeviceUniqueNo == request.Search
|| os.Supplier.Contains(request.Search)
|| os.SapCode == request.Search
)
.OrderBy(deviceUp => deviceUp.CreateTime, OrderByType.Desc)
.Select((deviceUp, device, ga) => new DeviceUploadLogResponse
.OrderBy(x => x.CreateTime, OrderByType.Desc)
.Select((x, device, ga, os) => new DeviceUploadLogResponse
{
OriginUserUniqueNo = deviceUp.UserUniqueNo,
Supplier = device.Supplier,
DeviceUniqueNo = deviceUp.DeviceUniqueNo,
Id = deviceUp.Id,
RaiseDateTime = deviceUp.RaiseDateTime,
CreateTime = deviceUp.CreateTime,
SerialNo = deviceUp.SerialNo,
Id = x.Id,
OriginUserUniqueNo = x.UserUniqueNo,
OutsourceSupplier = device.Supplier,
SapUserCode = os.SapCode,
SapUserName = SqlFunc.Subqueryable<GainfoEntity>().Where(p => p.Code == os.SapCode).Select(p => p.Name),
DeviceUniqueNo = x.DeviceUniqueNo,
RaiseDateTime = x.RaiseDateTime,
CreateTime = x.CreateTime,
SerialNo = x.SerialNo,
UserNo = ga.No,
UserCode = ga.Code,
UserName = ga.Name,
DeployPlace = device.DeployPlace,
Sync = deviceUp.Sync,
Status = deviceUp.Status,
Sync = x.Sync,
Status = x.Status,
})
.ToPageListAsync(request);
}
public async Task UploadLogsAsync(List<DeviceUploadLogUploadRequest> requests)
{
var deviceUniqueNos = requests.Select(x => x.DeviceUniqueNo).Distinct().ToList();
var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceUniqueNos.Contains(x.UniqueNo)).ToListAsync();
var existsDeviceUniqueNos = devices.Select(x => x.UniqueNo).ToList();
var inserts = new List<DeviceUploadLogEntity>();
foreach (var request in requests.Where(x => existsDeviceUniqueNos.Contains(x.DeviceUniqueNo)))
{
if (await _dbContext.Queryable<DeviceUploadLogEntity>().Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo
&& x.SerialNo == request.SerialNo
&& x.RaiseDateTime == request.RaiseDateTime).AnyAsync())
{
continue;
}
if (request.CardNo.IsPresent() && request.UserUniqueNo != request.CardNo)
{
//UserUniqueNo为老系统档案号(自动生成),CardNo为工号
if (await _dbContext.Queryable<OldDeviceGainfoEntity>()
.Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo)
.Where(x => x.No == request.UserUniqueNo && x.Code == request.CardNo)
.Select(x => x.Code)
.AnyAsync())
{
request.UserUniqueNo = request.CardNo;
}
}
var device = devices.First(x => x.UniqueNo == request.DeviceUniqueNo);
inserts.Add(new DeviceUploadLogEntity
{
DeviceUniqueNo = request.DeviceUniqueNo,
UserUniqueNo = request.UserUniqueNo,
RaiseDateTime = request.RaiseDateTime,
SerialNo = request.SerialNo,
Type = device.Type == DeviceTypeEnumType.Attendance
? DeviceUploadLogTypeEnumType.Attendance
: device.Type == DeviceTypeEnumType.Door && device.AsAttendance
? DeviceUploadLogTypeEnumType.Attendance
: DeviceUploadLogTypeEnumType.Door,
TenantId = device.TenantId,
Status = request.Status ?? true,
CreatedBy = 1,
ModifiedBy = 1,
});
}
await _dbContext.InsertAsync(inserts);
}
}