|
|
@@ -89,20 +89,20 @@ namespace X2D1TaskServer.Service
|
|
|
/// <param name="time"></param>
|
|
|
internal void ResetTime(int formatFlag, ref DateTime time)
|
|
|
{
|
|
|
- if (formatFlag == 0)
|
|
|
- {
|
|
|
- time = DateTime.MaxValue;
|
|
|
- }
|
|
|
- else if (formatFlag == 1)
|
|
|
- {
|
|
|
- var newTime = new DateTime(time.Year, time.Month, time.Day, 0, 0, 0);
|
|
|
- time = newTime.AddHours(24);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- var newTime = new DateTime(time.Year, time.Month, time.Day, time.Hour, 0, 0);
|
|
|
- time = newTime.AddHours(1);
|
|
|
- }
|
|
|
+ //if (formatFlag == 0)
|
|
|
+ //{
|
|
|
+ // time = DateTime.MaxValue;
|
|
|
+ //}
|
|
|
+ //else if (formatFlag == 1)
|
|
|
+ //{
|
|
|
+ // var newTime = new DateTime(time.Year, time.Month, time.Day, 0, 0, 0);
|
|
|
+ // time = newTime.AddHours(24);
|
|
|
+ //}
|
|
|
+ //else
|
|
|
+ //{
|
|
|
+ // var newTime = new DateTime(time.Year, time.Month, time.Day, time.Hour, 0, 0);
|
|
|
+ // time = newTime.AddHours(1);
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -135,11 +135,11 @@ namespace X2D1TaskServer.Service
|
|
|
_ = LogUI.Error($"文件[{Path.GetFileName(filePath)}]格式异常,解析时间信息出错");
|
|
|
return null;
|
|
|
}
|
|
|
- if (dateTime <= preTime)
|
|
|
- {
|
|
|
- //已处理,跳过此文件
|
|
|
- return null;
|
|
|
- }
|
|
|
+ //if (dateTime <= preTime)
|
|
|
+ //{
|
|
|
+ // //已处理,跳过此文件
|
|
|
+ // return null;
|
|
|
+ //}
|
|
|
historyFile.CapTime = dateTime;
|
|
|
|
|
|
|
|
|
@@ -695,19 +695,19 @@ namespace X2D1TaskServer.Service
|
|
|
dto.SatTxLat = 11.57;
|
|
|
dto.CdbTxLon = 43;
|
|
|
dto.CdbTxLat = 11.57;
|
|
|
- var mainEcef = PhysicsHelper.GeoToEcef((dto.MainX, dto.MainY, dto.MainZ));
|
|
|
- var adjaEcef = PhysicsHelper.GeoToEcef((dto.AdjaX, dto.AdjaY, dto.AdjaZ));
|
|
|
- var lon = r.Next(41, 46) + Math.Round(r.NextDouble(), 3);
|
|
|
- var lat = r.Next(9, 14) + Math.Round(r.NextDouble(), 3);
|
|
|
+ var mainEcef = (dto.MainX, dto.MainY, dto.MainZ);
|
|
|
+ var adjaEcef = (dto.AdjaX, dto.AdjaY, dto.AdjaZ);
|
|
|
+ var lon = r.Next(38, 48) + Math.Round(r.NextDouble(), 3);
|
|
|
+ var lat = r.Next(7, 16) + Math.Round(r.NextDouble(), 3);
|
|
|
var tarEcef = PhysicsHelper.GeoToEcef((lon, lat, 0));
|
|
|
- var recEcef = PhysicsHelper.GeoToEcef((x2D1.SatTxLon, x2D1.SatTxLat, 0));
|
|
|
+ var recEcef = PhysicsHelper.GeoToEcef((dto.SatTxLon, dto.SatTxLat, 0));
|
|
|
var d1 = PhysicsHelper.Dto(tarEcef, mainEcef, recEcef);
|
|
|
var d2 = PhysicsHelper.Dto(tarEcef, adjaEcef, recEcef);
|
|
|
var d3 = PhysicsHelper.Dto(tarEcef, recEcef);
|
|
|
- var dto1 = (d1 - d2) * 1e6 + r.Next(-10, 11);
|
|
|
- var dto2 = (d1 - d3) * 1e6 + r.Next(-10, 11);
|
|
|
- dto.SxDto = dto1;
|
|
|
- dto.XdDto = dto2;
|
|
|
+ var dto1 = (d1 - d2) * 1e6 + r.Next(-50, 51);
|
|
|
+ var dto2 = (d1 - d3) * 1e6 + r.Next(-50, 51);
|
|
|
+ dto.SxDto = Math.Round(dto1, 3);
|
|
|
+ dto.XdDto = Math.Round(dto2, 3);
|
|
|
var result = await HttpHelper.PostRequestAsync<PosResDto>(_config.baseUrl + "Pos/PosX2D1NoParAsync", dto);
|
|
|
#endregion
|
|
|
|
wyq