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

Service/CheckServer/MainForm.cs

@@ -160,7 +160,7 @@ namespace CheckServer
                 {
                     Serilog.Log.Error(ex, "清理wwwroot历史文件异常");
                 }
-                await Task.Delay(3600 * 1000);
+                await Task.Delay(60 * 1000);
             }
         }
     }

Service/CpuCgServer/MainForm.cs

@@ -162,7 +162,7 @@ namespace CpuCgServer
                 {
                     Serilog.Log.Error(ex, "清理wwwroot历史文件异常");
                 }
-                await Task.Delay(3600 * 1000);
+                await Task.Delay(60 * 1000);
             }
         }
     }

Service/GpuCgServer/AddIns/GpuCgHelper.cs

@@ -59,8 +59,7 @@ namespace GpuCgServer
             var exeFile = Path.Combine(exePath, exeName);
             if (!File.Exists(exeFile))
                 throw new Exception($"文件[{exeFile}]不存在");
-            Stopwatch sw = new Stopwatch();
-            sw.Start();
+            
             Process p = new Process();
             p.StartInfo.WorkingDirectory = exePath;
             p.StartInfo.FileName = exeFile;
@@ -69,6 +68,8 @@ namespace GpuCgServer
             p.StartInfo.RedirectStandardError = true;
             p.StartInfo.RedirectStandardOutput = true;
             p.StartInfo.UseShellExecute = false;
+            Stopwatch sw = new Stopwatch();
+            sw.Start();
             p.Start();
             var succeed = p.WaitForExit(timeoutSeconds * 1000);
             if (!succeed)
@@ -77,6 +78,10 @@ namespace GpuCgServer
             }
             var res = p.StandardOutput.ReadToEnd();
             sw.Stop();
+            if (sw.ElapsedMilliseconds < 800)
+            {
+                throw new Exception("没有GPU");
+            }
             List<GpuCgResponseDto> list = new List<GpuCgResponseDto>();
             //3:-0.000*-0.00054.553+72.917*0.000*37.756+-72.917*0.000*37.671+
             if (res.Length<3)

Service/GpuCgServer/Controllers/GpuCgController.cs

@@ -48,8 +48,8 @@ namespace GpuCgServer.Controllers
             }
             catch (Exception ex)
             {
-                Serilog.Log.Error(ex, "执行GPU参估异常");
-                return Error<List<GpuCgResponseDto>>($"执行GPU参估异常");
+                Serilog.Log.Error(ex, $"执行GPU参估异常,{ex.Message}");
+                return Error<List<GpuCgResponseDto>>($"执行GPU参估异常,{ex.Message}");
             }
         }
 

Service/GpuCgServer/MainForm.cs

@@ -160,7 +160,7 @@ namespace GpuCgServer
                 {
                     Serilog.Log.Error(ex, "清理wwwroot历史文件异常");
                 }
-                await Task.Delay(3600 * 1000);
+                await Task.Delay(60 * 1000);
             }
         }
     }

Service/X2D1NoRefTaskServer/Service/TaskService.cs

@@ -175,11 +175,16 @@ namespace X2D1NoRefTaskServer.Service
                                         SigProc = true,
                                     };
                                     detectDto.dmcType = detectDto.dmcType & ~EnumSigCheckTypeDto.DAMA;//DAMA不支持上行信号检测,在这里移除掉
-                                    if (detectDto.dmcType == EnumSigCheckTypeDto.DAMA)
+                                    if ((int)detectDto.dmcType ==0)
                                     {
                                         LogHelper.Warning($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},上行信号不支持DAMA检测,请使用能量检测");
                                         continue;
                                     }
+                                    if (detectDto.dmcType == EnumSigCheckTypeDto.Normal)
+                                    {
+                                        LogHelper.Warning($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},上行信号不支持Normal检测");
+                                        continue;
+                                    }
                                     var deteResp = await HttpHelper.PostRequestAsync<List<DetectResDto>>(baseUrl + "DetectCg/DetectCalc", detectDto, token: cts.Token);
                                     if (deteResp.code != 200)
                                     {
@@ -486,11 +491,16 @@ namespace X2D1NoRefTaskServer.Service
                                         SigProc = true,
                                     };
                                     detectDto.dmcType = detectDto.dmcType & ~EnumSigCheckTypeDto.DAMA;//DAMA不支持上行信号检测,在这里移除掉
-                                    if (detectDto.dmcType == EnumSigCheckTypeDto.DAMA)
+                                    if ((int)detectDto.dmcType == 0)
                                     {
                                         LogHelper.Warning($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},上行信号不支持DAMA检测");
                                         continue;
                                     }
+                                    if (detectDto.dmcType == EnumSigCheckTypeDto.Normal)
+                                    {
+                                        LogHelper.Warning($"【任务{dto.ID}】信号{taskSig.FreqUp / 1e6:f3},上行信号不支持Normal检测");
+                                        continue;
+                                    }
                                     var deteResp = await HttpHelper.PostRequestAsync<List<DetectResDto>>(baseUrl + "DetectCg/DetectCalc", detectDto, token: cts.Token);
                                     if (deteResp.code != 200)
                                     {

XdCxRhDW.App/EditForms/SigEditor.cs

@@ -1,4 +1,5 @@
-using DevExpress.XtraEditors;
+using DevExpress.Utils.About;
+using DevExpress.XtraEditors;
 using ExtensionsDev;
 using System;
 using System.Collections.Generic;
@@ -19,7 +20,10 @@ namespace XdCxRhDW.App.EditForms
 {
     public partial class SigEditor : DevExpress.XtraEditors.XtraForm
     {
+       
         public SigInfo info;
+
+       private   List<SigInfo> infos;
         public SigEditor()
         {
             InitializeComponent();
@@ -37,7 +41,7 @@ namespace XdCxRhDW.App.EditForms
             this.Text = "编辑信号";
             this.info = info;
         }
-        private void SatEditor_Load(object sender, EventArgs e)
+        private async void SatEditor_Load(object sender, EventArgs e)
         {
 
             txtSigType.AddEnum<EnumSigCheckType>();
@@ -53,6 +57,12 @@ namespace XdCxRhDW.App.EditForms
                         txtSigType.Items[item].CheckState = CheckState.Checked;
                 }
             }
+            infos = new List<SigInfo>();
+            using (RHDWContext db = new RHDWContext())
+            {
+                var res = await db.SigInfos.ToListAsync();
+                infos.AddRange(res);
+            }
         }
 
         private void btnCancel_Click(object sender, EventArgs e)
@@ -84,7 +94,15 @@ namespace XdCxRhDW.App.EditForms
                     dxErrorProvider.SetError(txtSnr, "门限格式错误");
                     return;
                 }
-                info.FreqUp = (long)(freqUp * 1000000);
+                long  frequp = (long)(freqUp * 1000000);
+               
+                if (infos.Any(i => i.ID != info.ID && i.FreqUp == frequp))
+                {
+
+                    DxHelper.MsgBoxHelper.ShowError($"上行频点[{freqUp}]已经存在!");
+                    return;
+                }
+                info.FreqUp = frequp;
                 info.FreqDown = (long)(freqDown * 1000000);
                 info.Snr = Convert.ToDouble(txtSnr.EditValue);
                 var res = txtSigType.Items.Where(p => p.CheckState == CheckState.Checked).Select(t => (EnumSigCheckType)t.Value).ToList();

XdCxRhDW.App/MainForm.cs

@@ -280,7 +280,7 @@ namespace XdCxRhDW
                 {
                     Serilog.Log.Error(ex, "清理wwwroot历史文件异常");
                 }
-                await Task.Delay(3600 * 1000);
+                await Task.Delay(60 * 1000);
             }
         }
 

XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -508,7 +508,7 @@
     <EmbeddedResource Include="PopupControl\ShowCxCtrl.resx">
       <DependentUpon>ShowCxCtrl.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
+    <None Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

XdCxRhDW.Sender/XdCxRhDW.Sender.csproj

@@ -91,6 +91,7 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>