|
@@ -132,6 +132,11 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
var XlCalcDto = new XlCalcDto() { tleStr = xlInfo1.TwoLine, dt = dto.SigTime };
|
|
|
string url = string.Format("http://{0}:{1}/Api/Xl/Calc", IpHelper.GetLocalIp(), settings.HttpPort);
|
|
|
var ephMain = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto);
|
|
|
+ if (ephMain.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var StationRes = db.StationRes.Add(new StationRes()
|
|
|
{
|
|
@@ -154,9 +159,9 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
YbMainDto = dto.MainYbDto,
|
|
|
StationResID = StationRes.ID,
|
|
|
MainCode = dto.MainCode,
|
|
|
- MainX = ephMain.X,
|
|
|
- MainY = ephMain.Y,
|
|
|
- MainZ = ephMain.Z,
|
|
|
+ MainX = ephMain.data.X,
|
|
|
+ MainY = ephMain.data.Y,
|
|
|
+ MainZ = ephMain.data.Z,
|
|
|
});
|
|
|
|
|
|
var cxRes = db.CxRes.Add(new CxRes()
|
|
@@ -301,9 +306,19 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
|
|
|
var XlCalcDto = new XlCalcDto() { tleStr = xlInfo1.TwoLine, dt = dto.SigTime };
|
|
|
var ephMain = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto);
|
|
|
+ if (ephMain.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var XlCalcDto2 = new XlCalcDto() { tleStr = xlInfo2.TwoLine, dt = dto.SigTime };
|
|
|
var ephAdja = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto2);
|
|
|
+ if (ephAdja.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var StationRes = db.StationRes.Add(new StationRes()
|
|
|
{
|
|
@@ -329,12 +344,12 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
StationResID = StationRes.ID,
|
|
|
MainCode = dto.MainCode,
|
|
|
Adja1Code = dto.AdjaCode,
|
|
|
- MainX = ephMain.X,
|
|
|
- MainY = ephMain.Y,
|
|
|
- MainZ = ephMain.Z,
|
|
|
- Adja1X = ephAdja.X,
|
|
|
- Adja1Y = ephAdja.Y,
|
|
|
- Adja1Z = ephAdja.Z,
|
|
|
+ MainX = ephMain.data.X,
|
|
|
+ MainY = ephMain.data.Y,
|
|
|
+ MainZ = ephMain.data.Z,
|
|
|
+ Adja1X = ephAdja.data.X,
|
|
|
+ Adja1Y = ephAdja.data.Y,
|
|
|
+ Adja1Z = ephAdja.data.Z,
|
|
|
});
|
|
|
|
|
|
var res = PosApi.X2D1_Pos(cgRes, StationRes);
|
|
@@ -468,9 +483,19 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
|
|
|
var XlCalcDto = new XlCalcDto() { tleStr = xlInfo1.TwoLine, dt = dto.SigTime };
|
|
|
var ephMain = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto);
|
|
|
+ if (ephMain.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var XlCalcDto2 = new XlCalcDto() { tleStr = xlInfo2.TwoLine, dt = dto.SigTime };
|
|
|
var ephAdja = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto2);
|
|
|
+ if (ephAdja.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.AdjaCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.AdjaCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var StationRes = db.StationRes.Add(new StationRes()
|
|
|
{
|
|
@@ -492,12 +517,12 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
StationResID = StationRes.ID,
|
|
|
MainCode = dto.MainCode,
|
|
|
Adja1Code = dto.AdjaCode,
|
|
|
- MainX = ephMain.X,
|
|
|
- MainY = ephMain.Y,
|
|
|
- MainZ = ephMain.Z,
|
|
|
- Adja1X = ephAdja.X,
|
|
|
- Adja1Y = ephAdja.Y,
|
|
|
- Adja1Z = ephAdja.Z,
|
|
|
+ MainX = ephMain.data.X,
|
|
|
+ MainY = ephMain.data.Y,
|
|
|
+ MainZ = ephMain.data.Z,
|
|
|
+ Adja1X = ephAdja.data.X,
|
|
|
+ Adja1Y = ephAdja.data.Y,
|
|
|
+ Adja1Z = ephAdja.data.Z,
|
|
|
});
|
|
|
|
|
|
var res = PosApi.X2D1_PosNoRef(cgRes, StationRes);
|
|
@@ -646,9 +671,19 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
|
|
|
var XlCalcDto = new XlCalcDto() { tleStr = xlInfo1.TwoLine, dt = dto.SigTime };
|
|
|
var ephMain = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto);
|
|
|
+ if (ephMain.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var XlCalcDto2 = new XlCalcDto() { tleStr = xlInfo2.TwoLine, dt = dto.SigTime };
|
|
|
var ephAdja = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto2);
|
|
|
+ if (ephAdja.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.AdjaCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.AdjaCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var StationRes = db.StationRes.Add(new StationRes()
|
|
|
{
|
|
@@ -676,12 +711,12 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
StationResID = StationRes.ID,
|
|
|
MainCode = dto.MainCode,
|
|
|
Adja1Code = dto.AdjaCode,
|
|
|
- MainX = ephMain.X,
|
|
|
- MainY = ephMain.Y,
|
|
|
- MainZ = ephMain.Z,
|
|
|
- Adja1X = ephAdja.X,
|
|
|
- Adja1Y = ephAdja.Y,
|
|
|
- Adja1Z = ephAdja.Z,
|
|
|
+ MainX = ephMain.data.X,
|
|
|
+ MainY = ephMain.data.Y,
|
|
|
+ MainZ = ephMain.data.Z,
|
|
|
+ Adja1X = ephAdja.data.X,
|
|
|
+ Adja1Y = ephAdja.data.Y,
|
|
|
+ Adja1Z = ephAdja.data.Z,
|
|
|
});
|
|
|
|
|
|
var cxRes = db.CxRes.Add(new CxRes()
|
|
@@ -839,12 +874,27 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
|
|
|
var XlCalcDto = new XlCalcDto() { tleStr = xlInfo1.TwoLine, dt = dto.SigTime };
|
|
|
var ephMain = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto);
|
|
|
+ if (ephMain.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var XlCalcDto2 = new XlCalcDto() { tleStr = xlInfo2.TwoLine, dt = dto.SigTime };
|
|
|
var ephAdja1 = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto2);
|
|
|
+ if (ephAdja1.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.Adja1Code}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.Adja1Code}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var XlCalcDto3 = new XlCalcDto() { tleStr = xlInfo3.TwoLine, dt = dto.SigTime };
|
|
|
var ephAdja2 = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto3);
|
|
|
+ if (ephAdja2.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.Adja2Code}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.Adja2Code}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var StationRes = db.StationRes.Add(new StationRes()
|
|
|
{
|
|
@@ -870,15 +920,15 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
MainCode = dto.MainCode,
|
|
|
Adja1Code = dto.Adja1Code,
|
|
|
Adja2Code = dto.Adja2Code,
|
|
|
- MainX = ephMain.X,
|
|
|
- MainY = ephMain.Y,
|
|
|
- MainZ = ephMain.Z,
|
|
|
- Adja1X = ephAdja1.X,
|
|
|
- Adja1Y = ephAdja1.Y,
|
|
|
- Adja1Z = ephAdja1.Z,
|
|
|
- Adja2X = ephAdja2.X,
|
|
|
- Adja2Y = ephAdja2.Y,
|
|
|
- Adja2Z = ephAdja2.Z,
|
|
|
+ MainX = ephMain.data.X,
|
|
|
+ MainY = ephMain.data.Y,
|
|
|
+ MainZ = ephMain.data.Z,
|
|
|
+ Adja1X = ephAdja1.data.X,
|
|
|
+ Adja1Y = ephAdja1.data.Y,
|
|
|
+ Adja1Z = ephAdja1.data.Z,
|
|
|
+ Adja2X = ephAdja2.data.X,
|
|
|
+ Adja2Y = ephAdja2.data.Y,
|
|
|
+ Adja2Z = ephAdja2.data.Z,
|
|
|
});
|
|
|
|
|
|
var res = PosApi.X3_Pos(cgRes, StationRes);
|
|
@@ -1022,12 +1072,27 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
|
|
|
var XlCalcDto = new XlCalcDto() { tleStr = xlInfo1.TwoLine, dt = dto.SigTime };
|
|
|
var ephMain = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto);
|
|
|
+ if (ephMain.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var XlCalcDto2 = new XlCalcDto() { tleStr = xlInfo2.TwoLine, dt = dto.SigTime };
|
|
|
var ephAdja1 = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto2);
|
|
|
+ if (ephAdja1.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.Adja1Code}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.Adja1Code}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var XlCalcDto3 = new XlCalcDto() { tleStr = xlInfo3.TwoLine, dt = dto.SigTime };
|
|
|
var ephAdja2 = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto3);
|
|
|
+ if (ephAdja2.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.Adja2Code}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.Adja2Code}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var StationRes = db.StationRes.Add(new StationRes()
|
|
|
{
|
|
@@ -1048,15 +1113,15 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
MainCode = dto.MainCode,
|
|
|
Adja1Code = dto.Adja1Code,
|
|
|
Adja2Code = dto.Adja2Code,
|
|
|
- MainX = ephMain.X,
|
|
|
- MainY = ephMain.Y,
|
|
|
- MainZ = ephMain.Z,
|
|
|
- Adja1X = ephAdja1.X,
|
|
|
- Adja1Y = ephAdja1.Y,
|
|
|
- Adja1Z = ephAdja1.Z,
|
|
|
- Adja2X = ephAdja2.X,
|
|
|
- Adja2Y = ephAdja2.Y,
|
|
|
- Adja2Z = ephAdja2.Z,
|
|
|
+ MainX = ephMain.data.X,
|
|
|
+ MainY = ephMain.data.Y,
|
|
|
+ MainZ = ephMain.data.Z,
|
|
|
+ Adja1X = ephAdja1.data.X,
|
|
|
+ Adja1Y = ephAdja1.data.Y,
|
|
|
+ Adja1Z = ephAdja1.data.Z,
|
|
|
+ Adja2X = ephAdja2.data.X,
|
|
|
+ Adja2Y = ephAdja2.data.Y,
|
|
|
+ Adja2Z = ephAdja2.data.Z,
|
|
|
});
|
|
|
|
|
|
var res = PosApi.X3_PosNoRef(cgRes, StationRes);
|
|
@@ -1220,13 +1285,27 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
|
|
|
var XlCalcDto = new XlCalcDto() { tleStr = xlInfo1.TwoLine, dt = dto.SigTime };
|
|
|
var ephMain = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto);
|
|
|
+ if (ephMain.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var XlCalcDto2 = new XlCalcDto() { tleStr = xlInfo2.TwoLine, dt = dto.SigTime };
|
|
|
var ephAdja1 = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto2);
|
|
|
+ if (ephAdja1.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.Adja1Code}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.Adja1Code}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var XlCalcDto3 = new XlCalcDto() { tleStr = xlInfo3.TwoLine, dt = dto.SigTime };
|
|
|
var ephAdja2 = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto3);
|
|
|
-
|
|
|
+ if (ephAdja2.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.Adja2Code}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.Adja2Code}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var StationRes = db.StationRes.Add(new StationRes()
|
|
|
{
|
|
@@ -1256,24 +1335,24 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
MainCode = dto.MainCode,
|
|
|
Adja1Code = dto.Adja1Code,
|
|
|
Adja2Code = dto.Adja2Code,
|
|
|
- MainX = ephMain.X,
|
|
|
- MainY = ephMain.Y,
|
|
|
- MainZ = ephMain.Z,
|
|
|
- MainVx = ephMain.VX,
|
|
|
- MainVy = ephMain.VY,
|
|
|
- MainVz = ephMain.VZ,
|
|
|
- Adja1X = ephAdja1.X,
|
|
|
- Adja1Y = ephAdja1.Y,
|
|
|
- Adja1Z = ephAdja1.Z,
|
|
|
- Adja1Vx = ephAdja1.VX,
|
|
|
- Adja1Vy = ephAdja1.VY,
|
|
|
- Adja1Vz = ephAdja1.VZ,
|
|
|
- Adja2X = ephAdja2.X,
|
|
|
- Adja2Y = ephAdja2.Y,
|
|
|
- Adja2Z = ephAdja2.Z,
|
|
|
- Adja2Vx = ephAdja2.VX,
|
|
|
- Adja2Vy = ephAdja2.VY,
|
|
|
- Adja2Vz = ephAdja2.VZ,
|
|
|
+ MainX = ephMain.data.X,
|
|
|
+ MainY = ephMain.data.Y,
|
|
|
+ MainZ = ephMain.data.Z,
|
|
|
+ MainVx = ephMain.data.VX,
|
|
|
+ MainVy = ephMain.data.VY,
|
|
|
+ MainVz = ephMain.data.VZ,
|
|
|
+ Adja1X = ephAdja1.data.X,
|
|
|
+ Adja1Y = ephAdja1.data.Y,
|
|
|
+ Adja1Z = ephAdja1.data.Z,
|
|
|
+ Adja1Vx = ephAdja1.data.VX,
|
|
|
+ Adja1Vy = ephAdja1.data.VY,
|
|
|
+ Adja1Vz = ephAdja1.data.VZ,
|
|
|
+ Adja2X = ephAdja2.data.X,
|
|
|
+ Adja2Y = ephAdja2.data.Y,
|
|
|
+ Adja2Z = ephAdja2.data.Z,
|
|
|
+ Adja2Vx = ephAdja2.data.VX,
|
|
|
+ Adja2Vy = ephAdja2.data.VY,
|
|
|
+ Adja2Vz = ephAdja2.data.VZ,
|
|
|
});
|
|
|
|
|
|
var res = PosApi.X3_PosTwoDfo(cgRes, StationRes);
|
|
@@ -1419,9 +1498,19 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
|
|
|
var XlCalcDto = new XlCalcDto() { tleStr = xlInfo1.TwoLine, dt = dto.SigTime };
|
|
|
var ephMain = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto);
|
|
|
+ if (ephMain.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.MainCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var XlCalcDto2 = new XlCalcDto() { tleStr = xlInfo2.TwoLine, dt = dto.SigTime };
|
|
|
var ephAdja = HttpHelper.PostRequest<SatEphDto>(url, XlCalcDto2);
|
|
|
+ if (ephAdja.code != 200)
|
|
|
+ {
|
|
|
+ Serilog.Log.Error($"推算[{dto.AdjaCode}]的星历出错");
|
|
|
+ return Error<PosResDto>($"推算[{dto.AdjaCode}]的星历出错");
|
|
|
+ }
|
|
|
|
|
|
var StationRes = db.StationRes.Add(new StationRes()
|
|
|
{
|
|
@@ -1448,18 +1537,18 @@ namespace XdCxRhDW.App.WebAPI
|
|
|
StationResID = StationRes.ID,
|
|
|
MainCode = dto.MainCode,
|
|
|
Adja1Code = dto.AdjaCode,
|
|
|
- MainX = ephMain.X,
|
|
|
- MainY = ephMain.Y,
|
|
|
- MainZ = ephMain.Z,
|
|
|
- MainVx = ephMain.VX,
|
|
|
- MainVy = ephMain.VY,
|
|
|
- MainVz = ephMain.VZ,
|
|
|
- Adja1X = ephAdja.X,
|
|
|
- Adja1Y = ephAdja.Y,
|
|
|
- Adja1Z = ephAdja.Z,
|
|
|
- Adja1Vx = ephAdja.VX,
|
|
|
- Adja1Vy = ephAdja.VY,
|
|
|
- Adja1Vz = ephAdja.VZ,
|
|
|
+ MainX = ephMain.data.X,
|
|
|
+ MainY = ephMain.data.Y,
|
|
|
+ MainZ = ephMain.data.Z,
|
|
|
+ MainVx = ephMain.data.VX,
|
|
|
+ MainVy = ephMain.data.VY,
|
|
|
+ MainVz = ephMain.data.VZ,
|
|
|
+ Adja1X = ephAdja.data.X,
|
|
|
+ Adja1Y = ephAdja.data.Y,
|
|
|
+ Adja1Z = ephAdja.data.Z,
|
|
|
+ Adja1Vx = ephAdja.data.VX,
|
|
|
+ Adja1Vy = ephAdja.data.VY,
|
|
|
+ Adja1Vz = ephAdja.data.VZ,
|
|
|
});
|
|
|
|
|
|
var res = PosApi.X2_PosDtoDfo(cgRes, StationRes);
|