1111

Service/X2D1NoRefTaskServer/Service/HistoryTaskService.cs

@@ -147,9 +147,10 @@ namespace X2D1NoRefTaskServer.Service
                                 LogHelper.Warning($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻未找到超短波信号ch1文件,跳过此组数据");
                                 continue;
                             }
-                            if(!dto.Freqs.Any(p=>(p.FreqUp==dinfo.FreqHz))
+                            var freqInfo = dto.Freqs.FirstOrDefault(p => p.FreqUp == dinfo.FreqHz);
+                            if (freqInfo == null)
                             {
-                                continue;//跳过不是任务处理的频点,注意如果任务没有填频点则全处理
+                                continue;//跳过不是任务处理的频点
                             }
                             //主星
                             var minfo = finfos.FirstOrDefault(m => m.Ch == 2);
@@ -174,7 +175,7 @@ namespace X2D1NoRefTaskServer.Service
                                 DetectDto detectDto = new DetectDto()
                                 {
                                     file1 = cdbFile,//11局使用上行泄露信号进行检测
-                                    dmcType = (DmcType)dto.TaskCheckType,//上行信号检测目前的算法只能使用基于能量的KY或IBS检测
+                                    dmcType = (DmcType)freqInfo.SigType,//上行信号检测目前的算法只能使用基于能量的KY或IBS检测
                                     fsHz = minfo.FsHz,
                                 };
                                 detectDto.dmcType = detectDto.dmcType & ~DmcType.DAMA;//DAMA不支持上行信号检测,在这里移除掉

XdCxRhDW.Entity/EntityEnum.cs

@@ -148,86 +148,52 @@ namespace XdCxRhDW.Entity
         /// 卫星图
         /// </summary>
         [Display(Name = "卫星图")]
-        SatMap=2,
+        SatMap = 2,
 
         /// <summary>
         /// 道路图
         /// </summary>
         [Display(Name = "道路图")]
-        RoadMap=4,
+        RoadMap = 4,
 
         /// <summary>
         /// 行政区划图
         /// </summary>
         [Display(Name = "行政区划图")]
-        XZQH_Map=8
+        XZQH_Map = 8
 
     }
 
-    public enum EnumSigType
-    {
-        /// <summary>
-        /// 常规
-        /// </summary>
-        [Display(Name = "常规信号")]
-        Normal,
-
-        /// <summary>
-        /// 突发信号
-        /// </summary>
-        [Display(Name = "突发信号")]
-        SX,
-    }
-
     /// <summary>
-    /// 任务信号的检测方式(支持多选)
+    /// 定位点的信号检测类型
     /// </summary>
-    [Flags]
-    public enum EnumTaskCheckType
+    public enum EnumPosCheckType
     {
         /// <summary>
         /// DAMA
         /// </summary>
         [Display(Name = "DAMA")]
-        DAMA=1,
-
+        DAMA = 1,
         /// <summary>
         /// IBS
         /// </summary>
         [Display(Name = "IBS")]
-        IBS=2,
-
+        IBS = 2,
         /// <summary>
         /// 能量检测
         /// </summary>
         [Display(Name = "能量检测")]
         Ky5758 = 4,
-    }
 
-    /// <summary>
-    /// 定位点的信号检测类型
-    /// </summary>
-    public enum EnumPosCheckType
-    {
         /// <summary>
-        /// DAMA
-        /// </summary>
-        [Display(Name = "DAMA")]
-        DAMA,
-        /// <summary>
-        /// IBS
-        /// </summary>
-        [Display(Name = "IBS")]
-        IBS,
-        /// <summary>
-        /// 能量检测
+        /// 常规信号
         /// </summary>
-        [Display(Name = "能量检测")]
-        Ky5758,
+        [Display(Name = "常规信号")]
+        Normal = 8,
     }
 
     /// <summary>
-    /// 信号的信号类型(支持多选)
+    /// 信号检测类型(支持多选)
     /// </summary>
     [Flags]
     public enum EnumSigCheckType

XdCxRhDw.Dto/EnumPosResTypeDto.cs

@@ -145,47 +145,36 @@ namespace XdCxRhDW.Dto
         X2Dfo,
     }
 
-    /// <summary>
-    /// 信号类型
-    /// </summary>
-    public enum EnumSigTypeDto
-    {
-        /// <summary>
-        /// 常规
-        /// </summary>
-        [Display(Name = "常规信号")]
-        Normal,
-
-        /// <summary>
-        /// 突发信号
-        /// </summary>
-        [Display(Name = "突发信号")]
-        SX,
-    }
 
     /// <summary>
-    /// 任务信号的检测方式(支持多选)
+    /// 信号检测类型(支持多选)
     /// </summary>
     [Flags]
-    public enum EnumTaskCheckTypeDto
+    public enum EnumSigCheckTypeDto
     {
         /// <summary>
-        /// DAMA检测
+        /// DAMA
         /// </summary>
         [Display(Name = "DAMA检测")]
-        DAMA = 1,
+        DAMA,
 
         /// <summary>
-        /// IBS检测
+        /// IBS
         /// </summary>
         [Display(Name = "IBS检测")]
-        IBS = 2,
+        IBS,
 
         /// <summary>
         /// 能量检测
         /// </summary>
         [Display(Name = "能量检测")]
-        Ky5758 = 4
+        Ky5758,
+
+        /// <summary>
+        /// 常规信号
+        /// </summary>
+        [Display(Name = "常规信号")]
+        Normal = 8,
     }
 
     /// <summary>
@@ -198,16 +187,24 @@ namespace XdCxRhDW.Dto
         /// </summary>
         [Display(Name = "DAMA检测")]
         DAMA,
+
         /// <summary>
         /// IBS
         /// </summary>
         [Display(Name = "IBS检测")]
         IBS,
+
         /// <summary>
         /// 能量检测
         /// </summary>
         [Display(Name = "能量检测")]
         Ky5758,
+
+        /// <summary>
+        /// 常规信号
+        /// </summary>
+        [Display(Name = "常规信号")]
+        Normal = 8,
     }
 
 }

XdCxRhDw.Dto/TaskSigDto.cs

@@ -37,7 +37,7 @@ namespace XdCxRhDW.Dto
         /// 信号类型
         /// </summary>
         [Display(Name = "信号类型")]
-        public EnumTaskCheckTypeDto SigType { get; set; }
+        public EnumSigCheckTypeDto SigType { get; set; }
 
         /// <summary>
         /// 参估信噪比门限