diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/CancelTask/CancelTaskResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/CancelTask/CancelTaskResultModel.cs index aea4864..ac4880a 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/CancelTask/CancelTaskResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/CancelTask/CancelTaskResultModel.cs @@ -47,5 +47,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.CancelTask /// 请求编号 /// public string reqCode { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierBind/CarrierBindResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierBind/CarrierBindResultModel.cs index 7385cf2..49dcd99 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierBind/CarrierBindResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierBind/CarrierBindResultModel.cs @@ -37,5 +37,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.CarrierBind /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierLock/CarrierLockResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierLock/CarrierLockResultModel.cs index f683e46..a39da7c 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierLock/CarrierLockResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierLock/CarrierLockResultModel.cs @@ -33,5 +33,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.CarrierLock /// public class CarrierLockResultModel { + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierUnbind/CarrierUnbindResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierUnbind/CarrierUnbindResultModel.cs index d78bbb4..597dcef 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierUnbind/CarrierUnbindResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/CarrierUnbind/CarrierUnbindResultModel.cs @@ -37,5 +37,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.CarrierUnbind /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/ContinueTask/ContinueTaskResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/ContinueTask/ContinueTaskResultModel.cs index 6011b9b..fbd9e0f 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/ContinueTask/ContinueTaskResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/ContinueTask/ContinueTaskResultModel.cs @@ -47,5 +47,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.ContinueTask /// 请求编号 /// public string reqCode { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/EquipmentNotify/EquipmentNotifyResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/EquipmentNotify/EquipmentNotifyResultModel.cs index b72c5ac..d7fe802 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/EquipmentNotify/EquipmentNotifyResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/EquipmentNotify/EquipmentNotifyResultModel.cs @@ -47,5 +47,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.EquipmentNotify /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/GbCancelTask/GbCancelTaskResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/GbCancelTask/GbCancelTaskResultModel.cs index c608238..bedc6ae 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/GbCancelTask/GbCancelTaskResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/GbCancelTask/GbCancelTaskResultModel.cs @@ -42,5 +42,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.GbCancelTask /// 自定义扩展字段 /// public object Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/GbContinueTask/GbContinueTaskResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/GbContinueTask/GbContinueTaskResultModel.cs index b7ca47f..6cd6727 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/GbContinueTask/GbContinueTaskResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/GbContinueTask/GbContinueTaskResultModel.cs @@ -47,5 +47,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.GbContinueTask /// 自定义扩展字段 /// public object Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/GenAgvSchedulingTask/GenAgvSchedulingTaskResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/GenAgvSchedulingTask/GenAgvSchedulingTaskResultModel.cs index 653b7e3..d6077af 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/GenAgvSchedulingTask/GenAgvSchedulingTaskResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/GenAgvSchedulingTask/GenAgvSchedulingTaskResultModel.cs @@ -42,5 +42,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.GenAgvSchedulingTask /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/MatLabelBind/MatLabelBindResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/MatLabelBind/MatLabelBindResultModel.cs index f3616dc..7043a82 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/MatLabelBind/MatLabelBindResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/MatLabelBind/MatLabelBindResultModel.cs @@ -37,5 +37,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.MatLabelBind /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/MatLabelUnbind/MatLabelUnbindResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/MatLabelUnbind/MatLabelUnbindResultModel.cs index c2e1958..d778da4 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/MatLabelUnbind/MatLabelUnbindResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/MatLabelUnbind/MatLabelUnbindResultModel.cs @@ -33,5 +33,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.MatLabelUnbind /// public class MatLabelUnbindResultModel { + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/PreTask/PreTaskResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/PreTask/PreTaskResultModel.cs index d1dfe47..d82badc 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/PreTask/PreTaskResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/PreTask/PreTaskResultModel.cs @@ -42,5 +42,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.PreTask /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/QueryCarrier/QueryCarrierResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/QueryCarrier/QueryCarrierResultModel.cs index 3e45869..1cb54ce 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/QueryCarrier/QueryCarrierResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/QueryCarrier/QueryCarrierResultModel.cs @@ -87,5 +87,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.QueryCarrier /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/QueryRobot/QueryRobotResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/QueryRobot/QueryRobotResultModel.cs index 4eb9857..d20c426 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/QueryRobot/QueryRobotResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/QueryRobot/QueryRobotResultModel.cs @@ -87,6 +87,8 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.QueryRobot /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } /// diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/QueryTask/QueryTaskResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/QueryTask/QueryTaskResultModel.cs index c2ae035..4e68041 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/QueryTask/QueryTaskResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/QueryTask/QueryTaskResultModel.cs @@ -82,6 +82,8 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.QueryTask /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } /// diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/SiteBind/SiteBindResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/SiteBind/SiteBindResultModel.cs index 73682cd..32e978c 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/SiteBind/SiteBindResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/SiteBind/SiteBindResultModel.cs @@ -37,5 +37,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.SiteBind /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/SiteLock/SiteLockResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/SiteLock/SiteLockResultModel.cs index b92e214..05aebda 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/SiteLock/SiteLockResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/SiteLock/SiteLockResultModel.cs @@ -33,5 +33,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.SiteLock /// public class SiteLockResultModel { + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/TaskGroup/TaskGroupResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/TaskGroup/TaskGroupResultModel.cs index de0a9af..e95c762 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/TaskGroup/TaskGroupResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/TaskGroup/TaskGroupResultModel.cs @@ -33,5 +33,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.TaskGroup /// public class TaskGroupResultModel { + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/TaskPriority/TaskPriorityResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/TaskPriority/TaskPriorityResultModel.cs index 7e90563..3399eac 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/TaskPriority/TaskPriorityResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/TaskPriority/TaskPriorityResultModel.cs @@ -42,5 +42,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.TaskPriority /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneBanish/ZoneBanishResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneBanish/ZoneBanishResultModel.cs index 3cbad03..3e252bd 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneBanish/ZoneBanishResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneBanish/ZoneBanishResultModel.cs @@ -42,5 +42,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.ZoneBanish /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneBlockade/ZoneBlockadeResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneBlockade/ZoneBlockadeResultModel.cs index a157a62..d1179a3 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneBlockade/ZoneBlockadeResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneBlockade/ZoneBlockadeResultModel.cs @@ -37,5 +37,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.ZoneBlockade /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneHoming/ZoneHomingResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneHoming/ZoneHomingResultModel.cs index 014e9cd..ec750a9 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneHoming/ZoneHomingResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/ZoneHoming/ZoneHomingResultModel.cs @@ -47,5 +47,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.ZoneHoming /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Domain/Model/ZonePause/ZonePauseResultModel.cs b/Sln.Wcs.HikRoBotApi/Domain/Model/ZonePause/ZonePauseResultModel.cs index bd47377..f18a11b 100644 --- a/Sln.Wcs.HikRoBotApi/Domain/Model/ZonePause/ZonePauseResultModel.cs +++ b/Sln.Wcs.HikRoBotApi/Domain/Model/ZonePause/ZonePauseResultModel.cs @@ -37,5 +37,7 @@ namespace Sln.Wcs.HikRoBotApi.Domain.Model.ZonePause /// 自定义数据 /// public string Extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotApi/Service/Impl/HikRoBotService.cs b/Sln.Wcs.HikRoBotApi/Service/Impl/HikRoBotService.cs index 9d91d1f..c738fca 100644 --- a/Sln.Wcs.HikRoBotApi/Service/Impl/HikRoBotService.cs +++ b/Sln.Wcs.HikRoBotApi/Service/Impl/HikRoBotService.cs @@ -1,13 +1,13 @@ -using Sln.Wcs.HikRoBotApi.Domain.Dto.CancelTask; -using Sln.Wcs.HikRoBotApi.Domain.Dto.ContinueTask; using Sln.Wcs.HikRoBotApi.Domain.Dto.GbCancelTask; using Sln.Wcs.HikRoBotApi.Domain.Dto.GbContinueTask; using Sln.Wcs.HikRoBotApi.Domain.Dto.GbTaskSubmit; +using Sln.Wcs.HikRoBotApi.Domain.Model.CarrierLock; +using Sln.Wcs.HikRoBotApi.Domain.Model.MatLabelUnbind; +using Sln.Wcs.HikRoBotApi.Domain.Model.SiteLock; +using Sln.Wcs.HikRoBotApi.Domain.Model.TaskGroup; using Sln.Wcs.HikRoBotApi.Enum; using Sln.Wcs.HikRoBotApi.Util; using Sln.Wcs.HikRoBotSdk; -using GenAgvSchedulingTaskDto = Sln.Wcs.HikRoBotApi.Domain.Dto.GenAgvSchedulingTask.GenAgvSchedulingTaskDto; -using GenAgvSchedulingTaskResultDto = Sln.Wcs.HikRoBotApi.Domain.Dto.GenAgvSchedulingTask.GenAgvSchedulingTaskResultDto; using TaskGroupResultDto = Sln.Wcs.HikRoBotApi.Domain.Dto.TaskGroup.TaskGroupResultDto; using TaskPriorityResultDto = Sln.Wcs.HikRoBotApi.Domain.Dto.TaskPriority.TaskPriorityResultDto; using ZonePauseResultDto = Sln.Wcs.HikRoBotApi.Domain.Dto.ZonePause.ZonePauseResultDto; @@ -26,8 +26,6 @@ using QueryCarrierResultDto = Sln.Wcs.HikRoBotApi.Domain.Dto.QueryCarrier.QueryC using MatLabelBindResultDto = Sln.Wcs.HikRoBotApi.Domain.Dto.MatLabelBind.MatLabelBindResultDto; using MatLabelUnbindResultDto = Sln.Wcs.HikRoBotApi.Domain.Dto.MatLabelUnbind.MatLabelUnbindResultDto; using EquipmentNotifyResultDto = Sln.Wcs.HikRoBotApi.Domain.Dto.EquipmentNotify.EquipmentNotifyResultDto; -using CancelTaskResultDto = Sln.Wcs.HikRoBotApi.Domain.Dto.CancelTask.CancelTaskResultDto; -using ContinueTaskResultDto = Sln.Wcs.HikRoBotApi.Domain.Dto.ContinueTask.ContinueTaskResultDto; #region << 版 本 注 释 >> /*-------------------------------------------------------------------- @@ -58,1029 +56,774 @@ namespace Sln.Wcs.HikRoBotApi.Service.Impl private readonly IHIKRoBotSdk hikRoBotSdk; private readonly ApiResultCodeUtil codeUtil; - public HikRoBotService(IHIKRoBotSdk hikRoBotSdk,ApiResultCodeUtil codeUtil) + public HikRoBotService(IHIKRoBotSdk hikRoBotSdk, ApiResultCodeUtil codeUtil) { this.hikRoBotSdk = hikRoBotSdk; this.codeUtil = codeUtil; } - public GbContinueTaskResultDto GbContinueTask(GbContinueTaskDto gbContinueTask) + /// + /// 通用执行方法：封装空值检查、SDK 调用、结果码解析、异常处理 + /// + private TResult Execute( + Func sdkCall, + Func mapSuccess, + Func mapError) { try { - if (gbContinueTask == null) - { - throw new ArgumentException("输入参数为空。"); - } + dynamic resp = sdkCall(); + codeUtil.parse((string)resp.code, (string)resp.message, out var status); + return mapSuccess(resp, status); + } + catch (Exception ex) + { + return mapError(ex.Message); + } + } - var sdkDto = new HikRoBotSdk.Dto.GbContinueTask.GbContinueTaskDto() + private static TResult Error(string msg) where TResult : new() + { + dynamic result = new TResult(); + result.code = HikRoBotStatusEnum.SDK调用异常; + result.msg = msg; + result.errorCode = msg; + result.success = false; + return result; + } + + public GbContinueTaskResultDto GbContinueTask(GbContinueTaskDto req) + { + return Execute( + () => { - triggerType = gbContinueTask.TriggerType, - triggerCode = gbContinueTask.TriggerCode, - targetRoute = gbContinueTask.TargetRoute != null ? new HikRoBotSdk.Dto.Common.TargetRoute() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.GbContinueTask(new HikRoBotSdk.Dto.GbContinueTask.GbContinueTaskDto { - type = gbContinueTask.TargetRoute.Type, - code = gbContinueTask.TargetRoute.Code, - operation = gbContinueTask.TargetRoute.Operation, - } : null, - extra = gbContinueTask.Extra, - }; - - var resp = this.hikRoBotSdk.GbContinueTask(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new GbContinueTaskResultDto() + triggerType = req.TriggerType, + triggerCode = req.TriggerCode, + targetRoute = req.TargetRoute != null ? new HikRoBotSdk.Dto.Common.TargetRoute + { + type = req.TargetRoute.Type, + code = req.TargetRoute.Code, + operation = req.TargetRoute.Operation, + } : null, + extra = req.Extra, + }); + }, + (resp, status) => new GbContinueTaskResultDto { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.GbContinueTask.GbContinueTaskResultModel { RobotTaskCode = resp.data?.robotTaskCode, NextSeq = resp.data?.nextSeq, Extra = resp.data?.extra, + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new GbContinueTaskResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public GbCancelTaskResultDto GbCancelTask(GbCancelTaskDto gbCancelTask) + public GbCancelTaskResultDto GbCancelTask(GbCancelTaskDto req) { - try - { - if (gbCancelTask == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new HikRoBotSdk.Dto.GbCancelTask.GbCancelTaskDto() - { - robotTaskCode = gbCancelTask.RobotTaskCode, - cancelType = gbCancelTask.CancelType, - carrierCode = gbCancelTask.CarrierCode, - robotCode = gbCancelTask.RobotCode, - reason = gbCancelTask.Reason, - returnTaskType = gbCancelTask.ReturnTaskType, - targetRoute = gbCancelTask.TargetRoute != null ? new HikRoBotSdk.Dto.Common.TargetRoute() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.GbCancelTask(new HikRoBotSdk.Dto.GbCancelTask.GbCancelTaskDto { - type = gbCancelTask.TargetRoute.Type, - code = gbCancelTask.TargetRoute.Code, - } : null, - extra = gbCancelTask.Extra, - }; - - var resp = this.hikRoBotSdk.GbCancelTask(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new GbCancelTaskResultDto() + robotTaskCode = req.RobotTaskCode, + cancelType = req.CancelType, + carrierCode = req.CarrierCode, + robotCode = req.RobotCode, + reason = req.Reason, + returnTaskType = req.ReturnTaskType, + targetRoute = req.TargetRoute != null ? new HikRoBotSdk.Dto.Common.TargetRoute + { + type = req.TargetRoute.Type, + code = req.TargetRoute.Code, + } : null, + extra = req.Extra, + }); + }, + (resp, status) => new GbCancelTaskResultDto { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.GbCancelTask.GbCancelTaskResultModel { RobotTaskCode = resp.data?.robotTaskCode, Extra = resp.data?.extra, + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new GbCancelTaskResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public GbTaskSubmitResultDto GbTaskSubmit(GbTaskSubmitDto gbTaskSubmit) + public GbTaskSubmitResultDto GbTaskSubmit(GbTaskSubmitDto req) { - try - { - if (gbTaskSubmit == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new HikRoBotSdk.Dto.GbTaskSubmit.GbTaskSubmitDto() - { - taskType = gbTaskSubmit.TaskType, - initPriority = gbTaskSubmit.InitPriority, - deadline = gbTaskSubmit.Deadline, - expectedStartTime = gbTaskSubmit.ExpectedStartTime, - robotType = gbTaskSubmit.RobotType, - robotCode = gbTaskSubmit.RobotCode, - interrupt = gbTaskSubmit.Interrupt, - robotTaskCode = gbTaskSubmit.RobotTaskCode, - groupCode = gbTaskSubmit.GroupCode, - extra = gbTaskSubmit.Extra != null ? new HikRoBotSdk.Dto.Common.ExtraInfo() : null, - targetRoute = gbTaskSubmit.TargetRoute != null ? gbTaskSubmit.TargetRoute.ConvertAll(r => new HikRoBotSdk.Dto.Common.TargetRoute() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.GbTaskSubmit(new HikRoBotSdk.Dto.GbTaskSubmit.GbTaskSubmitDto { - type = r.Type, - code = r.Code, - operation = r.Operation, - robotType = r.RobotType, - robotCode = r.RobotCode, - }) : null, - }; - - var resp = this.hikRoBotSdk.GbTaskSubmit(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new GbTaskSubmitResultDto() + taskType = req.TaskType, + initPriority = req.InitPriority, + deadline = req.Deadline, + expectedStartTime = req.ExpectedStartTime, + robotType = req.RobotType, + robotCode = req.RobotCode, + interrupt = req.Interrupt, + robotTaskCode = req.RobotTaskCode, + groupCode = req.GroupCode, + extra = req.Extra != null ? new HikRoBotSdk.Dto.Common.ExtraInfo() : null, + targetRoute = req.TargetRoute != null ? req.TargetRoute.ConvertAll(r => new HikRoBotSdk.Dto.Common.TargetRoute + { + type = r.Type, + code = r.Code, + operation = r.Operation, + robotType = r.RobotType, + robotCode = r.RobotCode, + }) : null, + }); + }, + (resp, status) => new GbTaskSubmitResultDto { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.GbTaskSubmit.GbTaskSubmitResultModel { code = resp.code, message = resp.message, - data = new Domain.Model.GbTaskSubmit.GbTaskSubmitResultData() + data = new Domain.Model.GbTaskSubmit.GbTaskSubmitResultData { robotTaskCode = resp.data?.robotTaskCode, extra = resp.data?.extra?.ToString(), - } + }, + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new GbTaskSubmitResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - - public TaskGroupResultDto TaskGroup(Domain.Dto.TaskGroup.TaskGroupDto taskGroup) - { - try - { - if (taskGroup == null) - { - throw new ArgumentException("输入参数为空。"); - } - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.TaskGroup.TaskGroupDto() + public TaskGroupResultDto TaskGroup(Domain.Dto.TaskGroup.TaskGroupDto req) + { + return Execute( + () => { - groupCode = taskGroup.GroupCode, - strategy = taskGroup.Strategy, - strategyValue = taskGroup.StrategyValue, - groupSeq = !string.IsNullOrEmpty(taskGroup.GroupSeq) ? int.Parse(taskGroup.GroupSeq) : (int?)null, - targetRoute = taskGroup.TargetRoute != null ? new Sln.Wcs.HikRoBotSdk.Dto.Common.TargetRoute() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.TaskGroup(new HikRoBotSdk.Dto.TaskGroup.TaskGroupDto { - type = taskGroup.TargetRoute.Type, - code = taskGroup.TargetRoute.Code, - } : null, - }; - - var resp = this.hikRoBotSdk.TaskGroup(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new TaskGroupResultDto() + groupCode = req.GroupCode, + strategy = req.Strategy, + strategyValue = req.StrategyValue, + groupSeq = !string.IsNullOrEmpty(req.GroupSeq) ? int.Parse(req.GroupSeq) : (int?)null, + targetRoute = req.TargetRoute != null ? new HikRoBotSdk.Dto.Common.TargetRoute + { + type = req.TargetRoute.Type, + code = req.TargetRoute.Code, + } : null, + }); + }, + (resp, status) => new TaskGroupResultDto { code = status, msg = resp.message,data = new TaskGroupResultModel() { - code = hikRoBotStatus, - msg = resp.message, - }; - } - catch (Exception ex) - { - return new TaskGroupResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + success = resp.success, + errorCode = resp.errorCode, + }}, + Error + ); } - public TaskPriorityResultDto SetTaskPriority(Domain.Dto.TaskPriority.TaskPriorityDto taskPriority) + public TaskPriorityResultDto SetTaskPriority(Domain.Dto.TaskPriority.TaskPriorityDto req) { - try - { - if (taskPriority == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.TaskPriority.TaskPriorityDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.SetTaskPriority(new HikRoBotSdk.Dto.TaskPriority.TaskPriorityDto + { + robotTaskCode = req.RobotTaskCode, + initPriority = req.InitPriority ?? 0, + deadline = req.Deadline, + extra = req.Extra, + }); + }, + (resp, status) => new TaskPriorityResultDto { - robotTaskCode = taskPriority.RobotTaskCode, - initPriority = taskPriority.InitPriority ?? 0, - deadline = taskPriority.Deadline, - extra = taskPriority.Extra, - }; - - var resp = this.hikRoBotSdk.SetTaskPriority(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new TaskPriorityResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.TaskPriority.TaskPriorityResultModel { RobotTaskCode = resp.data?.robotTaskCode, Extra = resp.data?.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new TaskPriorityResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public ZonePauseResultDto ZonePause(Domain.Dto.ZonePause.ZonePauseDto zonePause) + public ZonePauseResultDto ZonePause(Domain.Dto.ZonePause.ZonePauseDto req) { - try - { - if (zonePause == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.ZonePause.ZonePauseDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.ZonePause(new HikRoBotSdk.Dto.ZonePause.ZonePauseDto + { + zoneCode = req.ZoneCode, + mapCode = req.MapCode, + invoke = req.Invoke, + }); + }, + (resp, status) => new ZonePauseResultDto { - zoneCode = zonePause.ZoneCode, - mapCode = zonePause.MapCode, - invoke = zonePause.Invoke, - }; - - var resp = this.hikRoBotSdk.ZonePause(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new ZonePauseResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.ZonePause.ZonePauseResultModel { Extra = resp.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new ZonePauseResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public ZoneHomingResultDto ZoneHoming(Domain.Dto.ZoneHoming.ZoneHomingDto zoneHoming) + public ZoneHomingResultDto ZoneHoming(Domain.Dto.ZoneHoming.ZoneHomingDto req) { - try - { - if (zoneHoming == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.ZoneHoming.ZoneHomingDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.ZoneHoming(new HikRoBotSdk.Dto.ZoneHoming.ZoneHomingDto + { + mapCode = req.MapCode, + zoneCode = req.ZoneCode, + zoneCodes = req.ZoneCodes, + autoShutdown = req.AutoShutdown.ToString().ToLower(), + bootTime = req.BootTime, + expireTime = req.ExpireTime, + extra = req.Extra, + }); + }, + (resp, status) => new ZoneHomingResultDto { - mapCode = zoneHoming.MapCode, - zoneCode = zoneHoming.ZoneCode, - zoneCodes = zoneHoming.ZoneCodes, - autoShutdown = zoneHoming.AutoShutdown.ToString().ToLower(), - bootTime = zoneHoming.BootTime, - expireTime = zoneHoming.ExpireTime, - extra = zoneHoming.Extra, - }; - - var resp = this.hikRoBotSdk.ZoneHoming(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new ZoneHomingResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.ZoneHoming.ZoneHomingResultModel { HomingCode = resp.data?.homingCode, RobotCount = resp.data?.robotCount ?? 0, Extra = resp.data?.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new ZoneHomingResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public ZoneBanishResultDto ZoneBanish(Domain.Dto.ZoneBanish.ZoneBanishDto zoneBanish) + public ZoneBanishResultDto ZoneBanish(Domain.Dto.ZoneBanish.ZoneBanishDto req) { - try - { - if (zoneBanish == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.ZoneBanish.ZoneBanishDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.ZoneBanish(new HikRoBotSdk.Dto.ZoneBanish.ZoneBanishDto + { + zoneCode = req.ZoneCode, + zoneCodes = req.ZoneCodes, + targetZoneCode = req.TargetZoneCode, + pause = req.Pause.ToString().ToLower(), + report = req.Report.ToString().ToLower(), + controlMode = req.ControlMode, + expireTime = req.ExpireTime, + invoke = req.Invoke, + extra = req.Extra, + }); + }, + (resp, status) => new ZoneBanishResultDto { - zoneCode = zoneBanish.ZoneCode, - zoneCodes = zoneBanish.ZoneCodes, - targetZoneCode = zoneBanish.TargetZoneCode, - pause = zoneBanish.Pause.ToString().ToLower(), - report = zoneBanish.Report.ToString().ToLower(), - controlMode = zoneBanish.ControlMode, - expireTime = zoneBanish.ExpireTime, - invoke = zoneBanish.Invoke, - extra = zoneBanish.Extra, - }; - - var resp = this.hikRoBotSdk.ZoneBanish(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new ZoneBanishResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.ZoneBanish.ZoneBanishResultModel { BanishCode = resp.data?.banishCode, Extra = resp.data?.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new ZoneBanishResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public ZoneBlockadeResultDto ZoneBlockade(Domain.Dto.ZoneBlockade.ZoneBlockadeDto zoneBlockade) + public ZoneBlockadeResultDto ZoneBlockade(Domain.Dto.ZoneBlockade.ZoneBlockadeDto req) { - try - { - if (zoneBlockade == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.ZoneBlockade.ZoneBlockadeDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.ZoneBlockade(new HikRoBotSdk.Dto.ZoneBlockade.ZoneBlockadeDto + { + zoneCode = req.ZoneCode, + mapCode = req.MapCode, + invoke = req.Invoke, + pause = req.Pause.ToString().ToLower(), + report = req.Report.ToString().ToLower(), + disableSite = req.DisableSite, + enableSite = req.EnableSite, + }); + }, + (resp, status) => new ZoneBlockadeResultDto { - zoneCode = zoneBlockade.ZoneCode, - mapCode = zoneBlockade.MapCode, - invoke = zoneBlockade.Invoke, - pause = zoneBlockade.Pause.ToString().ToLower(), - report = zoneBlockade.Report.ToString().ToLower(), - disableSite = zoneBlockade.DisableSite, - enableSite = zoneBlockade.EnableSite, - }; - - var resp = this.hikRoBotSdk.ZoneBlockade(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new ZoneBlockadeResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.ZoneBlockade.ZoneBlockadeResultModel { Extra = resp.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new ZoneBlockadeResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public CarrierBindResultDto CarrierBind(Domain.Dto.CarrierBind.CarrierBindDto carrierBind) + public CarrierBindResultDto CarrierBind(Domain.Dto.CarrierBind.CarrierBindDto req) { - try - { - if (carrierBind == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.CarrierBind.CarrierBindDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.CarrierBind(new HikRoBotSdk.Dto.CarrierBind.CarrierBindDto + { + carrierCode = req.CarrierCode, + siteCode = req.SiteCode, + carrierDir = req.CarrierDir, + extra = req.Extra, + }); + }, + (resp, status) => new CarrierBindResultDto { - carrierCode = carrierBind.CarrierCode, - siteCode = carrierBind.SiteCode, - carrierDir = carrierBind.CarrierDir, - extra = carrierBind.Extra, - }; - - var resp = this.hikRoBotSdk.CarrierBind(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new CarrierBindResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.CarrierBind.CarrierBindResultModel { Extra = resp.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new CarrierBindResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public CarrierUnbindResultDto CarrierUnbind(Domain.Dto.CarrierUnbind.CarrierUnbindDto carrierUnbind) + public CarrierUnbindResultDto CarrierUnbind(Domain.Dto.CarrierUnbind.CarrierUnbindDto req) { - try - { - if (carrierUnbind == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.CarrierUnbind.CarrierUnbindDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.CarrierUnbind(new HikRoBotSdk.Dto.CarrierUnbind.CarrierUnbindDto + { + carrierCode = req.CarrierCode, + siteCode = req.SiteCode, + extra = req.Extra, + }); + }, + (resp, status) => new CarrierUnbindResultDto { - carrierCode = carrierUnbind.CarrierCode, - siteCode = carrierUnbind.SiteCode, - extra = carrierUnbind.Extra, - }; - - var resp = this.hikRoBotSdk.CarrierUnbind(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new CarrierUnbindResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.CarrierUnbind.CarrierUnbindResultModel { Extra = resp.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new CarrierUnbindResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public SiteBindResultDto SiteBind(Domain.Dto.SiteBind.SiteBindDto siteBind) + public SiteBindResultDto SiteBind(Domain.Dto.SiteBind.SiteBindDto req) { - try - { - if (siteBind == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.SiteBind.SiteBindDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.SiteBind(new HikRoBotSdk.Dto.SiteBind.SiteBindDto + { + slotCategory = req.SlotCategory, + slotCode = req.SlotCode, + carrierCategory = req.CarrierCategory, + carrierType = req.CarrierType, + carrierCode = req.CarrierCode, + carrierDir = req.CarrierDir, + invoke = req.Invoke, + stackLabel = req.StackLabel, + colCount = req.ColCount, + extra = req.Extra, + }); + }, + (resp, status) => new SiteBindResultDto { - slotCategory = siteBind.SlotCategory, - slotCode = siteBind.SlotCode, - carrierCategory = siteBind.CarrierCategory, - carrierType = siteBind.CarrierType, - carrierCode = siteBind.CarrierCode, - carrierDir = siteBind.CarrierDir, - invoke = siteBind.Invoke, - stackLabel = siteBind.StackLabel, - colCount = siteBind.ColCount, - extra = siteBind.Extra, - }; - - var resp = this.hikRoBotSdk.SiteBind(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new SiteBindResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.SiteBind.SiteBindResultModel { Extra = resp.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new SiteBindResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public CarrierLockResultDto CarrierLock(Domain.Dto.CarrierLock.CarrierLockDto carrierLock) + public CarrierLockResultDto CarrierLock(Domain.Dto.CarrierLock.CarrierLockDto req) { - try - { - if (carrierLock == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.CarrierLock.CarrierLockDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.CarrierLock(new HikRoBotSdk.Dto.CarrierLock.CarrierLockDto + { + carrierCode = req.CarrierCode, + invoke = req.Invoke, + }); + }, + (resp, status) => new CarrierLockResultDto { code = status, msg = resp.message, data = new CarrierLockResultModel() { - carrierCode = carrierLock.CarrierCode, - invoke = carrierLock.Invoke, - }; - - var resp = this.hikRoBotSdk.CarrierLock(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new CarrierLockResultDto() - { - code = hikRoBotStatus, - msg = resp.message, - }; - } - catch (Exception ex) - { - return new CarrierLockResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + success = resp.success, + errorCode = resp.errorCode, + }}, + Error + ); } - public SiteLockResultDto SiteLock(Domain.Dto.SiteLock.SiteLockDto siteLock) + public SiteLockResultDto SiteLock(Domain.Dto.SiteLock.SiteLockDto req) { - try - { - if (siteLock == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.SiteLock.SiteLockDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.SiteLock(new HikRoBotSdk.Dto.SiteLock.SiteLockDto + { + siteCode = req.SiteCode, + invoke = req.Invoke, + }); + }, + (resp, status) => new SiteLockResultDto { code = status, msg = resp.message,data = new SiteLockResultModel() { - siteCode = siteLock.SiteCode, - invoke = siteLock.Invoke, - }; - - var resp = this.hikRoBotSdk.SiteLock(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new SiteLockResultDto() - { - code = hikRoBotStatus, - msg = resp.message, - }; - } - catch (Exception ex) - { - return new SiteLockResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + success = resp.success, + errorCode = resp.errorCode, + }}, + Error + ); } - public PreTaskResultDto PreTask(Domain.Dto.PreTask.PreTaskDto preTask) + public PreTaskResultDto PreTask(Domain.Dto.PreTask.PreTaskDto req) { - try - { - if (preTask == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.PreTask.PreTaskDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.PreTask(new HikRoBotSdk.Dto.PreTask.PreTaskDto + { + siteCode = req.SiteCode, + nextTaskTime = req.NextTaskTime, + robotType = req.RobotType, + priority = req.Priority, + taskCount = req.TaskCount, + capacityCount = req.CapacityCount, + amrDir = req.AmrDir, + extra = req.Extra, + }); + }, + (resp, status) => new PreTaskResultDto { - siteCode = preTask.SiteCode, - nextTaskTime = preTask.NextTaskTime, - robotType = preTask.RobotType, - priority = preTask.Priority, - taskCount = preTask.TaskCount, - capacityCount = preTask.CapacityCount, - amrDir = preTask.AmrDir, - extra = preTask.Extra, - }; - - var resp = this.hikRoBotSdk.PreTask(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new PreTaskResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.PreTask.PreTaskResultModel { RobotTaskCode = resp.data?.robotTaskCode, Extra = resp.data?.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new PreTaskResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public QueryTaskResultDto QueryTaskStatus(Domain.Dto.QueryTask.QueryTaskDto queryTask) + public QueryTaskResultDto QueryTaskStatus(Domain.Dto.QueryTask.QueryTaskDto req) { - try - { - if (queryTask == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.QueryTask.QueryTaskDto() - { - robotTaskCode = queryTask.RobotTaskCode, - }; - - var resp = this.hikRoBotSdk.QueryTaskStatus(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - var model = new Domain.Model.QueryTask.QueryTaskResultModel - { - RobotTaskCode = resp.data?.robotTaskCode, - TaskType = resp.data?.taskType, - TaskStatus = resp.data?.taskStatus, - InitPriority = resp.data?.initPriority, - Deadline = resp.data?.deadline, - SingleRobotCode = resp.data?.singleRobotCode, - CurrentSeq = resp.data?.currentSeq, - Extra = resp.data?.extra?.ToString(), - }; - - if (resp.data?.targetRoute != null) - { - model.TargetRoute = resp.data.targetRoute.Select(r => new Domain.Model.QueryTask.TargetRoute + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.QueryTaskStatus(new HikRoBotSdk.Dto.QueryTask.QueryTaskDto { - Type = r.type, - Code = r.code, - }).ToList(); - } - - if (resp.data?.waring != null) + robotTaskCode = req.RobotTaskCode, + }); + }, + (resp, status) => { - model.Waring = new Domain.Model.QueryTask.Waring + var data = resp.data; + var model = new Domain.Model.QueryTask.QueryTaskResultModel { - Code = resp.data.waring.taskWarnCode, - Desc = resp.data.waring.errorMsg, + RobotTaskCode = data?.robotTaskCode, + TaskType = data?.taskType, + TaskStatus = data?.taskStatus, + InitPriority = data?.initPriority, + Deadline = data?.deadline, + SingleRobotCode = data?.singleRobotCode, + CurrentSeq = data?.currentSeq, + Extra = data?.extra?.ToString(), + success = resp.success, + errorCode = resp.errorCode, }; - } - return new QueryTaskResultDto() - { - code = hikRoBotStatus, - msg = resp.message, - data = model, - }; - } - catch (Exception ex) - { - return new QueryTaskResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } - } - - public QueryRobotResultDto QueryRobotStatus(Domain.Dto.QueryRobot.QueryRobotDto queryRobot) - { - try - { - if (queryRobot == null) - { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.QueryRobot.QueryRobotDto() - { - singleRobotCode = queryRobot.SingleRobotCode, - }; - - var resp = this.hikRoBotSdk.QueryRobotStatus(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - var model = new Domain.Model.QueryRobot.QueryRobotResultModel - { - SingleRobotCode = resp.data?.singleRobotCode, - RobotDir = resp.data?.robotDir ?? 0, - RobotIp = resp.data?.robotIp, - Battery = resp.data?.battery ?? 0, - Speed = resp.data?.speed ?? 0, - CarrierCode = resp.data?.carrierCode, - Extra = resp.data?.extra?.ToString(), - }; - - if (double.TryParse(resp.data?.x, out double xVal)) - { - model.X = xVal; - } - - if (double.TryParse(resp.data?.y, out double yVal)) - { - model.Y = yVal; - } - - if (resp.data?.robotStatus != null) - { - model.RobotStatus = resp.data.robotStatus.taskable; - } - - if (resp.data?.warnings != null) - { - model.Warnings = resp.data.warnings.Select(w => new Domain.Model.QueryRobot.Waring + if (data?.targetRoute != null) { - Code = w.taskWarnCode, - Desc = w.errorMsg, - }).ToList(); - } + model.TargetRoute = ((IEnumerable)data.targetRoute).Select(r => new Domain.Model.QueryTask.TargetRoute + { + Type = r.type, + Code = r.code, + }).ToList(); + } - return new QueryRobotResultDto() - { - code = hikRoBotStatus, - msg = resp.message, - data = model, - }; - } - catch (Exception ex) - { - return new QueryRobotResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + if (data?.waring != null) + { + model.Waring = new Domain.Model.QueryTask.Waring + { + Code = data.waring.taskWarnCode, + Desc = data.waring.errorMsg, + }; + } + + return new QueryTaskResultDto { code = status, msg = resp.message, data = model }; + }, + Error + ); } - public QueryCarrierResultDto QueryCarrierStatus(Domain.Dto.QueryCarrier.QueryCarrierDto queryCarrier) + public QueryRobotResultDto QueryRobotStatus(Domain.Dto.QueryRobot.QueryRobotDto req) { - try - { - if (queryCarrier == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.QueryCarrier.QueryCarrierDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.QueryRobotStatus(new HikRoBotSdk.Dto.QueryRobot.QueryRobotDto + { + singleRobotCode = req.SingleRobotCode, + }); + }, + (resp, status) => { - carrierCode = queryCarrier.CarrierCode, - }; + var data = resp.data; + var model = new Domain.Model.QueryRobot.QueryRobotResultModel + { + SingleRobotCode = data?.singleRobotCode, + RobotDir = data?.robotDir ?? 0, + RobotIp = data?.robotIp, + Battery = data?.battery ?? 0, + Speed = data?.speed ?? 0, + CarrierCode = data?.carrierCode, + Extra = data?.extra?.ToString(), + success = resp.success, + errorCode = resp.errorCode, + }; - var resp = this.hikRoBotSdk.QueryCarrierStatus(sdkDto); + string xStr = data?.x; + if (double.TryParse(xStr, out double xVal)) model.X = xVal; - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); + string yStr = data?.y; + if (double.TryParse(yStr, out double yVal)) model.Y = yVal; - var model = new Domain.Model.QueryCarrier.QueryCarrierResultModel - { - CarrierCode = resp.data?.carrierCode, - RobotTaskCode = resp.data?.robotTaskCode, - SiteCode = resp.data?.siteCode, - CarrierDir = resp.data?.carrierDir, - CarrierStatus = resp.data?.carrierStatus, - BinCode = resp.data?.binCode, - BinName = resp.data?.binName, - RobotCode = resp.data?.robotCode, - Extra = resp.data?.extra?.ToString(), - }; + if (data?.robotStatus != null) + model.RobotStatus = data.robotStatus.taskable; - if (double.TryParse(resp.data?.x, out double xVal)) - { - model.X = xVal; - } + if (data?.warnings != null) + { + model.Warnings = ((IEnumerable)data.warnings).Select(w => new Domain.Model.QueryRobot.Waring + { + Code = w.taskWarnCode, + Desc = w.errorMsg, + }).ToList(); + } - if (double.TryParse(resp.data?.y, out double yVal)) - { - model.Y = yVal; - } - - return new QueryCarrierResultDto() - { - code = hikRoBotStatus, - msg = resp.message, - data = model, - }; - } - catch (Exception ex) - { - return new QueryCarrierResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + return new QueryRobotResultDto { code = status, msg = resp.message, data = model}; + }, + Error + ); } - public MatLabelBindResultDto MatLabelBind(Domain.Dto.MatLabelBind.MatLabelBindDto matLabelBind) + public QueryCarrierResultDto QueryCarrierStatus(Domain.Dto.QueryCarrier.QueryCarrierDto req) { - try - { - if (matLabelBind == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.MatLabelBind.MatLabelBindDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.QueryCarrierStatus(new HikRoBotSdk.Dto.QueryCarrier.QueryCarrierDto + { + carrierCode = req.CarrierCode, + }); + }, + (resp, status) => { - carrierCode = matLabelBind.CarrierCode, - matLabel = matLabelBind.MatLabel, - }; + var data = resp.data; + var model = new Domain.Model.QueryCarrier.QueryCarrierResultModel + { + CarrierCode = data?.carrierCode, + RobotTaskCode = data?.robotTaskCode, + SiteCode = data?.siteCode, + CarrierDir = data?.carrierDir, + CarrierStatus = data?.carrierStatus, + BinCode = data?.binCode, + BinName = data?.binName, + RobotCode = data?.robotCode, + Extra = data?.extra?.ToString(), + success = resp.success, + errorCode = resp.errorCode, + }; - var resp = this.hikRoBotSdk.MatLabelBind(sdkDto); + string xStr = data?.x; + if (double.TryParse(xStr, out double xVal)) model.X = xVal; - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); + string yStr = data?.y; + if (double.TryParse(yStr, out double yVal)) model.Y = yVal; - return new MatLabelBindResultDto() + return new QueryCarrierResultDto { code = status, msg = resp.message, data = model }; + }, + Error + ); + } + + public MatLabelBindResultDto MatLabelBind(Domain.Dto.MatLabelBind.MatLabelBindDto req) + { + return Execute( + () => { - code = hikRoBotStatus, + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.MatLabelBind(new HikRoBotSdk.Dto.MatLabelBind.MatLabelBindDto + { + carrierCode = req.CarrierCode, + matLabel = req.MatLabel, + }); + }, + (resp, status) => new MatLabelBindResultDto + { + code = status, msg = resp.message, data = new Domain.Model.MatLabelBind.MatLabelBindResultModel { Extra = resp.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new MatLabelBindResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public MatLabelUnbindResultDto MatLabelUnbind(Domain.Dto.MatLabelUnbind.MatLabelUnbindDto matLabelUnbind) + public MatLabelUnbindResultDto MatLabelUnbind(Domain.Dto.MatLabelUnbind.MatLabelUnbindDto req) { - try - { - if (matLabelUnbind == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.MatLabelUnbind.MatLabelUnbindDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.MatLabelUnbind(new HikRoBotSdk.Dto.MatLabelUnbind.MatLabelUnbindDto + { + carrierCode = req.CarrierCode, + matLabel = req.MatLabel, + }); + }, + (resp, status) => new MatLabelUnbindResultDto { code = status, msg = resp.message,data = new MatLabelUnbindResultModel() { - carrierCode = matLabelUnbind.CarrierCode, - matLabel = matLabelUnbind.MatLabel, - }; - - var resp = this.hikRoBotSdk.MatLabelUnbind(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new MatLabelUnbindResultDto() - { - code = hikRoBotStatus, - msg = resp.message, - }; - } - catch (Exception ex) - { - return new MatLabelUnbindResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + errorCode = resp.errorCode, + success = resp.success, + }}, + Error + ); } - public EquipmentNotifyResultDto EquipmentNotify(Domain.Dto.EquipmentNotify.EquipmentNotifyDto equipmentNotify) + public EquipmentNotifyResultDto EquipmentNotify(Domain.Dto.EquipmentNotify.EquipmentNotifyDto req) { - try - { - if (equipmentNotify == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.EquipmentNotify.EquipmentNotifyDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.EquipmentNotify(new HikRoBotSdk.Dto.EquipmentNotify.EquipmentNotifyDto + { + eqptCode = req.EqptCode, + taskCode = req.TaskCode, + actionStatus = req.ActionStatus, + siteCode = req.SiteCode, + extra = req.Extra, + }); + }, + (resp, status) => new EquipmentNotifyResultDto { - eqptCode = equipmentNotify.EqptCode, - taskCode = equipmentNotify.TaskCode, - actionStatus = equipmentNotify.ActionStatus, - siteCode = equipmentNotify.SiteCode, - extra = equipmentNotify.Extra, - }; - - var resp = this.hikRoBotSdk.EquipmentNotify(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new EquipmentNotifyResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.EquipmentNotify.EquipmentNotifyResultModel { RobotTaskCode = resp.data?.robotTaskCode, NextSeq = resp.data?.nextSeq, Extra = resp.data?.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new EquipmentNotifyResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } - public EquipmentNotifyResultDto EquipmentNotifyGbt(Domain.Dto.EquipmentNotify.EquipmentNotifyDto equipmentNotify) + public EquipmentNotifyResultDto EquipmentNotifyGbt(Domain.Dto.EquipmentNotify.EquipmentNotifyDto req) { - try - { - if (equipmentNotify == null) + return Execute( + () => { - throw new ArgumentException("输入参数为空。"); - } - - var sdkDto = new Sln.Wcs.HikRoBotSdk.Dto.EquipmentNotify.EquipmentNotifyDto() + if (req == null) throw new ArgumentException("输入参数为空。"); + return hikRoBotSdk.EquipmentNotifyGbt(new HikRoBotSdk.Dto.EquipmentNotify.EquipmentNotifyDto + { + eqptCode = req.EqptCode, + taskCode = req.TaskCode, + actionStatus = req.ActionStatus, + siteCode = req.SiteCode, + extra = req.Extra, + }); + }, + (resp, status) => new EquipmentNotifyResultDto { - eqptCode = equipmentNotify.EqptCode, - taskCode = equipmentNotify.TaskCode, - actionStatus = equipmentNotify.ActionStatus, - siteCode = equipmentNotify.SiteCode, - extra = equipmentNotify.Extra, - }; - - var resp = this.hikRoBotSdk.EquipmentNotifyGbt(sdkDto); - - bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HikRoBotStatusEnum hikRoBotStatus); - - return new EquipmentNotifyResultDto() - { - code = hikRoBotStatus, + code = status, msg = resp.message, data = new Domain.Model.EquipmentNotify.EquipmentNotifyResultModel { RobotTaskCode = resp.data?.robotTaskCode, NextSeq = resp.data?.nextSeq, Extra = resp.data?.extra?.ToString(), + errorCode = resp.errorCode, + success = resp.success, }, - }; - } - catch (Exception ex) - { - return new EquipmentNotifyResultDto() - { - code = HikRoBotStatusEnum.SDK调用异常, - msg = ex.Message, - }; - } + }, + Error + ); } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/CancelTask/CancelTaskResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/CancelTask/CancelTaskResultDto.cs index c46a751..0f90c93 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/CancelTask/CancelTaskResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/CancelTask/CancelTaskResultDto.cs @@ -44,5 +44,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.CancelTask /// 请求编号 /// public string reqCode { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/CarrierBind/CarrierBindResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/CarrierBind/CarrierBindResultDto.cs index 66f692d..2489d0c 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/CarrierBind/CarrierBindResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/CarrierBind/CarrierBindResultDto.cs @@ -5,5 +5,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.CarrierBind public string code { get; set; } public string message { get; set; } public object extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/CarrierLock/CarrierLockResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/CarrierLock/CarrierLockResultDto.cs index cb9fe53..e2f2ba2 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/CarrierLock/CarrierLockResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/CarrierLock/CarrierLockResultDto.cs @@ -4,5 +4,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.CarrierLock { public string code { get; set; } public string message { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/CarrierUnbind/CarrierUnbindResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/CarrierUnbind/CarrierUnbindResultDto.cs index 9b09991..a130120 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/CarrierUnbind/CarrierUnbindResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/CarrierUnbind/CarrierUnbindResultDto.cs @@ -5,5 +5,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.CarrierUnbind public string code { get; set; } public string message { get; set; } public object extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/ContinueTask/ContinueTaskResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/ContinueTask/ContinueTaskResultDto.cs index 1f3e828..40c3a95 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/ContinueTask/ContinueTaskResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/ContinueTask/ContinueTaskResultDto.cs @@ -44,5 +44,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.ContinueTask /// 请求编号 /// public string reqCode { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/EquipmentNotify/EquipmentNotifyResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/EquipmentNotify/EquipmentNotifyResultDto.cs index c11a260..1049aba 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/EquipmentNotify/EquipmentNotifyResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/EquipmentNotify/EquipmentNotifyResultDto.cs @@ -5,6 +5,8 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.EquipmentNotify public string code { get; set; } public string message { get; set; } public EquipmentNotifyResultData data { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } public class EquipmentNotifyResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/GbCancelTask/GbCancelTaskResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/GbCancelTask/GbCancelTaskResultDto.cs index ac37ad5..9209d07 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/GbCancelTask/GbCancelTaskResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/GbCancelTask/GbCancelTaskResultDto.cs @@ -5,6 +5,8 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.GbCancelTask public string code { get; set; } public string message { get; set; } public GbCancelTaskResultData data { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } public class GbCancelTaskResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/GbContinueTask/GbContinueTaskResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/GbContinueTask/GbContinueTaskResultDto.cs index c285a2a..e8daca9 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/GbContinueTask/GbContinueTaskResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/GbContinueTask/GbContinueTaskResultDto.cs @@ -5,6 +5,8 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.GbContinueTask public string code { get; set; } public string message { get; set; } public GbContinueTaskResultData data { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } public class GbContinueTaskResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/GbTaskSubmit/GbTaskSubmitResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/GbTaskSubmit/GbTaskSubmitResultDto.cs index 4691352..17c89c5 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/GbTaskSubmit/GbTaskSubmitResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/GbTaskSubmit/GbTaskSubmitResultDto.cs @@ -6,6 +6,10 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.GbTaskSubmit public string message { get; set; } public GbTaskSubmitResultData data { get; set; } + + public string errorCode{get;set;} + + public bool success { get; set; } } public class GbTaskSubmitResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/MatLabelBind/MatLabelBindResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/MatLabelBind/MatLabelBindResultDto.cs index 0adce61..4c0ed54 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/MatLabelBind/MatLabelBindResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/MatLabelBind/MatLabelBindResultDto.cs @@ -5,5 +5,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.MatLabelBind public string code { get; set; } public string message { get; set; } public object extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/MatLabelUnbind/MatLabelUnbindResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/MatLabelUnbind/MatLabelUnbindResultDto.cs index b44ab56..636b3d0 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/MatLabelUnbind/MatLabelUnbindResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/MatLabelUnbind/MatLabelUnbindResultDto.cs @@ -4,5 +4,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.MatLabelUnbind { public string code { get; set; } public string message { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/PreTask/PreTaskResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/PreTask/PreTaskResultDto.cs index 6504db0..3d08fc9 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/PreTask/PreTaskResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/PreTask/PreTaskResultDto.cs @@ -5,6 +5,8 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.PreTask public string code { get; set; } public string message { get; set; } public PreTaskResultData data { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } public class PreTaskResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/QueryCarrier/QueryCarrierResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/QueryCarrier/QueryCarrierResultDto.cs index 4f5731a..1d6074c 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/QueryCarrier/QueryCarrierResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/QueryCarrier/QueryCarrierResultDto.cs @@ -5,6 +5,8 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.QueryCarrier public string code { get; set; } public string message { get; set; } public QueryCarrierResultData data { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } public class QueryCarrierResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/QueryRobot/QueryRobotResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/QueryRobot/QueryRobotResultDto.cs index 47fbb78..bd1e05c 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/QueryRobot/QueryRobotResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/QueryRobot/QueryRobotResultDto.cs @@ -8,6 +8,8 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.QueryRobot public string code { get; set; } public string message { get; set; } public QueryRobotResultData data { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } public class QueryRobotResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/QueryTask/QueryTaskResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/QueryTask/QueryTaskResultDto.cs index 0ea1064..98f80c4 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/QueryTask/QueryTaskResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/QueryTask/QueryTaskResultDto.cs @@ -8,6 +8,8 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.QueryTask public string code { get; set; } public string message { get; set; } public QueryTaskResultData data { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } public class QueryTaskResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/SiteBind/SiteBindResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/SiteBind/SiteBindResultDto.cs index c974793..9ce1875 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/SiteBind/SiteBindResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/SiteBind/SiteBindResultDto.cs @@ -5,5 +5,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.SiteBind public string code { get; set; } public string message { get; set; } public object extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/SiteLock/SiteLockResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/SiteLock/SiteLockResultDto.cs index cf2119e..420cf2a 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/SiteLock/SiteLockResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/SiteLock/SiteLockResultDto.cs @@ -4,5 +4,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.SiteLock { public string code { get; set; } public string message { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/TaskGroup/TaskGroupResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/TaskGroup/TaskGroupResultDto.cs index 2550c5d..952b487 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/TaskGroup/TaskGroupResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/TaskGroup/TaskGroupResultDto.cs @@ -4,5 +4,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.TaskGroup { public string code { get; set; } public string message { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/TaskPriority/TaskPriorityResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/TaskPriority/TaskPriorityResultDto.cs index 3b3b4cd..69ed7af 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/TaskPriority/TaskPriorityResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/TaskPriority/TaskPriorityResultDto.cs @@ -5,6 +5,8 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.TaskPriority public string code { get; set; } public string message { get; set; } public TaskPriorityResultData data { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } public class TaskPriorityResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/ZoneBanish/ZoneBanishResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/ZoneBanish/ZoneBanishResultDto.cs index f95d613..a86e7ae 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/ZoneBanish/ZoneBanishResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/ZoneBanish/ZoneBanishResultDto.cs @@ -5,6 +5,8 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.ZoneBanish public string code { get; set; } public string message { get; set; } public ZoneBanishResultData data { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } public class ZoneBanishResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/ZoneBlockade/ZoneBlockadeResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/ZoneBlockade/ZoneBlockadeResultDto.cs index 64f9192..d593774 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/ZoneBlockade/ZoneBlockadeResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/ZoneBlockade/ZoneBlockadeResultDto.cs @@ -5,5 +5,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.ZoneBlockade public string code { get; set; } public string message { get; set; } public object extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } } diff --git a/Sln.Wcs.HikRoBotSdk/Dto/ZoneHoming/ZoneHomingResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/ZoneHoming/ZoneHomingResultDto.cs index 1ef6a43..6d88beb 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/ZoneHoming/ZoneHomingResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/ZoneHoming/ZoneHomingResultDto.cs @@ -5,6 +5,8 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.ZoneHoming public string code { get; set; } public string message { get; set; } public ZoneHomingResultData data { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } public class ZoneHomingResultData diff --git a/Sln.Wcs.HikRoBotSdk/Dto/ZonePause/ZonePauseResultDto.cs b/Sln.Wcs.HikRoBotSdk/Dto/ZonePause/ZonePauseResultDto.cs index 7814e33..3dcd8bf 100644 --- a/Sln.Wcs.HikRoBotSdk/Dto/ZonePause/ZonePauseResultDto.cs +++ b/Sln.Wcs.HikRoBotSdk/Dto/ZonePause/ZonePauseResultDto.cs @@ -5,5 +5,7 @@ namespace Sln.Wcs.HikRoBotSdk.Dto.ZonePause public string code { get; set; } public string message { get; set; } public object extra { get; set; } + public string errorCode { get; set; } + public bool success { get; set; } } }