Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-04-29 c38154df95a2c2fa1bd32c45f6be9c0d98e37440

 代码管理/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;
@@ -6,6 +7,7 @@
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Tasks;

namespace WIDESEAWCS_WCSServer.Controllers.Task
{
@@ -14,9 +16,14 @@
    public class TaskController : ApiBaseController<ITaskService, Dt_Task>
    {
        private readonly IHttpContextAccessor _httpContextAccessor;
        public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor) : base(service)
        private readonly IRouterExtension _routerExtension;
        //private readonly WebSocketServer _webSocketServer;

        public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IRouterExtension routerExtension/*, WebSocketServer webSocketServer*/) : base(service)
        {
            _httpContextAccessor = httpContextAccessor;
            _routerExtension = routerExtension;
            //_webSocketServer = webSocketServer;
        }

        [HttpPost, Route("ReceiveTask"), AllowAnonymous]
@@ -25,17 +32,23 @@
            return Service.ReceiveWMSTask(taskDTOs);
        }

        [HttpPost, HttpGet, Route("RequestAssignLocation"), AllowAnonymous]
        public string? RequestAssignLocation(int taskNum, string roadwayNo)
        {
            return Service.RequestAssignLocation(taskNum, roadwayNo);
        }

        [HttpPost, HttpGet, Route("UpdateTaskExceptionMessage")]
        public WebResponseContent UpdateTaskExceptionMessage(int taskNum, string message)
        {
            return Service.UpdateTaskExceptionMessage(taskNum, message);
        }

        [HttpPost, HttpGet, Route("UpdateTaskStatusToNext")]
        public WebResponseContent UpdateTaskStatusToNext(int taskNum)
        {
            return Service.UpdateTaskStatusToNext(taskNum);
        }
        //[HttpPost, HttpGet, Route("UpdateTaskStatusToNext")]
        //public WebResponseContent UpdateTaskStatusToNext(int taskNum)
        //{
        //    return Service.UpdateTaskStatusToNext(taskNum);
        //}

        [HttpPost, HttpGet, Route("TaskStatusRecovery")]
        public WebResponseContent TaskStatusRecovery(int taskNum)
@@ -48,5 +61,45 @@
        {
            return Service.RollbackTaskStatusToLast(taskNum);
        }

        /// <summary>
        /// 鍥炲AGV瀹夊叏淇″彿
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("SendSecureReplyToAgv")]
        public WebResponseContent SendSecureReplyToAgv(int taskNum)
        {
            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("AgvCarrying"), AllowAnonymous]
        public WebResponseContent AgvCarrying(int row, int startColumn, int endColumn, int layer, int targetLayer)
        {
            return Service.AgvCarrying(row, startColumn, endColumn, layer, targetLayer);
        }
        //[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);
        }
    }
}