wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

执行代码清理，修复warning

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:59:12 +08:00
parent c6b8dfc861
commit 1dbb17f103
118 changed files with 5046 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
WarehouseMgr/Tnb.WarehouseMgr/TimedTaskBackgroundService.cs
View File

@@ -21,7 +21,7 @@ namespace Tnb.WarehouseMgr
{
public bool IsStarted { get; set; }
private IEventPublisher _eventPublisher = default!;
private ElevatorControlConfiguration _elevatorControlConfiguration = App.Configuration.Build<ElevatorControlConfiguration>();
private readonly ElevatorControlConfiguration _elevatorControlConfiguration = App.Configuration.Build<ElevatorControlConfiguration>();
private readonly IServiceProvider _serviceProvider;
//private static Dictionary<string, Func<CancellationToken?, Task>> _timedFuncMap = new(StringComparer.OrdinalIgnoreCase);
public TimedTaskBackgroundService(IServiceProvider serviceProvider)
@@ -33,19 +33,21 @@ namespace Tnb.WarehouseMgr
{
IsStarted = true;
var timedTask = Task.Run(() =>
Task timedTask = Task.Run(() =>
{
_eventPublisher = App.GetRequiredService<IEventPublisher>();
//电梯Agv心跳检测
TimedTask(async token =>
_ = TimedTask(async token =>
{
var parameter = new Dictionary<string, string>();
parameter["DevName"] = _elevatorControlConfiguration.DevName;
parameter["TagName"] = "AGVKeepalive";
parameter["Value"] = "123";
parameter["token"] = _elevatorControlConfiguration.token;
var result = await HttpClientHelper.GetAsync(_elevatorControlConfiguration.WriteTagUrl, pars: parameter);
Dictionary<string, string> parameter = new()
{
["DevName"] = _elevatorControlConfiguration.DevName,
["TagName"] = "AGVKeepalive",
["Value"] = "123",
["token"] = _elevatorControlConfiguration.token
};
string result = await HttpClientHelper.GetAsync(_elevatorControlConfiguration.WriteTagUrl, pars: parameter);
await Console.Out.WriteLineAsync($"心跳检测结果:{result}");
}, stoppingToken, 30, TimeSpanUnit.Seconds);
////齐套出库
@@ -70,7 +72,7 @@ namespace Tnb.WarehouseMgr
private Task TimedTask(Func<CancellationToken, Task> action, CancellationToken ct, int interval, TimeSpanUnit timeType = TimeSpanUnit.Seconds)
{
var token = ct;
CancellationToken token = ct;
return Task.Factory.StartNew(async () =>
{
while (!token.IsCancellationRequested)
@@ -158,15 +160,15 @@ namespace Tnb.WarehouseMgr
internal class CustomerTaskScheduler : TaskScheduler
{
// 这边的 BlockingCollection 只是举个例子，如果是普通的队列，配合锁也是可以的。
private readonly BlockingCollection<Task> _tasks = new BlockingCollection<Task>();
private readonly BlockingCollection<Task> _tasks = new();
public CustomerTaskScheduler()
{
var thread = new Thread(() =>
Thread thread = new(() =>
{
foreach (var task in _tasks.GetConsumingEnumerable())
foreach (Task task in _tasks.GetConsumingEnumerable())
{
TryExecuteTask(task);
_ = TryExecuteTask(task);
}
})
{