zoulei 1 жил өмнө
parent
commit
32c4fdc494

+ 1 - 1
Service/X2D1NoRefTaskServer/Service/HistoryTaskService.cs

@@ -147,7 +147,7 @@ namespace X2D1NoRefTaskServer.Service
                                 LogHelper.Warning($"【任务{dto.ID}】{capTime:yyyyMMddHHmmss}时刻未找到超短波信号ch1文件,跳过此组数据");
                                 continue;
                             }
-                            if (dto.FreqsHz.Any() && !dto.FreqsHz.Contains(dinfo.FreqHz))
+                            if(!dto.Freqs.Any(p=>(p.FreqUp==dinfo.FreqHz))
                             {
                                 continue;//跳过不是任务处理的频点,注意如果任务没有填频点则全处理
                             }

+ 20 - 7
XdCxRhDw.Dto/TaskSigDto.cs

@@ -9,10 +9,11 @@ using System.Text;
 using System.Threading.Tasks;
 using XdCxRhDW.Dto;
 
-namespace XdCxRhDW.Entity
+namespace XdCxRhDW.Dto
 {
-
-    //任务信号
+    /// <summary>
+    /// 任务信号
+    /// </summary>
     public class TaskSigDto
     {
         /// <summary>
@@ -20,15 +21,27 @@ namespace XdCxRhDW.Entity
         /// </summary>
         public int TaskInfoID { get; set; }
 
-        [Display(Name = "上行频点(MHz)")]
-        public double FreqUp { get; set; }
+        /// <summary>
+        /// 上行频点(MHz)
+        /// </summary>
+        [Display(Name = "上行频点(Hz")]
+        public long FreqUp { get; set; }
 
-        [Display(Name = "下行频点(MHz)")]
-        public double FreqDown { get; set; }
+        /// <summary>
+        /// 下行频点(MHz)
+        /// </summary>
+        [Display(Name = "下行频点(Hz)")]
+        public long FreqDown { get; set; }
 
+        /// <summary>
+        /// 信号类型
+        /// </summary>
         [Display(Name = "信号类型")]
         public EnumTaskCheckTypeDto SigType { get; set; }
 
+        /// <summary>
+        /// 参估信噪比门限
+        /// </summary>
         [Display(Name = "门限(dB)")]
         public double Snr { get; set; }
     }