Merge branch 'master' of http://139.155.15.221:3000/zoulei/XdCxRhDW

Service/X2D1TaskServer54/Controllers/HistoryTaskProcessingController.cs → Service/X2D1TaskServer54/Controllers/X2D1NoRefTaskProcessingController.cs

@@ -14,14 +14,14 @@ namespace X3TaskServer54.Controllers
     /// <summary>
     ///离线任务处理接口
     /// </summary>
-    public class HistoryTaskProcessingController : BaseController
+    public class X2D1NoRefTaskProcessingController : BaseController
     {
         /*******************
          * !!!不要在Controller中放业务逻辑的全局变量(每次调用Http接口Controller都可能是一个新的对象)
          * Controller主要就是调用Service层的东西。Service层执行业务逻辑和调用Repository层操作数据库
          * ********************/
         private readonly HistoryTaskService _service;
-        public HistoryTaskProcessingController(HistoryTaskService service)
+        public X2D1NoRefTaskProcessingController(HistoryTaskService service)
         {
             _service = service;
         }

Service/X2D1TaskServer54/X3TaskServer54.csproj

@@ -119,7 +119,7 @@
       <Link>DxHelper\ChsLocalizer.cs</Link>
     </Compile>
     <Compile Include="AddIns\DDC\DDCHelper.cs" />
-    <Compile Include="Controllers\HistoryTaskProcessingController.cs" />
+    <Compile Include="Controllers\X2D1NoRefTaskProcessingController.cs" />
     <Compile Include="HistoryFile.cs" />
     <Compile Include="LogHelper.cs" />
     <Compile Include="LogInfo.cs" />

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -596,10 +596,23 @@ namespace XdCxRhDW.App.UserControl
                                 DxHelper.MsgBoxHelper.ShowWarning($"未找到注册的处理服务");
                                 return;
                             }
-                            TaskHistoryTimeEditor frm = new TaskHistoryTimeEditor(tsk);
-                            if (frm.ShowDialog() != DialogResult.OK) return;
-                            var startTime = frm.start;
-                            var endTime = frm.end;
+                            DateTime startTime;
+                            DateTime endTime;
+
+                            if (ConfigurationManager.AppSettings["UseFor54"] != null
+                           && ConfigurationManager.AppSettings["UseFor54"].ToLower() != "false"
+                           && ConfigurationManager.AppSettings["UseFor54"].ToLower() != "0")
+                            {
+                                startTime = DateTime.Now;
+                                endTime = DateTime.Now.AddHours(1);
+                            }
+                            else
+                            {
+                                TaskHistoryTimeEditor frm = new TaskHistoryTimeEditor(tsk);
+                                if (frm.ShowDialog() != DialogResult.OK) return;
+                                startTime = frm.start;
+                                endTime = frm.end;
+                            }
                             X2D1NoRefTaskHandleDto dto = new X2D1NoRefTaskHandleDto()
                             {
                                 MainSatCode = tsk.MainSat,