11

Service/X2D1NoRefTaskServer/Service/TaskService.cs

@@ -281,7 +281,10 @@ namespace X2D1NoRefTaskServer.Service
                                         }
                                     }
                                     LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻定位完成");
-
+                                    LogHelper.Info($"-----------------------------------------------------------------");
+                                }
+                                catch (TaskCanceledException)
+                                {
                                 }
                                 catch (Exception ex)
                                 {
@@ -590,6 +593,9 @@ namespace X2D1NoRefTaskServer.Service
                                     LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻定位完成");
                                     LogHelper.Info($"-----------------------------------------------------------------");
 
+                                }
+                                catch (TaskCanceledException)
+                                {
                                 }
                                 catch (Exception ex)
                                 {
@@ -776,7 +782,7 @@ namespace X2D1NoRefTaskServer.Service
             }
             catch
             {
-                LogHelper.Warning($"无法连接到MySql,将使用任务中的卫星编号.SQL={sql}");
+                LogHelper.Warning($"无法连接到MySql,将使用任务中的卫星编号");
                 return false;
             }
         }

XdCxRhDW.Api/AddIns/定位/PosApi.cs

@@ -80,7 +80,7 @@ namespace XdCxRhDW.Api
         /// <returns></returns>
         public static double[] X1D1_Pos(CgRes cgRes, StationRes sRes, CxRes cxRes, bool CalcConfidence = false)
         {
-            if (cgRes.DtoCdb.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+            if (cgRes.DtoCdb.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, -1};
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] satStation = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };
             double[] cdbStation = new double[3] { sRes.CdbTxLon.Value, sRes.CdbTxLat.Value, 0 };
@@ -134,7 +134,7 @@ namespace XdCxRhDW.Api
         {
             if (cgRes.Dto1.Value == 0 || cgRes.DtoCdb.Value == 0)
             {
-                return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+                return new double[7] { 999, 999, 0, 999, 999, 0, -1};
             }
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] adjaSat = new double[3] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value };
@@ -159,7 +159,7 @@ namespace XdCxRhDW.Api
         {
             if (cgRes.Dto1.Value == 0 || cgRes.Dto2.Value == 0)
             {
-                return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+                return new double[7] { 999, 999, 0, 999, 999, 0, -1};
             }
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] adja1Sat = new double[3] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value };
@@ -188,7 +188,7 @@ namespace XdCxRhDW.Api
         {
             if (cgRes.Dto1.Value == 0 || cgRes.DtoCdb.Value == 0)
             {
-                return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+                return new double[7] { 999, 999, 0, 999, 999, 0, -1};
             }
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] adjaSat = new double[3] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value };
@@ -255,7 +255,7 @@ namespace XdCxRhDW.Api
         {
             if (cgRes.Dto1.Value == 0 || cgRes.DtoCdb.Value == 0)
             {
-                return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+                return new double[7] { 999, 999, 0, 999, 999, 0, -1};
             }
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] adjaSat = new double[3] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value };
@@ -385,9 +385,9 @@ namespace XdCxRhDW.Api
         {
             if (cgRes.Dto1.Value == 0 || cgRes.Dto2.Value == 0)
             {
-                return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+                return new double[7] { 999, 999, 0, 999, 999, 0, -1};
             }
-            if (cgRes.Dto1.Value == 0 || cgRes.Dto2.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+            if (cgRes.Dto1.Value == 0 || cgRes.Dto2.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, -1};
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] adjaSat1 = new double[3] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value };
             double[] adjaSat2 = new double[3] { cgRes.Adja2X.Value, cgRes.Adja2Y.Value, cgRes.Adja2Z.Value };
@@ -457,7 +457,7 @@ namespace XdCxRhDW.Api
         {
             if (cgRes.Dto1.Value == 0 || cgRes.Dto2.Value == 0)
             {
-                return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+                return new double[7] { 999, 999, 0, 999, 999, 0, -1};
             }
             double[] mainSat = new double[3] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value };
             double[] adjaSat1 = new double[3] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value };
@@ -522,7 +522,7 @@ namespace XdCxRhDW.Api
         /// <returns></returns>
         public static double[] X3_PosTwoDfo(CgRes cgRes, StationRes sRes, bool CalcConfidence = false)
         {
-            if (cgRes.Dfo1.Value == 0 || cgRes.Dfo2.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+            if (cgRes.Dfo1.Value == 0 || cgRes.Dfo2.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, -1};
             double[] mainSat = new double[6] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value, cgRes.MainVx.Value, cgRes.MainVy.Value, cgRes.MainVz.Value };
             double[] adjaSat1 = new double[6] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value, cgRes.Adja1Vx.Value, cgRes.Adja1Vy.Value, cgRes.Adja1Vz.Value };
             double[] adjaSat2 = new double[6] { cgRes.Adja2X.Value, cgRes.Adja2Y.Value, cgRes.Adja2Z.Value, cgRes.Adja2Vx.Value, cgRes.Adja2Vy.Value, cgRes.Adja2Vz.Value };
@@ -596,7 +596,7 @@ namespace XdCxRhDW.Api
         /// <returns></returns>
         public static double[] X2_PosDtoDfo(CgRes cgRes, StationRes sRes, bool CalcConfidence = false)
         {
-            if (cgRes.Dto1.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, 100 };
+            if (cgRes.Dto1.Value == 0) return new double[7] { 999, 999, 0, 999, 999, 0, -1};
             double[] mainSat = new double[6] { cgRes.MainX.Value, cgRes.MainY.Value, cgRes.MainZ.Value, cgRes.MainVx.Value, cgRes.MainVy.Value, cgRes.MainVz.Value };
             double[] adjaSat = new double[6] { cgRes.Adja1X.Value, cgRes.Adja1Y.Value, cgRes.Adja1Z.Value, cgRes.Adja1Vx.Value, cgRes.Adja1Vy.Value, cgRes.Adja1Vz.Value };
             double[] satStation = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };

XdCxRhDW.App/CorTools/DetectToolForm.cs

@@ -324,10 +324,8 @@ namespace XdCxRhDW.App.CorTools
                 DxHelper.MsgBoxHelper.ShowError($"CPU文件参估参数错误");
                 return;
             }
-            await HttpHelper.DeleteFileAsync(SysConfig.GetBaseUrl(), xItem.file1, xItem.file2);
             WriteIni();
             gridSource.Clear();
-
             try
             {
                 var result = await HttpHelper.PostRequestAsync<CpuCgResDto>(SysConfig.GetUrl("DetectCg/CpuCgCalc"), xItem, xItem.TimeoutSeconds);
@@ -367,6 +365,7 @@ namespace XdCxRhDW.App.CorTools
                 Serilog.Log.Error(ex, "CPU文件参估出错");
                 DxHelper.MsgBoxHelper.ShowError("CPU文件参估出错");
             }
+            await HttpHelper.DeleteFileAsync(SysConfig.GetBaseUrl(), xItem.file1, xItem.file2);
             gridView1.RefreshData();
             layoutControl1.Enabled = true;
         }