baogq
/
HightWay_AirPot_WCS
generated from wenjy/SlnMesnac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 前端界面修改，通讯部分TryCatch

Browse Source
master
SoulStar 2 months ago
parent 215837df5d
commit 063deee15f
5 changed files with 146 additions and 74 deletions
Show Stats Download Patch File Download Diff File

2
SlnMesnac.Business/base/BaseTaskInfoBusiness.cs
Unescape Escape View File

@ -158,7 +158,7 @@ namespace SlnMesnac.Business.@base
}
/// <summary>
/// Timer刷新任务状态, 有新任务初次下发AGV,Timer执行
/// Timer刷新任务状态, 有新任务初次下发AGV, Timer执行
/// </summary>
public void RefreshTaskState()
{

14
SlnMesnac.Repository/service/Impl/AGVStateServiceImpl.cs
Unescape Escape View File

@ -66,8 +66,16 @@ namespace SlnMesnac.Repository.service.Impl
/// <returns></returns>
public async Task<bool> UpdateAsync(AGVState record)
{
bool result = await _rep.UpdateAsync(record);
return result;
try
{
bool result = await _rep.UpdateAsync(record);
return result;
}
catch (Exception ex)
{
_logger.LogError($"更新设备状态信息出现错误:{ex.Message}");
return false;
}
}
/// <summary>
@ -116,7 +124,7 @@ namespace SlnMesnac.Repository.service.Impl
{
return _rep.DeleteById(id);
}
catch(Exception ex)
catch (Exception ex)
{
_logger.LogError("AGV状态删除错误：" + ex.Message);
return false;

188
SlnMesnac.TouchSocket/AirPorthttpClient.cs
Unescape Escape View File

@ -127,18 +127,26 @@ namespace SlnMesnac.TouchSocket
///
public AGVResponseEntity<ResponseAddTaskDataEntity> AGVAddTaskRequest(AGVRequestAddTaskEntity requestValue)
{
if (_httpClient == null)
try
{
_logger.LogError("http服务为空");
if (_httpClient == null)
{
_logger.LogError("http服务为空");
return null;
}
//序列化输入数据
string json = Newtonsoft.Json.JsonConvert.SerializeObject(requestValue);
var context = new StringContent(json, Encoding.UTF8, "application/json");
var httpContent = _httpClient.PostAsync($"{Url}/api/task/addTask", context).ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("POST:/api/task/addTask", null, requestValue);
return JsonStringToEntity<ResponseAddTaskDataEntity>(result);
}
catch (Exception ex)
{
_logger.LogError($"AGV下发任务请求接口异常 {ex.Message}");
return null;
}
//序列化输入数据
string json = Newtonsoft.Json.JsonConvert.SerializeObject(requestValue);
var context = new StringContent(json, Encoding.UTF8, "application/json");
var httpContent = _httpClient.PostAsync($"{Url}/api/task/addTask", context).ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("POST:/api/task/addTask", null, requestValue);
return JsonStringToEntity<ResponseAddTaskDataEntity>(result);
}
/// <summary>
@ -148,18 +156,27 @@ namespace SlnMesnac.TouchSocket
/// <returns></returns>
public AGVResponseEntity<object> AGVOperationalTaskRequest(AGVRequestOperationalTaskEntity requestValue)
{
if (_httpClient == null)
try
{
_logger.LogError("http服务为空");
if (_httpClient == null)
{
_logger.LogError("http服务为空");
return null;
}
//序列化输入数据
string json = Newtonsoft.Json.JsonConvert.SerializeObject(requestValue);
var context = new StringContent(json, Encoding.UTF8, "application/json");
var httpContent = _httpClient.PostAsync($"{Url}/api/task/operationalTask", context).ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("POST:/api/task/operationalTask", null, requestValue);
return JsonStringToEntity<object>(result);
}
catch (Exception ex)
{
_logger.LogError($"取消/终止任务请求接口异常 {ex.Message}");
return null;
}
//序列化输入数据
string json = Newtonsoft.Json.JsonConvert.SerializeObject(requestValue);
var context = new StringContent(json, Encoding.UTF8, "application/json");
var httpContent = _httpClient.PostAsync($"{Url}/api/task/operationalTask", context).ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("POST:/api/task/operationalTask", null, requestValue);
return JsonStringToEntity<object>(result);
}
/// <summary>
@ -169,18 +186,27 @@ namespace SlnMesnac.TouchSocket
/// <returns></returns>
public AGVResponseEntity<ResponseTaskStateDetailDataEntity> AGVGetTaskStateDetailRequest(AGVRequestTaskStateDetailEntity requestValue)
{
if (_httpClient == null)
try
{
_logger.LogError("http服务为空");
if (_httpClient == null)
{
_logger.LogError("http服务为空");
return null;
}
//序列化输入数据
string json = Newtonsoft.Json.JsonConvert.SerializeObject(requestValue);
var context = new StringContent(json, Encoding.UTF8, "application/json");
var httpContent = _httpClient.PutAsync($"{Url}/api/task/getTaskStateDetail", context).ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("PUT:/api/task/getTaskStateDetail", null, requestValue);
return JsonStringToEntity<ResponseTaskStateDetailDataEntity>(result);
}
catch (Exception ex)
{
_logger.LogError($"查询任务状态接口异常 {ex.Message}");
return null;
}
//序列化输入数据
string json = Newtonsoft.Json.JsonConvert.SerializeObject(requestValue);
var context = new StringContent(json, Encoding.UTF8, "application/json");
var httpContent = _httpClient.PutAsync($"{Url}/api/task/getTaskStateDetail", context).ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("PUT:/api/task/getTaskStateDetail", null, requestValue);
return JsonStringToEntity<ResponseTaskStateDetailDataEntity>(result);
}
/// <summary>
@ -189,16 +215,25 @@ namespace SlnMesnac.TouchSocket
/// <returns></returns>
public AGVResponseEntity<List<ResponseRobotAtrributeDataEntity>> AGVAllStateRequest()
{
if (_httpClient == null)
try
{
if (_httpClient == null)
{
_logger.LogError("http服务为空");
return null;
}
//序列化输入数据
var httpContent = _httpClient.GetAsync($"{Url}/api/task/robot/getRobot").ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("GET:/api/task/robot/getRobot", null);
return JsonStringToEntity<List<ResponseRobotAtrributeDataEntity>>(result);
}
catch (Exception ex)
{
_logger.LogError("http服务为空");
_logger.LogError($"获取所有AGV信息接口异常 {ex.Message}");
return null;
}
//序列化输入数据
var httpContent = _httpClient.GetAsync($"{Url}/api/task/robot/getRobot").ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("GET:/api/task/robot/getRobot", null);
return JsonStringToEntity<List<ResponseRobotAtrributeDataEntity>>(result);
}
/// <summary>
@ -207,15 +242,24 @@ namespace SlnMesnac.TouchSocket
/// <returns></returns>
public AGVResponseEntity<ResponseActiveMapDataEntity> AGVMapActiveRequest()
{
if (_httpClient == null)
try
{
if (_httpClient == null)
{
_logger.LogError("http服务为空");
return null;
}
var httpContent = _httpClient.GetAsync($"{Url}/api/v1.0.0/Maps/mapActive").ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("GET:/api/v1.0.0/Maps/mapActive", null);
return JsonStringToEntity<ResponseActiveMapDataEntity>(result);
}
catch (Exception ex)
{
_logger.LogError("http服务为空");
_logger.LogError($"互殴当前激活地图接口异常 {ex.Message}");
return null;
}
var httpContent = _httpClient.GetAsync($"{Url}/api/v1.0.0/Maps/mapActive").ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("GET:/api/v1.0.0/Maps/mapActive", null);
return JsonStringToEntity<ResponseActiveMapDataEntity>(result);
}
/// <summary>
@ -225,18 +269,27 @@ namespace SlnMesnac.TouchSocket
/// <returns></returns>
public AGVResponseEntity<List<ResponseMapPositionDataEntity>> AGVMapPositionRequest(string requestValue)
{
if (_httpClient == null)
try
{
if (_httpClient == null)
{
_logger.LogError("http服务为空");
return null;
}
//序列化输入数据
string json = Newtonsoft.Json.JsonConvert.SerializeObject(requestValue);
var context = new StringContent(json, Encoding.UTF8, "application/json");
var httpContent = _httpClient.GetAsync($"{Url}/api/v1.0.0/Positions?mapId={requestValue}").ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("GET:/api/v1.0.0/Positions?mapId={0}", null, requestValue);
return JsonStringToEntity<List<ResponseMapPositionDataEntity>>(result);
}
catch (Exception ex)
{
_logger.LogError("http服务为空");
_logger.LogError($"获取当前地图所有位置点接口异常 {ex.Message}");
return null;
}
//序列化输入数据
string json = Newtonsoft.Json.JsonConvert.SerializeObject(requestValue);
var context = new StringContent(json, Encoding.UTF8, "application/json");
var httpContent = _httpClient.GetAsync($"{Url}/api/v1.0.0/Positions?mapId={requestValue}").ConfigureAwait(false).GetAwaiter().GetResult().Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
//JToken responseValue = AirportAGVClient.InvokeT<JToken>("GET:/api/v1.0.0/Positions?mapId={0}", null, requestValue);
return JsonStringToEntity<List<ResponseMapPositionDataEntity>>(result);
}
/// <summary>
@ -246,24 +299,33 @@ namespace SlnMesnac.TouchSocket
/// <returns></returns>
public AGVResponseEntity<object> AGVErrorClear(string agvIp)
{
if (_httpClient == null)
try
{
_logger.LogError("http服务为空");
return null;
}
string token = "bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiYWRtaW4iLCJyb2xlIjoiMSIsImlzcyI6IlNpbmV2YVNlcnZlciIsImF1ZCI6IlNpbmV2YUNsaWVudCJ9.Ujn-JuQDzA_sloITF84z1pdQvvH8DQ0DSFlhz4zP44M";
var request = new HttpRequestMessage(HttpMethod.Delete, $"http://{agvIp}/api/v1.0.0/ClearException/0");
// 单独为此请求添加 Authorization 头部
request.Headers.Add("Authorization", token);
// 发送请求
var response = _httpClient.SendAsync(request).ConfigureAwait(false).GetAwaiter().GetResult();
// 读取响应内容
var httpContent = response.Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
if (_httpClient == null)
{
_logger.LogError("http服务为空");
return null;
}
string token = "bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiYWRtaW4iLCJyb2xlIjoiMSIsImlzcyI6IlNpbmV2YVNlcnZlciIsImF1ZCI6IlNpbmV2YUNsaWVudCJ9.Ujn-JuQDzA_sloITF84z1pdQvvH8DQ0DSFlhz4zP44M";
return JsonStringToEntity<object>(result);
var request = new HttpRequestMessage(HttpMethod.Delete, $"http://{agvIp}/api/v1.0.0/ClearException/0");
// 单独为此请求添加 Authorization 头部
request.Headers.Add("Authorization", token);
// 发送请求
var response = _httpClient.SendAsync(request).ConfigureAwait(false).GetAwaiter().GetResult();
// 读取响应内容
var httpContent = response.Content;
string result = httpContent.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
return JsonStringToEntity<object>(result);
}
catch (Exception ex)
{
_logger.LogError($"AGV异常清楚接口异常 {ex.Message}");
return null;
}
}
///// <summary>

11
SlnMesnac.WPF/Page/ControlPage/UserTaskControl.xaml
Unescape Escape View File

@ -5,16 +5,17 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SlnMesnac.WPF.Page.ControlPage"
mc:Ignorable="d" d:DesignWidth="800" Background="Transparent" Height="590">
<Grid HorizontalAlignment="Center" Width="800" Height="590" VerticalAlignment="Top">
<Grid HorizontalAlignment="Center" Width="800" Height="590" VerticalAlignment="Bottom">
<Button Content="D定位抓取" x:Name="DeliverNeedPosition" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=DeliverNeedPosition}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="466,51,234,509" Click="Button_Click_1"/>
<Button Content="A定位抓取" x:Name="AMRNeedPosition" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name, ElementName=AMRNeedPosition}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="466,121,234,439" Click="Button_Click_1"/>
<Button Content="D无定抓取" x:Name="DeilverNoPosition" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=DeilverNoPosition}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="324,51,376,509" Click="Button_Click_1"/>
<Button Content="A无定抓取" x:Name="AMRNoPosition" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=AMRNoPosition}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="324,121,376,439" Click="Button_Click_1"/>
<Button Content="发送结束抓取" x:Name="VisionEnd" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=VisionEnd}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="466,185,234,375" Click="Button_Click_2"/>
<Button Content="调用800小车" x:Name="Get800" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Get800}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="48,121,652,439" Click="Button_Click_3"/>
<Button Content="入库800小车" x:Name="Out800" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Out800}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="48,51,652,509" Click="Button_Click_4"/>
<Button Content="调用1000小车" x:Name="Get1000" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Get1000}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="187,121,513,439" Click="Button_Click_3"/>
<Button Content="入库1000小车" x:Name="Out1000" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Out1000}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="187,51,513,509" Click="Button_Click_4"/>
<Button Content="调用800小车" x:Name="Get800" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Get800}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="47,51,653,509" Click="Button_Click_3"/>
<Button Content="入库800小车" x:Name="Out800" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Out800}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="47,121,653,439" Click="Button_Click_4"/>
<Button Content="测试按钮" x:Name="TestButton" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TestButton}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="47,190,653,370" />
<Button Content="调用1000小车" x:Name="Get1000" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Get1000}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="187,51,513,509" Click="Button_Click_3"/>
<Button Content="入库1000小车" x:Name="Out1000" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Out1000}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="187,121,513,439" Click="Button_Click_4"/>
<Button Content="复位1000小车" x:Name="Reset1000" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Reset1000}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="187,190,513,370" Click="Button_Click_4"/>
<Button Content="手动停止800任务" x:Name="ManualStop800Task" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=ManualStop800Task}" Style="{StaticResource BUTTON_AGREE}" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="604,51,83,509" Click="Button_Click_5" RenderTransformOrigin="0.504,0.511"/>
<Button Content="手动清除800报警" x:Name="ManualClear800Error" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=ManualClear800Error}" Style="{StaticResource BUTTON_AGREE}" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="604,121,83,439" Click="Button_Click_6"/>

5
SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs
Unescape Escape View File

@ -242,8 +242,9 @@ namespace SlnMesnac.WPF.ViewModel
case "StopTaskRefresh":
_baseTaskInfoBusiness.TaskStateUpdateTimerOperation(TimerControl.Stop);
break;
case "StopAll":
//StopAllTaskActionInvoke();
case "TestButton":
bool a = _AGVStateService.ResetAGVStackCount(_appConfig.AGVConfig.Where(x => x.AGVName == "S800-B").First().AGVGUID.ToString());
_logger.LogInformation($"测试按钮运行{a.ToString()}");
break;
default:
break;

Write Preview
Loading…
Cancel
Save