22

DW5S.App/CorTools/DetectToolForm.cs

@@ -15,11 +15,15 @@ using DW5S.DTO;
 using DW5S.Repostory;
 using DW5S.KxcApi;
 using DevExpress.XtraLayout.Utils;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.CorTools
 {
     public partial class DetectToolForm : DevExpress.XtraEditors.XtraForm
     {
+        [Autowired]
+        private readonly ILogger logger;
+
         static readonly string inifile = Path.Combine(Application.StartupPath, "par.ini");
         List<CafResultDto> gridSource = new List<CafResultDto>();
 
@@ -57,7 +61,7 @@ namespace DW5S.App.CorTools
                     catch (Exception ex)
                     {
                         layoutControl1.Enabled = true;
-                        DW5S.Framework.LogHelper.Error(ex.Message, ex);
+                        logger.LogError(ex,ex.Message);
                         DxHelper.MsgBoxHelper.ShowError(ex.Message);
                         return;
                     }
@@ -68,7 +72,7 @@ namespace DW5S.App.CorTools
                     catch (Exception ex)
                     {
                         layoutControl1.Enabled = true;
-                        DW5S.Framework.LogHelper.Error(ex.Message, ex);
+                        logger.LogError(ex,ex.Message);
                         DxHelper.MsgBoxHelper.ShowError(ex.Message);
                         return;
                     }
@@ -94,7 +98,7 @@ namespace DW5S.App.CorTools
                     catch (Exception ex)
                     {
                         layoutControl1.Enabled = true;
-                        DW5S.Framework.LogHelper.Error("CPU多时隙参估参数错误", ex);
+                        logger.LogError(ex,"CPU多时隙参估参数错误");
                         DxHelper.MsgBoxHelper.ShowError($"CPU多时隙参估参数错误");
                         return;
                     }
@@ -116,7 +120,7 @@ namespace DW5S.App.CorTools
                         else
                         {
                             DxHelper.MsgBoxHelper.ShowError(result.msg);
-                            DW5S.Framework.LogHelper.Error(result.msg);
+                            logger.LogError(result.msg);
                         }
                     }
                     catch (TaskCanceledException)
@@ -125,7 +129,7 @@ namespace DW5S.App.CorTools
                     }
                     catch (Exception ex)
                     {
-                        DW5S.Framework.LogHelper.Error("CPU多时隙参估计算异常", ex);
+                        logger.LogError(ex,"CPU多时隙参估计算异常");
                         DxHelper.MsgBoxHelper.ShowError($"CPU多时隙参估计算异常");
                     }
                     await HttpHelper.DeleteFileAsync(SysConfig.GetBaseUrl(), file1, file2);
@@ -174,14 +178,14 @@ namespace DW5S.App.CorTools
                         }
                         else
                         {
-                            DW5S.Framework.LogHelper.Error(result.msg);
+                            logger.LogError(result.msg);
                             DxHelper.MsgBoxHelper.ShowError(result.msg);
                         }
                         await HttpHelper.DeleteFileAsync(SysConfig.GetBaseUrl(), file1);
                     }
                     catch (Exception ex)
                     {
-                        DW5S.Framework.LogHelper.Error("信号识别异常", ex);
+                        logger.LogError(ex,"信号识别异常");
                     }
                     layoutControl1.Enabled = true;
                 }, false)
@@ -269,7 +273,7 @@ namespace DW5S.App.CorTools
                 }
                 else
                 {
-                    DW5S.Framework.LogHelper.Error(dmcResult.msg);
+                    logger.LogError(dmcResult.msg);
                     DxHelper.MsgBoxHelper.ShowError(dmcResult.msg);
                 }
                 WriteIni();
@@ -280,7 +284,7 @@ namespace DW5S.App.CorTools
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("信号检测出错", ex);
+                logger.LogError(ex,"信号检测出错");
                 DxHelper.MsgBoxHelper.ShowError($"信号检测出错");
             }
             await HttpHelper.DeleteFileAsync(SysConfig.GetBaseUrl(), dto.file1);
@@ -301,7 +305,7 @@ namespace DW5S.App.CorTools
             catch (Exception ex)
             {
                 layoutControl1.Enabled = true;
-                DW5S.Framework.LogHelper.Error(ex.Message, ex);
+                logger.LogError(ex,ex.Message);
                 DxHelper.MsgBoxHelper.ShowError(ex.Message);
                 return;
             }
@@ -319,7 +323,7 @@ namespace DW5S.App.CorTools
             catch (Exception ex)
             {
                 layoutControl1.Enabled = true;
-                DW5S.Framework.LogHelper.Error("CPU文件参估参数错误", ex);
+                logger.LogError(ex,"CPU文件参估参数错误");
                 DxHelper.MsgBoxHelper.ShowError($"CPU文件参估参数错误");
                 return;
             }
@@ -351,7 +355,7 @@ namespace DW5S.App.CorTools
                 }
                 else
                 {
-                    DW5S.Framework.LogHelper.Error(result.msg);
+                    logger.LogError(result.msg);
                     DxHelper.MsgBoxHelper.ShowError(result.msg);
                 }
             }
@@ -361,7 +365,7 @@ namespace DW5S.App.CorTools
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("CPU文件参估出错", ex);
+                logger.LogError(ex,"CPU文件参估出错");
                 DxHelper.MsgBoxHelper.ShowError("CPU文件参估出错");
             }
             await HttpHelper.DeleteFileAsync(SysConfig.GetBaseUrl(), xItem.file1, xItem.file2);
@@ -392,7 +396,7 @@ namespace DW5S.App.CorTools
                 await HttpHelper.DeleteFileAsync(SysConfig.GetBaseUrl(), par.file1, par.file2);
                 if (resp.code != 200)
                 {
-                    DW5S.Framework.LogHelper.Error(resp.msg);
+                    logger.LogError(resp.msg);
                     DxHelper.MsgBoxHelper.ShowError(resp.msg);
                 }
                 else
@@ -414,7 +418,7 @@ namespace DW5S.App.CorTools
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("参估绘图失败", ex);
+                logger.LogError(ex,"参估绘图失败");
                 DxHelper.MsgBoxHelper.ShowError($"参估绘图失败");
                 return;
             }

DW5S.App/MainForm.cs

@@ -222,7 +222,7 @@ namespace DW5S
                 }
                 catch (Exception ex)
                 {
-                    await LogUI.Error("清理过期星历异常", ex);
+                    logger.LogError(ex, "清理过期星历异常");
                 }
                 finally
                 {
@@ -241,16 +241,17 @@ namespace DW5S
                 {
                     List<XlInfo> calcItems = null;
                     List<SatInfo> satInfo = null;
-                    using (RHDWContext db = new RHDWContext())
-                    {
-                        calcItems = await db.XlInfos.Where(p => p.Lon == null).OrderByDescending(p => p.SatCode).Take(100).ToListAsync();
-                        satInfo = await db.SatInfos.ToListAsync();
-                    }
+                    var repsXl = unitOfWork.Reps<XlInfo>();
+                    var repsSat = unitOfWork.Reps<SatInfo>();
+
+                    calcItems = (await repsXl.FindAsync(p => p.Lon == null, p => p.SatCode, false)).Take(100).ToList();
+                    satInfo = (await repsSat.GetAllAsync()).ToList();
+
                     if (calcItems != null && calcItems.Any())
                     {
                         var firstUpdateItems = calcItems.Where(p => satInfo.Any(t => t.SatCode == p.SatCode)).ToList();
 
-                        await Task.Run(() =>
+                        await Task.Run(async () =>
                         {
                             List<XlInfo> Level1 = new List<XlInfo>();
                             foreach (var item in firstUpdateItems)
@@ -265,16 +266,17 @@ namespace DW5S
                                 catch (Exception ex)
                                 {
                                     item.Lon = -999;
-                                    LogUI.Error($"[{item.TwoLine}]推算XYZ星历出错!", ex).Wait(5000);
+                                    logger.LogError(ex, $"[{item.TwoLine}]推算XYZ星历出错!");
                                 }
                             }
                             if (Level1.Any())
                             {
-                                using (RHDWContext db = new RHDWContext())
+                                var repsXl = unitOfWork.Reps<XlInfo>();
+                                foreach (var item in Level1)
                                 {
-                                    db.XlInfos.AddOrUpdate(Level1.ToArray());
-                                    db.SaveChanges();
+                                    repsXl.Update(item);
                                 }
+                                await unitOfWork.SaveAsync();
                             }
                             List<XlInfo> Level2 = new List<XlInfo>();
                             foreach (var item in calcItems)
@@ -288,16 +290,17 @@ namespace DW5S
                                 catch (Exception ex)
                                 {
                                     item.Lon = -999;
-                                    LogUI.Error($"[{item.TwoLine}]推算XYZ星历出错!", ex).Wait(5000);
+                                    logger.LogError(ex, $"[{item.TwoLine}]推算XYZ星历出错!");
                                 }
                             }
                             if (Level2.Any())
                             {
-                                using (RHDWContext db = new RHDWContext())
+                                var repsXl = unitOfWork.Reps<XlInfo>();
+                                foreach (var item in Level2)
                                 {
-                                    db.XlInfos.AddOrUpdate(Level2.ToArray());
-                                    db.SaveChanges();
+                                    repsXl.Update(item);
                                 }
+                                await unitOfWork.SaveAsync();
                             }
                         });
                     }
@@ -308,7 +311,7 @@ namespace DW5S
                 }
                 catch (Exception ex)
                 {
-                    LogUI.Error($"推算XYZ星历出错!", ex).Wait(5000);
+                    logger.LogError(ex, $"推算XYZ星历出错!");
                 }
                 finally
                 {
@@ -343,7 +346,7 @@ namespace DW5S
                 }
                 catch (Exception ex)
                 {
-                    await LogUI.Error("清理wwwroot历史文件异常", ex);
+                    logger.LogError(ex, "清理wwwroot历史文件异常");
                 }
                 await Task.Delay(60 * 1000);
             }
@@ -353,33 +356,31 @@ namespace DW5S
         {
             while (true)
             {
-                using (RHDWLogContext db = new RHDWLogContext())
+                var repsLogRes = unitOfWork.Reps<LogRes>();
+                try
                 {
-                    try
-                    {
-                        var time1 = DateTime.Today.AddDays(-7);
-                        var time2 = DateTime.Today.AddDays(-30);
-                        var delItems = await db.LogRes.Where(p => p.LogTime < time1 && p.LogType != Entity.EnumLogType.Error).Take(500).ToListAsync();
-                        db.LogRes.RemoveRange(delItems);
+                    var time1 = DateTime.Today.AddDays(-7);
+                    var time2 = DateTime.Today.AddDays(-30);
+                    //var delItems = (await repsLogRes.FindAsync(p => p.LogTime < time1 && p.LogType != Entity.EnumLogType.Error)).Take(500).ToList();
+                    var deleteTime1 = await repsLogRes.DeleteAsync(p => p.LogTime < time1 && p.LogType != Entity.EnumLogType.Error);
 
-                        var delItems2 = await db.LogRes.Where(p => p.LogTime < time2 && p.LogType == Entity.EnumLogType.Error).Take(500).ToListAsync();
-                        db.LogRes.RemoveRange(delItems2);
-                        await db.SaveChangesAsync();
-                        if (!delItems.Any() && !delItems2.Any())
-                        {
-                            break;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        await LogUI.Error("清理日志信息异常", ex);
-                        await Task.Delay(10000);
-                    }
-                    finally
+                    //var delItems2 = (await repsLogRes.FindAsync(p => p.LogTime < time2 && p.LogType == Entity.EnumLogType.Error)).Take(500).ToList();
+                    var deleteTime2 = await repsLogRes.DeleteAsync(p => p.LogTime < time2 && p.LogType == Entity.EnumLogType.Error);
+                    await unitOfWork.SaveAsync();
+                    if (deleteTime1 > 0 && deleteTime2 > 0)
                     {
-                        await Task.Delay(5000);
+                        break;
                     }
                 }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex, "清理日志信息异常");
+                    await Task.Delay(10000);
+                }
+                finally
+                {
+                    await Task.Delay(5000);
+                }
             }
         }
 
@@ -420,35 +421,37 @@ namespace DW5S
 
         }
 
-        private void btnOpenApi_ItemClick(object sender, ItemClickEventArgs e)
+        private async void btnOpenApi_ItemClick(object sender, ItemClickEventArgs e)
         {
-            using (RHDWContext db = new RHDWContext())
+
+            var repsSys = unitOfWork.Reps<SysSetings>();
+            var settings = await repsSys.FirstOrDefaultAsync();
+            if (settings == null)
             {
-                if (SysConfig.Config == null)
-                {
-                    DxHelper.MsgBoxHelper.ShowWarning($"请在系统设置中配置基础信息");
-                    return;
-                }
-                string addr = $"http://{IpHelper.GetLocalIp()}:{SysConfig.Config.HttpPort}/swagger";
-                try
-                {
-                    System.Diagnostics.Process.Start(addr);
-                }
-                catch
-                {
-                    db.Dispose();
-                    DxHelper.MsgBoxHelper.ShowError($"无法打开默认浏览器,请手动打开浏览器查看接口文档.地址{addr}");
-                }
+                DxHelper.MsgBoxHelper.ShowWarning($"请在系统设置中配置基础信息");
+                return;
+            }
+            string addr = $"http://{IpHelper.GetLocalIp()}:{settings.HttpPort}/swagger";
+            try
+            {
+                System.Diagnostics.Process.Start(addr);
             }
+            catch
+            {
+                DxHelper.MsgBoxHelper.ShowError($"无法打开默认浏览器,请手动打开浏览器查看接口文档.地址{addr}");
+            }
+
         }
 
         private void StartProcess()
         {
-            Task.Run(() =>
+            Task.Run(async() =>
             {
                 KillProcess();
                 Process pro = new Process();
                 var servicesDir = Directory.GetDirectories(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Service\\"), "*", SearchOption.TopDirectoryOnly);
+                var repsSys = unitOfWork.Reps<SysSetings>();
+                var settings = await repsSys.FirstOrDefaultAsync();
                 foreach (var item in servicesDir)
                 {
                     try
@@ -457,12 +460,12 @@ namespace DW5S
                         string exeFile = $"{item}\\{exeName}.exe";
                         pro.StartInfo.FileName = exeFile;
                         pro.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
-                        pro.StartInfo.Arguments = $"http://127.0.0.1:{SysConfig.Config.HttpPort}";
+                        pro.StartInfo.Arguments = $"http://127.0.0.1:{settings.HttpPort}";
                         pro.Start();
                     }
                     catch (Exception ex)
                     {
-                        DW5S.Framework.LogHelper.Error($"启动【{item}】中的服务异常", ex);
+                        logger.LogError(ex,$"启动【{item}】中的服务异常");
                         DxHelper.MsgBoxHelper.ShowError($"启动【{item}】中的服务异常");
                     }
                 }