|
@@ -29,12 +29,12 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
|
|
|
private readonly IBasicProjectService _iBasicProjectService;
|
|
|
private readonly IMapper _mapper;
|
|
|
private readonly IDialogService _dialog;
|
|
|
- private readonly ILogger _logger;
|
|
|
+ private readonly Microsoft.Extensions.Logging.ILogger _logger;
|
|
|
private readonly IEventAggregator _aggregator;
|
|
|
private List<BasDeviceDto> allDeviceList = new List<BasDeviceDto>();//所有方案
|
|
|
private List<BasDeviceDto> conditionDevices = new List<BasDeviceDto>();//符合条件的方案
|
|
|
private List<CrumbViewModel> breadCrumbs = new List<CrumbViewModel>();
|
|
|
- public DeviceViewModel(IBasicDeviceService iBasicDeviceService, IBasicDeviceKindService iBasicDeviceKindService, IBasicProjectService iBasicProjectService, IMapper mapper, IDialogService dialog, ILogger logger ,IEventAggregator aggregator)
|
|
|
+ public DeviceViewModel(IBasicDeviceService iBasicDeviceService, IBasicDeviceKindService iBasicDeviceKindService, IBasicProjectService iBasicProjectService, IMapper mapper, IDialogService dialog, Microsoft.Extensions.Logging.ILogger logger ,IEventAggregator aggregator)
|
|
|
{
|
|
|
_iBasicDeviceService = iBasicDeviceService;
|
|
|
_iBasicDeviceKindService = iBasicDeviceKindService;
|
|
@@ -140,7 +140,12 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
|
|
|
{
|
|
|
//重新读取PLC
|
|
|
GetPprojectConfig();
|
|
|
- _logger.LogInformation($"修改设备信息成功");
|
|
|
+ _logger.LogInformation($"修改设备信息成功,设备名称为{deviceKindCon.device_name}");
|
|
|
+ _aggregator.GetEvent<LogEvent>().Publish (new LogMessage
|
|
|
+ {
|
|
|
+ LogTime= DateTime.Now,
|
|
|
+ LogMsg= $"修改设备信息成功,设备名称为{deviceKindCon.device_name}"
|
|
|
+ });
|
|
|
MessageBox.Show("修改设备信息成功", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
|
|
|
}
|
|
|
}
|
|
@@ -158,6 +163,12 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
|
|
|
var del = _iBasicDeviceService.Delete(id);
|
|
|
if (del)
|
|
|
{
|
|
|
+ _logger.LogInformation($"删除设备成功");
|
|
|
+ _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
|
|
|
+ {
|
|
|
+ LogTime = DateTime.Now,
|
|
|
+ LogMsg = $"删除设备成功"
|
|
|
+ });
|
|
|
MessageBox.Show("删除成功!", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
|
|
|
GetPprojectConfig();
|
|
|
}
|
|
@@ -264,7 +275,12 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
|
|
|
{
|
|
|
//重新读取PLC
|
|
|
GetPprojectConfig();
|
|
|
- _logger.LogInformation($"添加设备成功");
|
|
|
+ _logger.LogInformation($"添加设备成功,设备名为{returnValue.DeviceName}");
|
|
|
+ _aggregator.GetEvent<LogEvent>().Publish(new LogMessage
|
|
|
+ {
|
|
|
+ LogTime = DateTime.Now,
|
|
|
+ LogMsg = $"添加设备成功,设备名为{returnValue.DeviceName}"
|
|
|
+ });
|
|
|
MessageBox.Show("添加设备成功!", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
|
|
|
}
|
|
|
}
|