change - HikRoBotSdk 请求头生成处理

dev
WenJY 3 weeks ago
parent 3d19cd4039
commit eed312294f

@ -76,16 +76,7 @@ namespace Sln.Wcs.HikRoBotSdk
public GbTaskSubmitResultDto GbTaskSubmit(GbTaskSubmitDto gbTaskSubmit) public GbTaskSubmitResultDto GbTaskSubmit(GbTaskSubmitDto gbTaskSubmit)
{ {
string url = $"{hikRoBotConfig.api}/task/submit"; string url = $"{hikRoBotConfig.api}/task/submit";
var request = url return GenRequestHeader(url).PostJsonAsync(gbTaskSubmit).Result.GetJsonAsync<GbTaskSubmitResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
string json = JsonConvert.SerializeObject(gbTaskSubmit);
Console.WriteLine($"请求报文:{json}");
return request.PostJsonAsync(gbTaskSubmit).Result.GetJsonAsync<GbTaskSubmitResultDto>().Result;
} }
/// <summary> /// <summary>
@ -98,14 +89,7 @@ namespace Sln.Wcs.HikRoBotSdk
public GbContinueTaskResultDto GbContinueTask(GbContinueTaskDto gbContinueTask) public GbContinueTaskResultDto GbContinueTask(GbContinueTaskDto gbContinueTask)
{ {
string url = $"{hikRoBotConfig.api}/task/extend/continue"; string url = $"{hikRoBotConfig.api}/task/extend/continue";
var request = url return GenRequestHeader(url).PostJsonAsync(gbContinueTask).Result.GetJsonAsync<GbContinueTaskResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(gbContinueTask).Result.GetJsonAsync<GbContinueTaskResultDto>().Result;
} }
/// <summary> /// <summary>
@ -118,14 +102,7 @@ namespace Sln.Wcs.HikRoBotSdk
public GbCancelTaskResultDto GbCancelTask(GbCancelTaskDto gbCancelTask) public GbCancelTaskResultDto GbCancelTask(GbCancelTaskDto gbCancelTask)
{ {
string url = $"{hikRoBotConfig.api}/task/cancel"; string url = $"{hikRoBotConfig.api}/task/cancel";
var request = url return GenRequestHeader(url).PostJsonAsync(gbCancelTask).Result.GetJsonAsync<GbCancelTaskResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(gbCancelTask).Result.GetJsonAsync<GbCancelTaskResultDto>().Result;
} }
/// <summary> /// <summary>
@ -138,14 +115,7 @@ namespace Sln.Wcs.HikRoBotSdk
public TaskGroupResultDto TaskGroup(TaskGroupDto taskGroup) public TaskGroupResultDto TaskGroup(TaskGroupDto taskGroup)
{ {
string url = $"{hikRoBotConfig.api}/task/group"; string url = $"{hikRoBotConfig.api}/task/group";
var request = url return GenRequestHeader(url).PostJsonAsync(taskGroup).Result.GetJsonAsync<TaskGroupResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(taskGroup).Result.GetJsonAsync<TaskGroupResultDto>().Result;
} }
/// <summary> /// <summary>
@ -158,14 +128,7 @@ namespace Sln.Wcs.HikRoBotSdk
public TaskPriorityResultDto SetTaskPriority(TaskPriorityDto taskPriority) public TaskPriorityResultDto SetTaskPriority(TaskPriorityDto taskPriority)
{ {
string url = $"{hikRoBotConfig.api}/task/priority"; string url = $"{hikRoBotConfig.api}/task/priority";
var request = url return GenRequestHeader(url).PostJsonAsync(taskPriority).Result.GetJsonAsync<TaskPriorityResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(taskPriority).Result.GetJsonAsync<TaskPriorityResultDto>().Result;
} }
/// <summary> /// <summary>
@ -178,14 +141,7 @@ namespace Sln.Wcs.HikRoBotSdk
public ZonePauseResultDto ZonePause(ZonePauseDto zonePause) public ZonePauseResultDto ZonePause(ZonePauseDto zonePause)
{ {
string url = $"{hikRoBotConfig.api}/zone/pause"; string url = $"{hikRoBotConfig.api}/zone/pause";
var request = url return GenRequestHeader(url).PostJsonAsync(zonePause).Result.GetJsonAsync<ZonePauseResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(zonePause).Result.GetJsonAsync<ZonePauseResultDto>().Result;
} }
/// <summary> /// <summary>
@ -198,14 +154,7 @@ namespace Sln.Wcs.HikRoBotSdk
public ZoneHomingResultDto ZoneHoming(ZoneHomingDto zoneHoming) public ZoneHomingResultDto ZoneHoming(ZoneHomingDto zoneHoming)
{ {
string url = $"{hikRoBotConfig.api}/zone/homing"; string url = $"{hikRoBotConfig.api}/zone/homing";
var request = url return GenRequestHeader(url).PostJsonAsync(zoneHoming).Result.GetJsonAsync<ZoneHomingResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(zoneHoming).Result.GetJsonAsync<ZoneHomingResultDto>().Result;
} }
/// <summary> /// <summary>
@ -218,14 +167,7 @@ namespace Sln.Wcs.HikRoBotSdk
public ZoneBanishResultDto ZoneBanish(ZoneBanishDto zoneBanish) public ZoneBanishResultDto ZoneBanish(ZoneBanishDto zoneBanish)
{ {
string url = $"{hikRoBotConfig.api}/zone/banish"; string url = $"{hikRoBotConfig.api}/zone/banish";
var request = url return GenRequestHeader(url).PostJsonAsync(zoneBanish).Result.GetJsonAsync<ZoneBanishResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(zoneBanish).Result.GetJsonAsync<ZoneBanishResultDto>().Result;
} }
/// <summary> /// <summary>
@ -238,14 +180,7 @@ namespace Sln.Wcs.HikRoBotSdk
public ZoneBlockadeResultDto ZoneBlockade(ZoneBlockadeDto zoneBlockade) public ZoneBlockadeResultDto ZoneBlockade(ZoneBlockadeDto zoneBlockade)
{ {
string url = $"{hikRoBotConfig.api}/zone/blockade"; string url = $"{hikRoBotConfig.api}/zone/blockade";
var request = url return GenRequestHeader(url).PostJsonAsync(zoneBlockade).Result.GetJsonAsync<ZoneBlockadeResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(zoneBlockade).Result.GetJsonAsync<ZoneBlockadeResultDto>().Result;
} }
/// <summary> /// <summary>
@ -258,14 +193,7 @@ namespace Sln.Wcs.HikRoBotSdk
public CarrierBindResultDto CarrierBind(CarrierBindDto carrierBind) public CarrierBindResultDto CarrierBind(CarrierBindDto carrierBind)
{ {
string url = $"{hikRoBotConfig.api}/carrier/bind"; string url = $"{hikRoBotConfig.api}/carrier/bind";
var request = url return GenRequestHeader(url).PostJsonAsync(carrierBind).Result.GetJsonAsync<CarrierBindResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(carrierBind).Result.GetJsonAsync<CarrierBindResultDto>().Result;
} }
/// <summary> /// <summary>
@ -278,14 +206,7 @@ namespace Sln.Wcs.HikRoBotSdk
public CarrierUnbindResultDto CarrierUnbind(CarrierUnbindDto carrierUnbind) public CarrierUnbindResultDto CarrierUnbind(CarrierUnbindDto carrierUnbind)
{ {
string url = $"{hikRoBotConfig.api}/carrier/unbind"; string url = $"{hikRoBotConfig.api}/carrier/unbind";
var request = url return GenRequestHeader(url).PostJsonAsync(carrierUnbind).Result.GetJsonAsync<CarrierUnbindResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(carrierUnbind).Result.GetJsonAsync<CarrierUnbindResultDto>().Result;
} }
/// <summary> /// <summary>
@ -298,14 +219,7 @@ namespace Sln.Wcs.HikRoBotSdk
public SiteBindResultDto SiteBind(SiteBindDto siteBind) public SiteBindResultDto SiteBind(SiteBindDto siteBind)
{ {
string url = $"{hikRoBotConfig.api}/site/bind"; string url = $"{hikRoBotConfig.api}/site/bind";
var request = url return GenRequestHeader(url).PostJsonAsync(siteBind).Result.GetJsonAsync<SiteBindResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(siteBind).Result.GetJsonAsync<SiteBindResultDto>().Result;
} }
/// <summary> /// <summary>
@ -318,14 +232,7 @@ namespace Sln.Wcs.HikRoBotSdk
public CarrierLockResultDto CarrierLock(CarrierLockDto carrierLock) public CarrierLockResultDto CarrierLock(CarrierLockDto carrierLock)
{ {
string url = $"{hikRoBotConfig.api}/carrier/lock"; string url = $"{hikRoBotConfig.api}/carrier/lock";
var request = url return GenRequestHeader(url).PostJsonAsync(carrierLock).Result.GetJsonAsync<CarrierLockResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(carrierLock).Result.GetJsonAsync<CarrierLockResultDto>().Result;
} }
/// <summary> /// <summary>
@ -338,14 +245,7 @@ namespace Sln.Wcs.HikRoBotSdk
public SiteLockResultDto SiteLock(SiteLockDto siteLock) public SiteLockResultDto SiteLock(SiteLockDto siteLock)
{ {
string url = $"{hikRoBotConfig.api}/site/lock"; string url = $"{hikRoBotConfig.api}/site/lock";
var request = url return GenRequestHeader(url).PostJsonAsync(siteLock).Result.GetJsonAsync<SiteLockResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(siteLock).Result.GetJsonAsync<SiteLockResultDto>().Result;
} }
/// <summary> /// <summary>
@ -358,14 +258,7 @@ namespace Sln.Wcs.HikRoBotSdk
public PreTaskResultDto PreTask(PreTaskDto preTask) public PreTaskResultDto PreTask(PreTaskDto preTask)
{ {
string url = $"{hikRoBotConfig.api}/task/pretask"; string url = $"{hikRoBotConfig.api}/task/pretask";
var request = url return GenRequestHeader(url).PostJsonAsync(preTask).Result.GetJsonAsync<PreTaskResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(preTask).Result.GetJsonAsync<PreTaskResultDto>().Result;
} }
/// <summary> /// <summary>
@ -378,14 +271,7 @@ namespace Sln.Wcs.HikRoBotSdk
public QueryTaskResultDto QueryTaskStatus(QueryTaskDto queryTask) public QueryTaskResultDto QueryTaskStatus(QueryTaskDto queryTask)
{ {
string url = $"{hikRoBotConfig.api}/task/query"; string url = $"{hikRoBotConfig.api}/task/query";
var request = url return GenRequestHeader(url).PostJsonAsync(queryTask).Result.GetJsonAsync<QueryTaskResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(queryTask).Result.GetJsonAsync<QueryTaskResultDto>().Result;
} }
/// <summary> /// <summary>
@ -398,14 +284,7 @@ namespace Sln.Wcs.HikRoBotSdk
public QueryRobotResultDto QueryRobotStatus(QueryRobotDto queryRobot) public QueryRobotResultDto QueryRobotStatus(QueryRobotDto queryRobot)
{ {
string url = $"{hikRoBotConfig.api}/robot/query"; string url = $"{hikRoBotConfig.api}/robot/query";
var request = url return GenRequestHeader(url).PostJsonAsync(queryRobot).Result.GetJsonAsync<QueryRobotResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(queryRobot).Result.GetJsonAsync<QueryRobotResultDto>().Result;
} }
/// <summary> /// <summary>
@ -418,14 +297,7 @@ namespace Sln.Wcs.HikRoBotSdk
public QueryCarrierResultDto QueryCarrierStatus(QueryCarrierDto queryCarrier) public QueryCarrierResultDto QueryCarrierStatus(QueryCarrierDto queryCarrier)
{ {
string url = $"{hikRoBotConfig.api}/carrier/query"; string url = $"{hikRoBotConfig.api}/carrier/query";
var request = url return GenRequestHeader(url).PostJsonAsync(queryCarrier).Result.GetJsonAsync<QueryCarrierResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(queryCarrier).Result.GetJsonAsync<QueryCarrierResultDto>().Result;
} }
/// <summary> /// <summary>
@ -438,14 +310,7 @@ namespace Sln.Wcs.HikRoBotSdk
public MatLabelBindResultDto MatLabelBind(MatLabelBindDto matLabelBind) public MatLabelBindResultDto MatLabelBind(MatLabelBindDto matLabelBind)
{ {
string url = $"{hikRoBotConfig.api}/matlabel/bind"; string url = $"{hikRoBotConfig.api}/matlabel/bind";
var request = url return GenRequestHeader(url).PostJsonAsync(matLabelBind).Result.GetJsonAsync<MatLabelBindResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(matLabelBind).Result.GetJsonAsync<MatLabelBindResultDto>().Result;
} }
/// <summary> /// <summary>
@ -458,14 +323,7 @@ namespace Sln.Wcs.HikRoBotSdk
public MatLabelUnbindResultDto MatLabelUnbind(MatLabelUnbindDto matLabelUnbind) public MatLabelUnbindResultDto MatLabelUnbind(MatLabelUnbindDto matLabelUnbind)
{ {
string url = $"{hikRoBotConfig.api}/matlabel/unbind"; string url = $"{hikRoBotConfig.api}/matlabel/unbind";
var request = url return GenRequestHeader(url).PostJsonAsync(matLabelUnbind).Result.GetJsonAsync<MatLabelUnbindResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(matLabelUnbind).Result.GetJsonAsync<MatLabelUnbindResultDto>().Result;
} }
/// <summary> /// <summary>
@ -478,14 +336,7 @@ namespace Sln.Wcs.HikRoBotSdk
public EquipmentNotifyResultDto EquipmentNotify(EquipmentNotifyDto equipmentNotify) public EquipmentNotifyResultDto EquipmentNotify(EquipmentNotifyDto equipmentNotify)
{ {
string url = $"{hikRoBotConfig.api}/spi/wcs/robot/eqpt/notify"; string url = $"{hikRoBotConfig.api}/spi/wcs/robot/eqpt/notify";
var request = url return GenRequestHeader(url).PostJsonAsync(equipmentNotify).Result.GetJsonAsync<EquipmentNotifyResultDto>().Result;
.WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15));
return request.PostJsonAsync(equipmentNotify).Result.GetJsonAsync<EquipmentNotifyResultDto>().Result;
} }
/// <summary> /// <summary>
@ -498,14 +349,23 @@ namespace Sln.Wcs.HikRoBotSdk
public EquipmentNotifyResultDto EquipmentNotifyGbt(EquipmentNotifyDto equipmentNotify) public EquipmentNotifyResultDto EquipmentNotifyGbt(EquipmentNotifyDto equipmentNotify)
{ {
string url = $"{hikRoBotConfig.api}/spi/wcs/robot/eqpt/notifyGbt"; string url = $"{hikRoBotConfig.api}/spi/wcs/robot/eqpt/notifyGbt";
return GenRequestHeader(url).PostJsonAsync(equipmentNotify).Result.GetJsonAsync<EquipmentNotifyResultDto>().Result;
}
/// <summary>
/// 生成请求头
/// </summary>
/// <param name="url"></param>
/// <returns></returns>
private IFlurlRequest GenRequestHeader(string url)
{
var request = url var request = url
.WithHeader("Content-Type", hikRoBotConfig.contentType) .WithHeader("Content-Type", hikRoBotConfig.contentType)
.WithHeader("User-Agent", hikRoBotConfig.userAgent) .WithHeader("User-Agent", hikRoBotConfig.userAgent)
.WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N")) .WithHeader("X-lr-request-id", System.Guid.NewGuid().ToString("N"))
.WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion)
.WithTimeout(TimeSpan.FromSeconds(15)); .WithTimeout(TimeSpan.FromSeconds(15));
return request;
return request.PostJsonAsync(equipmentNotify).Result.GetJsonAsync<EquipmentNotifyResultDto>().Result;
} }
} }
} }

Loading…
Cancel
Save