33

XdCxRhDW.App/Api/PosApi.cs

@@ -46,7 +46,7 @@ namespace XdCxRhDW.App.Api
         private extern static void X3_PosNoRef20240305_Core(double[] mainSat, double[] adjaSat1, double[] adjaSat2, double[] mainSatTarStation, double[] adjaSat1TarStation, double[] adjaSat2TarStation
            , double[] zone, double tarDto1, double tarDto2, double[] res);
 
-        [DllImport(OtherPos, EntryPoint = "SanXing_DW", CallingConvention = CallingConvention.Cdecl)]//三星双频差带参
+        [DllImport(OtherPos, EntryPoint = "TriStar_2DFO_DW", CallingConvention = CallingConvention.Cdecl)]//三星双频差带参
         private extern static void X3_PosTwoDfo20240305_Core(double[] mainSat, double[] adjaSat1, double[] adjaSat2, double[] mainSatTarStation, double[] adjaSat1TarStation, double[] adjaSat2TarStation
           , double[] refStation, double[] zone, double tarDfo1, double tarDfo2, double refDfo1, double refDfo2, double fu1, double fd1, double fu2, double fd2, double[] res);
 
@@ -73,9 +73,9 @@ namespace XdCxRhDW.App.Api
         {
             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, sRes.CdbTxLat, 0 };
-            double[] cxStation = new double[3] { sRes.CxLon, sRes.CxLat, 0 };
-            double[] refStation = new double[3] { sRes.RefLon, sRes.RefLat, 0 };
+            double[] cdbStation = new double[3] { sRes.CdbTxLon.Value, sRes.CdbTxLat.Value, 0 };
+            double[] cxStation = new double[3] { sRes.CxLon.Value, sRes.CxLat.Value, 0 };
+            double[] refStation = new double[3] { sRes.RefLon.Value, sRes.RefLat.Value, 0 };
             double dtoCdb = cgRes.DtoCdb.Value / 1e6;
             double[] zone = new double[] { -85, 85, -180, 180 }; //定位区域
             double theta = cxRes.Fx;//单位°
@@ -97,8 +97,8 @@ namespace XdCxRhDW.App.Api
             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 };
             double[] satStation = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };
-            double[] cdbStation = new double[3] { sRes.CdbTxLon, sRes.CdbTxLat, 0 };
-            double[] refStation = new double[3] { sRes.RefLon, sRes.RefLat, 0 };
+            double[] cdbStation = new double[3] { sRes.CdbTxLon.Value, sRes.CdbTxLat.Value, 0 };
+            double[] refStation = new double[3] { sRes.RefLon.Value, sRes.RefLat.Value, 0 };
             double dto1 = cgRes.Dto1.Value / 1e6;
             double dtoCdb = cgRes.DtoCdb.Value / 1e6;
             double ybDto1 = cgRes.YbMainDto.Value / 1e6;
@@ -120,7 +120,7 @@ namespace XdCxRhDW.App.Api
             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 };
             double[] satStation = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };
-            double[] cdbStation = new double[3] { sRes.CdbTxLon, sRes.CdbTxLat, 0 };
+            double[] cdbStation = new double[3] { sRes.CdbTxLon.Value, sRes.CdbTxLat.Value, 0 };
             double dto1 = cgRes.Dto1.Value / 1e6;
             double dtoCdb = cgRes.DtoCdb.Value / 1e6;
             double[] zone = new double[] { -85, 85, -180, 180 }; //定位区域
@@ -208,7 +208,7 @@ namespace XdCxRhDW.App.Api
             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 };
             double[] satStation = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };
-            double[] refStation = new double[3] { sRes.RefLon, sRes.RefLat, 0 };
+            double[] refStation = new double[3] { sRes.RefLon.Value, sRes.RefLat.Value, 0 };
             double[] zone = new double[] { -85, 85, -180, 180 }; //定位区域
             var tarDto1 = cgRes.Dto1.Value / 1e6;
             var tarDto2 = cgRes.Dto2.Value / 1e6;
@@ -252,7 +252,7 @@ namespace XdCxRhDW.App.Api
             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 };
             double[] satStation = new double[3] { sRes.SatTxLon, sRes.SatTxLat, 0 };
-            double[] refStation = new double[3] { sRes.RefLon, sRes.RefLat, 0 };
+            double[] refStation = new double[3] { sRes.RefLon.Value, sRes.RefLat.Value, 0 };
             double[] zone = new double[] { -85, 85, -180, 180 }; //定位区域
             var tarDfo1 = cgRes.Dfo1.Value;
             var tarDfo2 = cgRes.Dfo2.Value;
@@ -279,7 +279,7 @@ namespace XdCxRhDW.App.Api
             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 };
-            double[] refStation = new double[3] { sRes.RefLon, sRes.RefLat, 0 };
+            double[] refStation = new double[3] { sRes.RefLon.Value, sRes.RefLat.Value, 0 };
             double[] zone = new double[] { -85, 85, -180, 180 }; //定位区域
             var tarDto = cgRes.Dto1.Value / 1e6;
             var tarDfo = cgRes.Dfo1.Value;

XdCxRhDW.App/Model/StationRes.cs

@@ -26,32 +26,32 @@ namespace XdCxRhDW.App.Model
         /// <summary>
         /// 超短波天线经度
         /// </summary>
-        public double CdbTxLon { get; set; }
+        public double? CdbTxLon { get; set; }
 
         /// <summary>
         /// 超短波接收天线纬度
         /// </summary>
-        public double CdbTxLat { get; set; }
+        public double? CdbTxLat { get; set; }
 
         /// <summary>
         /// 测向站经度
         /// </summary>
-        public double CxLon { get; set; }
+        public double? CxLon { get; set; }
 
         /// <summary>
         /// 测向站纬度
         /// </summary>
-        public double CxLat { get; set; }
+        public double? CxLat { get; set; }
 
         /// <summary>
         /// 参考站经度
         /// </summary>
-        public double RefLon { get; set; }
+        public double? RefLon { get; set; }
 
         /// <summary>
         /// 参考站纬度
         /// </summary>
-        public double RefLat { get; set; }
+        public double? RefLat { get; set; }
 
     }
 }

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -750,8 +750,8 @@ namespace XdCxRhDW.App.UserControl
                 DtoLineXdOption dtoLineXd = new DtoLineXdOption();
                 dtoLineXd.MsEph = new double[] { cg.MainX.Value, cg.MainY.Value, cg.MainZ.Value, 0, 0, 0 };
                 dtoLineXd.MsAnt = new double[] { station.SatTxLon, station.SatTxLat, 0 };
-                dtoLineXd.CDBAnt = new double[] { station.CdbTxLon, station.CdbTxLat, 0 };
-                dtoLineXd.RefGeod = new double[] { station.RefLon, station.RefLat, 0 };
+                dtoLineXd.CDBAnt = new double[] { station.CdbTxLon.Value, station.CdbTxLat.Value, 0 };
+                dtoLineXd.RefGeod = new double[] { station.RefLon.Value, station.RefLat.Value, 0 };
                 dtoLineXd.xdDto = cg.DtoCdb.Value;
                 dtoLineXd.RefDto = cg.YbMainDto.Value;
                 dtoLineXd.PosLon = item.PosLon;
@@ -768,7 +768,7 @@ namespace XdCxRhDW.App.UserControl
                     twoStartOption.NsEph = new double[] { cg.Adja1X.Value, cg.Adja1Y.Value, cg.Adja1Z.Value, 0, 0, 0 };
                     twoStartOption.MsAnt = new double[] { station.SatTxLon, station.SatTxLat, 0 };
                     twoStartOption.NsAnt = new double[] { station.SatTxLon, station.SatTxLat, 0 };
-                    twoStartOption.RefGeod = new double[] { station.RefLon, station.RefLat, 0 };
+                    twoStartOption.RefGeod = new double[] { station.RefLon.Value, station.RefLat.Value, 0 };
                     twoStartOption.TargetDto = cg.Dto1.Value;
                     twoStartOption.RefDto = cg.YbMainDto.Value - cg.YbAdja1Dto.Value;
                     twoStartOption.PosLon = item.PosLon;
@@ -820,7 +820,7 @@ namespace XdCxRhDW.App.UserControl
                 twoStartOption.NsEph = new double[] { cg.Adja1X.Value, cg.Adja1Y.Value, cg.Adja1Z.Value, 0, 0, 0 };
                 twoStartOption.MsAnt = new double[] { station.SatTxLon, station.SatTxLat, 0 };
                 twoStartOption.NsAnt = new double[] { station.SatTxLon, station.SatTxLat, 0 };
-                twoStartOption.RefGeod = new double[] { station.RefLon, station.RefLat, 0 };
+                twoStartOption.RefGeod = new double[] { station.RefLon.Value, station.RefLat.Value, 0 };
                 twoStartOption.TargetDto = cg.Dto1.Value;
                 twoStartOption.RefDto = cg.YbMainDto.Value - cg.YbAdja1Dto.Value;
                 twoStartOption.PosLon = item.PosLon;
@@ -901,7 +901,7 @@ namespace XdCxRhDW.App.UserControl
                 twoStartOption.NsEph = new double[] { cg.Adja1X.Value, cg.Adja1Y.Value, cg.Adja1Z.Value, cg.Adja1Vx.Value, cg.Adja1Vy.Value, cg.Adja1Vz.Value };
                 twoStartOption.MsAnt = new double[] { station.SatTxLon, station.SatTxLat, 0 };
                 twoStartOption.NsAnt = new double[] { station.SatTxLon, station.SatTxLat, 0 };
-                twoStartOption.RefGeod = new double[] { station.RefLon, station.RefLat, 0 };
+                twoStartOption.RefGeod = new double[] { station.RefLon.Value, station.RefLat.Value, 0 };
                 twoStartOption.TargetDfo = cg.Dfo1.Value;
                 twoStartOption.Turn1 = Math.Abs(twoStartOption.Freq - (cg.TarFreqDown.HasValue ? cg.TarFreqDown.Value : 0));
                 twoStartOption.Turn2 = Math.Abs(twoStartOption.RefFreq - (cg.RefFreqDown.HasValue ? cg.RefFreqDown.Value : 0));
@@ -960,10 +960,10 @@ namespace XdCxRhDW.App.UserControl
                 double startdeg = 360;
                 double deg = startdeg - cx.Fx;//向北顺时针方向为夹角
                 //计算测向站到定位点之间的距离
-                var km = MapControlEx.CalcLineKm(station.CxLon, station.CxLat, item.PosLon, item.PosLat);
-                var endpoint = MapControlEx.CalcSituation(station.CxLon, station.CxLat, deg, (km + 100) * 1000);
+                var km = MapControlEx.CalcLineKm(station.CxLon.Value, station.CxLat.Value, item.PosLon, item.PosLat);
+                var endpoint = MapControlEx.CalcSituation(station.CxLon.Value, station.CxLat.Value, deg, (km + 100) * 1000);
                 List<(double, double)> points = new List<(double, double)>();
-                points.Add((station.CxLon, station.CxLat));
+                points.Add((station.CxLon.Value, station.CxLat.Value));
                 points.Add((endpoint.Item1, endpoint.Item2));
                 mapControl1.DrawCXLine($"测向线角度:{cx.Fx}°\t\n", points);
             }

XdCxRhDW.App/WebAPI/Controllers/PosController.cs

@@ -58,14 +58,14 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    CdbTxLon = dto.CdbTxLon,
+                    CdbTxLat = dto.CdbTxLat,
+                    CxLon = dto.CxLon,
+                    CxLat = dto.CxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new CgRes()
@@ -148,14 +148,14 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    CdbTxLon = dto.CdbTxLon,
+                    CdbTxLat = dto.CdbTxLat,
+                    CxLon = dto.CxLon,
+                    CxLat = dto.CxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new CgRes()
@@ -219,14 +219,12 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    CdbTxLon = dto.CdbTxLon,
+                    CdbTxLat = dto.CdbTxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new CgRes()
@@ -328,14 +326,12 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    CdbTxLon = dto.CdbTxLon,
+                    CdbTxLat = dto.CdbTxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new Model.CgRes()
@@ -398,14 +394,10 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    CdbTxLon = dto.CdbTxLon,
+                    CdbTxLat = dto.CdbTxLat,
                 });
 
                 var cgRes = db.CgRes.Add(new CgRes()
@@ -506,14 +498,10 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    CdbTxLon = dto.CdbTxLon,
+                    CdbTxLat = dto.CdbTxLat,
                 });
 
                 var cgRes = db.CgRes.Add(new Model.CgRes()
@@ -572,19 +560,19 @@ namespace XdCxRhDW.App.WebAPI
                 if (runTask == null)
                 {
                     Serilog.Log.Warning($"接收到融合带参定位(含星历)参数,由于任务没有运行中忽略本次定位!");
-                    return Error<PosRes>($"多模式融合定位平台没有启动两星一地定位任务");
+                    return Error<PosRes>($"多模式融合定位平台没有启动融合定位任务");
                 }
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    CdbTxLon = dto.CdbTxLon,
+                    CdbTxLat = dto.CdbTxLat,
+                    CxLon = dto.CxLon,
+                    CxLat = dto.CxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new CgRes()
@@ -693,14 +681,14 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    CdbTxLon = dto.CdbTxLon,
+                    CdbTxLat = dto.CdbTxLat,
+                    CxLon = dto.CxLon,
+                    CxLat = dto.CxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new CgRes()
@@ -772,14 +760,10 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new CgRes()
@@ -905,14 +889,10 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new Model.CgRes()
@@ -979,14 +959,8 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
                 });
 
                 var cgRes = db.CgRes.Add(new CgRes()
@@ -1043,7 +1017,7 @@ namespace XdCxRhDW.App.WebAPI
                 var runTask = await db.TaskInfos.Where(p => p.TaskState == EnumTaskState.Running && p.PosType == EnumPosType.X3TwoDto).FirstOrDefaultAsync();
                 if (runTask == null)
                 {
-                    Serilog.Log.Warning($"接收到两星一地无参定位(无星历)参数,由于任务没有运行中忽略本次定位!");
+                    Serilog.Log.Warning($"接收到三星双时差无参定位(无星历)参数,由于任务没有运行中忽略本次定位!");
                     return Error<PosRes>($"多模式融合定位平台没有启动三星双时差定位任务");
                 }
                 var parameter1 = new SQLiteParameter("@sigTime", dto.SigTime);
@@ -1109,14 +1083,8 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
                 });
 
                 var cgRes = db.CgRes.Add(new Model.CgRes()
@@ -1182,14 +1150,10 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new CgRes()
@@ -1328,14 +1292,10 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new Model.CgRes()
@@ -1417,14 +1377,10 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new CgRes()
@@ -1536,14 +1492,10 @@ namespace XdCxRhDW.App.WebAPI
 
                 var StationRes = db.StationRes.Add(new StationRes()
                 {
-                    SatTxLon = dto.StationResInfo.SatTxLon,
-                    SatTxLat = dto.StationResInfo.SatTxLat,
-                    CdbTxLon = dto.StationResInfo.CdbTxLon,
-                    CdbTxLat = dto.StationResInfo.CdbTxLat,
-                    CxLon = dto.StationResInfo.CxLon,
-                    CxLat = dto.StationResInfo.CxLat,
-                    RefLon = dto.StationResInfo.RefLon,
-                    RefLat = dto.StationResInfo.RefLat,
+                    SatTxLon = dto.SatTxLon,
+                    SatTxLat = dto.SatTxLat,
+                    RefLon = dto.RefLon,
+                    RefLat = dto.RefLat,
                 });
 
                 var cgRes = db.CgRes.Add(new Model.CgRes()

XdCxRhDw.Dto/PosDto/RHNoXlPosDto.cs

@@ -82,8 +82,43 @@ namespace XdCxRhDw.Dto
         public string TsName { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        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; }
     }
 }

XdCxRhDw.Dto/PosDto/RHPosDto.cs

@@ -102,9 +102,44 @@ namespace XdCxRhDw.Dto
         public double AdjaZ { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        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; }
     }
         
 }

XdCxRhDw.Dto/PosDto/X1D1NoXlPosDto.cs

@@ -57,8 +57,43 @@ namespace XdCxRhDw.Dto
         public string TsName { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        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; }
     }
 }

XdCxRhDw.Dto/PosDto/X1D1PosDto.cs

@@ -66,9 +66,44 @@ namespace XdCxRhDw.Dto
         public double MainZ { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        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; }
     }
         
 }

XdCxRhDw.Dto/PosDto/X2D1NoParPosDto.cs

@@ -87,10 +87,24 @@ namespace XdCxRhDw.Dto
         public double AdjaZ { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        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; }
     }
         
 }

XdCxRhDw.Dto/PosDto/X2D1NoXlNoParlPosDto.cs

@@ -67,9 +67,24 @@ namespace XdCxRhDw.Dto
         public string TsName { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        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; }
 
     }
         

XdCxRhDw.Dto/PosDto/X2D1NoXlPosDto.cs

@@ -81,8 +81,33 @@ namespace XdCxRhDw.Dto
         public string TsName { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        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 RefLon { get; set; }
+
+        /// <summary>
+        /// 参考站纬度
+        /// </summary>
+        public double RefLat { get; set; }
     }
 }

XdCxRhDw.Dto/PosDto/X2D1PosDto.cs

@@ -97,9 +97,34 @@ namespace XdCxRhDw.Dto
         public double AdjaZ { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        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 RefLon { get; set; }
+
+        /// <summary>
+        /// 参考站纬度
+        /// </summary>
+        public double RefLat { get; set; }
 
     }
         

XdCxRhDw.Dto/PosDto/X2DtoDfoNoXlPosDto.cs

@@ -93,9 +93,24 @@ namespace XdCxRhDw.Dto
         public string TsName { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        public double SatTxLon { get; set; }
+
+        /// <summary>
+        /// 卫星接收天线纬度
+        /// </summary>
+        public double SatTxLat { get; set; }
+
+        /// <summary>
+        /// 参考站经度
+        /// </summary>
+        public double RefLon { get; set; }
+
+        /// <summary>
+        /// 参考站纬度
+        /// </summary>
+        public double RefLat { get; set; }
 
     }
         

XdCxRhDw.Dto/PosDto/X2DtoDfoPosDto.cs

@@ -143,9 +143,24 @@ namespace XdCxRhDw.Dto
         public double AdjaVz { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        public double SatTxLon { get; set; }
+
+        /// <summary>
+        /// 卫星接收天线纬度
+        /// </summary>
+        public double SatTxLat { get; set; }
+
+        /// <summary>
+        /// 参考站经度
+        /// </summary>
+        public double RefLon { get; set; }
+
+        /// <summary>
+        /// 参考站纬度
+        /// </summary>
+        public double RefLat { get; set; }
 
     }
         

XdCxRhDw.Dto/PosDto/X3TwoDfoNoXlPosDto.cs

@@ -108,9 +108,24 @@ namespace XdCxRhDw.Dto
         public string TsName { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        public double SatTxLon { get; set; }
+
+        /// <summary>
+        /// 卫星接收天线纬度
+        /// </summary>
+        public double SatTxLat { get; set; }
+
+        /// <summary>
+        /// 参考站经度
+        /// </summary>
+        public double RefLon { get; set; }
+
+        /// <summary>
+        /// 参考站纬度
+        /// </summary>
+        public double RefLat { get; set; }
 
     }
         

XdCxRhDw.Dto/PosDto/X3TwoDfoPosDto.cs

@@ -183,10 +183,24 @@ namespace XdCxRhDw.Dto
         public double Adja2Vz { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        public double SatTxLon { get; set; }
 
+        /// <summary>
+        /// 卫星接收天线纬度
+        /// </summary>
+        public double SatTxLat { get; set; }
+
+        /// <summary>
+        /// 参考站经度
+        /// </summary>
+        public double RefLon { get; set; }
+
+        /// <summary>
+        /// 参考站纬度
+        /// </summary>
+        public double RefLat { get; set; }
     }
         
 }

XdCxRhDw.Dto/PosDto/X3TwoDtoNoParPosDto.cs

@@ -17,21 +17,6 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
-        /// <summary>
-        /// 主星编号
-        /// </summary>
-        public int MainSatID { get; set; }
-
-        /// <summary>
-        /// 邻星1编号
-        /// </summary>
-        public int Adja1SatID { get; set; }
-
-        /// <summary>
-        /// 邻星2编号
-        /// </summary>
-        public int Adja2SatID { get; set; }
-
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>
@@ -118,9 +103,14 @@ namespace XdCxRhDw.Dto
         public double Adja2Z { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
+        /// </summary>
+        public double SatTxLon { get; set; }
+
+        /// <summary>
+        /// 卫星接收天线纬度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        public double SatTxLat { get; set; }
 
     }
         

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlNoParPosDto.cs

@@ -73,9 +73,14 @@ namespace XdCxRhDw.Dto
         public string TsName { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        public double SatTxLon { get; set; }
+
+        /// <summary>
+        /// 卫星接收天线纬度
+        /// </summary>
+        public double SatTxLat { get; set; }
 
     }
         

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlPosDto.cs

@@ -88,9 +88,24 @@ namespace XdCxRhDw.Dto
         public string TsName { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        public double SatTxLon { get; set; }
+
+        /// <summary>
+        /// 卫星接收天线纬度
+        /// </summary>
+        public double SatTxLat { get; set; }
+
+        /// <summary>
+        /// 参考站经度
+        /// </summary>
+        public double RefLon { get; set; }
+
+        /// <summary>
+        /// 参考站纬度
+        /// </summary>
+        public double RefLat { get; set; }
 
     }
         

XdCxRhDw.Dto/PosDto/X3TwoDtoPosDto.cs

@@ -118,10 +118,24 @@ namespace XdCxRhDw.Dto
         public double Adja2Z { get; set; }
 
         /// <summary>
-        /// 站点信息
+        /// 卫星接收天线经度
         /// </summary>
-        public StationResDto StationResInfo { get; set; }
+        public double SatTxLon { get; set; }
 
+        /// <summary>
+        /// 卫星接收天线纬度
+        /// </summary>
+        public double SatTxLat { get; set; }
+
+        /// <summary>
+        /// 参考站经度
+        /// </summary>
+        public double RefLon { get; set; }
+
+        /// <summary>
+        /// 参考站纬度
+        /// </summary>
+        public double RefLat { get; set; }
     }
         
 }