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
2025-06-06 16:08:06 +08:00
parent fea1688c06
commit e716baa5cc
4 changed files with 214 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
Src/Dlhis.ScheduledTask/DeviceUploadLog/DoubleSearchStore.cs Normal file
View File

@@ -0,0 +1,137 @@
using System.Linq.Expressions;
using Dlhis.Entity.Device.Entities;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
namespace Dlhis.ScheduledTask.DeviceUploadLog;
public static class DoubleSearchStore
{
public static async Task<List<T>> GetResultAsync<T>(this IDbContext dbContext,
List<string> tables,
Expression<Func<T, bool>> where,
int pageIndex, int pageSize) where T : DeviceUploadLogEntity
{
var searchOffset = (pageIndex - 1) * pageSize;
var currentOffset = (pageIndex - 1) * pageSize / tables.Count;
var listResult = new List<TempResult<T>>(tables.Count);
foreach (var table in tables)
{
var r = await dbContext.Queryable<T>().AS(table)
.WhereIF(where != null, where)
.OrderBy(x => x.RaiseDateTime)
.Skip(currentOffset).Take(pageSize)
.ToListAsync();
listResult.Add(new TempResult<T>
{
Table = table,
Result = r,
Min = r.Min(x => x.RaiseDateTime),
Max = r.Max(x => x.RaiseDateTime)
});
}
var currentMin = listResult.Min(x => x.Min);
var currentMax = listResult.Max(x => x.Max);
var resultOffset = 0;
foreach (var item in listResult)
{
var r = await dbContext.Queryable<T>().AS(item.Table)
.WhereIF(where != null, where)
.Where(x => x.RaiseDateTime >= currentMin && x.RaiseDateTime <= currentMax)
.OrderBy(x => x.RaiseDateTime)
.ToListAsync();
var ct = r.Min(x => x.RaiseDateTime);
if (ct == currentMin)
{
resultOffset += currentOffset;
}
else
{
var count = r.Count(x => x.RaiseDateTime > currentMin && x.RaiseDateTime <= item.Min);
resultOffset += currentOffset - count;
}
item.Result = r;
}
var result = listResult.SelectMany(x => x.Result).OrderBy(x => x.RaiseDateTime).ToList();
return result.Skip(searchOffset - (resultOffset + 1)).Take(pageSize).ToList();
}
public class TempResult<T>
{
public string Table { get; set; }
public List<T> Result { get; set; }
public DateTime Min { get; set; }
public DateTime Max { get; set; }
}
}
// public static class DoubleSearchStore
// {
// public static async Task<List<T>> GetResultAsync<T>(this IDbContext dbContext,
// List<string> tables,
// Expression<Func<T, bool>> where,
// int pageIndex, int pageSize) where T : TestDataEntity
// {
// var searchOffset = (pageIndex - 1) * pageSize;
// var currentOffset = (pageIndex - 1) * pageSize / tables.Count;
//
// var listResult = new List<TempResult<T>>(tables.Count);
// foreach (var table in tables)
// {
// var r = await dbContext.Queryable<T>().AS(table)
// .WhereIF(where != null, where)
// .OrderBy(x => x.Timestamp)
// .Skip(currentOffset).Take(pageSize)
// .ToListAsync();
//
// listResult.Add(new TempResult<T>
// {
// Table = table,
// Result = r,
// Min = r.Min(x => x.Timestamp),
// Max = r.Max(x => x.Timestamp)
// });
// }
//
// var currentMin = listResult.Min(x => x.Min);
// var currentMax = listResult.Max(x => x.Max);
// var resultOffset = 0;
// foreach (var item in listResult)
// {
// var r = await dbContext.Queryable<T>().AS(item.Table)
// .WhereIF(where != null, where)
// .Where(x => x.Timestamp >= currentMin && x.Timestamp <= currentMax)
// .OrderBy(x => x.Timestamp)
// .ToListAsync();
//
// var ct = r.Min(x => x.Timestamp);
// if (ct == currentMin)
// {
// resultOffset += currentOffset;
// }
// else
// {
// var count = r.Count(x => x.Timestamp > currentMin && x.Timestamp <= item.Min);
// resultOffset += currentOffset - count;
// }
//
// item.Result = r;
// }
//
// var result = listResult.SelectMany(x => x.Result).OrderBy(x => x.Timestamp).ToList();
// return result.Skip(searchOffset - (resultOffset + 1)).Take(pageSize).ToList();
// }
//
// public class TempResult<T>
// {
// public string Table { get; set; }
// public List<T> Result { get; set; }
// public long Min { get; set; }
// public long Max { get; set; }
// }
// }

12
Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/DeviceTaskAssignmentsController.cs
View File

@@ -35,6 +35,18 @@ public class DeviceTaskAssignmentsController : ControllerBase
return await _deviceTaskAssignmentService.GetPageAsync(request);
}
/// <summary>
/// 设备任务预警
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("page-warning")]
[IgnoreTenant]
public async Task<Pagination<DeviceTaskAssignmentResponse>> GetPageWarningAsync([FromQuery] DeviceTaskAssignmentRequest request)
{
return await _deviceTaskAssignmentService.GetPageWarningAsync(request);
}
/// <summary>
/// 重置任务
/// </summary>

3
Src/Dlhis.ScheduledTask/TaskAssignment/Services/IDeviceTaskAssignmentService.cs
View File

@@ -8,6 +8,9 @@ public interface IDeviceTaskAssignmentService : IScopeDependency
{
Task<Pagination<DeviceTaskAssignmentResponse>> GetPageAsync(DeviceTaskAssignmentRequest request);
Task<Pagination<DeviceTaskAssignmentResponse>> GetPageWarningAsync(DeviceTaskAssignmentRequest request);
Task ResetAsync(DeviceTaskResetRequest request);
}

62
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
View File

@@ -103,6 +103,68 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
return page;
}
public async Task<Pagination<DeviceTaskAssignmentResponse>> GetPageWarningAsync(DeviceTaskAssignmentRequest request)
{
var page = await _dbContext.Queryable<DeviceTaskEntity>()
.LeftJoin<DeviceEntity>((deviceTask, device) => deviceTask.DeviceUniqueNo == device.UniqueNo)
.LeftJoin<GainfoEntity>((deviceTask, device, ga) => deviceTask.UserNo == ga.No)
.LeftJoin<GainfoLeaveEntity>((deviceTask, device, ga, gaLeave) => deviceTask.UserNo == gaLeave.No)
.LeftJoin<DeviceRegistryEntity>((deviceTask, device, ga, gaLeave, deviceRegistry) => deviceRegistry.DeviceUniqueNo == deviceTask.DeviceUniqueNo)
.Where(deviceTask => deviceTask.TenantId == request.Factory)
.WhereIF(!request.Search.IsEmpty(), (deviceTask, device, ga) =>
ga.Name == request.Search
|| ga.Code == request.Search
|| deviceTask.DeviceUniqueNo == request.Search
)
.Where(deviceTask => deviceTask.Version >= 10)
.OrderBy(deviceTask => deviceTask.ModifiedTime, OrderByType.Desc)
.Select((deviceTask, device, ga, gaLeave, deviceRegistry) => new DeviceTaskAssignmentResponse
{
Id = deviceTask.Id,
DeviceUniqueNo = deviceTask.DeviceUniqueNo,
ResultMessage = deviceTask.ResultMessage,
RetryCount = deviceTask.Version,
Status = deviceTask.Status,
UserNo = deviceTask.UserNo,
UserName = SqlFunc.IsNull(ga.Name, gaLeave.Name),
UserCode = SqlFunc.IsNull(ga.Code, gaLeave.Code),
Type = deviceTask.Type,
CreateTime = deviceTask.CreateTime,
LastUpdateTime = deviceTask.ModifiedTime,
TenantId = deviceTask.TenantId,
LastHeartbeatTime = deviceRegistry.LastHeartbeatTime,
HeartbeatInterval = device.HeartbeatInterval,
DeployPlace = device.DeployPlace,
CreateBy = deviceTask.CreatedBy,
Source = deviceTask.Source
})
.ToPageListAsync(request);
try
{
var tenants = await _tenantApi.GetTenantsInternalAsync();
page.Data.ForEach(item => { item.TenantName = tenants.FirstOrDefault(x => x.Code == item.TenantId)?.Name; });
}
catch (Exception)
{
//ignore
}
try
{
var userIds = page.Data.Select(x => x.CreateBy).Distinct().ToList();
var userInfos = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = userIds });
page.Data.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreateBy)?.OperatorName);
}
catch (Exception e)
{
_logger.LogError("获取人员数据失败:{error}", e.Message);
}
return page;
}
public async Task ResetAsync(DeviceTaskResetRequest request)
{
var tasks = await _dbContext.Queryable<DeviceTaskEntity>()