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

Service/CapMoni/App.config

@@ -2,7 +2,7 @@
 <configuration>
 	<appSettings>
 		<!--采集文件存放目录-->
-		<add key="FileDir" value="E:\"/>
+		<add key="FileDir" value="C:\"/>
 		<!--采集时长(S)-->
 		<add key="Duration" value="60"/>
 		<!--频点(MHz)多个 "310.85;310.95;311;312;313;314;315;316;317"-->

XdCxRhDW.App/Controllers/PosController.cs

@@ -449,7 +449,7 @@ namespace XdCxRhDW.App.Controllers
                     return Error<PosResDto>($"推算卫星{dto.AdjaCode}的ECEF星历出错");
                 }
 
-//#warning 测试代码
+                //#warning 测试代码
                 //var tarEcef = PhysicsHelper.GeoToEcef((110, 17, 0));
                 //var ecefXl1 = (ephMain.data.X, ephMain.data.Y, ephMain.data.Z);
                 //var ecefXl2 = (ephAdja.data.X, ephAdja.data.Y, ephAdja.data.Z);
@@ -528,7 +528,6 @@ namespace XdCxRhDW.App.Controllers
                         TarFreqDown = dto.FreqDown,
                     });
 
-
                     var res = PosApi.X2D1_Pos(cgRes, StationRes, dto.CalcConfidence);
                     PosRes posRes = new PosRes()
                     {
@@ -771,6 +770,11 @@ namespace XdCxRhDW.App.Controllers
 
 
                 Serilog.Log.Information($"卫星{dto.AdjaCode}使用发布时刻为{xl2.TimeUTC:yyyyMMddHHmmss}的星历进行推算");
+                //dto.SigTime = new DateTime(2023, 12, 24, 18, 0, 0);
+                //dto.CdbTxLon = 45;
+                //dto.CdbTxLat = 20;
+                //dto.SatTxLon = 45;
+                //dto.SatTxLat = 20;
                 var XlCalcDto = new XlCalcDto() { tleStr = xl1.TwoLine, SigTime = dto.SigTime };
                 var ephMain = await HttpHelper.PostRequestAsync<SatEphResDto>(SysConfig.GetUrl("Xl/Calc"), XlCalcDto);
                 if (ephMain.code != 200)
@@ -786,8 +790,8 @@ namespace XdCxRhDW.App.Controllers
                     return Error<PosResDto>($"推算卫星{dto.AdjaCode}的ECEF星历出错");
                 }
 
-//#warning 测试代码
-                //var tarEcef = PhysicsHelper.GeoToEcef((110, 17, 0));
+                //#warning 测试代码
+                //var tarEcef = PhysicsHelper.GeoToEcef((46, 21, 0));
                 //var ecefXl1 = (ephMain.data.X, ephMain.data.Y, ephMain.data.Z);
                 //var ecefXl2 = (ephAdja.data.X, ephAdja.data.Y, ephAdja.data.Z);
                 //var ecefCdb = PhysicsHelper.GeoToEcef((dto.CdbTxLon, dto.CdbTxLat, 0));

XdCxRhDW.App/MainForm.cs

@@ -44,7 +44,6 @@ namespace XdCxRhDW
     public partial class MainForm : DevExpress.XtraBars.Ribbon.RibbonForm
     {
         Dictionary<string, Type> ctrlTypes = new Dictionary<string, Type>();
-        string errmsg;
         public MainForm()
         {
             InitializeComponent();
@@ -75,12 +74,6 @@ namespace XdCxRhDW
         {
             this.text = this.Text;
             this.HtmlText = $"<size=12>{this.text}";
-            if (!string.IsNullOrWhiteSpace(errmsg))
-            {
-                MsgBoxHelper.ShowError(errmsg);
-                Application.Exit();
-                return;
-            }
             using (RHDWContext db = new RHDWContext())
             {
                 SysConfig.Config = db.SysSetings.FirstOrDefault();

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -179,7 +179,7 @@ namespace XdCxRhDW.App.UserControl
                 {
                     if (settings.WmtsSource == EnumWmtsSource.ZCJ)
                     {
-                        url = AppConfigHelper.Get("ZCJ_URL","");
+                        url = AppConfigHelper.Get("ZCJ_URL", "");
                     }
                     else
                     {