From 9cb137d29be0d565efc80477e05fd34d8f39cee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= <mcc890916@hotmail.com>
Date: Sat, 10 Aug 2024 16:30:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskInteraction/IActionManagerService.cs    |  2 +-
 .../TaskInteraction/ActionManagerService.cs     | 11 +++++++----
 .../Controllers/TaskMailController.cs           | 17 +++++++++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/IActionManagerService.cs b/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/IActionManagerService.cs
index e22ce8bb..63ef5be9 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/IActionManagerService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/IActionManagerService.cs
@@ -23,6 +23,6 @@ namespace DS.WMS.Core.Op.Interface.TaskInteraction
         /// <returns></returns>
         Task TriggerAction(BusinessTask businessTask);
 
-        Task TriggerTest(TaskBaseTypeEnum taskType, long? id);
+        Task<DataResult> TriggerTest(TaskBaseTypeEnum taskType, long? id);
     }
 }
diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionManagerService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionManagerService.cs
index 0c7accef..58ec7677 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionManagerService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionManagerService.cs
@@ -83,7 +83,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             //}
         }
 
-        public async Task TriggerTest(TaskBaseTypeEnum taskType, long? id)
+        public async Task<DataResult> TriggerTest(TaskBaseTypeEnum taskType, long? id)
         {
             var task = await TenantDb.Queryable<BusinessTask>()
                 .Where(t => t.TaskType == taskType
@@ -95,14 +95,17 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             if (task != null)
             {
                 TaskFlowDataContext dataContext = new(
-                    (TaskFlowDataNameConst.BusinessTask, task),
-                    ("ActionType", 1),
-                    ("Name", "订舱代理通知")
+                    (TaskFlowDataNameConst.BusinessTask, task)
                 );
 
                 TaskFlowRuner taskFlow = new(TenantDb, ServiceProvider);
                 await taskFlow.RunWithBsno(task.TaskType, task.BusinessId, dataContext);
+                return DataResult.Success;
             }
+
+            var result = DataResult.Failed("找不到指定类型的任务");
+            result.Data = 404;
+            return result;
         }
     }
 
diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/TaskMailController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/TaskMailController.cs
index a69e4130..572f9051 100644
--- a/ds-wms-service/DS.WMS.OpApi/Controllers/TaskMailController.cs
+++ b/ds-wms-service/DS.WMS.OpApi/Controllers/TaskMailController.cs
@@ -36,15 +36,24 @@ namespace DS.WMS.OpApi.Controllers
             HttpStatusCode statusCode;
             try
             {
-                await actionManager.TriggerTest(taskype, id);
-                statusCode = HttpStatusCode.NoContent;
+                var result = await actionManager.TriggerTest(taskype, id);
+                if (result.Succeeded)
+                {
+                    statusCode = HttpStatusCode.NoContent;
+                    return new StatusCodeResult((int)statusCode);
+                }
+
+                return new ContentResult
+                {
+                    Content = result.Message,
+                    StatusCode = result.Data == null ? null : (int)result.Data
+                };
             }
             catch
             {
                 statusCode = HttpStatusCode.InternalServerError;
+                return new StatusCodeResult((int)statusCode);
             }
-
-            return new StatusCodeResult((int)statusCode);
         }
 
         /// <summary>