11

Service/CheckServer/CheckServer.csproj

@@ -231,7 +231,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>del DevExpress*.xml,EntityFramework*.xml,Serilog*.xml,Newtonsoft*.xml
+    <PostBuildEvent>copy XdCxRhDw*.dll ..\..\..\..\XdCxRhDW.App\Service\信号检测服务\AddIns\
+del DevExpress*.xml,EntityFramework*.xml,Serilog*.xml,Newtonsoft*.xml
 del System*.xml,Microsoft*.xml,autofac*.xml,MySql*.xml,K4os*.xml,google*.xml
 del BouncyCastle*.xml
 

Service/X2D1NoRefTaskServer/Service/HistoryTaskService.cs

@@ -81,7 +81,7 @@ namespace X2D1NoRefTaskServer.Service
                         IEnumerable<string> files;
                         if (!Directory.Exists(filesDir))
                         {
-                            //LogHelper.Info($"【任务{dto.ID}】目录[{filesDir}]不存在,跳过此目录");
+                            LogHelper.Info($"【任务{dto.ID}】目录[{filesDir}]不存在,跳过此目录");
                             ResetTime(formatFlag, ref preTime);
                             continue;
                         }

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -453,8 +453,8 @@ namespace XdCxRhDW.App.UserControl
                 }
                 catch (Exception ex)
                 {
-                    Serilog.Log.Error(ex, "保存任务异常");
-                    DxHelper.MsgBoxHelper.ShowError("保存任务异常");
+                    Serilog.Log.Error(ex, "编辑任务异常");
+                    DxHelper.MsgBoxHelper.ShowError("编辑任务异常");
                 }
             }
             else
@@ -496,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).ToListAsync() ;
+                            var dbSigs = await db.TaskSigs.Where(w => w.TaskInfoID == tsk.ID).Include(p=>p.SigInfo).ToListAsync();
                             if (!dbSigs.Any())
                             {
                                 DxHelper.MsgBoxHelper.ShowWarning($"请添加任务信号");
@@ -504,12 +504,20 @@ namespace XdCxRhDW.App.UserControl
                             }
                             foreach (var item in dbSigs)
                             {
-                                TaskSigDto sigDto = item.MapTo<TaskSigDto>();
-                                var sigDelay =await db.SigDelays.Where(p => p.SigInfoId == item.ID).ToListAsync();
-                                sigDto.SigDelay.Add(sigDelay.MapTo<SigDelayDto>());
+                                TaskSigDto sigDto = new TaskSigDto()
+                                {
+                                    FreqDown = item.SigInfo.FreqDown,
+                                    FreqUp = item.SigInfo.FreqUp,
+                                    SigType = (EnumSigCheckTypeDto)item.SigInfo.SigType,
+                                    Snr = item.SigInfo.Snr,
+                                    TaskInfoID = item.TaskInfoID,
+                                };
+                                var sigDelay = await db.SigDelays.Where(p => p.SigInfoId == item.ID).ToListAsync();
+
+                                sigDto.SigDelay.AddRange(sigDelay.MapTo<List<SigDelayDto>>());
                                 tskSigsDto.Add(sigDto);
                             }
-                          
+
                             tx = db.TxInfos.FirstOrDefault();
                             if (tx == null)
                             {

XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -1188,7 +1188,10 @@
   <Import Project="packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
   <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
   <PropertyGroup>
-    <PostBuildEvent>del DevExpress*.xml,EntityFramework*.xml,Serilog*.xml,Newtonsoft*.xml
+    <PostBuildEvent>del *.dll.configwmic process where name='信号检测服务.exe' delete
+del *.dll.configwmic process where name='CPU参估服务.exe' delete
+del *.dll.configwmic process where name='GPU参估服务.exe' delete
+del DevExpress*.xml,EntityFramework*.xml,Serilog*.xml,Newtonsoft*.xml
 del System*.xml,Microsoft*.xml,autofac*.xml,MySql*.xml,K4os*.xml,google*.xml
 del BouncyCastle*.xml
 copy $(SolutionDir)tips.txt tips.txt
@@ -1202,7 +1205,6 @@ xcopy x64 AddIns\x64 /EHCIY
 xcopy x86 AddIns\x86 /EHCIY
 rmdir x86 /S/Q
 rmdir x64 /S/Q
-del *.dll.config
 </PostBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

XdCxRhDW.Entity/SigDelay.cs

@@ -18,6 +18,7 @@ namespace XdCxRhDW.Entity
         public int SigInfoId { get; set; }
 
         [Display(AutoGenerateField = false)]
+        [JsonIgnore]
         public virtual SigInfo SigInfo { get; set; }
 
         [Display(Name = "卫星编号")]
@@ -27,6 +28,7 @@ namespace XdCxRhDW.Entity
         public string Sat { get; set; }
 
         [Display(AutoGenerateField = false)]
+        [JsonIgnore]
         public virtual SatInfo SatInfo { get; set; }
 
         [Display(Name = "转发延迟(us)")]

XdCxRhDW.Entity/TaskSig.cs

@@ -33,15 +33,15 @@ namespace XdCxRhDW.Entity
         public virtual SigInfo SigInfo { get; set; }
 
         /// <summary>
-        /// 上行频点(MHz)(防止信号被删除的冗余字段)
+        /// 上行频点(Hz)(防止信号被删除的冗余字段)
         /// </summary>
-        [Display(Name = "上行频点(MHz)")]
-        public double FreqUp { get; set; }
+        [Display(Name = "上行频点(Hz)")]
+        public long FreqUp { get; set; }
 
         /// <summary>
-        /// 下行频点(MHz)(防止信号被删除的冗余字段)
+        /// 下行频点(Hz)(防止信号被删除的冗余字段)
         /// </summary>
-        [Display(Name = "下行频点(MHz)")]
-        public double FreqDown { get; set; }
+        [Display(Name = "下行频点(Hz)")]
+        public long FreqDown { get; set; }
     }
 }

XdCxRhDw.Dto/TaskSigDto.cs

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