From 66b1b95f207cbf623e0ef216c963d2e96a6923f6 Mon Sep 17 00:00:00 2001
From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com>
Date: 星期一, 16 十二月 2024 18:44:22 +0800
Subject: [PATCH] 修改问题

---
 Wms/Wms/Controllers/DownApiController.cs |  483 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 482 insertions(+), 1 deletions(-)

diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 27d21f1..42bd8ac 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -16,6 +16,11 @@
 using WMS.Entity.BllTaskEntity;
 using WMS.IBLL.IBllTaskServer;
 using Model.ModelVm.BllTaskVm;
+using static Model.InterFaceModel.RCSModel;
+using WMS.IBLL.IBllTransServer;
+using Microsoft.Extensions.Logging;
+using ZXing.QrCode.Internal;
+using Model.ModelVm.BllCheckVm;
 
 namespace Wms.Controllers
 {
@@ -33,7 +38,9 @@
         private readonly ITaskServer _taskSvc;//浠诲姟Svc
         private readonly IBllTaskSyncServer _taskSyncSvc;//浠诲姟鍚屾Svc
         private readonly IWaveMageServer _waveSvc;//浠诲姟鍚屾Svc
-        public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IBllTaskSyncServer taskSyncSvc, IWaveMageServer waveSvc)
+        private readonly IRcsServer _rcsserver;//RCS鐩稿叧浠诲姟
+        private readonly INoticeServer _noticeSvc;//浜屾ゼ鍗曟嵁鐩稿叧
+        public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IBllTaskSyncServer taskSyncSvc, IWaveMageServer waveSvc, IRcsServer rcsserver, INoticeServer noticeSvc)
         {
             _config = setting.Value;
             _exNoticeSvc = exNoticeSvc;
@@ -42,6 +49,8 @@
             _taskSvc = taskSvc;
             _taskSyncSvc = taskSyncSvc;
             _waveSvc = waveSvc;
+            _rcsserver = rcsserver;
+            _noticeSvc = noticeSvc;
         }
 
         #region WMS鎺ュ彛 璋冪敤涓嬫父绯荤粺鎺ュ彛 
@@ -641,5 +650,477 @@
 
         #endregion
 
+
+        #region 浜屾ゼ涓氬姟
+        /// <summary>
+        /// RCS鍙《
+        /// </summary>
+        /// <param name="pallmsg"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult GetPalletNo(Pallnetmsg pallmsg)
+        {
+            var logStr = $@".\log\AGV\AGV鐢宠鍙《" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+            AgvResultModel resultModel = null;//杩斿洖淇℃伅
+            try
+            {
+                var jsonData = JsonConvert.SerializeObject(pallmsg);
+                LogFile.SaveLogToFile($"AGV鐢宠鍙《-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
+                if (string.IsNullOrWhiteSpace(pallmsg.Location))
+                {
+                    resultModel = new AgvResultModel { code = "1", message = "鍙枡浣嶇疆涓虹┖!", data = "", reqCode = "" };
+                    var jsonData3 = JsonConvert.SerializeObject(resultModel);
+                    LogFile.SaveLogToFile($"AGV鐢宠鍙《-杩斿洖鎶ユ枃锛�( {jsonData3} ),", logStr);
+                    return Ok(resultModel);
+                }
+                if (string.IsNullOrWhiteSpace(pallmsg.Type))
+                {
+                    resultModel = new AgvResultModel { code = "1", message = "浠诲姟绫诲瀷涓虹┖!", data = "", reqCode = "" };
+                    var jsonData4 = JsonConvert.SerializeObject(resultModel);
+                    LogFile.SaveLogToFile($"AGV鐢宠鍙《-杩斿洖鎶ユ枃锛�( {jsonData4} ),", logStr);
+                    return Ok(resultModel);
+                }
+                string taskNo = "";
+                //鍏蜂綋澶勭悊鏂规硶
+                _rcsserver.GetPalletNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask, out taskNo);
+
+                resultModel = new AgvResultModel { code = "0", message = "鍙《鎴愬姛!", data = taskNo, reqCode = "" };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV鐢宠鍙《-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+            catch (Exception e)
+            {
+                LogFile.SaveLogToFile($"AGV鐢宠鍙《寮傚父锛�( {e.Message} ),", logStr);
+
+                resultModel = new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV鐢宠鍙《-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+        }
+
+        /// <summary>
+        /// RCS鐢宠鍌ㄤ綅
+        /// </summary>
+        /// <param name="pallmsg"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult ApplyLocatNo(Pallnetmsg pallmsg)
+        {
+            var logStr = $@".\log\AGV\AGV鐢宠鍌ㄤ綅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+            AgvResultModel resultModel = null;//杩斿洖淇℃伅
+            try
+            {
+                var jsonData = JsonConvert.SerializeObject(pallmsg);
+                LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
+                if (string.IsNullOrWhiteSpace(pallmsg.Location))
+                {
+                    resultModel = new AgvResultModel { code = "1", message = "鐢宠浣嶇疆涓虹┖!", data = "", reqCode = "" };
+                    var jsonData3 = JsonConvert.SerializeObject(resultModel);
+                    LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData3} ),", logStr);
+                    return Ok(resultModel);
+                }
+                if (string.IsNullOrWhiteSpace(pallmsg.Type))
+                {
+                    resultModel = new AgvResultModel { code = "1", message = "浠诲姟绫诲瀷涓虹┖!", data = "", reqCode = "" };
+                    var jsonData3 = JsonConvert.SerializeObject(resultModel);
+                    LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData3} ),", logStr);
+                    return Ok(resultModel);
+                }
+                if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
+                {
+                    resultModel = new AgvResultModel { code = "1", message = "鐢宠妗跺彿涓虹┖!", data = "", reqCode = "" };
+                    var jsonData3 = JsonConvert.SerializeObject(resultModel);
+                    LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData3} ),", logStr);
+                    return Ok(resultModel);
+                }
+                string taskNo = "";
+                //鍏蜂綋澶勭悊鏂规硶
+                _rcsserver.ApplyLocatNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask, out taskNo);
+
+                resultModel = new AgvResultModel { code = "0", message = "鐢宠鍌ㄤ綅鎴愬姛!", data = taskNo, reqCode = "" };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+            catch (Exception e)
+            {
+                LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅寮傚父锛�( {e.Message} ),", logStr);
+
+                resultModel = new AgvResultModel { code = "1", message = e.Message, data = "", reqCode = "" };
+                var jsonData3 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV鐢宠鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData3} ),", logStr);
+                return Ok(resultModel);
+            }
+        }
+        /// <summary>
+        /// 灏嗗噣妗舵敼涓鸿剰妗跺苟鎷夊埌鑴忔《鍖�
+        /// </summary>
+        /// <param name="pallmsg"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult ChangePalletStatus(Pallnetmsg pallmsg)
+        {
+            var result = new ErpModel { Success = -1, Message = "", };
+            try
+            {
+                if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
+                {
+                    result.Message = "妗剁紪鍙蜂笉鑳戒负绌猴紒";
+                    return Ok(result);
+                }
+                _rcsserver.ChangePalletStatus(pallmsg.PalletNo, _config.AgvHost + _config.GenAgvSchedulingTask);
+                result.Success = 0;
+                result.Message = "鎿嶄綔鎴愬姛锛�";
+                return Ok(result);
+            }
+            catch (Exception e)
+            {
+                result.Message = e.Message;
+                return Ok(result);
+            }
+        }
+
+        /// <summary>
+        /// MES涓嬪彂娓呮礂閿佸畾鑴忔《
+        /// </summary>
+        /// <param name="pallmsg"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult CleanPallet(Pallnetmsg pallmsg)
+        {
+            var result = new ErpModel { Success = -1, Message = "", };
+            try
+            {
+                if (string.IsNullOrWhiteSpace(pallmsg.Location))
+                {
+                    result.Message = "鍙枡浣嶇疆涓虹┖锛�";
+                    return Ok(result);
+                }
+                if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
+                {
+                    result.Message = "妗跺彿涓虹┖锛�";
+                    return Ok(result);
+                }
+                _rcsserver.CleanPallet(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask);
+                result.Success = 0;
+                result.Message = "鍙《鎴愬姛锛�";
+                return Ok(result);
+            }
+            catch (Exception e)
+            {
+                result.Message = e.Message;
+                return Ok(result);
+            }
+        }
+
+        /// <summary>
+        /// 鍏ュ簱鍗曟嵁涓嬪彂
+        /// </summary>
+        /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+        /// <returns></returns>
+        //[Authorize]
+        [HttpPost]
+        public IActionResult CreateAsnWork(AsnInfo model)
+        {
+            var result = new ErpModel { Success = -1, Message = "" };
+            try
+            {
+                /*var claimsIdentity = this.User.Identity as ClaimsIdentity;
+                if (claimsIdentity == null)
+                {
+                    throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+                }
+                string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+                if (string.IsNullOrWhiteSpace(UserId))
+                {
+                    throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+                }*/
+
+                result = _noticeSvc.CreateAsnWork(model);
+
+                return Ok(result);
+            }
+            catch (Exception e)
+            {
+                result.Message = e.Message;
+                return Ok(result);
+            }
+        }
+
+
+        #region Agv浠诲姟瀹屾垚鍙嶉
+        /// <summary>
+        /// 浠诲姟寮�濮�
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult start(AgvTaskDto model)
+        {
+            //璁板綍log
+            var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+            AgvResultModel resultModel = null;//杩斿洖淇℃伅
+            try
+            {
+                var jsonData = JsonConvert.SerializeObject(model);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟寮�濮�-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
+                //鍏蜂綋澶勭悊鏂规硶
+
+
+
+                resultModel = new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟寮�濮�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+            catch (Exception ex)
+            {
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟寮�濮�-寮傚父锛�( {ex.Message} ),", logStr);
+
+                resultModel = new AgvResultModel { code = "1", message = ex.Message, reqCode = model.reqCode };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟寮�濮�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+        }
+        /// <summary>
+        /// 璧板嚭鍌ㄤ綅
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult outbin(AgvTaskDto model)
+        {
+            //璁板綍log
+            var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+            AgvResultModel resultModel = null;//杩斿洖淇℃伅
+            try
+            {
+                var jsonData = JsonConvert.SerializeObject(model);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-璧板嚭鍌ㄤ綅-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
+                //鍏蜂綋澶勭悊鏂规硶
+
+
+
+                resultModel = new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-璧板嚭鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+            catch (Exception ex)
+            {
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-璧板嚭鍌ㄤ綅-寮傚父锛�( {ex.Message} ),", logStr);
+
+                resultModel = new AgvResultModel { code = "1", message = ex.Message, reqCode = model.reqCode };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-璧板嚭鍌ㄤ綅-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+        }
+        /// <summary>
+        /// 浠诲姟缁撴潫
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult end(AgvTaskDto model)
+        {
+            //璁板綍log
+            var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+            AgvResultModel resultModel = null;//杩斿洖淇℃伅
+            try
+            {
+                var jsonData = JsonConvert.SerializeObject(model);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟缁撴潫-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
+                //鍏蜂綋澶勭悊鏂规硶
+                _rcsserver.RCSFinishTask(model.taskCode, "1", "AGV");
+
+
+                resultModel = new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟缁撴潫-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+            catch (Exception ex)
+            {
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟缁撴潫-寮傚父锛�( {ex.Message} ),", logStr);
+
+                resultModel = new AgvResultModel { code = "1", message = ex.Message, reqCode = model.reqCode };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟缁撴潫-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+        }
+        /// <summary>
+        /// 浠诲姟鍗曞彇娑�
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult cancel(AgvTaskDto model)
+        {
+            //璁板綍log
+            var logStr = $@".\log\AGV\浠诲姟鎵ц閫氱煡" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+            AgvResultModel resultModel = null;//杩斿洖淇℃伅
+            try
+            {
+                var jsonData = JsonConvert.SerializeObject(model);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍗曞彇娑�-璇锋眰鎶ユ枃锛�( {jsonData} ),", logStr);
+
+                //鍏蜂綋澶勭悊鏂规硶
+
+
+
+                resultModel = new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍗曞彇娑�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+            catch (Exception ex)
+            {
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍗曞彇娑�-寮傚父锛�( {ex.Message} ),", logStr);
+
+                resultModel = new AgvResultModel { code = "1", message = ex.Message, reqCode = model.reqCode };
+                var jsonData2 = JsonConvert.SerializeObject(resultModel);
+                LogFile.SaveLogToFile($"AGV浠诲姟鎵ц閫氱煡-浠诲姟鍗曞彇娑�-杩斿洖鎶ユ枃锛�( {jsonData2} ),", logStr);
+                return Ok(resultModel);
+            }
+        }        
+
+        #endregion
+
+        /// <summary>
+        /// 鍑哄簱鍗曟嵁涓嬪彂
+        /// </summary>
+        /// <param name="model">鍑哄簱鍗曚俊鎭�</param>
+        /// <returns></returns>
+        //[Authorize]
+        [HttpPost]
+        public IActionResult CreateSoWork(SoInfo model)
+        {
+            try
+            {
+                /*var claimsIdentity = this.User.Identity as ClaimsIdentity;
+                if (claimsIdentity == null)
+                {
+                    throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+                }
+                string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+                if (string.IsNullOrWhiteSpace(UserId))
+                {
+                    throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+                }*/
+
+                SoResInfo result = _noticeSvc.CreateSoWork(model);
+                return Ok(result);
+
+            }
+            catch (Exception e)
+            {
+                return Ok(new ErpModel { Success = -1, Message = e.Message });
+            }
+        }
+
+        /// <summary>
+        /// 鎵嬪姩涓嬪彂灏忚溅浠诲姟
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult SendAgvTaskWms(CheckTaskVm model)
+        {
+            try
+            {
+                //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+                var claimsIdentity = this.User.Identity as ClaimsIdentity;
+                if (claimsIdentity == null)
+                {
+                    return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+                }
+                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+                if (string.IsNullOrWhiteSpace(userId))
+                {
+                    return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+                }
+                _rcsserver.DownTask(model.taskNo, int.Parse(userId), _config.AgvHost + _config.GenAgvSchedulingTask);
+
+                return Ok(new { code = 0, msg = "閲嶆柊涓嬪彂宸插畬鎴�", data = "" });
+            }
+            catch (Exception e)
+            {
+                return Ok(new { code = 1, msg = e.Message });
+            }
+        }
+
+        /// <summary>
+        /// 鎵嬪姩瀹屾垚灏忚溅浠诲姟
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult FinshAgvTaskWms(CheckTaskVm model)
+        {
+            try
+            {
+                //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+                var claimsIdentity = this.User.Identity as ClaimsIdentity;
+                if (claimsIdentity == null)
+                {
+                    return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+                }
+                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+                if (string.IsNullOrWhiteSpace(userId))
+                {
+                    return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+                }
+                //鍏蜂綋澶勭悊鏂规硶
+                _rcsserver.RCSFinishTask(model.taskNo, "1", "WMS");
+
+                return Ok(new { code = 0, msg = "閲嶆柊涓嬪彂宸插畬鎴�", data = "" });
+            }
+            catch (Exception e)
+            {
+                return Ok(new { code = 1, msg = e.Message });
+            }
+        }
+
+        /// <summary>
+        /// 鎵嬪姩鍙栨秷AGV绉诲簱浠诲姟
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult CancelAgvTaskWms(CheckTaskVm model)
+        {
+            try
+            {
+                //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+                var claimsIdentity = this.User.Identity as ClaimsIdentity;
+                if (claimsIdentity == null)
+                {
+                    return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+                }
+                var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+                if (string.IsNullOrWhiteSpace(userId))
+                {
+                    return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+                }
+                _rcsserver.CancelTask(model.taskNo, int.Parse(userId));
+
+                return Ok(new { code = 0, msg = "鎴愬姛鍙栨秷浠诲姟", data = "" });
+            }
+            catch (Exception e)
+            {
+                return Ok(new { code = 1, msg = e.Message });
+            }
+        }
+        #endregion
     }
 }

--
Gitblit v1.8.0