|
|
@@ -227,7 +227,7 @@ namespace X2LeoTaskServer54.Service
|
|
|
smpCount = 0,
|
|
|
snrThreshold = 15,
|
|
|
};
|
|
|
- var result2 = await HttpHelper.PostRequestAsync<List<CpuCgResDto>>(baseUrl + "DetectCg/CpuCgCalc", cpuCgDto, token: cts.Token);
|
|
|
+ var result2 = await HttpHelper.PostRequestAsync<CpuCgResDto>(baseUrl + "DetectCg/CpuCgCalc", cpuCgDto, token: cts.Token);
|
|
|
sw.Stop();
|
|
|
if (result2.code != 200)
|
|
|
{
|
|
|
@@ -242,11 +242,6 @@ namespace X2LeoTaskServer54.Service
|
|
|
LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-参估结果个数和检测结果个数不匹配");
|
|
|
return;
|
|
|
}
|
|
|
- if (data2.Count != 0)
|
|
|
- {
|
|
|
- LogHelper.Error($"【任务{dto.ID}】第{No}组{adTime:yyyyMMddHHmmss}时刻-信号{freq}MHz-参考参估无结果");
|
|
|
- return;
|
|
|
- }
|
|
|
sw.Start();
|
|
|
for (int i = 0; i < data1.Count; i++)
|
|
|
{
|
|
|
@@ -275,9 +270,9 @@ namespace X2LeoTaskServer54.Service
|
|
|
Dfo = data1[i].Df,
|
|
|
Snr = data1[i].Snr,
|
|
|
YbMainDto = 260000,
|
|
|
- YbAdjaDto = 260000 + PosDtoFactor * data2[0].Dt,
|
|
|
+ YbAdjaDto = 260000 + PosDtoFactor * data2.Dt,
|
|
|
YbMainDfo = 100,
|
|
|
- YbAdjaDfo = 100 + data2[0].Df,
|
|
|
+ YbAdjaDfo = 100 + data2.Df,
|
|
|
TarFreqUp = (tarFileInfo1.FreqDownMHz + 44) * 1e6,
|
|
|
RefFreqUp = (refFileInfo1.FreqDownMHz + 44) * 1e6,
|
|
|
SatTxLon = dto.CapLon,
|
|
|
@@ -345,7 +340,7 @@ namespace X2LeoTaskServer54.Service
|
|
|
sb.Append($"{Convert.ToInt64(leoX2.Snr * 1e2):D6}\t");
|
|
|
sb.Append($"{Convert.ToInt64((leoX2.YbMainDto- leoX2.YbAdjaDto) * 1e2):D10}\t");
|
|
|
sb.Append($"{Convert.ToInt64((leoX2.YbMainDfo - leoX2.YbAdjaDfo) * 1e2):D10}\t");
|
|
|
- sb.Append($"{Convert.ToInt64(100 * 1e2):D6}\t");
|
|
|
+ sb.Append($"{Convert.ToInt64(data2.Snr * 1e2):D6}\t");
|
|
|
sb.Append($"{Convert.ToInt64(0 * 1e2):D10}\t");
|
|
|
sb.Append($"{Convert.ToInt64(0 * 1e2):D10}\t");
|
|
|
sb.Append($"{Convert.ToInt64(0 * 1e2):D6}\t");
|
wyq