ddd

Service/X2D1TaskServer/Service/TaskHistoryService.cs

@@ -166,7 +166,7 @@ namespace X2D1TaskServer54.Service
                     }
                 }
 #warning 历史数据文件太少,对105导出的csv结果重新定位
-                var csvFile = Directory.GetFiles(dto.CapDir, "*.csv").Where(p=>!p.Contains("副本")).FirstOrDefault();
+                var csvFile = Directory.GetFiles(dto.CapDir, "*.csv").Where(p => !p.Contains("副本")).FirstOrDefault();
                 if (csvFile != null && mainFileTmp != null && adjaFileTmp != null && cdbFileTmp != null)
                 {
                     var lines = File.ReadAllLines(csvFile).Skip(1).ToList();
@@ -176,16 +176,18 @@ namespace X2D1TaskServer54.Service
                         var arr2 = lines[i + 1].Split(',');
                         var capTime = DateTime.ParseExact(arr1[0], "yyyy-MM-dd HH:mm:ss.fff", null);
                         var upFreqHz = (long)(Convert.ToDouble(arr1[1]) * 1e6);
-                        var dt1 = Convert.ToDouble(arr1[24])*1e6;//主邻1时差
+                        var cdbLon = Convert.ToDouble(arr2[21]);
+                        var cdbLat = Convert.ToDouble(arr2[22]);
+                        var dt1 = Convert.ToDouble(arr1[24]) * 1e6;//主邻1时差
                         var df1 = Convert.ToDouble(arr1[25]);//Hz
                         var snr1 = Convert.ToDouble(arr1[26]);
 
-                        var dt2 = Convert.ToDouble(arr2[24])*1e6;//主超短时差
+                        var dt2 = Convert.ToDouble(arr2[24]) * 1e6;//主超短时差
                         var df2 = Convert.ToDouble(arr2[25]);//Hz
                         var snr2 = Convert.ToDouble(arr2[26]);
 
-                        var refDto1= Convert.ToDouble(arr1[37])*1e6;//样本主星时差
-                        var refDto2= Convert.ToDouble(arr1[39])*1e6;//样本邻星时差
+                        var refDto1 = Convert.ToDouble(arr1[37]) * 1e6;//样本主星时差
+                        var refDto2 = Convert.ToDouble(arr1[39]) * 1e6;//样本邻星时差
 
                         var mainX = Convert.ToDouble(arr1[27]);
                         var mainY = Convert.ToDouble(arr1[28]);
@@ -196,6 +198,10 @@ namespace X2D1TaskServer54.Service
                         double[] mainEph = new double[3] { mainX, mainY, mainZ };
                         double[] adjaEph = new double[3] { adjaX, adjaY, adjaZ };
 
+                        double[] cdbLoc = new double[2];
+                        cdbLoc[0] = cdbLon;
+                        cdbLoc[1] = cdbLat;
+
 
                         var taskSig = dto.Sigs.FirstOrDefault(p => p.FreqUp == cdbFileTmp.UpFreqHz);
                         if (taskSig == null)
@@ -206,6 +212,7 @@ namespace X2D1TaskServer54.Service
                         string adjaFile = await HttpHelper.UploadFileAsync(adjaFileTmp.FilePath, _config.baseUrl, token: cts.Token);//邻星文件
                         string cdbFile = await HttpHelper.UploadFileAsync(cdbFileTmp.FilePath, _config.baseUrl, token: cts.Token);//超短文件
                         var paramInfo = new BaseParamInfo(taskSig, cdbFileTmp, mainFileTmp, adjaFileTmp);
+                        //paramInfo.Minfo.UpFreqHz = upFreqHz;
                         (bool deret, List<DetectResDto> deteRes) = await DetectCalc(cdbFile, mainFile, paramInfo, cts);
                         if (!deret) continue;
                         deteRes = deteRes.Take(1).ToList();
@@ -299,7 +306,7 @@ namespace X2D1TaskServer54.Service
                             continue;
                         }
                         string msg = $"【任务{dto.ID}】目标信号[{paramInfo.TaskSig.FreqUp / 1e6:f3}MHz]";
-                        await Pos(dto, paramInfo, deteRes, data1, data2, cts, msg, capTime, mainEph, adjaEph, refDto1, refDto2);
+                        await Pos(dto, paramInfo, deteRes, data1, data2, cts, msg, capTime, mainEph, adjaEph, refDto1, refDto2, cdbLoc);
                     }
 
 
@@ -308,7 +315,7 @@ namespace X2D1TaskServer54.Service
             }, cts.Token);
         }
 
-        public async Task Pos(X2D1TaskHandleDto dto, BaseParamInfo paramInfo, List<DetectResDto> deteRes, List<CpuCgResDto> data1, List<CpuCgResDto> data2, CancellationTokenSource cts, string msg, DateTime sigTime, double[] mainEph, double[] adjaEph, double refDto1, double refDto2)
+        public async Task Pos(X2D1TaskHandleDto dto, BaseParamInfo paramInfo, List<DetectResDto> deteRes, List<CpuCgResDto> data1, List<CpuCgResDto> data2, CancellationTokenSource cts, string msg, DateTime sigTime, double[] mainEph, double[] adjaEph, double refDto1, double refDto2, double[] cdbLoc)
         {
 
             for (int i = 0; i < data1.Count; i++)
@@ -335,8 +342,8 @@ namespace X2D1TaskServer54.Service
                         MSatTxLat = dto.MSatCapLat,
                         NSatTxLon = dto.NSatCapLon,
                         NSatTxLat = dto.NSatCapLat,
-                        CdbTxLon = dto.CdbLon,
-                        CdbTxLat = dto.CdbLat,
+                        CdbTxLon = cdbLoc[0],
+                        CdbTxLat = cdbLoc[1],
                         RefLon = dto.RefLon,
                         RefLat = dto.RefLat,
                         FreqDown = paramInfo.Minfo.DownFreqHz,