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

心跳、读缓存调整

Browse Source
This commit is contained in:
马健
2024-07-25 14:59:44 +08:00
parent 65eed56fad
commit 201293b82f
4 changed files with 92 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -123,8 +123,8 @@ namespace Tnb.WarehouseMgr
}
catch (Exception ex)
{
Logger.LogError(ex.Message);
Logger.LogError(ex.StackTrace);
Logger.LogError("【LoadConfirm】" + ex.Message);
Logger.LogError("【LoadConfirm】" + ex.StackTrace);
return await ToApiResult(HttpStatusCode.InternalServerError, $"取货确认..................失败 原因是{ex.Message}");
throw;
}
@@ -159,6 +159,11 @@ namespace Tnb.WarehouseMgr
{
if (elevator != null && s_elevatorMap.TryGetValue(elevator.device_id, out object? elevatorCode))
{
if (!TimedTaskBackgroundService.elevatorStatus[elevatorCode.ToString()])
{
Logger.LogError($"【LoadConfirm】 {elevatorCode} 电梯心跳中断，请重试！");
return await ToApiResult(HttpStatusCode.InternalServerError, $"{elevatorCode} 电梯心跳中断，请重试！");
}
//s_eleUseStatusDic[elevator.device_id] = (int)EnumElevatorUseStatus.空闲;
string devName = elevatorCode?.ToString();
Logger.Information($"【LoadConfirm】 获取设备:{devName},状态");
@@ -180,7 +185,7 @@ namespace Tnb.WarehouseMgr
if (curFloor != floorNo)
{
Logger.Information($"【LoadConfirm】 电梯还未开门，请重试！curFloor != floorNo");
return await ToApiResult(HttpStatusCode.InternalServerError, "【LoadConfirm】 电梯还未开门，请重试！");
return await ToApiResult(HttpStatusCode.InternalServerError, "电梯还未开门，请重试！");
}
if (doorStatus.ToEnum<EnumDoorStatus>() != EnumDoorStatus.开门到位保持 && runStatus.ToEnum<EnumRunStatus>() == EnumRunStatus.停梯 && floorNo == curFloor) //判断电梯楼层与当前放货在同一楼层在允许放货
{
@@ -202,9 +207,11 @@ namespace Tnb.WarehouseMgr
}
}
}
catch (Exception)
catch (Exception ex)
{
return await ToApiResult(HttpStatusCode.InternalServerError, "请重试！");
Logger.LogError("【LoadConfirm】" + ex.Message);
Logger.LogError("【LoadConfirm】" + ex.StackTrace);
return await ToApiResult(HttpStatusCode.InternalServerError, $"取货确认..................失败 原因是{ex.Message}");
throw;
}
return await ToApiResult(HttpStatusCode.InternalServerError, "请重试！");
@@ -339,6 +346,11 @@ namespace Tnb.WarehouseMgr
}
if (s_elevatorMap.TryGetValue(elevator.device_id, out object? elevatorCode))
{
if (!TimedTaskBackgroundService.elevatorStatus[elevatorCode.ToString()])
{
Logger.LogError($"【UnloadConfirm】 {elevatorCode} 电梯心跳中断，请重试！");
return await ToApiResult(HttpStatusCode.InternalServerError, $"{elevatorCode} 电梯心跳中断，请重试！");
}
string devName = elevatorCode?.ToString();
@@ -397,7 +409,8 @@ namespace Tnb.WarehouseMgr
}
catch (Exception ex)
{
Logger.Error("【UnloadConfirm】 放货确认失败", ex);
Logger.Error("【UnloadConfirm】 放货确认失败", ex.Message);
Logger.Error("【UnloadConfirm】 放货确认失败", ex.StackTrace);
return await ToApiResult(HttpStatusCode.InternalServerError, "电梯还未开门，请重试！");
throw;
}