111

Service/X2D1NoRefTaskServer/Controllers/HistoryTaskProcessingController.cs

@@ -21,8 +21,8 @@ namespace X2D1NoRefTaskServer.Controllers
          * !!!不要在Controller写太复杂的业务逻辑
          * Controller主要就是调用Service层的东西。Service层执行业务逻辑和调用Repository层操作数据库
          * ********************/
-        private readonly HistoryTaskService _service;
-        public HistoryTaskProcessingController(HistoryTaskService service)
+        private readonly TaskService _service;
+        public HistoryTaskProcessingController(TaskService service)
         {
             _service = service;
         }
@@ -34,7 +34,7 @@ namespace X2D1NoRefTaskServer.Controllers
         /// <param name="dto">离线任务信息</param>
         /// <returns></returns>
         [HttpPost]
-        public AjaxResult Run(X2D1HistoryTaskHandleDto dto)
+        public AjaxResult Run(X2D1NoRefTaskHandleDto dto)
         {
             try
             {

Service/X2D1NoRefTaskServer/Service/HistoryTaskService.cs → Service/X2D1NoRefTaskServer/Service/TaskService.cs

@@ -12,11 +12,11 @@ using XdCxRhDW.Dto;
 
 namespace X2D1NoRefTaskServer.Service
 {
-    public class HistoryTaskService
+    public class TaskService
     {
         private readonly string baseUrl;
         CancellationTokenSource cts;
-        public HistoryTaskService()
+        public TaskService()
         {
             var posPlatformAddr = ConfigurationManager.AppSettings["PosPlatformAddr"].Trim();//like http://127.0.0.1:8091 or http://127.0.0.1:8091/
             if (posPlatformAddr.EndsWith("/"))
@@ -24,7 +24,7 @@ namespace X2D1NoRefTaskServer.Service
             else
                 this.baseUrl = posPlatformAddr + "/api/";
         }
-        public void StartAsync(X2D1HistoryTaskHandleDto dto)
+        public void StartAsync(X2D1NoRefTaskHandleDto dto)
         {
             cts = new CancellationTokenSource();
             if (!Directory.Exists(dto.CapDir))
@@ -301,7 +301,7 @@ namespace X2D1NoRefTaskServer.Service
                 time = time.AddHours(1);
             }
         }
-        private HistoryFile FileToHistoryFile(X2D1HistoryTaskHandleDto dto, string filePath, bool canConnected)
+        private HistoryFile FileToHistoryFile(X2D1NoRefTaskHandleDto dto, string filePath, bool canConnected)
         {  //读取采集文件
            //2024_01_31_10_01_51_000000000_ch11_-1_＿Nxx.xxxxxx_Exx.xxxxxx_xxxxx.xxxHz_xxx.xxxMHz_ch1_xd1.dat
             HistoryFile historyFile = new HistoryFile();

Service/X2D1NoRefTaskServer/X2D1NoRefTaskServer.csproj

@@ -160,7 +160,7 @@
     <Compile Include="MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Service\HistoryTaskService.cs" />
+    <Compile Include="Service\TaskService.cs" />
     <Compile Include="HistoryFile.cs" />
     <None Include="packages.config" />
     <None Include="Properties\licenses.licx" />

Service/X2D1TaskServer54/Controllers/HistoryTaskProcessingController.cs

@@ -33,7 +33,7 @@ namespace X3TaskServer54.Controllers
         /// <param name="dto">离线任务信息</param>
         /// <returns></returns>
         [HttpPost]
-        public AjaxResult Run(X2D1HistoryTaskHandleDto dto)
+        public AjaxResult Run(X2D1NoRefTaskHandleDto dto)
         {
             try
             {

Service/X2D1TaskServer54/Service/HistoryTaskService.cs

@@ -39,7 +39,7 @@ namespace X3TaskServer54.Service
             int.TryParse(PosDtoFactorstr, out PosDtoFactor);
             if (PosDtoFactor == 0) PosDtoFactor = 1;
         }
-        public void StartAsync(X2D1HistoryTaskHandleDto dto)
+        public void StartAsync(X2D1NoRefTaskHandleDto dto)
         {
             cts = new CancellationTokenSource();
             Task.Run(async () =>

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -516,7 +516,7 @@ namespace XdCxRhDW.App.UserControl
                             if (frm.ShowDialog() != DialogResult.OK) return;
                             var startTime = frm.start;
                             var endTime = frm.end;
-                            X2D1HistoryTaskHandleDto dto = new X2D1HistoryTaskHandleDto()
+                            X2D1NoRefTaskHandleDto dto = new X2D1NoRefTaskHandleDto()
                             {
                                 MainSatCode = tsk.MainSat,
                                 AdjaSatCode = tsk.Adja1Sat.Value,
@@ -551,7 +551,7 @@ namespace XdCxRhDW.App.UserControl
                             if (frm.ShowDialog() != DialogResult.OK) return;
                             var startTime = frm.start;
                             var endTime = frm.end;
-                            X2D1HistoryTaskHandleDto dto = new X2D1HistoryTaskHandleDto()
+                            X2D1NoRefTaskHandleDto dto = new X2D1NoRefTaskHandleDto()
                             {
                                 MainSatCode = tsk.MainSat,
                                 AdjaSatCode = tsk.Adja1Sat.Value,

XdCxRhDw.Dto/TaskHandleDto/X2D1HistoryTaskHandleDto.cs

@@ -8,9 +8,9 @@ using System.Threading.Tasks;
 namespace XdCxRhDW.Dto
 {
     /// <summary>
-    /// 两星一地历史任务处理模型
+    /// 两星一地无参处理模型
     /// </summary>
-    public class X2D1HistoryTaskHandleDto
+    public class X2D1NoRefTaskHandleDto
     {
         /// <summary>
         /// 任务类型