|
@@ -554,7 +554,6 @@ namespace X2D1TaskServer
|
|
}
|
|
}
|
|
List<DetectResDto> refDetects = await DoRefAsync(dto, paramInfo, deteRes, data1, data2, cts);
|
|
List<DetectResDto> refDetects = await DoRefAsync(dto, paramInfo, deteRes, data1, data2, cts);
|
|
bool beFindRef = false;
|
|
bool beFindRef = false;
|
|
-
|
|
|
|
if (refDetects != null && refDetects.Count > 0)//有参考信号
|
|
if (refDetects != null && refDetects.Count > 0)//有参考信号
|
|
{
|
|
{
|
|
beFindRef = true;
|
|
beFindRef = true;
|
|
@@ -562,7 +561,10 @@ namespace X2D1TaskServer
|
|
data1 = data1.Where(c => !refDetects.Any(r => r.Start == c.Smpstart && r.Length == c.Smplen)).ToList();
|
|
data1 = data1.Where(c => !refDetects.Any(r => r.Start == c.Smpstart && r.Length == c.Smplen)).ToList();
|
|
data2 = data2.Where(c => !refDetects.Any(r => r.Start == c.Smpstart && r.Length == c.Smplen)).ToList();
|
|
data2 = data2.Where(c => !refDetects.Any(r => r.Start == c.Smpstart && r.Length == c.Smplen)).ToList();
|
|
}
|
|
}
|
|
- await DoX2D1NoParPosAsync(dto, paramInfo, deteRes, data1, data2, cts, true, beFindRef);
|
|
|
|
|
|
+ string msg = $"【任务{dto.ID}】目标信号[{paramInfo.TaskSig.FreqUp / 1e6:f3}MHz]";
|
|
|
|
+ //目标信号找参考时才赋值固定站编号,为找参考信号做准备
|
|
|
|
+ //目标信号无参时不存储固定站编号
|
|
|
|
+ await DoX2D1NoParPosAsync(dto, paramInfo, deteRes, data1, data2, cts, msg, beFindRef ? dto.FixedStationDto.FixedStationId : 0, beFindRef);
|
|
|
|
|
|
}
|
|
}
|
|
catch (TaskCanceledException)
|
|
catch (TaskCanceledException)
|
|
@@ -582,9 +584,8 @@ namespace X2D1TaskServer
|
|
return task;
|
|
return task;
|
|
}
|
|
}
|
|
|
|
|
|
- private async Task DoX2D1NoParPosAsync(X2D1TaskHandleDto dto, BaseParamInfo paramInfo, List<DetectResDto> deteRes, List<CpuCgResDto> data1, List<CpuCgResDto> data2, CancellationTokenSource cts, bool beTar = false, bool beFindRef = false)
|
|
|
|
|
|
+ private async Task DoX2D1NoParPosAsync(X2D1TaskHandleDto dto, BaseParamInfo paramInfo, List<DetectResDto> deteRes, List<CpuCgResDto> data1, List<CpuCgResDto> data2, CancellationTokenSource cts, string msg, int fixedStationId, bool beFindRef = false)
|
|
{
|
|
{
|
|
- string msg = $"【任务{dto.ID}】{(!beTar ? "参考" : "目标")}信号[{paramInfo.TaskSig.FreqUp / 1e6:f3}MHz]";
|
|
|
|
for (int i = 0; i < data1.Count; i++)
|
|
for (int i = 0; i < data1.Count; i++)
|
|
{
|
|
{
|
|
try
|
|
try
|
|
@@ -619,9 +620,9 @@ namespace X2D1TaskServer
|
|
PosCheckType = detect.DmcType.GetEnumByDisplayName<EnumPosCheckTypeDto>(),
|
|
PosCheckType = detect.DmcType.GetEnumByDisplayName<EnumPosCheckTypeDto>(),
|
|
}
|
|
}
|
|
};
|
|
};
|
|
- if (dto.FixedStationDto != null)
|
|
|
|
|
|
+ if (fixedStationId > 0)
|
|
{
|
|
{
|
|
- x2D1.FixedStationId = dto.FixedStationDto.FixedStationId;
|
|
|
|
|
|
+ x2D1.FixedStationId = fixedStationId;
|
|
}
|
|
}
|
|
if (data1[i].Snr > 0 && data2[i].Snr > 0)
|
|
if (data1[i].Snr > 0 && data2[i].Snr > 0)
|
|
{
|
|
{
|
|
@@ -720,8 +721,9 @@ namespace X2D1TaskServer
|
|
await LogHelper.Error($"【任务{dto.ID}】参考信号[{dto.FixedStationDto.FreqUp / 1e6:f3}MHz],{capTime:yyyyMMddHHmmss}时刻参估结果个数和检测结果个数不匹配");
|
|
await LogHelper.Error($"【任务{dto.ID}】参考信号[{dto.FixedStationDto.FreqUp / 1e6:f3}MHz],{capTime:yyyyMMddHHmmss}时刻参估结果个数和检测结果个数不匹配");
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
-
|
|
|
|
- await DoX2D1NoParPosAsync(dto, paramInfo, refDetects, data1, data2, cts);
|
|
|
|
|
|
+ string msg = $"【任务{dto.ID}】参考信号[{paramInfo.TaskSig.FreqUp / 1e6:f3}MHz]";
|
|
|
|
+ //参考信号要存储固定站编号,标记是参考信号
|
|
|
|
+ await DoX2D1NoParPosAsync(dto, paramInfo, refDetects, data1, data2, cts, msg, dto.FixedStationDto.FixedStationId);
|
|
return refDetects;
|
|
return refDetects;
|
|
}
|
|
}
|
|
}
|
|
}
|