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

1、库位导入代码调整

Browse Source 
2、电梯通信代码调整
This commit is contained in:
yang.lee
2023-12-11 13:52:54 +08:00
parent c8d5847941
commit 0dd220ee4f
14 changed files with 352 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
WarehouseMgr/Tnb.WarehouseMgr/ElevatorControlService.cs
View File

@@ -3,6 +3,8 @@ using System.Dynamic;
using DingTalk.Api.Request;
using JNPF;
using JNPF.Common.Extension;
using JNPF.Common.Manager;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
@@ -28,38 +30,63 @@ namespace Tnb.WarehouseMgr
private readonly bool isFrontDoorBit = false; //是否到前门位
private readonly IServiceProvider _sp;
private readonly BackgroundService _backgudSvc;
private readonly ICacheManager _cacheMgr;
public ElevatorControlService(IServiceProvider sp, BackgroundService bgSvc)
public ElevatorControlService(IServiceProvider sp, BackgroundService bgSvc, ICacheManager cacheMgr)
{
_elevatorCtlCfg = App.Configuration.Build<ElevatorControlConfiguration>();
_sp = sp;
_backgudSvc = bgSvc;
_cacheMgr = cacheMgr;
}
/// <summary>
/// 呼梯测试
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> CallLiftTest(string devName, int floor)
[HttpPost, AllowAnonymous]
public async Task<dynamic> CallLiftTest()
{
bool isSuccefuly = false;
//var tags = new[] { "SysStatus", "RunStatus", "FloorNo", "DoorStatus", "AGVStatus" };
//(int sysStatus, int runStatus, _, int doorStatus, int agvStatus) = await GetElevatorStatus(devName, tags, CancellationToken.None);
////判断当前楼层是否是放货楼层,如不是则呼叫电梯到当前楼层
//if (sysStatus.ToEnum<EnumSysStatus>() == EnumSysStatus.正常状态 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯 &&
// agvStatus.ToEnum<EnumAgvStatus>() != EnumAgvStatus.AGV运行状态)
//{
// if (doorStatus.ToEnum<EnumDoorStatus>() != EnumDoorStatus.关门到位保持)
// {
// _ = await SendOpenCloseCmd(devName, (int)EnumAgvControl.前门关门);
// }
// dynamic result = await WriteTagAsync(devName, ElevatorConsts.FloorExecute, floor); //呼叫电梯到指定楼层
// if (!string.IsNullOrEmpty(result))
// {
// JObject jo = JObject.Parse(result);_
// isSuccefuly = jo?.Value<string>("Result")?.Equals("Ok", StringComparison.OrdinalIgnoreCase) ?? false;
// }
//}
var value = "";
var tags = new[] { "SysStatus", "RunStatus", "FloorNo", "DoorStatus", "AGVStatus" };
(int sysStatus, int runStatus, _, int doorStatus, int agvStatus) = await GetElevatorStatus(devName, tags, CancellationToken.None);
//判断当前楼层是否是放货楼层,如不是则呼叫电梯到当前楼层
if (sysStatus.ToEnum<EnumSysStatus>() == EnumSysStatus.正常状态 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯 &&
agvStatus.ToEnum<EnumAgvStatus>() != EnumAgvStatus.AGV运行状态)
try
{
if (doorStatus.ToEnum<EnumDoorStatus>() != EnumDoorStatus.关门到位保持)
var statusMap = await RedisHelper.HGetAllAsync("Elevator3");
foreach (var tag in tags)
{
_ = await SendOpenCloseCmd(devName, (int)EnumAgvControl.前门关门);
}
dynamic result = await WriteTagAsync(devName, ElevatorConsts.FloorExecute, floor); //呼叫电梯到指定楼层
if (!string.IsNullOrEmpty(result))
{
JObject jo = JObject.Parse(result);
isSuccefuly = jo?.Value<string>("Result")?.Equals("Ok", StringComparison.OrdinalIgnoreCase) ?? false;
if (statusMap.ContainsKey(tag))
{
var cacheItem = statusMap[tag];
var jo = JObject.Parse(cacheItem);
var v = jo.Value<int>("V");
}
}
//value = await _cacheMgr.GetAsync("Elevator3");
}
catch (Exception ex)
{
throw;
}
return isSuccefuly;
}
@@ -162,22 +189,25 @@ namespace Tnb.WarehouseMgr
/// <returns></returns>
public async Task<bool> SendOpenCloseCmd(string devName, int value)
{
Dictionary<string, string> dicCommand = new(StringComparer.OrdinalIgnoreCase)
var flag = false;
/*Dictionary<string, string> dicCommand = new(StringComparer.OrdinalIgnoreCase)
{
["DevName"] = devName,
["token"] = _elevatorCtlCfg.token,
["TagName"] = "DoorExecute",
["Value"] = value.ToString()
};
};*/
var eleStatusMap = await RedisHelper.HGetAllAsync(devName);
try
{
_ = await HttpClientHelper.GetAsync(_elevatorCtlCfg.WriteTagUrl, pars: dicCommand);
//_ = await HttpClientHelper.GetAsync(_elevatorCtlCfg.WriteTagUrl, pars: dicCommand);
flag = await RedisHelper.HSetAsync(devName, ElevatorConsts.DoorExecute, value);
}
catch (Exception)
{
return false;
}
return true;
return flag;
}
/// <summary>
/// 设置Agv控制请求状态
@@ -206,14 +236,17 @@ namespace Tnb.WarehouseMgr
/// <returns></returns>
public async Task<dynamic> WriteTagAsync(string devName, string tagName, int value)
{
Dictionary<string, string> dicCommand = new(StringComparer.OrdinalIgnoreCase)
/*Dictionary<string, string> dicCommand = new(StringComparer.OrdinalIgnoreCase)
{
["DevName"] = devName,
["token"] = _elevatorCtlCfg.token,
["TagName"] = tagName,
["Value"] = value.ToString()
};
return await HttpClientHelper.GetAsync(_elevatorCtlCfg.WriteTagUrl, pars: dicCommand);
return await HttpClientHelper.GetAsync(_elevatorCtlCfg.WriteTagUrl, pars: dicCommand);*/
return await RedisHelper.HSetAsync(devName, tagName, value);
}
/// <summary>
@@ -225,7 +258,7 @@ namespace Tnb.WarehouseMgr
public async Task<int> GetTagAsync(string devName, string tagName)
{
Dictionary<string, string> dicCommand = new()
/*Dictionary<string, string> dicCommand = new()
{
["DevName"] = devName,
["token"] = _elevatorCtlCfg.token,
@@ -233,7 +266,15 @@ namespace Tnb.WarehouseMgr
};
string result = await HttpClientHelper.GetAsync(_elevatorCtlCfg.GetTagUrl, pars: dicCommand);
JObject jo = JObject.Parse(result);
return jo.Value<int>("V");
return jo.Value<int>("V");*/
var eleStatusMap = await RedisHelper.HGetAllAsync(devName);
if (eleStatusMap.ContainsKey(tagName))
{
JObject jo = JObject.Parse(eleStatusMap[tagName]);
return jo.Value<int>("V");
}
return -1;
}
@@ -289,49 +330,65 @@ namespace Tnb.WarehouseMgr
[HttpPost("GetElevatorStatus")]
public async Task<(int sysStatus, int runStatus, int floorNo, int doorStatus, int agvStatus)> GetElevatorStatus([NotNull] string devName, [FromBody] IEnumerable<string> tags, CancellationToken token)
{
Task<string> GetTag(string tag)
{
var dicCommand = new Dictionary<string, string>
{
["DevName"] = devName,
["token"] = _elevatorCtlCfg.token,
["TagName"] = tag
};
/* async Task<string> GetTag(string tag)
{
var dicCommand = new Dictionary<string, string>
{
["DevName"] = devName,
["token"] = _elevatorCtlCfg.token,
["TagName"] = tag
};
return HttpClientHelper.GetAsync(_elevatorCtlCfg.GetTagUrl, pars: dicCommand);
}
return await HttpClientHelper.GetAsync(_elevatorCtlCfg.GetTagUrl, pars: dicCommand);
}
*/
await s_elevatorStatusSemaphore.WaitAsync(token);
var tasks = tags.Select(tag => GetTag(tag));
var results = await Task.WhenAll(tasks.Select(task => task));
Logger.Information($"状态结果:{string.Join(",",results)}");
var jos = results.Select(r => JObject.Parse(r)).ToArray();
var (sysStatus, runStatus, floorNo, doorStatus, agvStatus) = (0, 0, 0, 0, 0);
var propertyMap = new Dictionary<string, Action<int>>()
try
{
{ ElevatorConsts.SysStatus, v => sysStatus = v },
{ ElevatorConsts.RunStatus, v => runStatus = v },
{ ElevatorConsts.FloorNo, v => floorNo = v },
{ ElevatorConsts.DoorStatus, v => doorStatus = v },
{ ElevatorConsts.AGVStatus, v => agvStatus = v },
};
if (jos?.Length > 0)
{
foreach (var jo in jos)
//var tasks = tags.Select(tag => GetTag(tag));
//var results = await Task.WhenAll(tasks.Select(task => task));
var statusMap = await RedisHelper.HGetAllAsync(devName);
List<JObject> jos = new();
foreach (var tag in tags)
{
if (jo == null)
if (statusMap.ContainsKey(tag))
{
continue;
}
string? tagName = jo!.Value<string>("Name");
int value = jo!.Value<int>("V");
if (propertyMap.TryGetValue(tagName!, out var setProperty))
{
setProperty(value);
jos.Add(JObject.Parse(tag));
}
}
var propertyMap = new Dictionary<string, Action<int>>()
{
{ ElevatorConsts.SysStatus, v => sysStatus = v },
{ ElevatorConsts.RunStatus, v => runStatus = v },
{ ElevatorConsts.FloorNo, v => floorNo = v },
{ ElevatorConsts.DoorStatus, v => doorStatus = v },
{ ElevatorConsts.AGVStatus, v => agvStatus = v },
};
if (jos?.Count > 0)
{
foreach (var jo in jos)
{
if (jo == null)
{
continue;
}
string? tagName = jo!.Value<string>("TagName");
int value = jo!.Value<int>("V");
if (propertyMap.TryGetValue(tagName!, out var setProperty))
{
setProperty(value);
}
}
}
}
finally
{
s_elevatorStatusSemaphore.Release();
}
return (sysStatus, runStatus, floorNo, doorStatus, agvStatus);
@@ -400,12 +457,12 @@ namespace Tnb.WarehouseMgr
{
_ = await SendOpenCloseCmd(devName, (int)EnumAgvControl.前门关门);
}
dynamic result = await WriteTagAsync(devName, ElevatorConsts.FloorExecute, floor); //呼叫电梯到指定楼层
if (!string.IsNullOrEmpty(result))
{
JObject jo = JObject.Parse(result);
isSuccefuly = jo?.Value<string>("Result")?.Equals("Ok", StringComparison.OrdinalIgnoreCase) ?? false;
}
isSuccefuly = await WriteTagAsync(devName, ElevatorConsts.FloorExecute, floor); //呼叫电梯到指定楼层
//if (!string.IsNullOrEmpty(result))
//{
// JObject jo = JObject.Parse(result);
// isSuccefuly = jo?.Value<string>("Result")?.Equals("Ok", StringComparison.OrdinalIgnoreCase) ?? false;
//}
}
return isSuccefuly;
}
@@ -418,6 +475,9 @@ namespace Tnb.WarehouseMgr
tasks.Add(WriteTagAsync(devName, ElevatorConsts.AGVControl, input.value));
}
return tasks;
}
public async Task CloseElevatorControl(CloseElevatorInput input)
@@ -426,8 +486,22 @@ namespace Tnb.WarehouseMgr
{
throw new ArgumentNullException(nameof(input.devNames));
}
var tasks = ParallelWriteTagAsync(input);
var writeRes = await Task.WhenAll(tasks);
//var tasks = ParallelWriteTagAsync(input);
List<Dictionary<string, string>> devInfoList = new();
foreach (var dn in input.devNames)
{
var eleStatusMap = await RedisHelper.HGetAllAsync(dn);
if (eleStatusMap?.Count > 0)
{
devInfoList.Add(eleStatusMap);
}
}
foreach (var devMap in devInfoList)
{
devMap[ElevatorConsts.AGVControl] = input.value.ToString();
}
//var writeRes = await Task.WhenAll(tasks);
var timedTaskSvc = _backgudSvc as TimedTaskBackgroundService;
if (timedTaskSvc != null)
{