Merge branch 'master' of http://139.155.15.221:3000/zoulei/XdCxRhDW

Service/X2D1NoRefTaskServer/Service/HistoryTaskService.cs

@@ -68,6 +68,7 @@ namespace X2D1NoRefTaskServer.Service
                     StopTask(dto.ID, $"执行异常,不支持的日期目录格式");
                     return;
                 }
+
                 while (!cts.IsCancellationRequested && preTime <= dto.EndTime)
                 {
                     string filesDir = dto.CapDir;
@@ -142,7 +143,7 @@ namespace X2D1NoRefTaskServer.Service
                                 if (delay1 == null) delay1 = 0;
                                 if (delay2 == null) delay2 = 0;
                                 LogHelper.Info($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],主星[{minfo.SatId}],转发时延{delay1}us");
-                                LogHelper.Info($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],邻星[{ninfo.SatId}],转发时延{delay1}us");
+                                LogHelper.Info($"【任务{dto.ID}】信号[{taskSig.FreqUp / 1e6}],邻星[{ninfo.SatId}],转发时延{delay2}us");
                                 string mainFile = await HttpHelper.UploadFileAsync(minfo.FilePath, baseUrl + "File/UploadFileAsync", token: cts.Token);//主星文件
                                 string adjaFile = await HttpHelper.UploadFileAsync(ninfo.FilePath, baseUrl + "File/UploadFileAsync", token: cts.Token);//邻星文件
                                 string cdbFile = await HttpHelper.UploadFileAsync(dinfo.FilePath, baseUrl + "File/UploadFileAsync", token: cts.Token);//超短文件
@@ -154,13 +155,18 @@ namespace X2D1NoRefTaskServer.Service
                                     fsHz = minfo.FsHz,
                                 };
                                 detectDto.dmcType = detectDto.dmcType & ~EnumSigCheckTypeDto.DAMA;//DAMA不支持上行信号检测,在这里移除掉
+                                if (detectDto.dmcType == EnumSigCheckTypeDto.DAMA)
+                                {
+                                    LogHelper.Warning($"【任务{dto.ID}】信号{taskSig.FreqUp/1e6:f3},上行信号不支持DAMA检测,请使用能量检测");
+                                    continue;
+                                }
                                 var deteResp = await HttpHelper.PostRequestAsync<List<DetectResDto>>(baseUrl + "DetectCg/DetectCalc", detectDto, token: cts.Token);
                                 if (deteResp.code != 200)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻信号检测出错.{deteResp.msg}");
+                                    LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻信号检测出错.{deteResp.msg}");
                                     continue;
                                 }
-                                LogHelper.Info($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻信号检测完成,共{deteResp.data.Count}个时隙");
+                                LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻信号检测完成,共{deteResp.data.Count}个时隙");
                                 var smps = deteResp.data.Select(m => new SmpPosition(m.Start, m.Length)).ToList();//怎么补0?
                                 var cgDto = new CpuCgMultiDto()
                                 {
@@ -175,10 +181,10 @@ namespace X2D1NoRefTaskServer.Service
                                 var result1 = await HttpHelper.PostRequestAsync<List<CpuCgResDto>>(baseUrl + "DetectCg/CpuCgMultiCalc", cgDto, token: cts.Token);
                                 if (result1.code != 200)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻主星超短CPU参估出错.{result1.msg}");
+                                    LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻主星超短CPU参估出错.{result1.msg}");
                                     continue;
                                 }
-                                LogHelper.Info($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻主星超短CPU参估完成.");
+                                LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻主星超短CPU参估完成.");
                                 cgDto = new CpuCgMultiDto()
                                 {
                                     dtCenter = 260000,
@@ -192,15 +198,15 @@ namespace X2D1NoRefTaskServer.Service
                                 var result2 = await HttpHelper.PostRequestAsync<List<CpuCgResDto>>(baseUrl + "DetectCg/CpuCgMultiCalc", cgDto, token: cts.Token);
                                 if (result2.code != 200)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻邻星超短CPU参估出错.{result2.msg}");
+                                    LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻邻星超短CPU参估出错.{result2.msg}");
                                     continue;
                                 }
-                                LogHelper.Info($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻邻星超短CPU参估完成");
+                                LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻邻星超短CPU参估完成");
                                 var data1 = result1.data;
                                 var data2 = result2.data;
                                 if (data1.Count != data2.Count || data1.Count != deteResp.data.Count)
                                 {
-                                    LogHelper.Error($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻参估结果个数和检测结果个数不匹配");
+                                    LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻参估结果个数和检测结果个数不匹配");
                                     continue;
                                 }
                                 for (int i = 0; i < data1.Count; i++)
@@ -244,20 +250,20 @@ namespace X2D1NoRefTaskServer.Service
                                         var result = await HttpHelper.PostRequestAsync<PosResDto>(baseUrl + "Pos/PosX2D1NoXlNoParAsync", x2D1);
                                         if (result.code != 200)
                                         {
-                                            LogHelper.Error($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻时隙位置{data1[i].Smpstart}定位异常.{result.msg}");
+                                            LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻时隙位置{data1[i].Smpstart}定位异常.{result.msg}");
                                         }
                                     }
                                     catch (Exception ex)
                                     {
-                                        LogHelper.Error($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻时隙位置{data1[i].Smpstart}定位异常", ex);
+                                        LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻时隙位置{data1[i].Smpstart}定位异常", ex);
                                     }
                                 }
-                                LogHelper.Info($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻定位完成");
+                                LogHelper.Info($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻定位完成");
 
                             }
                             catch (Exception ex)
                             {
-                                LogHelper.Error($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻文件处理异常", ex);
+                                LogHelper.Error($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},{capTime:yyyyMMddHHmmss}时刻文件处理异常", ex);
                                 continue;
                             }
 

XdCxRhDW.App/Controllers/DetectCgController.cs

@@ -114,6 +114,7 @@ namespace XdCxRhDW.App.Controllers
             var svr = ServerContext.Instance.GetRandomOne(EnumSvrType.CheckSvr);
             dto.File = await HttpHelper.UploadFileAsync(GetLocalFile(dto.File), svr.BaseHttpAddr + "/api/File/UploadFileAsync");
             var res = await HttpHelper.PostRequestAsync<ResampleResponseDto>(svr.BaseHttpAddr + "/api/Check/Resample", dto);
+            await HttpHelper.DownloadFileAsync(svr.BaseHttpAddr, res.data.File, GetLocalFile(res.data.File));
             return res;
         }
     }

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -165,7 +165,7 @@ namespace XdCxRhDW.App.UserControl
             this.svgImageCollection1.Add("Running", SvgHelper.CreateCycle("#2E8B57"));
             gridView1.CustomDrawCell += GridView1_CustomDrawCell;
             gridView1.DoubleClick += GridView1_DoubleClick;
-            txtTimeCho_SelectedIndexChanged(null, null);            
+            txtTimeCho_SelectedIndexChanged(null, null);
             WaitHelper.CloseForm();
         }
 
@@ -395,9 +395,11 @@ namespace XdCxRhDW.App.UserControl
             {
                 try
                 {
+                    var editItem = gridView1.GetFocusedRow() as TaskInfo;
+                    if (editItem == null) return;
                     using (RHDWContext db = new RHDWContext())
                     {
-                        var editItem = gridView1.GetFocusedRow() as TaskInfo;
+                       
                         List<TaskSig> taskSig = await db.TaskSigs.Where(w => w.TaskInfoID == editItem.ID).ToListAsync();
                         var taskSigID = taskSig.Select(s => s.SigInfoID);
                         var items = await db.SigInfos.ToListAsync();
@@ -494,7 +496,7 @@ namespace XdCxRhDW.App.UserControl
                         List<TaskSigDto> tskSigsDto = new List<TaskSigDto>();
                         using (RHDWContext db = new RHDWContext())
                         {
-                            var dbSigs = await db.TaskSigs.Where(w => w.TaskInfoID == tsk.ID).Include(p=>p.SigInfo).ToListAsync();
+                            var dbSigs = await db.TaskSigs.Where(w => w.TaskInfoID == tsk.ID).Include(p => p.SigInfo).ToListAsync();
                             if (!dbSigs.Any())
                             {
                                 DxHelper.MsgBoxHelper.ShowWarning($"请添加任务信号");
@@ -510,7 +512,7 @@ namespace XdCxRhDW.App.UserControl
                                     Snr = item.SigInfo.Snr,
                                     TaskInfoID = item.TaskInfoID,
                                 };
-                                var sigDelay = await db.SigDelays.Where(p => p.SigInfoId == item.ID).ToListAsync();
+                                var sigDelay = await db.SigDelays.Where(p => p.SigInfoId == item.SigInfo.ID).ToListAsync();
 
                                 sigDto.SigDelay.AddRange(sigDelay.MapTo<List<SigDelayDto>>());
                                 tskSigsDto.Add(sigDto);
@@ -835,6 +837,7 @@ namespace XdCxRhDW.App.UserControl
                         var array = await db.PosRes.Where(p => ids.Contains(p.ID)).ToArrayAsync();
                         db.PosRes.RemoveRange(array);
                         await db.SaveChangesAsync();
+                        mapControl1.DelPosItem(array);
                     }
                 }
                 return true;
@@ -1100,9 +1103,13 @@ namespace XdCxRhDW.App.UserControl
             }
         }
 
-        public void RePosition(List<RePosRes> items)
+        public void RePosition(List<RePosRes> items, PosRequestByTimeRangeDto dto)
         {
-            if (items.Count == 0) return;
+            if (items.Count == 0)
+            {
+                MsgBoxHelper.ShowWarning($"查询任务[{dto.TaskInfoID}]开始时间:{dto.BeginTime:yyyy-MM-dd HH:mm:ss} 结束时间:{dto.EndTime:yyyy-MM-dd HH:mm:ss}无定位结果数据");
+                return;
+            }
             Task.Run(async () =>
             {
                 foreach (var item in items)
@@ -1355,7 +1362,7 @@ namespace XdCxRhDW.App.UserControl
                 var res = await HttpHelper.PostRequestAsync<List<RePosRes>>(baseUrl + "Pos/GetPosCgResByTimeRangeObsolete", dto, token: ct.Token);
                 if (res.code == 200)
                 {
-                    RePosition(res.data);
+                    RePosition(res.data, dto);
                 }
                 else
                 {
@@ -1364,8 +1371,9 @@ namespace XdCxRhDW.App.UserControl
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, "重新定位结果查询异常");
-                MsgBoxHelper.ShowError("重新定位结果查询异常");
+                string msg = $"任务[{dto.TaskInfoID}]重新定位结果查询开始时间:{dto.BeginTime:yyyy-MM-dd HH:mm:ss} 结束时间:{dto.EndTime:yyyy-MM-dd HH:mm:ss}异常";
+                Serilog.Log.Error(ex, msg);
+                MsgBoxHelper.ShowError(msg);
             }
 
 

XdCxRhDW.App/UserControl/CtrlXl.cs

@@ -62,6 +62,13 @@ namespace XdCxRhDW.App.UserControl
                 this.layoutControl1.Enabled = true;
                 return;
             }
+            if (string.IsNullOrEmpty(btnOpen.Text))
+            {
+                Serilog.Log.Warning($"请选择星历文件");
+                DxHelper.MsgBoxHelper.ShowInfo($"请选择星历文件");
+                this.layoutControl1.Enabled = true;
+                return;
+            }
             string file;
             try
             {

XdCxRhDw.Dto/TaskSigDto.cs

@@ -44,7 +44,6 @@ namespace XdCxRhDW.Dto
         /// <summary>
         /// 信号卫星转发延迟
         /// </summary>
-        [JsonIgnore]
         public List<SigDelayDto> SigDelay { get; set; } = new List<SigDelayDto>();
 
     }