Browse Source

更新星历导入失败,提示内容

wyq 1 year ago
parent
commit
4df17dc95c

+ 2 - 2
Service/CapMoni/App.config

@@ -5,8 +5,8 @@
 		<add key="FileDir" value="E:\"/>
 		<!--采集时长(S)-->
 		<add key="Duration" value="60"/>
-		<!--频点(MHz)多个-->
-		<add key="Freqs" value="310.85;310.95;311;312;313;314;315;316;317"/>
+		<!--频点(MHz)多个 "310.85;310.95;311;312;313;314;315;316;317"-->
+		<add key="Freqs" value="310.85;310.95;311;312"/>
 	</appSettings>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />

+ 5 - 9
XdCxRhDW.App/Controllers/PosController.cs

@@ -18,6 +18,7 @@ using XdCxRhDW.App.Model;
 using System.Diagnostics;
 using System.Configuration;
 using System.Data.Entity.Infrastructure;
+using XdCxRhDW.Framework;
 
 namespace XdCxRhDW.App.Controllers
 {
@@ -545,9 +546,8 @@ namespace XdCxRhDW.App.Controllers
                     };
                     if (posRes.PosLon == 999 || posRes.PosLat == 999)//有参无结果时做无参
                     {
-                        if (ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"] != null
-                     && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "false"
-                     && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "0")
+
+                        if (AppConfigHelper.Get("UseNewPosX2D1NoRef", false))
                         {
                             res = PosApi.X2D1_PosNoRef_ZL(cgRes, StationRes);
                         }
@@ -678,9 +678,7 @@ namespace XdCxRhDW.App.Controllers
                         TarFreqDown = dto.FreqDown,
                     });
                     double[] res;
-                    if (ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"] != null
-                 && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "false"
-                 && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "0")
+                    if (AppConfigHelper.Get("UseNewPosX2D1NoRef", false))
                     {
                         res = PosApi.X2D1_PosNoRef_ZL(cgRes, StationRes);
                     }
@@ -864,9 +862,7 @@ namespace XdCxRhDW.App.Controllers
                         TarFreqDown = dto.FreqDown,
                     });
                     double[] res;
-                    if (ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"] != null
-                 && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "false"
-                 && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "0")
+                    if (AppConfigHelper.Get("UseNewPosX2D1NoRef", false))
                     {
                         res = PosApi.X2D1_PosNoRef_ZL(cgRes, StationRes);
                     }

+ 10 - 4
XdCxRhDW.App/Controllers/XlController.cs

@@ -47,14 +47,20 @@ namespace XdCxRhDW.App.Controllers
                              satName = satName.Substring(2).Trim();
                          if (satName.StartsWith("TBA"))//待发布的卫星
                              continue;
+                         var line1 = lines[i + 1];
+                         var line2 = lines[i + 2];
+                         if (line1.Length != 69 || line2.Length != 69)
+                         {
+                             throw new Exception("星历文件内容错误格式");
+                         }
                          XlInfo xl = new XlInfo()
                          {
                              SatName = satName,
-                             Line1 = lines[i + 1],
-                             Line2 = lines[i + 2],
-                             SatCode = Convert.ToInt32(lines[i + 1].Substring(2, 5))
+                             Line1 = line1,
+                             Line2 = line2,
+                             SatCode = Convert.ToInt32(line1.Substring(2, 5))
                          };
-                         var timeStr = lines[i + 1].Substring(18, 14).Replace(" ", "");//https://www.space-track.org/documentation#tle星历接口中说这里面可以接受空格
+                         var timeStr = line1.Substring(18, 14).Replace(" ", "");//https://www.space-track.org/documentation#tle星历接口中说这里面可以接受空格
                          var yearStr = timeStr.Substring(0, 2);
                          var dayStr = timeStr.Substring(2, timeStr.Length - 2);
                          var day = Convert.ToDouble(dayStr);

+ 1 - 3
XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs

@@ -384,9 +384,7 @@ namespace XdCxRhDW.App.EditForms
                         Adja1Z = dto.AdjaZ,
                     };
                     double[] res;
-                    if (ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"] != null
-            && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "false"
-            && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "0")
+                    if (AppConfigHelper.Get("UseNewPosX2D1NoRef", false))
                     {
                         res = PosApi.X2D1_PosNoRef_ZL(cgRes, StationRes);
                     }

+ 2 - 9
XdCxRhDW.App/Program.cs

@@ -4,18 +4,11 @@ using Microsoft.Win32;
 using Serilog;
 using System;
 using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Security.Principal;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using XdCxRhDW.App;
-using XdCxRhDW.Dto;
 using XdCxRhDW.Framework;
 
 namespace XdCxRhDW
@@ -150,8 +143,8 @@ namespace XdCxRhDW
             if (IsRunningAsAdmin())
             {
                 CheckUACReg();
-                string screenTitle = ConfigurationManager.AppSettings["SystemName"];
-                string screenCompany = ConfigurationManager.AppSettings["Company"];
+                string screenTitle =AppConfigHelper.Get("SystemName","");
+                string screenCompany = AppConfigHelper.Get("Company","");
                 DxHelper.WaitHelper.SetSplashTips("Tips.txt");
                 ChsLocalizer.UseChs();
 

+ 3 - 5
XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -179,11 +179,11 @@ namespace XdCxRhDW.App.UserControl
                 {
                     if (settings.WmtsSource == EnumWmtsSource.ZCJ)
                     {
-                        url = ConfigurationManager.AppSettings["ZCJ_URL"].Trim();
+                        url = AppConfigHelper.Get("ZCJ_URL","");
                     }
                     else
                     {
-                        url = ConfigurationManager.AppSettings["SJZX_URL"].Trim();
+                        url = AppConfigHelper.Get("SJZX_URL", "");
                     }
                     if (url.EndsWith("/"))
                         url = url.Substring(0, url.Length - 1);
@@ -1129,9 +1129,7 @@ namespace XdCxRhDW.App.UserControl
                             }
                             else
                             {
-                                if (ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"] != null
-           && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "false"
-           && ConfigurationManager.AppSettings["UseNewPosX2D1NoRef"].ToLower() != "0")
+                                if (AppConfigHelper.Get("UseNewPosX2D1NoRef", false))
                                 {
                                     res = PosApi.X2D1_PosNoRef_ZL(CgRes, StationRes);
                                 }

+ 3 - 2
XdCxRhDW.App/UserControl/CtrlSysSettings.cs

@@ -26,6 +26,7 @@ using System.Security.Policy;
 using DevExpress.Utils.About;
 using XdCxRhDW.Dto;
 using System.Configuration;
+using XdCxRhDW.Framework;
 
 namespace XdCxRhDW.App.UserControl
 {
@@ -204,12 +205,12 @@ namespace XdCxRhDW.App.UserControl
                     var val = (EnumWmtsSource)rg.Properties.Items[i].Value;
                     if (val == EnumWmtsSource.ZCJ)
                     {
-                        var str = ConfigurationManager.AppSettings["ZCJ_URL"];
+                        var str =AppConfigHelper.Get("ZCJ_URL","");
                         e.Info = new ToolTipControlInfo(i, $"{rg.Properties.Items[i].Description}:{str}");
                     }
                     else
                     {
-                        var str = ConfigurationManager.AppSettings["SJZX_URL"];
+                        var str = AppConfigHelper.Get("SJZX_URL","");
                         e.Info = new ToolTipControlInfo(i, $"{rg.Properties.Items[i].Description}:{str}");
                     }
                     break;

+ 1 - 1
XdCxRhDW.App/UserControl/CtrlXl.cs

@@ -82,7 +82,7 @@ namespace XdCxRhDW.App.UserControl
                 else
                 {
                     Serilog.Log.Error(result.msg);
-                    DxHelper.MsgBoxHelper.ShowError("星历导入失败!");
+                    DxHelper.MsgBoxHelper.ShowError($"星历导入失败,{result.msg}!");
                 }
             }
             catch (TaskCanceledException)

+ 10 - 8
XdCxRhDW.App/X2D1PosRef/X2D1PosHandle.cs

@@ -92,13 +92,15 @@ namespace XdCxRhDW.App
                             if (point1 == null || point2 == null)//若参考频点未出结果,查找目标信号出
                             {
                                 bool isTarAny = await db.CgRes.AnyAsync(m => m.TaskID == dto.TaskID && !m.FixedStationID.HasValue && m.TarFreqUp.HasValue && m.TarFreqUp.Value == fixedStation.FreqUpHz && m.SigTime >= dto.SigTime);
-                                if (!isTarAny && (DateTime.Now - posItem.CreateTime).TotalMinutes < 2)//目标未出结果
+                                if (!isTarAny && (DateTime.Now - posItem.CreateTime).TotalMinutes < 1)//目标未出结果
                                 {
+                                    Serilog.Log.Information($"任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}目标未出结果");
                                     posItems.Add(posItem);
                                     continue;
                                 }
-                                else if (!isTarAny && (DateTime.Now - posItem.CreateTime).TotalMinutes >= 2)//目标两分钟之内未出结果走无参
+                                else if (!isTarAny && (DateTime.Now - posItem.CreateTime).TotalMinutes >= 1)//目标两分钟之内未出结果走无参
                                 {
+                                    Serilog.Log.Information($"任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}目标未出结果超时");
                                     SendX2D1NoXlNoParAsync(dto);
                                     continue;
                                 }
@@ -138,11 +140,11 @@ namespace XdCxRhDW.App
                                 var result = await HttpHelper.PostRequestAsync<PosResDto>(SysConfig.GetUrl("Pos/PosX2D1NoXlAsync"), X2D1NoXlPosDto);
                                 if (result.code != 200)
                                 {
-                                    Serilog.Log.Error($"{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地定位失败{result.msg}");
+                                    Serilog.Log.Information($"任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地定位失败{result.msg}");
                                 }
                                 else
                                 {
-                                    Serilog.Log.Error($"{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地定位完成{result.msg}");
+                                    Serilog.Log.Information($"任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地定位完成{result.msg}");
                                 }
                             }
 
@@ -151,7 +153,7 @@ namespace XdCxRhDW.App
                     }
                     catch (Exception ex)
                     {
-                        Serilog.Log.Error(ex, $"【取参考信号流程异常{ex.Message}");
+                        await LogHelper.Error($"【取参考信号流程异常{ex.Message}", ex);
                     }
 
                 }
@@ -169,12 +171,12 @@ namespace XdCxRhDW.App
             var result = await HttpHelper.PostRequestAsync<PosResDto>(SysConfig.GetUrl("Pos/PosX2D1NoXlNoParAsync"), dto);
             if (result.code != 200)
             {
-                Serilog.Log.Error($"{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地无参定位失败{result.msg}");
+                Serilog.Log.Information($"任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地无参定位失败{result.msg}");
 
             }
             else
             {
-                Serilog.Log.Error($"{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地无参定位完成{result.msg}");
+                Serilog.Log.Information($"任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地无参定位完成{result.msg}");
             }
         }
         public void Append(X2D1NoXlNoParlPosDto dto)
@@ -183,7 +185,7 @@ namespace XdCxRhDW.App
             bool ret = posItems.TryAdd(posItem);
             if (!ret)
             {
-                Serilog.Log.Error($"【任务{dto.TaskID}】添加取参考Dto");
+                Serilog.Log.Information($"【任务{dto.TaskID}】添加取参考Dto");
             }
         }
 

+ 3 - 6
XdCxRhDW.App/X2D1PosRef/X2D1PosRefService.cs

@@ -8,6 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using XdCxRhDW.Dto;
 using XdCxRhDW.Entity;
+using XdCxRhDW.Framework;
 using XdCxRhDW.Repostory;
 namespace XdCxRhDW.App
 {
@@ -24,11 +25,7 @@ namespace XdCxRhDW.App
 
         public X2D1PosRefService()
         {
-            double.TryParse(ConfigurationManager.AppSettings["TakeRefTime"], out TakeRefTime);
-            if (TakeRefTime < 0)
-            {
-                TakeRefTime = 30;
-            }
+            TakeRefTime = AppConfigHelper.Get("TakeRefTime", 10);
             StartMonitor();
         }
         public void StartMonitor()
@@ -83,7 +80,7 @@ namespace XdCxRhDW.App
                     var firstDto = handles.FirstOrDefault(m => m.TaskId == dto.TaskID);
                     if (firstDto == null)
                     {
-                        firstDto = new X2D1PosHandle(dto.TaskID.Value,TakeRefTime);
+                        firstDto = new X2D1PosHandle(dto.TaskID.Value, TakeRefTime);
                         handles.Add(firstDto);
                     }
                     firstDto.Append(dto);

+ 2 - 1
XdCxRhDW.Framework/IpHelper.cs

@@ -9,6 +9,7 @@ using System.Net.NetworkInformation;
 using System.Runtime.InteropServices;
 using System.Configuration;
 using System.Net.Http;
+using XdCxRhDW.Framework;
 
 public static class IpHelper
 {
@@ -25,7 +26,7 @@ public static class IpHelper
             {
                 if (item == "LocalIP")
                 {
-                    localIP = ConfigurationManager.AppSettings["LocalIP"].Trim();//优先使用本地配置的IP
+                    localIP =AppConfigHelper.Get("LocalIP","");//优先使用本地配置的IP
                 }
             }
             if (!string.IsNullOrWhiteSpace(localIP))