修复错别字

XdCxRhDW.App/Api/EphHelper.cs

@@ -168,22 +168,49 @@ namespace PosResAnalysis
     }
     public class SatEphDto
     {
+        /// <summary>
+        /// 卫星编号
+        /// </summary>
         [Display(Name = "卫星编号")]
         public int SatId { get; set; }
+        /// <summary>
+        /// 卫星时刻(北京时间)
+        /// </summary>
         [Display(Name = "卫星时刻")]
         public DateTime SatTime { get; set; }
-        [Display(Name = "星厉时刻")]
+        /// <summary>
+        /// 星历时刻(北京时间)
+        /// </summary>
+        [Display(Name = "星历时刻")]
         public DateTime TleTime { get; set; }
+        /// <summary>
+        /// X坐标
+        /// </summary>
         [Display(Name = "X")]
         public double X { get; set; }
+        /// <summary>
+        /// Y坐标
+        /// </summary>
         [Display(Name = "Y")]
         public double Y { get; set; }
+        /// <summary>
+        /// Z坐标
+        /// </summary>
         [Display(Name = "Z")]
         public double Z { get; set; }
+        /// <summary>
+        /// X方向速率
+        /// </summary>
         [Display(Name = "VX")]
         public double VX { get; set; }
+        /// <summary>
+        /// Y方向速率
+        /// </summary>
         [Display(Name = "VY")]
         public double VY { get; set; }
+        /// <summary>
+        /// Z方向速率
+        /// </summary>
         [Display(Name = "VZ")]
         public double VZ { get; set; }
         public override string ToString()

XdCxRhDW.App/CorTools/DetectToolForm.designer.cs

@@ -240,10 +240,10 @@
             // teSnr
             // 
             this.teSnr.EditValue = "14";
-            this.teSnr.Location = new System.Drawing.Point(646, 57);
+            this.teSnr.Location = new System.Drawing.Point(706, 57);
             this.teSnr.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teSnr.Name = "teSnr";
-            this.teSnr.Size = new System.Drawing.Size(56, 22);
+            this.teSnr.Size = new System.Drawing.Size(76, 22);
             this.teSnr.StyleController = this.layoutControl1;
             this.teSnr.TabIndex = 14;
             // 
@@ -374,50 +374,50 @@
             // teDfRange
             // 
             this.teDfRange.EditValue = "16384";
-            this.teDfRange.Location = new System.Drawing.Point(509, 57);
+            this.teDfRange.Location = new System.Drawing.Point(553, 57);
             this.teDfRange.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teDfRange.Name = "teDfRange";
-            this.teDfRange.Size = new System.Drawing.Size(56, 22);
+            this.teDfRange.Size = new System.Drawing.Size(72, 22);
             this.teDfRange.StyleController = this.layoutControl1;
             this.teDfRange.TabIndex = 11;
             // 
             // tePos
             // 
             this.tePos.EditValue = "0";
-            this.tePos.Location = new System.Drawing.Point(770, 57);
+            this.tePos.Location = new System.Drawing.Point(850, 57);
             this.tePos.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tePos.Name = "tePos";
-            this.tePos.Size = new System.Drawing.Size(55, 22);
+            this.tePos.Size = new System.Drawing.Size(88, 22);
             this.tePos.StyleController = this.layoutControl1;
             this.tePos.TabIndex = 10;
             // 
             // teCount
             // 
             this.teCount.EditValue = "0";
-            this.teCount.Location = new System.Drawing.Point(894, 57);
+            this.teCount.Location = new System.Drawing.Point(1007, 57);
             this.teCount.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teCount.Name = "teCount";
-            this.teCount.Size = new System.Drawing.Size(201, 22);
+            this.teCount.Size = new System.Drawing.Size(88, 22);
             this.teCount.StyleController = this.layoutControl1;
             this.teCount.TabIndex = 9;
             // 
             // teRange
             // 
             this.teRange.EditValue = "40000";
-            this.teRange.Location = new System.Drawing.Point(370, 57);
+            this.teRange.Location = new System.Drawing.Point(404, 57);
             this.teRange.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teRange.Name = "teRange";
-            this.teRange.Size = new System.Drawing.Size(55, 22);
+            this.teRange.Size = new System.Drawing.Size(65, 22);
             this.teRange.StyleController = this.layoutControl1;
             this.teRange.TabIndex = 8;
             // 
             // teCenter
             // 
             this.teCenter.EditValue = "0";
-            this.teCenter.Location = new System.Drawing.Point(224, 57);
+            this.teCenter.Location = new System.Drawing.Point(248, 57);
             this.teCenter.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teCenter.Name = "teCenter";
-            this.teCenter.Size = new System.Drawing.Size(55, 22);
+            this.teCenter.Size = new System.Drawing.Size(65, 22);
             this.teCenter.StyleController = this.layoutControl1;
             this.teCenter.TabIndex = 7;
             // 
@@ -427,7 +427,7 @@
             this.tefs.Location = new System.Drawing.Point(77, 57);
             this.tefs.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tefs.Name = "tefs";
-            this.tefs.Size = new System.Drawing.Size(56, 22);
+            this.tefs.Size = new System.Drawing.Size(80, 22);
             this.tefs.StyleController = this.layoutControl1;
             this.tefs.TabIndex = 6;
             // 
@@ -530,7 +530,7 @@
             this.layoutControlItem3.Control = this.tefs;
             this.layoutControlItem3.Location = new System.Drawing.Point(0, 52);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(132, 26);
+            this.layoutControlItem3.Size = new System.Drawing.Size(156, 26);
             this.layoutControlItem3.Text = "采样率(M)：";
             this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem3.TextSize = new System.Drawing.Size(67, 14);
@@ -559,9 +559,9 @@
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.teCenter;
-            this.layoutControlItem4.Location = new System.Drawing.Point(132, 52);
+            this.layoutControlItem4.Location = new System.Drawing.Point(156, 52);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(146, 26);
+            this.layoutControlItem4.Size = new System.Drawing.Size(156, 26);
             this.layoutControlItem4.Text = "时差中心(us)：";
             this.layoutControlItem4.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem4.TextSize = new System.Drawing.Size(82, 14);
@@ -570,9 +570,9 @@
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.teRange;
-            this.layoutControlItem5.Location = new System.Drawing.Point(278, 52);
+            this.layoutControlItem5.Location = new System.Drawing.Point(312, 52);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(146, 26);
+            this.layoutControlItem5.Size = new System.Drawing.Size(156, 26);
             this.layoutControlItem5.Text = "时差范围(us)：";
             this.layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem5.TextSize = new System.Drawing.Size(82, 14);
@@ -581,9 +581,9 @@
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.teSnr;
-            this.layoutControlItem10.Location = new System.Drawing.Point(564, 52);
+            this.layoutControlItem10.Location = new System.Drawing.Point(624, 52);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(137, 26);
+            this.layoutControlItem10.Size = new System.Drawing.Size(157, 26);
             this.layoutControlItem10.Text = "信噪比门限：";
             this.layoutControlItem10.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
@@ -592,9 +592,9 @@
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.teDfRange;
-            this.layoutControlItem8.Location = new System.Drawing.Point(424, 52);
+            this.layoutControlItem8.Location = new System.Drawing.Point(468, 52);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(140, 26);
+            this.layoutControlItem8.Size = new System.Drawing.Size(156, 26);
             this.layoutControlItem8.Text = "频差范围(Hz):";
             this.layoutControlItem8.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 14);
@@ -603,9 +603,9 @@
             // lciStartPos
             // 
             this.lciStartPos.Control = this.tePos;
-            this.lciStartPos.Location = new System.Drawing.Point(701, 52);
+            this.lciStartPos.Location = new System.Drawing.Point(781, 52);
             this.lciStartPos.Name = "lciStartPos";
-            this.lciStartPos.Size = new System.Drawing.Size(123, 26);
+            this.lciStartPos.Size = new System.Drawing.Size(156, 26);
             this.lciStartPos.Text = "起始样点：";
             this.lciStartPos.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.lciStartPos.TextSize = new System.Drawing.Size(60, 14);
@@ -614,9 +614,9 @@
             // lciSampleLength
             // 
             this.lciSampleLength.Control = this.teCount;
-            this.lciSampleLength.Location = new System.Drawing.Point(824, 52);
+            this.lciSampleLength.Location = new System.Drawing.Point(937, 52);
             this.lciSampleLength.Name = "lciSampleLength";
-            this.lciSampleLength.Size = new System.Drawing.Size(270, 26);
+            this.lciSampleLength.Size = new System.Drawing.Size(157, 26);
             this.lciSampleLength.Text = "计算样点：";
             this.lciSampleLength.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.lciSampleLength.TextSize = new System.Drawing.Size(60, 14);
@@ -628,7 +628,7 @@
             this.layoutControlItem12.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             this.layoutControlItem12.Control = this.chkDama;
             this.layoutControlItem12.Location = new System.Drawing.Point(862, 0);
-            this.layoutControlItem12.MaxSize = new System.Drawing.Size(0, 26);
+            this.layoutControlItem12.MaxSize = new System.Drawing.Size(74, 26);
             this.layoutControlItem12.MinSize = new System.Drawing.Size(74, 26);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.Size = new System.Drawing.Size(74, 26);
@@ -640,7 +640,7 @@
             // 
             this.lciBtnCheck.Control = this.btnCheck;
             this.lciBtnCheck.Location = new System.Drawing.Point(862, 26);
-            this.lciBtnCheck.MaxSize = new System.Drawing.Size(0, 26);
+            this.lciBtnCheck.MaxSize = new System.Drawing.Size(117, 26);
             this.lciBtnCheck.MinSize = new System.Drawing.Size(117, 26);
             this.lciBtnCheck.Name = "lciBtnCheck";
             this.lciBtnCheck.Size = new System.Drawing.Size(117, 26);
@@ -654,7 +654,7 @@
             this.layoutControlItem6.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             this.layoutControlItem6.Control = this.ckIBS;
             this.layoutControlItem6.Location = new System.Drawing.Point(936, 0);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 26);
+            this.layoutControlItem6.MaxSize = new System.Drawing.Size(56, 26);
             this.layoutControlItem6.MinSize = new System.Drawing.Size(56, 26);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.Size = new System.Drawing.Size(56, 26);
@@ -668,8 +668,11 @@
             this.layoutControlItem7.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
             this.layoutControlItem7.Control = this.ckKY;
             this.layoutControlItem7.Location = new System.Drawing.Point(992, 0);
+            this.layoutControlItem7.MaxSize = new System.Drawing.Size(102, 24);
+            this.layoutControlItem7.MinSize = new System.Drawing.Size(102, 24);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.Size = new System.Drawing.Size(102, 26);
+            this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem7.TextVisible = false;
             // 
@@ -677,7 +680,7 @@
             // 
             this.layoutControlItem11.Control = this.btnCalc;
             this.layoutControlItem11.Location = new System.Drawing.Point(979, 26);
-            this.layoutControlItem11.MaxSize = new System.Drawing.Size(0, 26);
+            this.layoutControlItem11.MaxSize = new System.Drawing.Size(115, 26);
             this.layoutControlItem11.MinSize = new System.Drawing.Size(115, 26);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.Size = new System.Drawing.Size(115, 26);

XdCxRhDW.App/CorTools/XlCalculateForm.Designer.cs

@@ -198,7 +198,7 @@
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Size = new System.Drawing.Size(780, 26);
-            this.layoutControlItem2.Text = "星厉";
+            this.layoutControlItem2.Text = "星历";
             this.layoutControlItem2.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
             this.layoutControlItem2.TextSize = new System.Drawing.Size(24, 14);
             this.layoutControlItem2.TextToControlDistance = 5;

XdCxRhDW.App/CorTools/XlCalculateForm.cs

@@ -124,8 +124,8 @@ namespace XdCxRhDW.App.CorTools
                 }
                 catch (Exception ex)
                 {
-                    Serilog.Log.Error(ex, "请求星厉推算Api出错");
-                    DxHelper.MsgBoxHelper.ShowError("星厉推算错误");
+                    Serilog.Log.Error(ex, "请求星历推算Api出错");
+                    DxHelper.MsgBoxHelper.ShowError("星历推算错误");
                 }
             }
             Console.ReadLine();

XdCxRhDW.App/Properties/licenses.licx

@@ -0,0 +1,7 @@
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -193,11 +193,24 @@ namespace XdCxRhDW.App.UserControl
                     options.Urls.Add($"http://+:{settings.HttpPort}");
                     httpServer = WebApp.Start<Startup>(options);
                 }
+                catch (System.Reflection.TargetInvocationException ex)
+                {
+                    httpServer = null;
+                    Serilog.Log.Error(ex, $"启动Http服务失败!");
+                    if (ex.InnerException is HttpListenerException)
+                    {
+                        DxHelper.MsgBoxHelper.ShowWarning($"启动Http服务失败,请以管理员身份运行程序!");
+                    }
+                    else
+                    {
+                        DxHelper.MsgBoxHelper.ShowWarning($"启动Http服务失败!");
+                    }
+                }
                 catch (Exception ex)
                 {
                     httpServer = null;
-                    Serilog.Log.Error(ex, "启动Http定位接口服务失败!");
-                    DxHelper.MsgBoxHelper.ShowWarning($"启动Http定位接口服务失败!");
+                    Serilog.Log.Error(ex, $"启动Http服务失败!");
+                    DxHelper.MsgBoxHelper.ShowWarning($"启动Http服务失败!");
                 }
             }
 
@@ -797,37 +810,37 @@ namespace XdCxRhDW.App.UserControl
             DxHelper.MsgBoxHelper.ShowWarning("未实现");
         }
 
-        private  void btnGDOP_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void btnGDOP_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             var info = GetPosRes("绘制GDOP");
             var posRes = info.Item1;
             if (posRes == null) return;
             var posType = info.Item2;
-           
-                try
+
+            try
+            {
+                switch (posType)
                 {
-                    switch (posType)
-                    {
-                        case EnumPosType.X1D1CX:
-                            throw new Exception("未实现一星一地类型绘制GDOP");
-                            break;
-                        case EnumPosType.X2D1:
-                            X2D1GDOPParam x2D1GdopParam = new X2D1GDOPParam(posRes.SigTime);
-                            x2D1GdopParam.mapControl1 = mapControl1;
-                            DxHelper.PopupHelper.ShowPopup(x2D1GdopParam, mapControl1, mapControl1.Width / 4);
-                            break;
-                        case EnumPosType.RH:
-                            throw new Exception("未实现融合类型绘制GDOP");
-                            break;
-                        default:
-                            break;
-                    }
+                    case EnumPosType.X1D1CX:
+                        throw new Exception("未实现一星一地类型绘制GDOP");
+                        break;
+                    case EnumPosType.X2D1:
+                        X2D1GDOPParam x2D1GdopParam = new X2D1GDOPParam(posRes.SigTime);
+                        x2D1GdopParam.mapControl1 = mapControl1;
+                        DxHelper.PopupHelper.ShowPopup(x2D1GdopParam, mapControl1, mapControl1.Width / 4);
+                        break;
+                    case EnumPosType.RH:
+                        throw new Exception("未实现融合类型绘制GDOP");
+                        break;
+                    default:
+                        break;
                 }
-                catch (Exception ex)
-                {
-                    DxHelper.MsgBoxHelper.ShowWarning($"绘制GDOP失败,{ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                DxHelper.MsgBoxHelper.ShowWarning($"绘制GDOP失败,{ex.Message}");
 
-                }
+            }
         }
     }
 

XdCxRhDW.App/UserControl/CtrlSysSettings.Designer.cs

@@ -31,6 +31,7 @@ namespace XdCxRhDW.App.UserControl
         {
             this.tablePanel1 = new DevExpress.Utils.Layout.TablePanel();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txtMapService = new DevExpress.XtraEditors.TextEdit();
             this.btnSave = new DevExpress.XtraEditors.SimpleButton();
             this.txtPort = new DevExpress.XtraEditors.TextEdit();
             this.txtIp = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -42,12 +43,12 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtMapService = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).BeginInit();
             this.tablePanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtMapService.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPort.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtIp.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtHttpPort.Properties)).BeginInit();
@@ -58,7 +59,6 @@ namespace XdCxRhDW.App.UserControl
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtMapService.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             this.SuspendLayout();
             // 
@@ -92,22 +92,30 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem2});
-            this.layoutControl1.Location = new System.Drawing.Point(265, 131);
+            this.layoutControl1.Location = new System.Drawing.Point(252, 79);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.Root;
             this.tablePanel1.SetRow(this.layoutControl1, 1);
-            this.layoutControl1.Size = new System.Drawing.Size(186, 364);
+            this.layoutControl1.Size = new System.Drawing.Size(213, 469);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // txtMapService
+            // 
+            this.txtMapService.Location = new System.Drawing.Point(12, 270);
+            this.txtMapService.Name = "txtMapService";
+            this.txtMapService.Size = new System.Drawing.Size(189, 22);
+            this.txtMapService.StyleController = this.layoutControl1;
+            this.txtMapService.TabIndex = 7;
+            // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(11, 330);
+            this.btnSave.Location = new System.Drawing.Point(12, 332);
             this.btnSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnSave.MaximumSize = new System.Drawing.Size(0, 22);
             this.btnSave.MinimumSize = new System.Drawing.Size(0, 22);
             this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(164, 22);
+            this.btnSave.Size = new System.Drawing.Size(189, 22);
             this.btnSave.StyleController = this.layoutControl1;
             this.btnSave.TabIndex = 4;
             this.btnSave.Text = "保存";
@@ -118,35 +126,35 @@ namespace XdCxRhDW.App.UserControl
             this.txtPort.EditValue = "16010";
             this.txtPort.Location = new System.Drawing.Point(11, 133);
             this.txtPort.Name = "txtPort";
-            this.txtPort.Size = new System.Drawing.Size(172, 20);
+            this.txtPort.Size = new System.Drawing.Size(172, 22);
             this.txtPort.StyleController = this.layoutControl1;
             this.txtPort.TabIndex = 5;
             // 
             // txtIp
             // 
-            this.txtIp.Location = new System.Drawing.Point(11, 27);
+            this.txtIp.Location = new System.Drawing.Point(12, 30);
             this.txtIp.Name = "txtIp";
             this.txtIp.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtIp.Size = new System.Drawing.Size(164, 20);
+            this.txtIp.Size = new System.Drawing.Size(189, 22);
             this.txtIp.StyleController = this.layoutControl1;
             this.txtIp.TabIndex = 4;
             // 
             // txtHttpPort
             // 
             this.txtHttpPort.EditValue = "8091";
-            this.txtHttpPort.Location = new System.Drawing.Point(11, 107);
+            this.txtHttpPort.Location = new System.Drawing.Point(12, 110);
             this.txtHttpPort.Name = "txtHttpPort";
-            this.txtHttpPort.Size = new System.Drawing.Size(164, 20);
+            this.txtHttpPort.Size = new System.Drawing.Size(189, 22);
             this.txtHttpPort.StyleController = this.layoutControl1;
             this.txtHttpPort.TabIndex = 5;
             // 
             // txtXLDirectory
             // 
-            this.txtXLDirectory.Location = new System.Drawing.Point(11, 187);
+            this.txtXLDirectory.Location = new System.Drawing.Point(12, 190);
             this.txtXLDirectory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtXLDirectory.Name = "txtXLDirectory";
-            this.txtXLDirectory.Size = new System.Drawing.Size(164, 20);
+            this.txtXLDirectory.Size = new System.Drawing.Size(189, 22);
             this.txtXLDirectory.StyleController = this.layoutControl1;
             this.txtXLDirectory.TabIndex = 6;
             // 
@@ -174,7 +182,7 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem5,
             this.layoutControlItem6});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(186, 364);
+            this.Root.Size = new System.Drawing.Size(213, 469);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -184,11 +192,11 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 80);
             this.layoutControlItem1.MinSize = new System.Drawing.Size(89, 80);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(168, 80);
+            this.layoutControlItem1.Size = new System.Drawing.Size(193, 80);
             this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem1.Text = "本机IP";
             this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(79, 14);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(96, 14);
             // 
             // layoutControlItem3
             // 
@@ -196,7 +204,7 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem3.Location = new System.Drawing.Point(0, 320);
             this.layoutControlItem3.MinSize = new System.Drawing.Size(36, 26);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(168, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(193, 129);
             this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem3.TextVisible = false;
@@ -205,38 +213,30 @@ namespace XdCxRhDW.App.UserControl
             // 
             this.layoutControlItem4.Control = this.txtHttpPort;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem4.CustomizationFormText = "HTTP接口端口";
+            this.layoutControlItem4.CustomizationFormText = "HTTP服务端口";
             this.layoutControlItem4.Location = new System.Drawing.Point(0, 80);
             this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 80);
             this.layoutControlItem4.MinSize = new System.Drawing.Size(89, 80);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(168, 80);
+            this.layoutControlItem4.Size = new System.Drawing.Size(193, 80);
             this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.Text = "HTTP接口端口";
+            this.layoutControlItem4.Text = "HTTP服务端口";
             this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(79, 14);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(96, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtXLDirectory;
-            this.layoutControlItem5.CustomizationFormText = "星厉检测目录";
+            this.layoutControlItem5.CustomizationFormText = "星历自动导入目录";
             this.layoutControlItem5.Location = new System.Drawing.Point(0, 160);
             this.layoutControlItem5.MaxSize = new System.Drawing.Size(0, 80);
             this.layoutControlItem5.MinSize = new System.Drawing.Size(89, 80);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(168, 80);
+            this.layoutControlItem5.Size = new System.Drawing.Size(193, 80);
             this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem5.Text = "星厉检测目录";
+            this.layoutControlItem5.Text = "星历自动导入目录";
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(79, 14);
-            // 
-            // txtMapService
-            // 
-            this.txtMapService.Location = new System.Drawing.Point(11, 267);
-            this.txtMapService.Name = "txtMapService";
-            this.txtMapService.Size = new System.Drawing.Size(164, 20);
-            this.txtMapService.StyleController = this.layoutControl1;
-            this.txtMapService.TabIndex = 7;
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(96, 14);
             // 
             // layoutControlItem6
             // 
@@ -245,11 +245,11 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 80);
             this.layoutControlItem6.MinSize = new System.Drawing.Size(73, 80);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(168, 80);
+            this.layoutControlItem6.Size = new System.Drawing.Size(193, 80);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.Text = "地图服务";
+            this.layoutControlItem6.Text = "Wms地址";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(79, 14);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(96, 14);
             // 
             // CtrlSysSettings
             // 
@@ -263,6 +263,7 @@ namespace XdCxRhDW.App.UserControl
             this.tablePanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txtMapService.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtPort.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtIp.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtHttpPort.Properties)).EndInit();
@@ -273,7 +274,6 @@ namespace XdCxRhDW.App.UserControl
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtMapService.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             this.ResumeLayout(false);
 

XdCxRhDW.App/WebAPI/Controllers/BaseController.cs

@@ -98,7 +98,7 @@ namespace XdCxRhDW.App.WebAPI
             /// </summary>
             public string msg { get; set; } = "ok";
             /// <summary>
-            /// 2000正确 0错误
+            /// 状态码.成功=200,失败=0
             /// </summary>
             public int code { get; set; } = 200;
 

XdCxRhDW.App/WebAPI/Controllers/DetectCgController.cs

@@ -60,7 +60,7 @@ namespace XdCxRhDW.App.WebAPI
             return (true, string.Empty);
         }
         /// <summary>
-        /// 参估计算
+        /// CPU参估计算
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -159,7 +159,7 @@ namespace XdCxRhDW.App.WebAPI
         }
 
         /// <summary>
-        /// 检测计算
+        /// 信号检测(支持DAMA、IBS、能量检测)
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>

XdCxRhDW.App/WebAPI/Controllers/XlController.cs

@@ -26,8 +26,10 @@ namespace XdCxRhDW.App.WebAPI
     public class XlController : BaseController
     {
         /// <summary>
-        /// 推算某个时间点星厉
+        /// 推算某个时间点星历
         /// </summary>
+        /// <param name="tleStr">双行根</param>
+        /// <param name="dt">推算时刻(北京时刻)</param>
         /// <returns></returns>
         [HttpGet]
         public async Task<AjaxResult<SatEphDto>> Calc(string tleStr, DateTime dt)
@@ -37,8 +39,12 @@ namespace XdCxRhDW.App.WebAPI
         }
 
         /// <summary>
-        /// 推算某个时间段星厉
+        /// 推算某个时间段星星历
         /// </summary>
+        /// <param name="tleStr">双行根</param>
+        /// <param name="start">开始时刻(北京时刻)</param>
+        /// <param name="end">结束时刻(北京时刻)</param
+        /// <param name="spanSeconds">推算间隔(秒)</param>
         /// <returns></returns>
         [HttpGet]
         public async Task<AjaxResult<List<SatEphDto>>> CalcMult(string tleStr, DateTime start, DateTime end, int spanSeconds)

XdCxRhDw.Dto/CalcDto.cs

@@ -16,19 +16,19 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 上传后返回的文件名
         /// </summary>
-        public String file1 { get; set; }
+        public string file1 { get; set; }
+
         /// <summary>
         /// 上传后返回的文件名
         /// </summary>
-        public String file2 { get; set; }
+        public string file2 { get; set; }
 
-        [Range(1, 5, ErrorMessage = "111")]
         /// <summary>
         /// 开始样点
         /// </summary>
         public int smpStart { get; set; }  
         /// <summary>
-        /// 样点数
+        /// 样点数(0表示文件末尾)
         /// </summary>
         public int smpCount { get; set; }      
         /// <summary>
@@ -42,13 +42,13 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 时差范围(us)
         /// </summary>
-        public double dtRange { get; set; }   
+        public double dtRange { get; set; }
         /// <summary>
-        /// 频差范围(Hz)
+        /// 频差范围(单位Hz,默认16384)
         /// </summary>
-        public double dfRange { get; set; } 
+        public double dfRange { get; set; } = 16384;
         /// <summary>
-        /// 信噪比dB
+        /// 信噪比门限dB
         /// </summary>
         public double snrThreshold { get; set; }
 

XdCxRhDw.Dto/DetectDto.cs

@@ -13,11 +13,11 @@ namespace XdCxRhDw.Dto
     public class DetectDto
     {
         /// <summary>
-        /// 上传后返回的文件名
+        /// 调用Upload接口上传文件后返回的文件名
         /// </summary>
-        public String file1 { get; set; }
+        public string file1 { get; set; }
         /// <summary>
-        /// 检测类型(DAMA=1,IBS=2,能量检测=3)
+        /// 检测类型(DAMA=1,IBS=2,能量检测=3) 
         /// </summary>
         public DmcType dmcType { get; set; }
 
@@ -36,11 +36,13 @@ namespace XdCxRhDw.Dto
         /// </summary>
         [Display(Name ="DAMA")]
         DAMA=1,
+
         /// <summary>
         /// IBS检测
         /// </summary>
         [Display(Name = "IBS")]
         IBS =2,
+
         /// <summary>
         /// 能量检测
         /// </summary>

XdCxRhDw.Dto/DetectResDto.cs

@@ -29,6 +29,10 @@ namespace XdCxRhDw.Dto
             Length = length;
             UserName = userName;
         }
+        /// <summary>
+        /// 文件名
+        /// </summary>
+        public string File1 { get; set; }
 
         /// <summary>
         /// 检测开始样点
@@ -38,10 +42,10 @@ namespace XdCxRhDw.Dto
         /// 检测样点长度
         /// </summary>
         public int Length { get; set; }
+
         /// <summary>
         /// 检测用户名称
         /// </summary>
-
         public string UserName { get; set; }
 
         /// <summary>
@@ -49,10 +53,7 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public double TimeMs { get; set; }
 
-        /// <summary>
-        /// 数据文件
-        /// </summary>
-        public String File1 { get; set; }
+
 
     }
 }

XdCxRhDw.Dto/EstimationResDto.cs

@@ -11,7 +11,16 @@ namespace XdCxRhDw.Dto
     /// </summary>
     public class EstimationResDto
     {
-        
+        /// <summary>
+        /// 文件1名称
+        /// </summary>
+        public string File1 { get; set; }
+
+        /// <summary>
+        /// 文件2名称
+        /// </summary>
+        public string File2 { get; set; }
+
         /// <summary>
         /// 相关时差，单位：us
         /// </summary>
@@ -35,22 +44,12 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 开始样点
         /// </summary>
-        public Int64 Smpstart { get; set; }
+        public long Smpstart { get; set; }
 
         /// <summary>
         /// 样点长度
         /// </summary>
-        public Int64 Smplen { get; set; }
-
-        /// <summary>
-        /// 数据文件1
-        /// </summary>
-        public String File1 { get; set; }
-
-        /// <summary>
-        /// 数据文件2
-        /// </summary>
-        public String File2 { get; set; }
+        public long Smplen { get; set; }
 
     }
 }

XdCxRhDw.Dto/FileDto.cs

@@ -12,7 +12,7 @@ namespace XdCxRhDw.Dto
     public class FileDto
     {
         /// <summary>
-        /// 上传后的文件名称
+        /// 上传文件后返回的名称
         /// </summary>
         public string FileName { get; set; }
     }