11

XdCxRhDW.App/EditForms/TaskEditor.cs

@@ -38,9 +38,8 @@ namespace XdCxRhDW.App.EditForms
                 radioGroups.Add(new RadioGroupItem(Convert.ToInt32(item), ((EnumPosType)item).GetEnumDisplayName()));
             }
             this.txtPosType.Properties.Items.AddRange(radioGroups.ToArray());
-
-
         }
+
         public TaskEditor(TaskInfo info)
            : this()
         {

XdCxRhDW.WebApi/Controllers/PosController.cs

@@ -66,6 +66,7 @@ namespace XdCxRhDW.App.WebAPI
                     SnrCdb = dto.XdSnr,
                     YbMainDto = dto.MainYbDto,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
                     MainX = dto.MainX,
                     MainY = dto.MainY,
                     MainZ = dto.MainZ,
@@ -116,14 +117,14 @@ namespace XdCxRhDW.App.WebAPI
                     return Error<PosResDto>($"多模式融合定位平台没有启动一星一地定位任务");
                 }
                 var parameter1 = new SQLiteParameter("@sigTime", dto.SigTime);
-                var parameter2 = new SQLiteParameter("@satcode", dto.MainSatID);
+                var parameter2 = new SQLiteParameter("@satcode", dto.MainCode);
                 var xlInfo1 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter2).FirstOrDefaultAsync();
                 if (xlInfo1 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.MainSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.MainSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.MainCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.MainCode}]的双行根数星历");
                 }
-                Serilog.Log.Information($"卫星{dto.MainSatID}使用{xlInfo1.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.MainCode}使用{xlInfo1.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
                 string url = string.Format("http://{0}:{1}/Api/", IpHelper.GetLocalIp(), settings.HttpPort);
@@ -131,8 +132,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response = await client.GetAsync(url);
                 if (!response.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.MainSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.MainSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.MainCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.MainCode}]星厉推算失败");
                 }
                 var content = await response.Content.ReadAsStringAsync();
                 var ephMain = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content).data;
@@ -161,6 +162,7 @@ namespace XdCxRhDW.App.WebAPI
                     SnrCdb = dto.XdSnr,
                     YbMainDto = dto.MainYbDto,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
                     MainX = ephMain.X,
                     MainY = ephMain.Y,
                     MainZ = ephMain.Z,
@@ -235,6 +237,8 @@ namespace XdCxRhDW.App.WebAPI
                     YbMainDto = dto.MainYbDto,
                     YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.AdjaCode,
                     MainX = dto.MainX,
                     MainY = dto.MainY,
                     MainZ = dto.MainZ,
@@ -281,23 +285,23 @@ namespace XdCxRhDW.App.WebAPI
                     return Error<PosResDto>($"多模式融合定位平台没有启动两星一地定位任务");
                 }
                 var parameter1 = new SQLiteParameter("@sigTime", dto.SigTime);
-                var parameter2 = new SQLiteParameter("@satcode", dto.MainSatID);
-                var parameter3 = new SQLiteParameter("@satcode", dto.AdjaSatID);
+                var parameter2 = new SQLiteParameter("@satcode", dto.MainCode);
+                var parameter3 = new SQLiteParameter("@satcode", dto.AdjaCode);
                 var xlInfo1 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter2).FirstOrDefaultAsync();
                 if (xlInfo1 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.MainSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.MainSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.MainCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.MainCode}]的双行根数星历");
                 }
 
                 var xlInfo2 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter3).FirstOrDefaultAsync();
                 if (xlInfo2 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.AdjaSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.AdjaSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.AdjaCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.AdjaCode}]的双行根数星历");
                 }
-                Serilog.Log.Information($"卫星{dto.MainSatID}使用{xlInfo1.TwoLine}进行星历推算");
-                Serilog.Log.Information($"卫星{dto.AdjaSatID}使用{xlInfo2.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.MainCode}使用{xlInfo1.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.AdjaCode}使用{xlInfo2.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
                 string url = string.Format("http://{0}:{1}/Api/", IpHelper.GetLocalIp(), settings.HttpPort);
@@ -305,8 +309,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response = await client.GetAsync(url1);
                 if (!response.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.MainSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.MainSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.MainCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.MainCode}]星厉推算失败");
                 }
                 var content = await response.Content.ReadAsStringAsync();
                 var ephMain = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content).data;
@@ -315,8 +319,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response2 = await client.GetAsync(url2);
                 if (!response2.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.AdjaSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.AdjaSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.AdjaCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.AdjaCode}]星厉推算失败");
                 }
                 var content2 = await response2.Content.ReadAsStringAsync();
                 var ephAdja = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content2).data;
@@ -343,6 +347,8 @@ namespace XdCxRhDW.App.WebAPI
                     YbMainDto = dto.MainYbDto,
                     YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.AdjaCode,
                     MainX = ephMain.X,
                     MainY = ephMain.Y,
                     MainZ = ephMain.Z,
@@ -408,6 +414,8 @@ namespace XdCxRhDW.App.WebAPI
                     DfoCdb = dto.XdDfo,
                     SnrCdb = dto.XdSnr,
                     StationResID = StationRes.ID,
+                    MainCode= dto.MainCode,
+                    Adja1Code= dto.AdjaCode,
                     MainX = dto.MainX,
                     MainY = dto.MainY,
                     MainZ = dto.MainZ,
@@ -455,23 +463,23 @@ namespace XdCxRhDW.App.WebAPI
                     return Error<PosResDto>($"多模式融合定位平台没有启动两星一地定位任务");
                 }
                 var parameter1 = new SQLiteParameter("@sigTime", dto.SigTime);
-                var parameter2 = new SQLiteParameter("@satcode", dto.MainSatID);
-                var parameter3 = new SQLiteParameter("@satcode", dto.AdjaSatID);
+                var parameter2 = new SQLiteParameter("@satcode", dto.MainCode);
+                var parameter3 = new SQLiteParameter("@satcode", dto.AdjaCode);
                 var xlInfo1 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter2).FirstOrDefaultAsync();
                 if (xlInfo1 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.MainSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.MainSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.MainCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.MainCode}]的双行根数星历");
                 }
 
                 var xlInfo2 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter3).FirstOrDefaultAsync();
                 if (xlInfo2 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.AdjaSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.AdjaSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.AdjaCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.AdjaCode}]的双行根数星历");
                 }
-                Serilog.Log.Information($"卫星{dto.MainSatID}使用{xlInfo1.TwoLine}进行星历推算");
-                Serilog.Log.Information($"卫星{dto.AdjaSatID}使用{xlInfo2.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.MainCode}使用{xlInfo1.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.AdjaCode}使用{xlInfo2.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
                 string url = string.Format("http://{0}:{1}/Api/", IpHelper.GetLocalIp(), settings.HttpPort);
@@ -479,8 +487,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response = await client.GetAsync(url1);
                 if (!response.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.MainSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.MainSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.MainCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.MainCode}]星厉推算失败");
                 }
                 var content = await response.Content.ReadAsStringAsync();
                 var ephMain = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content).data;
@@ -489,8 +497,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response2 = await client.GetAsync(url2);
                 if (!response2.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.AdjaSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.AdjaSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.AdjaCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.AdjaCode}]星厉推算失败");
                 }
                 var content2 = await response2.Content.ReadAsStringAsync();
                 var ephAdja = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content2).data;
@@ -513,6 +521,8 @@ namespace XdCxRhDW.App.WebAPI
                     DfoCdb = dto.XdDfo,
                     SnrCdb = dto.XdSnr,
                     StationResID = StationRes.ID,
+                    MainCode=dto.MainCode,
+                    Adja1Code=dto.AdjaCode,
                     MainX = ephMain.X,
                     MainY = ephMain.Y,
                     MainZ = ephMain.Z,
@@ -587,6 +597,8 @@ namespace XdCxRhDW.App.WebAPI
                     YbMainDto = dto.MainYbDto,
                     YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.AdjaCode,
                     MainX = dto.MainX,
                     MainY = dto.MainY,
                     MainZ = dto.MainZ,
@@ -640,23 +652,23 @@ namespace XdCxRhDW.App.WebAPI
                     return Error<PosResDto>($"多模式融合定位平台没有启动融合定位任务");
                 }
                 var parameter1 = new SQLiteParameter("@sigTime", dto.SigTime);
-                var parameter2 = new SQLiteParameter("@satcode", dto.MainSatID);
-                var parameter3 = new SQLiteParameter("@satcode", dto.AdjaSatID);
+                var parameter2 = new SQLiteParameter("@satcode", dto.MainCode);
+                var parameter3 = new SQLiteParameter("@satcode", dto.AdjaCode);
                 var xlInfo1 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter2).FirstOrDefaultAsync();
                 if (xlInfo1 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.MainSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.MainSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.MainCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.MainCode}]的双行根数星历");
                 }
 
                 var xlInfo2 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter3).FirstOrDefaultAsync();
                 if (xlInfo2 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.AdjaSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.AdjaSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.AdjaCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.AdjaCode}]的双行根数星历");
                 }
-                Serilog.Log.Information($"卫星{dto.MainSatID}使用{xlInfo1.TwoLine}进行星历推算");
-                Serilog.Log.Information($"卫星{dto.AdjaSatID}使用{xlInfo2.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.MainCode}使用{xlInfo1.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.AdjaCode}使用{xlInfo2.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
                 string url = string.Format("http://{0}:{1}/Api/", IpHelper.GetLocalIp(), settings.HttpPort);
@@ -664,8 +676,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response = await client.GetAsync(url1);
                 if (!response.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.MainSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.MainSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.MainCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.MainCode}]星厉推算失败");
                 }
                 var content = await response.Content.ReadAsStringAsync();
                 var ephMain = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content).data;
@@ -674,8 +686,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response2 = await client.GetAsync(url2);
                 if (!response2.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.AdjaSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.AdjaSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.AdjaCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.AdjaCode}]星厉推算失败");
                 }
                 var content2 = await response2.Content.ReadAsStringAsync();
                 var ephAdja = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content2).data;
@@ -704,6 +716,8 @@ namespace XdCxRhDW.App.WebAPI
                     YbMainDto = dto.MainYbDto,
                     YbAdja1Dto = dto.AdjaYbDto,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.AdjaCode,
                     MainX = ephMain.X,
                     MainY = ephMain.Y,
                     MainZ = ephMain.Z,
@@ -781,6 +795,9 @@ namespace XdCxRhDW.App.WebAPI
                     YbAdja1Dto = dto.YbAdja1Dto,
                     YbAdja2Dto = dto.YbAdja2Dto,
                     StationResID = StationRes.ID,
+                    MainCode=dto.MainCode,
+                    Adja1Code=dto.Adja1Code,
+                    Adja2Code=dto.Adja2Code,
                     MainX = dto.MainX,
                     MainY = dto.MainY,
                     MainZ = dto.MainZ,
@@ -830,32 +847,32 @@ namespace XdCxRhDW.App.WebAPI
                     return Error<PosResDto>($"多模式融合定位平台没有启动三星双时差定位任务");
                 }
                 var parameter1 = new SQLiteParameter("@sigTime", dto.SigTime);
-                var parameter2 = new SQLiteParameter("@satcode", dto.MainSatID);
-                var parameter3 = new SQLiteParameter("@satcode", dto.Adja1SatID);
-                var parameter4 = new SQLiteParameter("@satcode", dto.Adja2SatID);
+                var parameter2 = new SQLiteParameter("@satcode", dto.MainCode);
+                var parameter3 = new SQLiteParameter("@satcode", dto.Adja1Code);
+                var parameter4 = new SQLiteParameter("@satcode", dto.Adja2Code);
                 var xlInfo1 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter2).FirstOrDefaultAsync();
                 if (xlInfo1 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.MainSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.MainSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.MainCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.MainCode}]的双行根数星历");
                 }
 
                 var xlInfo2 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter3).FirstOrDefaultAsync();
                 if (xlInfo2 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.Adja1SatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.Adja1SatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.Adja1Code}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.Adja1Code}]的双行根数星历");
                 }
 
                 var xlInfo3 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter4).FirstOrDefaultAsync();
                 if (xlInfo3 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.Adja2SatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.Adja2SatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.Adja2Code}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.Adja2Code}]的双行根数星历");
                 }
-                Serilog.Log.Information($"卫星{dto.MainSatID}使用{xlInfo1.TwoLine}进行星历推算");
-                Serilog.Log.Information($"卫星{dto.Adja1SatID}使用{xlInfo2.TwoLine}进行星历推算");
-                Serilog.Log.Information($"卫星{dto.Adja2SatID}使用{xlInfo3.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.MainCode}使用{xlInfo1.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.Adja1Code}使用{xlInfo2.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.Adja2Code}使用{xlInfo3.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
 
@@ -864,8 +881,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response = await client.GetAsync(url1);
                 if (!response.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.MainSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.MainSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.MainCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.MainCode}]星厉推算失败");
                 }
                 var content = await response.Content.ReadAsStringAsync();
                 var ephMain = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content).data;
@@ -874,8 +891,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response2 = await client.GetAsync(url2);
                 if (!response2.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.Adja1SatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.Adja1SatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.Adja1Code}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.Adja1Code}]星厉推算失败");
                 }
                 var content2 = await response2.Content.ReadAsStringAsync();
                 var ephAdja1 = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content2).data;
@@ -884,8 +901,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response3 = await client.GetAsync(url3);
                 if (!response3.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.Adja2SatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.Adja2SatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.Adja2Code}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.Adja2Code}]星厉推算失败");
                 }
                 var content3 = await response2.Content.ReadAsStringAsync();
                 var ephAdja2 = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content3).data;
@@ -911,6 +928,9 @@ namespace XdCxRhDW.App.WebAPI
                     YbAdja1Dto = dto.YbAdja1Dto,
                     YbAdja2Dto = dto.YbAdja2Dto,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.Adja1Code,
+                    Adja2Code = dto.Adja2Code,
                     MainX = ephMain.X,
                     MainY = ephMain.Y,
                     MainZ = ephMain.Z,
@@ -977,6 +997,9 @@ namespace XdCxRhDW.App.WebAPI
                     Dfo2 = dto.Dfo2,
                     Snr2 = dto.Snr2,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.Adja1Code,
+                    Adja2Code = dto.Adja2Code,
                     MainX = dto.MainX,
                     MainY = dto.MainY,
                     MainZ = dto.MainZ,
@@ -1026,32 +1049,32 @@ namespace XdCxRhDW.App.WebAPI
                     return Error<PosResDto>($"多模式融合定位平台没有启动三星双时差定位任务");
                 }
                 var parameter1 = new SQLiteParameter("@sigTime", dto.SigTime);
-                var parameter2 = new SQLiteParameter("@satcode", dto.MainSatID);
-                var parameter3 = new SQLiteParameter("@satcode", dto.Adja1SatID);
-                var parameter4 = new SQLiteParameter("@satcode", dto.Adja2SatID);
+                var parameter2 = new SQLiteParameter("@satcode", dto.MainCode);
+                var parameter3 = new SQLiteParameter("@satcode", dto.Adja1Code);
+                var parameter4 = new SQLiteParameter("@satcode", dto.Adja2Code);
                 var xlInfo1 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter2).FirstOrDefaultAsync();
                 if (xlInfo1 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.MainSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.MainSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.MainCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.MainCode}]的双行根数星历");
                 }
 
                 var xlInfo2 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter3).FirstOrDefaultAsync();
                 if (xlInfo2 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.Adja1SatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.Adja1SatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.Adja1Code}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.Adja1Code}]的双行根数星历");
                 }
 
                 var xlInfo3 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter4).FirstOrDefaultAsync();
                 if (xlInfo3 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.Adja2SatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.Adja2SatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.Adja2Code}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.Adja2Code}]的双行根数星历");
                 }
-                Serilog.Log.Information($"卫星{dto.MainSatID}使用{xlInfo1.TwoLine}进行星历推算");
-                Serilog.Log.Information($"卫星{dto.Adja1SatID}使用{xlInfo2.TwoLine}进行星历推算");
-                Serilog.Log.Information($"卫星{dto.Adja2SatID}使用{xlInfo3.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.MainCode}使用{xlInfo1.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.Adja1Code}使用{xlInfo2.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.Adja2Code}使用{xlInfo3.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
 
@@ -1060,8 +1083,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response = await client.GetAsync(url1);
                 if (!response.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.MainSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.MainSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.MainCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.MainCode}]星厉推算失败");
                 }
                 var content = await response.Content.ReadAsStringAsync();
                 var ephMain = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content).data;
@@ -1070,8 +1093,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response2 = await client.GetAsync(url2);
                 if (!response2.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.Adja1SatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.Adja1SatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.Adja1Code}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.Adja1Code}]星厉推算失败");
                 }
                 var content2 = await response2.Content.ReadAsStringAsync();
                 var ephAdja1 = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content2).data;
@@ -1080,8 +1103,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response3 = await client.GetAsync(url3);
                 if (!response3.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.Adja2SatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.Adja2SatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.Adja2Code}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.Adja2Code}]星厉推算失败");
                 }
                 var content3 = await response2.Content.ReadAsStringAsync();
                 var ephAdja2 = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content3).data;
@@ -1102,6 +1125,9 @@ namespace XdCxRhDW.App.WebAPI
                     Dfo2 = dto.Dfo2,
                     Snr2 = dto.Snr2,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.Adja1Code,
+                    Adja2Code = dto.Adja2Code,
                     MainX = ephMain.X,
                     MainY = ephMain.Y,
                     MainZ = ephMain.Z,
@@ -1179,6 +1205,9 @@ namespace XdCxRhDW.App.WebAPI
                     RefFreqUp = dto.RefFreqUp,
                     RefFreqDown = dto.RefFreqDown,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.Adja1Code,
+                    Adja2Code = dto.Adja2Code,
                     MainX = dto.MainX,
                     MainY = dto.MainY,
                     MainZ = dto.MainZ,
@@ -1237,32 +1266,32 @@ namespace XdCxRhDW.App.WebAPI
                     return Error<PosResDto>($"多模式融合定位平台没有启动三星双频差定位任务");
                 }
                 var parameter1 = new SQLiteParameter("@sigTime", dto.SigTime);
-                var parameter2 = new SQLiteParameter("@satcode", dto.MainSatID);
-                var parameter3 = new SQLiteParameter("@satcode", dto.Adja1SatID);
-                var parameter4 = new SQLiteParameter("@satcode", dto.Adja2SatID);
+                var parameter2 = new SQLiteParameter("@satcode", dto.MainCode);
+                var parameter3 = new SQLiteParameter("@satcode", dto.Adja1Code);
+                var parameter4 = new SQLiteParameter("@satcode", dto.Adja2Code);
                 var xlInfo1 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter2).FirstOrDefaultAsync();
                 if (xlInfo1 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.MainSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.MainSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.MainCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.MainCode}]的双行根数星历");
                 }
 
                 var xlInfo2 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter3).FirstOrDefaultAsync();
                 if (xlInfo2 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.Adja1SatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.Adja1SatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.Adja1Code}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.Adja1Code}]的双行根数星历");
                 }
 
                 var xlInfo3 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter4).FirstOrDefaultAsync();
                 if (xlInfo3 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.Adja2SatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.Adja2SatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.Adja2Code}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.Adja2Code}]的双行根数星历");
                 }
-                Serilog.Log.Information($"卫星{dto.MainSatID}使用{xlInfo1.TwoLine}进行星历推算");
-                Serilog.Log.Information($"卫星{dto.Adja1SatID}使用{xlInfo2.TwoLine}进行星历推算");
-                Serilog.Log.Information($"卫星{dto.Adja2SatID}使用{xlInfo3.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.MainCode}使用{xlInfo1.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.Adja1Code}使用{xlInfo2.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.Adja2Code}使用{xlInfo3.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
 
@@ -1271,8 +1300,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response = await client.GetAsync(url1);
                 if (!response.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.MainSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.MainSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.MainCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.MainCode}]星厉推算失败");
                 }
                 var content = await response.Content.ReadAsStringAsync();
                 var ephMain = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content).data;
@@ -1281,8 +1310,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response2 = await client.GetAsync(url2);
                 if (!response2.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.Adja1SatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.Adja1SatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.Adja1Code}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.Adja1Code}]星厉推算失败");
                 }
                 var content2 = await response2.Content.ReadAsStringAsync();
                 var ephAdja1 = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content2).data;
@@ -1291,8 +1320,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response3 = await client.GetAsync(url3);
                 if (!response3.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.Adja2SatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.Adja2SatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.Adja2Code}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.Adja2Code}]星厉推算失败");
                 }
                 var content3 = await response2.Content.ReadAsStringAsync();
                 var ephAdja2 = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content3).data;
@@ -1322,6 +1351,9 @@ namespace XdCxRhDW.App.WebAPI
                     RefFreqUp = dto.RefFreqUp,
                     RefFreqDown = dto.RefFreqDown,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.Adja1Code,
+                    Adja2Code = dto.Adja2Code,
                     MainX = ephMain.X,
                     MainY = ephMain.Y,
                     MainZ = ephMain.Z,
@@ -1406,6 +1438,8 @@ namespace XdCxRhDW.App.WebAPI
                     RefFreqUp = dto.RefFreqUp,
                     RefFreqDown = dto.RefFreqDown,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.AdjaCode,
                     MainX = dto.MainX,
                     MainY = dto.MainY,
                     MainZ = dto.MainZ,
@@ -1458,23 +1492,23 @@ namespace XdCxRhDW.App.WebAPI
                     return Error<PosResDto>($"多模式融合定位平台没有启动双星时频差定位任务");
                 }
                 var parameter1 = new SQLiteParameter("@sigTime", dto.SigTime);
-                var parameter2 = new SQLiteParameter("@satcode", dto.MainSatID);
-                var parameter3 = new SQLiteParameter("@satcode", dto.AdjaSatID);
+                var parameter2 = new SQLiteParameter("@satcode", dto.MainCode);
+                var parameter3 = new SQLiteParameter("@satcode", dto.AdjaCode);
                 var xlInfo1 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter2).FirstOrDefaultAsync();
                 if (xlInfo1 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.MainSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.MainSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.MainCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.MainCode}]的双行根数星历");
                 }
 
                 var xlInfo2 = await db.XlInfos.SqlQuery("select * from XlInfo where ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))=(select min(ABS(JULIANDAY(TimeBJ)-JULIANDAY(@sigTime))) from XlInfo where satcode=@satcode)", parameter1, parameter3).FirstOrDefaultAsync();
                 if (xlInfo2 == null)
                 {
-                    Serilog.Log.Error($"未找到卫星[{dto.AdjaSatID}]的双行根数星历");
-                    return Error<PosResDto>($"未找到卫星[{dto.AdjaSatID}]的双行根数星历");
+                    Serilog.Log.Error($"未找到卫星[{dto.AdjaCode}]的双行根数星历");
+                    return Error<PosResDto>($"未找到卫星[{dto.AdjaCode}]的双行根数星历");
                 }
-                Serilog.Log.Information($"卫星{dto.MainSatID}使用{xlInfo1.TwoLine}进行星历推算");
-                Serilog.Log.Information($"卫星{dto.AdjaSatID}使用{xlInfo2.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.MainCode}使用{xlInfo1.TwoLine}进行星历推算");
+                Serilog.Log.Information($"卫星{dto.AdjaCode}使用{xlInfo2.TwoLine}进行星历推算");
                 var settings = await db.SysSetings.FirstOrDefaultAsync();
                 var client = new HttpClient();
 
@@ -1483,8 +1517,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response = await client.GetAsync(url1);
                 if (!response.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.MainSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.MainSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.MainCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.MainCode}]星厉推算失败");
                 }
                 var content = await response.Content.ReadAsStringAsync();
                 var ephMain = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content).data;
@@ -1493,8 +1527,8 @@ namespace XdCxRhDW.App.WebAPI
                 var response2 = await client.GetAsync(url2);
                 if (!response2.IsSuccessStatusCode) // 处理响应失败
                 {
-                    Serilog.Log.Error($"[{dto.AdjaSatID}]星厉推算失败");
-                    return Error<PosResDto>($"[{dto.AdjaSatID}]星厉推算失败");
+                    Serilog.Log.Error($"[{dto.AdjaCode}]星厉推算失败");
+                    return Error<PosResDto>($"[{dto.AdjaCode}]星厉推算失败");
                 }
                 var content2 = await response2.Content.ReadAsStringAsync();
                 var ephAdja1 = JsonConvert.DeserializeObject<AjaxResult<SatEphDto>>(content2).data;
@@ -1522,6 +1556,8 @@ namespace XdCxRhDW.App.WebAPI
                     RefFreqUp = dto.RefFreqUp,
                     RefFreqDown = dto.RefFreqDown,
                     StationResID = StationRes.ID,
+                    MainCode = dto.MainCode,
+                    Adja1Code = dto.AdjaCode,
                     MainX = ephMain.X,
                     MainY = ephMain.Y,
                     MainZ = ephMain.Z,

XdCxRhDw.Dto/PosDto/RHNoParPosDto.cs

@@ -16,6 +16,16 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
+        /// <summary>
+        /// 主星编号
+        /// </summary>
+        public int MainCode { get; set; }
+
+        /// <summary>
+        /// 邻星编号
+        /// </summary>
+        public int AdjaCode { get; set; }
+
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>

XdCxRhDw.Dto/PosDto/RHNoXlNoParPosDto.cs

@@ -19,7 +19,12 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主星编号
         /// </summary>
-        public int MainSatID { get; set; }
+        public int MainCode { get; set; }
+
+        /// <summary>
+        /// 邻星编号
+        /// </summary>
+        public int AdjaCode { get; set; }
 
         /// <summary>
         /// 邻星编号

XdCxRhDw.Dto/PosDto/RHNoXlPosDto.cs

@@ -19,12 +19,12 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主星编号
         /// </summary>
-        public int MainSatID { get; set; }
+        public int MainCode { get; set; }
 
         /// <summary>
         /// 邻星编号
         /// </summary>
-        public int AdjaSatID { get; set; }
+        public int AdjaCode { get; set; }
 
         /// <summary>
         /// 目标双星时差(us)

XdCxRhDw.Dto/PosDto/RHPosDto.cs

@@ -16,6 +16,16 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
+        /// <summary>
+        /// 主星编号
+        /// </summary>
+        public int MainCode { get; set; }
+
+        /// <summary>
+        /// 邻星编号
+        /// </summary>
+        public int AdjaCode { get; set; }
+
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>

XdCxRhDw.Dto/PosDto/X1D1NoParPosDto.cs

@@ -16,6 +16,11 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
+        /// <summary>
+        /// 主星编号
+        /// </summary>
+        public int MainCode { get; set; }
+
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>

XdCxRhDw.Dto/PosDto/X1D1NoXlNoParPosDto.cs

@@ -17,9 +17,9 @@ namespace XdCxRhDw.Dto
         public DateTime SigTime { get; set; }
 
         /// <summary>
-        /// 卫星编号
+        /// 主星编号
         /// </summary>
-        public int MainSatID { get; set; }
+        public int MainCode { get; set; }
 
         /// <summary>
         /// 目标星地时差(us)

XdCxRhDw.Dto/PosDto/X1D1NoXlPosDto.cs

@@ -17,9 +17,9 @@ namespace XdCxRhDw.Dto
         public DateTime SigTime { get; set; }
 
         /// <summary>
-        /// 卫星编号
+        /// 主星编号
         /// </summary>
-        public int MainSatID { get; set; }
+        public int MainCode { get; set; }
 
         /// <summary>
         /// 目标星地时差(us)

XdCxRhDw.Dto/PosDto/X1D1PosDto.cs

@@ -15,6 +15,11 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
+        /// <summary>
+        /// 主星编号
+        /// </summary>
+        public int MainCode { get; set; }
+
         /// <summary>
         /// 目标星地时差(us)
         /// </summary>

XdCxRhDw.Dto/PosDto/X2D1NoParPosDto.cs

@@ -16,6 +16,16 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
+        /// <summary>
+        /// 主星编号
+        /// </summary>
+        public int MainCode { get; set; }
+
+        /// <summary>
+        /// 邻星编号
+        /// </summary>
+        public int AdjaCode { get; set; }
+
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>

XdCxRhDw.Dto/PosDto/X2D1NoXlNoParlPosDto.cs

@@ -19,12 +19,12 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主星编号
         /// </summary>
-        public int MainSatID { get; set; }
+        public int MainCode { get; set; }
 
         /// <summary>
         /// 邻星编号
         /// </summary>
-        public int AdjaSatID { get; set; }
+        public int AdjaCode { get; set; }
 
         /// <summary>
         /// 目标双星时差(us)

XdCxRhDw.Dto/PosDto/X2D1NoXlPosDto.cs

@@ -20,12 +20,12 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主星编号
         /// </summary>
-        public int MainSatID { get; set; }
+        public int MainCode { get; set; }
 
         /// <summary>
         /// 邻星编号
         /// </summary>
-        public int AdjaSatID { get; set; }
+        public int AdjaCode { get; set; }
 
         /// <summary>
         /// 目标双星时差(us)

XdCxRhDw.Dto/PosDto/X2D1PosDto.cs

@@ -16,6 +16,16 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
+        /// <summary>
+        /// 主星编号
+        /// </summary>
+        public int MainCode { get; set; }
+
+        /// <summary>
+        /// 邻星编号
+        /// </summary>
+        public int AdjaCode { get; set; }
+
         /// <summary>
         /// 目标双星时差(us)
         /// </summary>

XdCxRhDw.Dto/PosDto/X2DtoDfoNoXlPosDto.cs

@@ -20,12 +20,12 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主星编号
         /// </summary>
-        public int MainSatID { get; set; }
+        public int MainCode { get; set; }
 
         /// <summary>
         /// 邻星编号
         /// </summary>
-        public int AdjaSatID { get; set; }
+        public int AdjaCode { get; set; }
 
         /// <summary>
         /// 主邻时差(us)

XdCxRhDw.Dto/PosDto/X2DtoDfoPosDto.cs

@@ -17,6 +17,16 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
+        /// <summary>
+        /// 主星编号
+        /// </summary>
+        public int MainCode { get; set; }
+
+        /// <summary>
+        /// 邻星编号
+        /// </summary>
+        public int AdjaCode { get; set; }
+
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>

XdCxRhDw.Dto/PosDto/X3TwoDfoNoXlPosDto.cs

@@ -20,17 +20,17 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主星编号
         /// </summary>
-        public int MainSatID { get; set; }
+        public int MainCode { get; set; }
 
         /// <summary>
         /// 邻星1编号
         /// </summary>
-        public int Adja1SatID { get; set; }
+        public int Adja1Code { get; set; }
 
         /// <summary>
         /// 邻星2编号
         /// </summary>
-        public int Adja2SatID { get; set; }
+        public int Adja2Code { get; set; }
 
         /// <summary>
         /// 主邻1时差(us)

XdCxRhDw.Dto/PosDto/X3TwoDfoPosDto.cs

@@ -17,6 +17,21 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
+        /// <summary>
+        /// 主星编号
+        /// </summary>
+        public int MainCode { get; set; }
+
+        /// <summary>
+        /// 邻星1编号
+        /// </summary>
+        public int Adja1Code { get; set; }
+
+        /// <summary>
+        /// 邻星2编号
+        /// </summary>
+        public int Adja2Code { get; set; }
+
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>

XdCxRhDw.Dto/PosDto/X3TwoDtoNoParPosDto.cs

@@ -17,6 +17,21 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
+        /// <summary>
+        /// 主星编号
+        /// </summary>
+        public int MainCode { get; set; }
+
+        /// <summary>
+        /// 邻星1编号
+        /// </summary>
+        public int Adja1Code { get; set; }
+
+        /// <summary>
+        /// 邻星2编号
+        /// </summary>
+        public int Adja2Code { get; set; }
+
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlNoParPosDto.cs

@@ -20,17 +20,17 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主星编号
         /// </summary>
-        public int MainSatID { get; set; }
+        public int MainCode { get; set; }
 
         /// <summary>
         /// 邻星1编号
         /// </summary>
-        public int Adja1SatID { get; set; }
+        public int Adja1Code { get; set; }
 
         /// <summary>
         /// 邻星2编号
         /// </summary>
-        public int Adja2SatID { get; set; }
+        public int Adja2Code { get; set; }
 
         /// <summary>
         /// 主邻1时差(us)

XdCxRhDw.Dto/PosDto/X3TwoDtoNoXlPosDto.cs

@@ -20,17 +20,17 @@ namespace XdCxRhDw.Dto
         /// <summary>
         /// 主星编号
         /// </summary>
-        public int MainSatID { get; set; }
+        public int MainCode { get; set; }
 
         /// <summary>
         /// 邻星1编号
         /// </summary>
-        public int Adja1SatID { get; set; }
+        public int Adja1Code { get; set; }
 
         /// <summary>
         /// 邻星2编号
         /// </summary>
-        public int Adja2SatID { get; set; }
+        public int Adja2Code { get; set; }
 
         /// <summary>
         /// 主邻1时差(us)

XdCxRhDw.Dto/PosDto/X3TwoDtoPosDto.cs

@@ -17,6 +17,21 @@ namespace XdCxRhDw.Dto
         /// </summary>
         public DateTime SigTime { get; set; }
 
+        /// <summary>
+        /// 主星编号
+        /// </summary>
+        public int MainCode { get; set; }
+
+        /// <summary>
+        /// 邻星1编号
+        /// </summary>
+        public int Adja1Code { get; set; }
+
+        /// <summary>
+        /// 邻星2编号
+        /// </summary>
+        public int Adja2Code { get; set; }
+
         /// <summary>
         /// 主邻1时差(us)
         /// </summary>