111

Service/CpuCgServer/Controllers/CpuCgController.cs

@@ -119,6 +119,7 @@ namespace CpuCgServer.Controllers
             {
                 var result = await xcorr.MultiCalc(xItem);
 
+                int idx = 0;
                 foreach (var item in result)
                 {
                     CpuCgResDto resDto = new CpuCgResDto
@@ -129,7 +130,7 @@ namespace CpuCgServer.Controllers
                         Dt = item.dt.Value,
                         Df = item.df.Value,
                         Snr = item.snr.Value,
-                        TimeSeconds = xItem.xcorrSmps[0].TimeSeconds,
+                        TimeSeconds = xItem.xcorrSmps[idx++].TimeSeconds,
                     };
                     resDtos.Add(resDto);
                 }

Service/X1LeoTaskServer54/X1LeoTaskServer54.csproj

@@ -42,9 +42,6 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
-    </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
     </Reference>

Service/X2D1TaskServer54/AddIns/时隙获取/SlotHelper.cs

@@ -41,10 +41,6 @@ namespace X2D1NoRefTaskServer54
                 float[] lenF = new float[slotscount];
                 Marshal.Copy(slotst, startsF, 0, slotscount);
                 Marshal.Copy(slotle, lenF, 0, slotscount);
-                for (int i = 0; i < startsF.Length; i++)
-                {
-                    startsF[i] = startsF[i] + i * 1.386666666666666666666666f;//SlotChecker.dll有BUG,只返回了第一个突发的时间
-                }
                 for (int i = 0; i < slotscount; i++)
                 {
                     Slot s = new Slot()

Service/X2D1TaskServer54/Service/TaskService.cs

@@ -137,7 +137,7 @@ namespace X2D1NoRefTaskServer54.Service
                                 { }
                             }
                             var adFiles = Directory.EnumerateFiles(CapDir, "*.dat", SearchOption.TopDirectoryOnly).Select(p => StringToAdFile(p))
-                                .Where(p => p.AdTime == listSlotsInfo.First().AdTime);
+                                .Where(p => p.AdTime == adTime);
                             if (adFiles.Count() != 3)
                             {
                                 await LogHelper.Warning($"【任务{dto.ID}】{adTime:yyyyMMddHHmmss}时刻原始AD文件个数不为3,跳过此组文件");
@@ -152,7 +152,7 @@ namespace X2D1NoRefTaskServer54.Service
                             var first = listSlotsInfo.First();
                             var sigs = listSlotsInfo.Select(p => new DDCSig() { FreqDownHz = (int)(p.FreqDownMHz * 1e6), Mult = (int)first.Multi, Slots = p });
                             List<DDCFile> chDDCFiles = new List<DDCFile>();//同一个时刻多个频点多个通道的DDC数据
-                            await LogHelper.Info($"【任务{dto.ID}】{listSlotsInfo.First().AdTime:yyyyMMddHHmmss}时刻DDC处理开始,共{sigs.Count()}个频点...");
+                            await LogHelper.Info($"【任务{dto.ID}】{adTime:yyyyMMddHHmmss}时刻DDC处理开始,共{sigs.Count()}个频点...");
                             Stopwatch sw = new Stopwatch();
                             sw.Start();
                             var listTask = new List<Task>();

Service/X2D1TaskServer54/X2D1NoRefTaskServer54.csproj

@@ -42,9 +42,6 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
-    </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
     </Reference>

Service/X2LeoTaskServer54/X2LeoTaskServer54.csproj

@@ -42,9 +42,6 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
-    </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
     </Reference>

Service/X3LeoTaskServer54/X3LeoTaskServer54.csproj

@@ -42,9 +42,6 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
-    </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
     </Reference>

Service/X3TaskServer54/X3TaskServer54.csproj

@@ -42,9 +42,6 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
-    </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
     </Reference>