1

Service/X2D1NoRefTaskServer/Controllers/HistoryTaskProcessingController.cs

@@ -12,9 +12,9 @@ using X2D1NoRefTaskServer.Service;
 namespace X2D1NoRefTaskServer.Controllers
 {
     /// <summary>
-    ///离线任务处理接口
+    ///两星一地无参任务处理接口
     /// </summary>
-    public class HistoryTaskProcessingController : BaseController
+    public class X2D1TaskProcessingController : BaseController
     {
         /*******************
          * !!!不要在Controller中放业务逻辑的全局变量
@@ -22,14 +22,14 @@ namespace X2D1NoRefTaskServer.Controllers
          * Controller主要就是调用Service层的东西。Service层执行业务逻辑和调用Repository层操作数据库
          * ********************/
         private readonly TaskService _service;
-        public HistoryTaskProcessingController(TaskService service)
+        public X2D1TaskProcessingController(TaskService service)
         {
             _service = service;
         }
 
 
         /// <summary>
-        /// 开始执行两星一地离线任务
+        /// 开始执行两星一地无参任务
         /// </summary>
         /// <param name="dto">离线任务信息</param>
         /// <returns></returns>
@@ -38,8 +38,10 @@ namespace X2D1NoRefTaskServer.Controllers
         {
             try
             {
-              
-                _service.StartHistoryAsync(dto);
+                if (dto.TaskType == EnumTaskTypeDto.History)
+                    _service.StartHistoryAsync(dto);
+                else
+                    _service.StarRealAsync(dto);
                 return Success();
             }
             catch (Exception ex)
@@ -51,7 +53,7 @@ namespace X2D1NoRefTaskServer.Controllers
 
 
         /// <summary>
-        /// 停止执行两星一地离线任务
+        /// 停止执行两星一地无参任务
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -530,7 +530,7 @@ namespace XdCxRhDW.App.UserControl
                                 DateDirFormat = tsk.CapDirFormat,
                                 Sigs = tskSigsDto,
                             };
-                            var res = await HttpHelper.PostRequestAsync<AjaxResult>(svtItem.BaseHttpAddr + "/api/HistoryTaskProcessing/Run", dto);
+                            var res = await HttpHelper.PostRequestAsync<AjaxResult>(svtItem.BaseHttpAddr + "/api/X2D1TaskProcessing/Run", dto);
                             if (res.code != 200)
                             {
                                 Serilog.Log.Error(res.msg);
@@ -565,7 +565,7 @@ namespace XdCxRhDW.App.UserControl
                                 CapLat = tx.Lat,
                                 Sigs = tskSigsDto.ToList()
                             };
-                            var res = await HttpHelper.PostRequestAsync<AjaxResult>(svtItem.BaseHttpAddr + "/api/HistoryTaskProcessing/Run", dto);
+                            var res = await HttpHelper.PostRequestAsync<AjaxResult>(svtItem.BaseHttpAddr + "/api/X2D1TaskProcessing/Run", dto);
                             if (res.code != 200)
                             {
                                 Serilog.Log.Error(res.msg);
@@ -612,7 +612,7 @@ namespace XdCxRhDW.App.UserControl
                         }
                         TaskStopHandleDto dto = new TaskStopHandleDto();
                         dto.ID = tsk.ID;
-                        var res = await HttpHelper.PostRequestAsync<AjaxResult>(svtItem.BaseHttpAddr + "/api/HistoryTaskProcessing/Stop", dto);
+                        var res = await HttpHelper.PostRequestAsync<AjaxResult>(svtItem.BaseHttpAddr + "/api/X2D1TaskProcessing/Stop", dto);
                         if (res.code != 200)
                         {
                             Serilog.Log.Error(res.msg);