添加log打印

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddSchViewModel.cs

@@ -7,6 +7,7 @@ using Model.Dto;
 using Model.Entities;
 using Newtonsoft.Json;
 using PLCTool.Common;
+using PLCTool.Events;
 using PLCTool.Models;
 using Prism.Commands;
 using Prism.Events;
@@ -114,6 +115,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             {
                 MessageBox.Show("删除成功！", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                 _logger.LogInformation($"删除测试项,ID为{id}");
+                SendLogToDis($"删除测试项,ID为{id}");
                 //更新已有的测试项
                 GetExistSchs();
             }
@@ -176,6 +178,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 _aggregator.GetEvent<ChangeEvent>().Publish("Change");
                 _regionManager.Regions["ContentRegion"].RequestNavigate("BaseConfigView");
                 _logger.LogInformation($"保存测试方案，方案名{ScheduleName}");
+                SendLogToDis($"保存测试方案，方案名{ScheduleName}");
             }
         }
         /// <summary>
@@ -651,6 +654,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 GetExistSchs();
                 //清空上次的内容
                 CleanContent();
+                SendLogToDis($"新增测试项{TestName},方案名称为{ScheduleName}");
                 _logger.LogInformation($"新增测试项{TestName},方案名称为{ScheduleName}");
             }
             catch (Exception ex)
@@ -660,6 +664,18 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
           
       
 
+        }
+        /// <summary>
+        /// 发送log之界面显示
+        /// </summary>
+        /// <param name="msg"></param>
+        private void SendLogToDis(string msg)
+        {
+            _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
+            {
+                LogTime = DateTime.Now,
+                LogMsg = msg
+            });
         }
         /// <summary>
         /// 清空测试项内容内容

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/DeviceKindViewModel.cs

@@ -128,7 +128,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                         {
                             //重新读取PLC
                             GetPprojectConfig();
-                            _logger.LogInformation($"修改设备类型成功");
+                            _logger.LogInformation($"修改设备类型成功,类型为{deviceKindCon}");
+                            SendLogToDis($"修改设备类型成功,类型为{deviceKindCon}");
                             MessageBox.Show("修改设备类型成功", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                         }
                     }
@@ -146,6 +147,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 var del = _iBasicDeviceKindService.Delete(id);
                 if (del)
                 {
+                    SendLogToDis($"删除设备类型成功,id为{id}");
                     MessageBox.Show("删除成功!", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                     GetPprojectConfig();
                 }
@@ -250,7 +252,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                         {
                             //重新读取PLC
                             GetPprojectConfig();
-                            _logger.LogInformation($"添加设备类型成功");
+                            _logger.LogInformation($"添加设备类型成功,类型为{deviceKindCon}");
+                            SendLogToDis($"添加设备类型成功,类型为{deviceKindCon}");
                             MessageBox.Show("添加设备类型成功！", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                         }
                     }
@@ -299,6 +302,18 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 DeviceKindItemList.Add(i);
             }
         }
+        /// <summary>
+        /// 发送log之界面显示
+        /// </summary>
+        /// <param name="msg"></param>
+        private void SendLogToDis(string msg)
+        {
+            _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
+            {
+                LogTime = DateTime.Now,
+                LogMsg = msg
+            });
+        }
 
         #endregion
         #region 命令绑定

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/DeviceViewModel.cs

@@ -141,11 +141,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                             //重新读取PLC
                             GetPprojectConfig();
                             _logger.LogInformation($"修改设备信息成功,设备名称为{deviceKindCon.device_name}");
-                            _aggregator.GetEvent<LogEvent>().Publish (new LogMessage
-                            {
-                                LogTime= DateTime.Now,
-                                LogMsg= $"修改设备信息成功,设备名称为{deviceKindCon.device_name}"
-                            });
+                            SendLogToDis($"修改设备信息成功,设备名称为{deviceKindCon.device_name}");
+                    
                             MessageBox.Show("修改设备信息成功", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                         }
                     }
@@ -153,7 +150,10 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
 
             });
         }
-
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="obj"></param>
         private void Delete(object obj)
         {
             int id = Convert.ToInt32(obj);
@@ -164,11 +164,9 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 if (del)
                 {
                     _logger.LogInformation($"删除设备成功");
-                    _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
-                    {
-                        LogTime = DateTime.Now,
-                        LogMsg = $"删除设备成功"
-                    });
+
+                    SendLogToDis($"删除设备成功");
+            
                     MessageBox.Show("删除成功!", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                     GetPprojectConfig();
                 }
@@ -202,7 +200,23 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             conditionDevices = conditionDevices.OrderBy(x => x.DeviceId).ToList();
             Getpage();
         }
+        /// <summary>
+        /// 发送log之界面显示
+        /// </summary>
+        /// <param name="msg"></param>
+        private void SendLogToDis(string msg)
+        {
+            _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
+            {
+                LogTime = DateTime.Now,
+                LogMsg = msg
+            });
+        }
 
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="obj"></param>
         private void Export(string obj)
         {
             using (System.Windows.Forms.SaveFileDialog saveFileDialog = new System.Windows.Forms.SaveFileDialog()
@@ -276,11 +290,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                             //重新读取PLC
                             GetPprojectConfig();
                             _logger.LogInformation($"添加设备成功，设备名为{returnValue.DeviceName}");
-                            _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
-                            {
-                                LogTime = DateTime.Now,
-                                LogMsg = $"添加设备成功，设备名为{returnValue.DeviceName}"
-                            });
+                            SendLogToDis($"添加设备成功，设备名为{returnValue.DeviceName}");
+
                             MessageBox.Show("添加设备成功！", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                         }
                     }

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/EditItemDetailViewModel.cs

@@ -7,6 +7,7 @@ using Model.Entities;
 using NetTaste;
 using Newtonsoft.Json;
 using PLCTool.Common;
+using PLCTool.Events;
 using PLCTool.Models;
 using Prism.Commands;
 using Prism.Events;
@@ -527,7 +528,18 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
 
             });
         }
-
+        /// <summary>
+        /// 发送log之界面显示
+        /// </summary>
+        /// <param name="msg"></param>
+        private void SendLogToDis(string msg)
+        {
+            _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
+            {
+                LogTime = DateTime.Now,
+                LogMsg = msg
+            });
+        }
         /// <summary>
         /// 初始化
         /// </summary>
@@ -625,6 +637,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 }
                 //更新已有的测试项
                 GetExistSchs();
+                SendLogToDis($"修改测试项，测试项名称为{TestName},方案名称为{ScheduleName}");
                 RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
 
             }
@@ -671,7 +684,6 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             try
             {
              
-                
                    
                     {
                       

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/EditSchViewModel.cs

@@ -6,6 +6,7 @@ using Model.Dto;
 using Model.Entities;
 using Newtonsoft.Json;
 using PLCTool.Common;
+using PLCTool.Events;
 using PLCTool.Models;
 using Prism.Commands;
 using Prism.Events;
@@ -129,10 +130,6 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         #region idialog接口实现
         public string Title { set; get; } = "新增方案";
 
-
-
-
-
         #endregion
 
 
@@ -154,7 +151,18 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 TestKinds.Add(test.ContentOption);
             }
         }
-
+        /// <summary>
+        /// 发送log之界面显示
+        /// </summary>
+        /// <param name="msg"></param>
+        private void SendLogToDis(string msg)
+        {
+            _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
+            {
+                LogTime = DateTime.Now,
+                LogMsg = msg
+            });
+        }
         private void Delete(object obj)
         {
             int id = Convert.ToInt32(obj);
@@ -164,6 +172,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 MessageBox.Show("删除成功！", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                 //更新已有的测试项
                 GetExistSchs();
+                SendLogToDis($"删除测试项，测试项id为{id},方案名称为{ScheduleName}");
             }
 
         }
@@ -231,6 +240,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 //发布消息
                 _aggregator.GetEvent<ChangeEvent>().Publish("Change");
                 _regionManager.Regions["ContentRegion"].RequestNavigate("BaseConfigView");
+                SendLogToDis($"修改测试方案，方案名称为{ScheduleName}");
             }
         }
       

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/ProjectViewModel.cs

@@ -115,7 +115,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                         {
                             //重新读取PLC
                             GetPprojectConfig();
-                            _logger.LogInformation($"修改项目成功");
+                            SendLogToDis($"修改项目成功,项目名称为{returnValue.ProjectName}");
+                            _logger.LogInformation($"修改项目成功,项目名称为{returnValue.ProjectName}");
                             MessageBox.Show("修改项目成功", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                         }
                     }
@@ -133,6 +134,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 var del = _iBasicProjectService.Delete(id);
                 if (del)
                 {
+                    SendLogToDis($"删除项目成功,id为{id}");
                     MessageBox.Show("删除成功!", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                     GetPprojectConfig();
                 }
@@ -246,7 +248,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                         {
                             //重新读取PLC
                             GetPprojectConfig();
-                            _logger.LogInformation($"添加项目成功");
+                            _logger.LogInformation($"添加项目成功,类型为{returnValue.ProjectName}");
+                            SendLogToDis($"添加项目成功,类型为{returnValue.ProjectName}");
                             MessageBox.Show("添加项目成功！", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
                         }
                     }
@@ -295,7 +298,18 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 ProjectItemList.Add(i);
             }
         }
-
+        /// <summary>
+        /// 发送log之界面显示
+        /// </summary>
+        /// <param name="msg"></param>
+        private void SendLogToDis(string msg)
+        {
+            _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
+            {
+                LogTime = DateTime.Now,
+                LogMsg = msg
+            });
+        }
         #endregion
         #region 命令绑定
 

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -6,6 +6,7 @@ using Model.Entities;
 using Newtonsoft.Json;
 
 using PLCTool.Common;
+using PLCTool.Events;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;
@@ -117,7 +118,18 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
           
         }
 
-
+        /// <summary>
+        /// 发送log之界面显示
+        /// </summary>
+        /// <param name="msg"></param>
+        private void SendLogToDis(string msg)
+        {
+            _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
+            {
+                LogTime = DateTime.Now,
+                LogMsg = msg
+            });
+        }
         /// <summary>
         /// 选中测试项
         /// </summary>
@@ -582,8 +594,10 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         }));
                     }
                     _logger.LogInformation($"开始自动测试。方案名{ScheduleName}，测试项{TestName}");
+                    SendLogToDis($"开始自动测试。方案名{ScheduleName}，测试项{TestName}");
+                    //测试
                     await ExecTest();
-                 
+                    SendLogToDis($"自动测试完成。方案名{ScheduleName}，测试项{TestName}");
                     _logger.LogInformation($"自动测试完成。方案名{ScheduleName}，测试项{TestName}");
                 
                    

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -7,6 +7,7 @@ using NetTaste;
 using Newtonsoft.Json;
 using OmronFinsTCP.Net;
 using PLCTool.Common;
+using PLCTool.Events;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;
@@ -154,7 +155,18 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 }
             }
         }
-
+        /// <summary>
+        /// 发送log之界面显示
+        /// </summary>
+        /// <param name="msg"></param>
+        private void SendLogToDis(string msg)
+        {
+            _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
+            {
+                LogTime = DateTime.Now,
+                LogMsg = msg
+            });
+        }
         /// <summary>
         /// //根据 测试方案明细主键ID 查找测试方案id 及方案名和设备名
         /// </summary>
@@ -576,6 +588,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
    
             StartEnalbe = false;
             _logger.LogInformation($"开始手动测试。方案名{ScheduleName}，测试项{TestName}");
+            SendLogToDis($"开始手动测试。方案名{ScheduleName}，测试项{TestName}");
             //开始时间
             startTime = DateTime.Now;
             //增加测试记录主表
@@ -610,7 +623,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             //将测试结果添加到数据库
 
             AddDtltRecord(globalSchDetailId);
-
+            SendLogToDis($"手动测试完成。方案名{ScheduleName}，测试项{TestName}");
             _logger.LogInformation($"手动测试完成。方案名{ScheduleName}，测试项{TestName}");
             StartEnalbe = true;
         }

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/RetryTestViewModel.cs

@@ -5,6 +5,7 @@ using Model.Dto;
 using Model.Entities;
 using Newtonsoft.Json;
 using PLCTool.Common;
+using PLCTool.Events;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;
@@ -161,7 +162,18 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 }
             }
         }
-
+        /// <summary>
+        /// 发送log之界面显示
+        /// </summary>
+        /// <param name="msg"></param>
+        private void SendLogToDis(string msg)
+        {
+            _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
+            {
+                LogTime = DateTime.Now,
+                LogMsg = msg
+            });
+        }
         /// <summary>
         /// //根据 测试方案明细主键ID 查找测试方案id 及方案名和设备名
         /// </summary>
@@ -581,6 +593,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
 
             StartEnalbe = false;
             _logger.LogInformation($"开始手动测试。方案名{ScheduleName}，测试项{TestName}");
+            SendLogToDis($"开始手动测试。方案名{ScheduleName}，测试项{TestName}");
             //开始时间
             startTime = DateTime.Now;
             //增加测试记录主表
@@ -615,7 +628,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             //将测试结果添加到数据库
 
             AddDtltRecord(globalSchDetailId);
-
+            SendLogToDis($"手动测试完成。方案名{ScheduleName}，测试项{TestName}");
             _logger.LogInformation($"手动测试完成。方案名{ScheduleName}，测试项{TestName}");
             StartEnalbe = true;
         }