diff --git a/Sln.Wcs.Common/Domain/Dto/ResultDto.cs b/Sln.Wcs.Common/Domain/Dto/ResultDto.cs index 39ca20b..9b6e450 100644 --- a/Sln.Wcs.Common/Domain/Dto/ResultDto.cs +++ b/Sln.Wcs.Common/Domain/Dto/ResultDto.cs @@ -31,17 +31,17 @@ namespace Sln.Wcs.Common.Domain.Dto public class ResultDto { /// - /// 状态码 + /// 业务状态码:根据 SDK 状态码判断请求是否成功 /// public TCode? code { get; set; } /// - /// + /// 业务信息 /// public string? msg { get; set; } /// - /// 结果 + /// SDK 返回结果 /// public TData? data { get; set; } } diff --git a/Sln.Wcs.HikRoBotSdk/HIkRoBotSdk.cs b/Sln.Wcs.HikRoBotSdk/HIkRoBotSdk.cs index 74453d5..38ac598 100644 --- a/Sln.Wcs.HikRoBotSdk/HIkRoBotSdk.cs +++ b/Sln.Wcs.HikRoBotSdk/HIkRoBotSdk.cs @@ -80,7 +80,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); string json = JsonConvert.SerializeObject(gbTaskSubmit); Console.WriteLine($"请求报文:{json}"); @@ -101,8 +102,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(gbContinueTask)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(gbContinueTask).Result.GetJsonAsync().Result; } @@ -121,8 +122,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(gbCancelTask)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(gbCancelTask).Result.GetJsonAsync().Result; } @@ -141,8 +142,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(taskGroup)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(taskGroup).Result.GetJsonAsync().Result; } @@ -161,8 +162,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(taskPriority)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(taskPriority).Result.GetJsonAsync().Result; } @@ -181,8 +182,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(zonePause)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(zonePause).Result.GetJsonAsync().Result; } @@ -201,8 +202,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(zoneHoming)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(zoneHoming).Result.GetJsonAsync().Result; } @@ -221,8 +222,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(zoneBanish)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(zoneBanish).Result.GetJsonAsync().Result; } @@ -241,8 +242,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(zoneBlockade)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(zoneBlockade).Result.GetJsonAsync().Result; } @@ -261,8 +262,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(carrierBind)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(carrierBind).Result.GetJsonAsync().Result; } @@ -281,8 +282,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(carrierUnbind)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(carrierUnbind).Result.GetJsonAsync().Result; } @@ -301,8 +302,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(siteBind)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(siteBind).Result.GetJsonAsync().Result; } @@ -321,8 +322,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(carrierLock)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(carrierLock).Result.GetJsonAsync().Result; } @@ -341,8 +342,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(siteLock)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(siteLock).Result.GetJsonAsync().Result; } @@ -361,8 +362,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(preTask)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(preTask).Result.GetJsonAsync().Result; } @@ -381,8 +382,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(queryTask)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(queryTask).Result.GetJsonAsync().Result; } @@ -401,8 +402,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(queryRobot)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(queryRobot).Result.GetJsonAsync().Result; } @@ -421,8 +422,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(queryCarrier)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(queryCarrier).Result.GetJsonAsync().Result; } @@ -441,8 +442,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(matLabelBind)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(matLabelBind).Result.GetJsonAsync().Result; } @@ -461,8 +462,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(matLabelUnbind)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(matLabelUnbind).Result.GetJsonAsync().Result; } @@ -481,8 +482,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(equipmentNotify)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(equipmentNotify).Result.GetJsonAsync().Result; } @@ -501,8 +502,8 @@ namespace Sln.Wcs.HikRoBotSdk .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); - Console.WriteLine($"请求报文:{JsonConvert.SerializeObject(equipmentNotify)}"); + .WithHeader("X-lr-version", hikRoBotConfig.xlrVersion) + .WithTimeout(TimeSpan.FromSeconds(15)); return request.PostJsonAsync(equipmentNotify).Result.GetJsonAsync().Result; }