修改GDOP未找到星历是不赋值

XdCxRhDW.App/UserControl/X1D1GDOPParam.cs

@@ -60,10 +60,6 @@ namespace XdCxRhDW.App.UserControl
                 {
                     mainTle = xlList.First(m => m.SatCode == cg.MainCode.Value).TwoLine;
                 }
-                else
-                {
-                    mainTle = xlList.First().TwoLine;
-                }
 
             }
 

XdCxRhDW.App/UserControl/X2D1GDOPParam.cs

@@ -71,19 +71,10 @@ namespace XdCxRhDW.App.UserControl
                 {
                     mainTle = xlList.First(m => m.SatCode == cg.MainCode.Value).TwoLine;
                 }
-                else
-                {
-                    mainTle = xlList.First().TwoLine;
-                }
-
                 if (cg != null && cg.Adja1Code.HasValue && xlList.Any(m => m.SatCode == cg.Adja1Code.Value))
                 {
                     adjaTle = xlList.First(m => m.SatCode == cg.Adja1Code.Value).TwoLine;
                 }
-                else
-                {
-                    adjaTle = xlList.First().TwoLine;
-                }
             }
 
             txtTleMain.UseDefault().SetStringData(xlall).Text = mainTle;

XdCxRhDW.App/UserControl/X2DFGDOPParam.cs

@@ -67,19 +67,10 @@ namespace XdCxRhDW.App.UserControl
                 {
                     mainTle = xlList.First(m => m.SatCode == cg.MainCode.Value).TwoLine;
                 }
-                else
-                {
-                    mainTle = xlList.First().TwoLine;
-                }
-
                 if (cg != null && cg.Adja1Code.HasValue && xlList.Any(m => m.SatCode == cg.Adja1Code.Value))
                 {
                     adjaTle1 = xlList.First(m => m.SatCode == cg.Adja1Code.Value).TwoLine;
                 }
-                else
-                {
-                    adjaTle1 = xlList.First().TwoLine;
-                }
             }
             txtTleLeo1.UseDefault().SetStringData(xlall).Text = mainTle;
             txtTleLeo2.UseDefault().SetStringData(xlall).Text = adjaTle1;

XdCxRhDW.App/UserControl/X3DFGDOPParam .cs

@@ -68,27 +68,15 @@ namespace XdCxRhDW.App.UserControl
                 {
                     mainTle = xlList.First(m => m.SatCode == cg.MainCode.Value).TwoLine;
                 }
-                else
-                {
-                    mainTle = xlList.First().TwoLine;
-                }
 
                 if (cg != null && cg.Adja1Code.HasValue && xlList.Any(m => m.SatCode == cg.Adja1Code.Value))
                 {
                     adjaTle1 = xlList.First(m => m.SatCode == cg.Adja1Code.Value).TwoLine;
                 }
-                else
-                {
-                    adjaTle1 = xlList.First().TwoLine;
-                }
                 if (cg != null && cg.Adja2Code.HasValue && xlList.Any(m => m.SatCode == cg.Adja2Code.Value))
                 {
                     adjaTle2 = xlList.First(m => m.SatCode == cg.Adja2Code.Value).TwoLine;
                 }
-                else
-                {
-                    adjaTle2 = xlList.First().TwoLine;
-                }
             }
             txtTleLeo1.UseDefault().SetStringData(xlall).Text = mainTle;
             txtTleLeo2.UseDefault().SetStringData(xlall).Text = adjaTle1;

XdCxRhDW.App/UserControl/X3GDOPParam.cs

@@ -62,27 +62,14 @@ namespace XdCxRhDW.App.UserControl
                 {
                     mainTle = xlList.First(m => m.SatCode == cg.MainCode.Value).TwoLine;
                 }
-                else
-                {
-                    mainTle = xlList.First().TwoLine;
-                }
-
                 if (cg != null && cg.Adja1Code.HasValue && xlList.Any(m => m.SatCode == cg.Adja1Code.Value))
                 {
                     adjaTle1 = xlList.First(m => m.SatCode == cg.Adja1Code.Value).TwoLine;
                 }
-                else
-                {
-                    adjaTle1 = xlList.First().TwoLine;
-                }
                 if (cg != null && cg.Adja2Code.HasValue && xlList.Any(m => m.SatCode == cg.Adja2Code.Value))
                 {
                     adjaTle2 = xlList.First(m => m.SatCode == cg.Adja2Code.Value).TwoLine;
                 }
-                else
-                {
-                    adjaTle2 = xlList.First().TwoLine;
-                }
             }
             txtTleMain.UseDefault().SetStringData(xlall).Text = mainTle;
             txtTleAdja1.UseDefault().SetStringData(xlall).Text = adjaTle1;

XdCxRhDW.TaskServer/Task/X2D1Task.cs

@@ -116,7 +116,7 @@ namespace XdCxRhDW.TaskServer.Task
                                     try
                                     {
                                         var xd = await CPUCalcAsync(deitem.File1, dfile.File, dfile.OutFsHz, deitem, 260000, 40000);
-                                        Thread.Sleep(100);
+                                       
                                         var sx = await CPUCalcAsync(deitem.File1, nfile.File, nfile.OutFsHz, deitem, 0, 40000);
                                         X2D1NoXlPosDto x2D1 = new X2D1NoXlPosDto()
                                         {
@@ -160,6 +160,9 @@ namespace XdCxRhDW.TaskServer.Task
                     preTime = preTime.AddHours(1);
                 }
 
+                IsRuning = false;
+                LogHelper.Info($"历史任务:{dto.ID}已结束!");
+
             });
         }