Dto

XdCxRhDW.App/WebAPI/Controllers/PosController.cs

@@ -63,7 +63,6 @@ namespace XdCxRhDW.App.WebAPI
                     MainX = dto.MainX,
                     MainY = dto.MainY,
                     MainZ = dto.MainZ,
-
                 });
 
                 var cxRes = db.CxRes.Add(new CxRes()

XdCxRhDW.Sender/Form1.Designer.cs

@@ -31,7 +31,7 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.localPort1 = new DevExpress.XtraEditors.TextEdit();
+            this.txtTskType = new DevExpress.XtraEditors.ImageComboBoxEdit();
             this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
             this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
             this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
@@ -39,30 +39,30 @@
             this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
             this.btnCopyAll = new DevExpress.XtraBars.BarButtonItem();
             this.btnClear = new DevExpress.XtraBars.BarButtonItem();
+            this.localPort1 = new DevExpress.XtraEditors.TextEdit();
             this.txtAddr1 = new DevExpress.XtraEditors.TextEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tablePanel1 = new DevExpress.Utils.Layout.TablePanel();
             this.btn1 = new DevExpress.XtraEditors.SimpleButton();
             this.listBoxControl1 = new DevExpress.XtraEditors.ListBoxControl();
             this.popupMenu1 = new DevExpress.XtraBars.PopupMenu(this.components);
-            this.txtTskType = new DevExpress.XtraEditors.ImageComboBoxEdit();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.localPort1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTskType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.localPort1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtAddr1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).BeginInit();
             this.tablePanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.listBoxControl1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTskType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
@@ -80,15 +80,20 @@
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
-            // localPort1
+            // txtTskType
             // 
-            this.localPort1.Location = new System.Drawing.Point(221, 19);
-            this.localPort1.MenuManager = this.barManager1;
-            this.localPort1.Name = "localPort1";
-            this.localPort1.Properties.NullValuePrompt = "空值表示随机端口";
-            this.localPort1.Size = new System.Drawing.Size(109, 20);
-            this.localPort1.StyleController = this.layoutControl1;
-            this.localPort1.TabIndex = 5;
+            this.txtTskType.Location = new System.Drawing.Point(334, 19);
+            this.txtTskType.MenuManager = this.barManager1;
+            this.txtTskType.Name = "txtTskType";
+            this.txtTskType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtTskType.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("一星一地测向定位", "X1D1CX", -1),
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("两星一地定位", "X2D1", -1),
+            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("融合定位", "RH", -1)});
+            this.txtTskType.Size = new System.Drawing.Size(102, 20);
+            this.txtTskType.StyleController = this.layoutControl1;
+            this.txtTskType.TabIndex = 6;
             // 
             // barManager1
             // 
@@ -150,9 +155,19 @@
             this.btnClear.Name = "btnClear";
             this.btnClear.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnClear_ItemClick);
             // 
+            // localPort1
+            // 
+            this.localPort1.Location = new System.Drawing.Point(221, 19);
+            this.localPort1.MenuManager = this.barManager1;
+            this.localPort1.Name = "localPort1";
+            this.localPort1.Properties.NullValuePrompt = "空值表示随机端口";
+            this.localPort1.Size = new System.Drawing.Size(109, 20);
+            this.localPort1.StyleController = this.layoutControl1;
+            this.localPort1.TabIndex = 5;
+            // 
             // txtAddr1
             // 
-            this.txtAddr1.EditValue = "127.0.0.1:8091";
+            this.txtAddr1.EditValue = "127.0.0.1:8092";
             this.txtAddr1.Location = new System.Drawing.Point(2, 19);
             this.txtAddr1.Name = "txtAddr1";
             this.txtAddr1.Properties.NullValuePrompt = "127.0.0.1:16010";
@@ -198,6 +213,16 @@
             this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14);
             // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txtTskType;
+            this.layoutControlItem2.Location = new System.Drawing.Point(332, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(106, 50);
+            this.layoutControlItem2.Text = "定位类型";
+            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14);
+            // 
             // tablePanel1
             // 
             this.tablePanel1.Columns.AddRange(new DevExpress.Utils.Layout.TablePanelColumn[] {
@@ -250,31 +275,6 @@
             this.popupMenu1.Manager = this.barManager1;
             this.popupMenu1.Name = "popupMenu1";
             // 
-            // txtTskType
-            // 
-            this.txtTskType.Location = new System.Drawing.Point(334, 19);
-            this.txtTskType.MenuManager = this.barManager1;
-            this.txtTskType.Name = "txtTskType";
-            this.txtTskType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtTskType.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("一星一地测向定位", "X1D1CX", -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("两星一地定位", "X2D1", -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("融合定位", "RH", -1)});
-            this.txtTskType.Size = new System.Drawing.Size(102, 20);
-            this.txtTskType.StyleController = this.layoutControl1;
-            this.txtTskType.TabIndex = 6;
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txtTskType;
-            this.layoutControlItem2.Location = new System.Drawing.Point(332, 0);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(106, 50);
-            this.layoutControlItem2.Text = "定位类型";
-            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14);
-            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -293,18 +293,18 @@
             this.Text = "结果推送";
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.localPort1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTskType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.localPort1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtAddr1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).EndInit();
             this.tablePanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.listBoxControl1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTskType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 

XdCxRhDW.Sender/Form1.cs

@@ -13,6 +13,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using XdCxRhDw.Dto;
 using XdCxRhDW.Dto;
 using XdCxRhDW.Sender.Properties;
 
@@ -64,13 +65,24 @@ namespace XdCxRhDW.Sender
                                 url += "PosRHAsync";
                             }
 
+                            var stationRes = new StationResDto()
+                            {
+                                SatTxLon = IniFiles.ReadValue<double>("Station_Data2023", "卫星接收天线", "Lon"),
+                                SatTxLat = IniFiles.ReadValue<double>("Station_Data2023", "卫星接收天线", "Lat"),
+                                CdbTxLon = IniFiles.ReadValue<double>("Station_Data2023", "超短波接收天线", "Lon"),
+                                CdbTxLat = IniFiles.ReadValue<double>("Station_Data2023", "超短波接收天线", "Lat"),
+                                CxLon = IniFiles.ReadValue<double>("Station_Data2023", "侧向站", "Lon"),
+                                CxLat = IniFiles.ReadValue<double>("Station_Data2023", "侧向站", "Lat"),
+                                RefLon = IniFiles.ReadValue<double>("Station_Data2023", "参考站", "Lon"),
+                                RefLat = IniFiles.ReadValue<double>("Station_Data2023", "参考站", "Lat"),
+                            };
                             foreach (var line in lines)
                             {
                                 if (string.IsNullOrWhiteSpace(line)) continue;
                                 var items = line.Split(" ".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
                                 SendDto dto = new SendDto()
                                 {
-                                    SignalTime = DateTime.Now,
+                                    SigTime = DateTime.Now,
                                     SxDto = Convert.ToDouble(items[0]),
                                     XdDto = Convert.ToDouble(items[1]),
                                     MainYbDto = Convert.ToDouble(items[2]),
@@ -82,14 +94,7 @@ namespace XdCxRhDW.Sender
                                     AdjaX = Convert.ToDouble(items[10]),
                                     AdjaY = Convert.ToDouble(items[11]),
                                     AdjaZ = Convert.ToDouble(items[12]),
-                                    SatTxLon = IniFiles.ReadValue<double>("Station_Data2023", "卫星接收天线", "Lon"),
-                                    SatTxLat = IniFiles.ReadValue<double>("Station_Data2023", "卫星接收天线", "Lat"),
-                                    CdbTxLon = IniFiles.ReadValue<double>("Station_Data2023", "超短波接收天线", "Lon"),
-                                    CdbTxLat = IniFiles.ReadValue<double>("Station_Data2023", "超短波接收天线", "Lat"),
-                                    CxLon = IniFiles.ReadValue<double>("Station_Data2023", "侧向站", "Lon"),
-                                    CxLat = IniFiles.ReadValue<double>("Station_Data2023", "侧向站", "Lat"),
-                                    RefLon = IniFiles.ReadValue<double>("Station_Data2023", "参考站", "Lon"),
-                                    RefLat = IniFiles.ReadValue<double>("Station_Data2023", "参考站", "Lat"),
+                                    StationResInfo = stationRes
                                 };
                                 var content = new StringContent(JsonConvert.SerializeObject(dto), System.Text.Encoding.UTF8, "application/json");
                                 var response = await client.PostAsync(url, content);

XdCxRhDw.Dto/PosDto/RHNoParPosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/PosDto/RHNoXlNoParPosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/PosDto/RHNoXlPosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/PosDto/RHPosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/PosDto/StationResDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace XdCxRhDw.Dto.PosDto
+namespace XdCxRhDw.Dto
 {
     /// <summary>
     /// 站点信息

XdCxRhDw.Dto/PosDto/X1D1NoParPosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/PosDto/X1D1NoXlNoParPosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/PosDto/X1D1NoXlPosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/PosDto/X1D1PosDto.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
-
 namespace XdCxRhDw.Dto
 {
     /// <summary>

XdCxRhDw.Dto/PosDto/X2D1NoParPosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/PosDto/X2D1NoXNoParlPosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/PosDto/X2D1NoXlPosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/PosDto/X2D1PosDto.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto.PosDto;
 
 namespace XdCxRhDw.Dto
 {

XdCxRhDw.Dto/SendDto.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using XdCxRhDw.Dto;
 
 namespace XdCxRhDW.Dto
 {
@@ -14,7 +15,7 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 信号时间(北京)
         /// </summary>
-        public DateTime SignalTime { get; set; }
+        public DateTime SigTime { get; set; }
         /// <summary>
         /// 双星目标时差
         /// </summary>
@@ -47,44 +48,6 @@ namespace XdCxRhDW.Dto
         public double? AdjaY { get; set; }
         public double? AdjaZ { get; set; }
 
-        /// <summary>
-        /// 卫星接收天线经度
-        /// </summary>
-        public double SatTxLon { get; set; }
-
-        /// <summary>
-        /// 卫星接收天线纬度
-        /// </summary>
-        public double SatTxLat { get; set; }
-
-        /// <summary>
-        /// 超短波天线经度
-        /// </summary>
-        public double CdbTxLon { get; set; }
-
-        /// <summary>
-        /// 超短波接收天线纬度
-        /// </summary>
-        public double CdbTxLat { get; set; }
-
-        /// <summary>
-        /// 测向站经度
-        /// </summary>
-        public double CxLon { get; set; }
-
-        /// <summary>
-        /// 测向站纬度
-        /// </summary>
-        public double CxLat { get; set; }
-
-        /// <summary>
-        /// 参考站经度
-        /// </summary>
-        public double RefLon { get; set; }
-
-        /// <summary>
-        /// 参考站纬度
-        /// </summary>
-        public double RefLat { get; set; }
+        public StationResDto StationResInfo { get; set; }
     }
 }