From c57ec7977738765a3a813d73f20e09a89867e39b Mon Sep 17 00:00:00 2001 From: 647556386 <647556386@qq.com> Date: 星期四, 10 四月 2025 23:08:36 +0800 Subject: [PATCH] 前端页面更新 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" index 89f653a..98e065a 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" @@ -1,4 +1,5 @@ -锘縰sing Microsoft.AspNetCore.Authorization; +锘縰sing HslCommunication.WebSocket; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using WIDESEAWCS_Core; @@ -16,11 +17,13 @@ { private readonly IHttpContextAccessor _httpContextAccessor; private readonly IRouterExtension _routerExtension; + //private readonly WebSocketServer _webSocketServer; - public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IRouterExtension routerExtension) : base(service) + public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IRouterExtension routerExtension/*, WebSocketServer webSocketServer*/) : base(service) { _httpContextAccessor = httpContextAccessor; _routerExtension = routerExtension; + //_webSocketServer = webSocketServer; } [HttpPost, Route("ReceiveTask"), AllowAnonymous] @@ -69,10 +72,30 @@ { return Service.SendSecureReplyToAgv(taskNum); } + [HttpPost, HttpGet, Route("GetRouteEndPoint"), AllowAnonymous] public WebResponseContent GetRouteEndPoint(string startPoint, int routeType) { return WebResponseContent.Instance.OK(data: _routerExtension.GetEndPoint(startPoint, routeType)); } + + //[HttpPost, HttpGet, Route("WebSocketPushMessage"), AllowAnonymous] + //public WebResponseContent WebSocketPushMessage(string message) + //{ + // try + // { + // _webSocketServer.PublishAllClientPayload(message); + // return WebResponseContent.Instance.OK(); + // } + // catch(Exception ex) + // { + // return WebResponseContent.Instance.Error(ex.Message); + // } + //} + [HttpPost, HttpGet, Route("RecWMSTaskCompleted"), AllowAnonymous] + public WebResponseContent RecWMSTaskCompleted(int taskNum) + { + return Service.RecWMSTaskCompleted(taskNum); + } } } -- Gitblit v1.9.3