CAN FD 调度表初步更改
This commit is contained in:
@@ -200,7 +200,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
canLinConfigPros = FreeSql.Select<CanLinConfigPro>().Where(a => a.CANLINInfo == CANLIN.CANFD)
|
||||
.Include(a => a.CANFdConfigExd)
|
||||
.IncludeMany(a => a.CanLinConfigContents, then => then.Include(b => b.LogicRule))//,then=> then.Include(b=>b.LogicRule)
|
||||
//.IncludeMany(a => a.CanLinConfigContents)
|
||||
.IncludeMany(a => a.CanFdScheduleConfigs)//
|
||||
.ToList();
|
||||
|
||||
ListCanLinConfigPro = new ObservableCollection<CanLinConfigPro>(canLinConfigPros);
|
||||
@@ -245,11 +245,25 @@ namespace CapMachine.Wpf.ViewModels
|
||||
//});
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ListWriteCanLinRWConfigDto = new ObservableCollection<CanLinRWConfigDto>();
|
||||
}
|
||||
var ReadData = SelectCanLinConfigPro.CanLinConfigContents!.Where(a => a.RWInfo == RW.Read).ToList();
|
||||
if (ReadData != null && ReadData.Count > 0)
|
||||
{
|
||||
ListReadCanLinRWConfigDto = new ObservableCollection<CanLinRWConfigDto>(Mapper.Map<List<CanLinRWConfigDto>>(ReadData));
|
||||
}
|
||||
else
|
||||
{
|
||||
ListReadCanLinRWConfigDto = new ObservableCollection<CanLinRWConfigDto>();
|
||||
}
|
||||
|
||||
//调度表配置信息
|
||||
if (SelectCanLinConfigPro.CanFdScheduleConfigs != null && SelectCanLinConfigPro.CanFdScheduleConfigs.Count() > 0)
|
||||
{
|
||||
ListCANFdScheduleConfigDto = new ObservableCollection<CANFdScheduleConfigDto>(Mapper.Map<List<CANFdScheduleConfigDto>>(SelectCanLinConfigPro.CanFdScheduleConfigs));
|
||||
}
|
||||
|
||||
//匹配选中的SelectCanLinConfigPro.CanLinConfigContents和ListCanDbcModel
|
||||
MatchSeletedAndCanDbcModel();
|
||||
@@ -499,6 +513,8 @@ namespace CapMachine.Wpf.ViewModels
|
||||
CanFdDriveService.InitCanConfig(SelectCanLinConfigPro);
|
||||
|
||||
InitLoadCanConfigPro();
|
||||
|
||||
CanFdDriveService.ToomossCanFDDrive.LoadCmdDataToDrive(CanFdDriveService.CmdData);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -616,6 +632,18 @@ namespace CapMachine.Wpf.ViewModels
|
||||
|
||||
SelectCanLinConfigProConfigName = SelectCanLinConfigPro.ConfigName;
|
||||
|
||||
|
||||
//调度表配置信息
|
||||
if (SelectCanLinConfigPro.CanFdScheduleConfigs != null && SelectCanLinConfigPro.CanFdScheduleConfigs.Count() > 0)
|
||||
{
|
||||
ListCANFdScheduleConfigDto = new ObservableCollection<CANFdScheduleConfigDto>(Mapper.Map<List<CANFdScheduleConfigDto>>(SelectCanLinConfigPro.CanFdScheduleConfigs));
|
||||
}
|
||||
else
|
||||
{
|
||||
ListCANFdScheduleConfigDto = new ObservableCollection<CANFdScheduleConfigDto>();
|
||||
}
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
//先判断是否是正确的集合数据，防止DataGrid的数据源刷新导致的触发事件
|
||||
@@ -918,6 +946,49 @@ namespace CapMachine.Wpf.ViewModels
|
||||
set { _ArbBaudRateCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
|
||||
private DelegateCommand<object> _SchEnableCmd;
|
||||
/// <summary>
|
||||
/// 调度表的使能 操作的指令
|
||||
/// </summary>
|
||||
public DelegateCommand<object> SchEnableCmd
|
||||
{
|
||||
set
|
||||
{
|
||||
_SchEnableCmd = value;
|
||||
}
|
||||
get
|
||||
{
|
||||
if (_SchEnableCmd == null)
|
||||
{
|
||||
_SchEnableCmd = new DelegateCommand<object>((Par) => SchEnableCmdCall(Par));
|
||||
}
|
||||
return _SchEnableCmd;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 调度表的使能信息
|
||||
/// </summary>
|
||||
/// <param name="par"></param>
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
private void SchEnableCmdCall(object par)
|
||||
{
|
||||
var dd = SelectedCANConfigExdDto.SchEnable;
|
||||
var Result = (bool)par;
|
||||
if (Result)
|
||||
{
|
||||
CanFdDriveService.ToomossCanFDDrive.SchEnable = true;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
CanFdDriveService.ToomossCanFDDrive.SchEnable = false;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private DelegateCommand<string> _CanOpCmd;
|
||||
/// <summary>
|
||||
/// CAN操作的指令
|
||||
@@ -1009,6 +1080,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
.Set(a => a.ArbBaudRate, SelectedCANConfigExdDto.ArbBaudRate)
|
||||
.Set(a => a.ISOEnable, SelectedCANConfigExdDto.ISOEnable)
|
||||
.Set(a => a.ResEnable, SelectedCANConfigExdDto.ResEnable)
|
||||
.Set(a => a.SchEnable, SelectedCANConfigExdDto.SchEnable)
|
||||
.Where(a => a.Id == SelectedCANConfigExdDto.Id)
|
||||
.ExecuteUpdated();
|
||||
}
|
||||
@@ -1070,6 +1142,12 @@ namespace CapMachine.Wpf.ViewModels
|
||||
|
||||
break;
|
||||
case "CycleSend"://循环发送你
|
||||
|
||||
//有可能加载完毕后不手动改变状态，导致值没有传输，所以这里赋值
|
||||
CanFdDriveService.ToomossCanFDDrive.SchEnable = SelectedCANConfigExdDto.SchEnable;
|
||||
//无论有没有调度表，都要把这个配置给CanDriveService
|
||||
CanFdDriveService.ListCANFdScheduleConfig = ListCANFdScheduleConfigDto.ToList();
|
||||
|
||||
//循环发送数据
|
||||
CanFdDriveService.CycleSendMsg();
|
||||
|
||||
@@ -1133,6 +1211,26 @@ namespace CapMachine.Wpf.ViewModels
|
||||
set { _WriteRuleCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
private ObservableCollection<CbxItems> _ReadRuleCbxItems;
|
||||
/// <summary>
|
||||
/// 读取的规格集合
|
||||
/// </summary>
|
||||
public ObservableCollection<CbxItems> ReadRuleCbxItems
|
||||
{
|
||||
get { return _ReadRuleCbxItems; }
|
||||
set { _ReadRuleCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
private ObservableCollection<CANFdScheduleConfigDto> _ListCANFdScheduleConfigDto;
|
||||
/// <summary>
|
||||
///调度表集合
|
||||
/// </summary>
|
||||
public ObservableCollection<CANFdScheduleConfigDto> ListCANFdScheduleConfigDto
|
||||
{
|
||||
get { return _ListCANFdScheduleConfigDto; }
|
||||
set { _ListCANFdScheduleConfigDto = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
//private string _SelectedWriteName;
|
||||
///// <summary>
|
||||
///// 选中的写入的Name
|
||||
@@ -1278,6 +1376,45 @@ namespace CapMachine.Wpf.ViewModels
|
||||
System.Windows.MessageBox.Show("请选中后再进行【删除】操作？", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case "WriteSch"://调度表
|
||||
|
||||
var data = CanFdDriveService.CmdData.GroupBy(a => a.MsgName).Select(a => a.Key).ToList();
|
||||
|
||||
if (data != null && data.Count > 0)
|
||||
{
|
||||
//弹窗
|
||||
DialogService.ShowDialog("DialogCANFdSchConfigView", new DialogParameters() {
|
||||
{"ListMsg", CanFdDriveService.CmdData.GroupBy(a=>a.MsgName).Select(a=>a.Key).ToList() },
|
||||
{ "ListCANFdScheduleConfigDto",ListCANFdScheduleConfigDto},
|
||||
{ "SelectCanLinConfigProId",SelectCanLinConfigPro.Id},
|
||||
|
||||
}, (par) =>
|
||||
{
|
||||
if (par.Result == ButtonResult.OK)
|
||||
{
|
||||
////程序名称
|
||||
ListCANFdScheduleConfigDto = par.Parameters.GetValue<ObservableCollection<CANFdScheduleConfigDto>>("ReturnValue");
|
||||
//把更新后的最新值给当前的主集合中
|
||||
SelectCanLinConfigPro.CanFdScheduleConfigs = Mapper.Map<List<CANFdScheduleConfig>>(ListCANFdScheduleConfigDto.ToList());
|
||||
|
||||
}
|
||||
else if (par.Result == ButtonResult.Cancel)
|
||||
{
|
||||
//取消
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Windows.MessageBox.Show("未发现写入的执行的命令数据，无法配置？", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
|
||||
}
|
||||
|
||||
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
377
CapMachine.Wpf/ViewModels/DialogCANFdSchConfigViewModel.cs
Normal file
377
CapMachine.Wpf/ViewModels/DialogCANFdSchConfigViewModel.cs
Normal file
@@ -0,0 +1,377 @@
|
||||
using AutoMapper;
|
||||
using CapMachine.Core;
|
||||
using CapMachine.Model.CANLIN;
|
||||
using CapMachine.Wpf.Dtos;
|
||||
using Prism.Commands;
|
||||
using Prism.Services.Dialogs;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
|
||||
namespace CapMachine.Wpf.ViewModels
|
||||
{
|
||||
/// <summary>
|
||||
/// CAN Fd 调度表配置
|
||||
/// </summary>
|
||||
public class DialogCANFdSchConfigViewModel : DialogViewModel
|
||||
{
|
||||
/// <summary>
|
||||
/// 构造函数
|
||||
/// </summary>
|
||||
public DialogCANFdSchConfigViewModel(IFreeSql freeSql, IMapper mapper)
|
||||
{
|
||||
Title = "调度表 CAN 配置";
|
||||
FreeSql = freeSql;
|
||||
Mapper = mapper;
|
||||
|
||||
|
||||
SendOrderCbxItems = new ObservableCollection<CbxItems>()
|
||||
{
|
||||
new CbxItems(){
|
||||
Key="0",
|
||||
Text="并行",
|
||||
},
|
||||
new CbxItems(){
|
||||
Key="1",
|
||||
Text="顺序",
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
//默认只能用1号调度器
|
||||
SchTabIndexCbxItems = new ObservableCollection<CbxItems>()
|
||||
{
|
||||
new CbxItems(){
|
||||
Key="0",
|
||||
Text="0",
|
||||
},
|
||||
//new CbxItems(){
|
||||
// Key="1",
|
||||
// Text="1",
|
||||
//},
|
||||
//new CbxItems(){
|
||||
// Key="2",
|
||||
// Text="2",
|
||||
//},
|
||||
//new CbxItems(){
|
||||
// Key="3",
|
||||
// Text="3",
|
||||
//},
|
||||
//new CbxItems(){
|
||||
// Key="4",
|
||||
// Text="4",
|
||||
//},
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
public IFreeSql FreeSql { get; }
|
||||
public IMapper Mapper { get; }
|
||||
|
||||
private string name;
|
||||
/// <summary>
|
||||
/// 名称
|
||||
/// </summary>
|
||||
public string Name
|
||||
{
|
||||
get { return name; }
|
||||
set { name = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
private ObservableCollection<CANFdScheduleConfigDto> _ListCANFdScheduleConfigDto = new ObservableCollection<CANFdScheduleConfigDto>();
|
||||
/// <summary>
|
||||
/// CAN 调度表数据集合
|
||||
/// </summary>
|
||||
public ObservableCollection<CANFdScheduleConfigDto> ListCANFdScheduleConfigDto
|
||||
{
|
||||
get { return _ListCANFdScheduleConfigDto; }
|
||||
set { _ListCANFdScheduleConfigDto = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 消息/帧报文信息集合
|
||||
/// </summary>
|
||||
public List<string> ListMsg { get; set; }
|
||||
|
||||
private ObservableCollection<CbxItems> _MsgCbxItems;
|
||||
/// <summary>
|
||||
/// 消息名称 集合信息
|
||||
/// </summary>
|
||||
public ObservableCollection<CbxItems> MsgCbxItems
|
||||
{
|
||||
get { return _MsgCbxItems; }
|
||||
set { _MsgCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 选中的程序的Id
|
||||
/// </summary>
|
||||
public long SelectCanLinConfigProId { get; set; }
|
||||
|
||||
private ObservableCollection<CbxItems> _SendOrderCbxItems;
|
||||
/// <summary>
|
||||
/// 发送方式 集合信息
|
||||
/// </summary>
|
||||
public ObservableCollection<CbxItems> SendOrderCbxItems
|
||||
{
|
||||
get { return _SendOrderCbxItems; }
|
||||
set { _SendOrderCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
|
||||
private string? _CurSendOrder;
|
||||
/// <summary>
|
||||
/// 当前发送方式
|
||||
/// </summary>
|
||||
public string? CurSendOrder
|
||||
{
|
||||
get { return _CurSendOrder; }
|
||||
set { _CurSendOrder = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
|
||||
private ObservableCollection<CbxItems> _SchTabIndexCbxItems;
|
||||
/// <summary>
|
||||
/// 调度器序号 集合信息
|
||||
/// </summary>
|
||||
public ObservableCollection<CbxItems> SchTabIndexCbxItems
|
||||
{
|
||||
get { return _SchTabIndexCbxItems; }
|
||||
set { _SchTabIndexCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
private CANFdScheduleConfigDto _CurSelectedItem;
|
||||
/// <summary>
|
||||
/// 选中的数据
|
||||
/// </summary>
|
||||
public CANFdScheduleConfigDto CurSelectedItem
|
||||
{
|
||||
get { return _CurSelectedItem; }
|
||||
set { _CurSelectedItem = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
|
||||
private DelegateCommand<object> _GridSelectionChangedCmd;
|
||||
/// <summary>
|
||||
/// 选中行数据命令
|
||||
/// </summary>
|
||||
public DelegateCommand<object> GridSelectionChangedCmd
|
||||
{
|
||||
set
|
||||
{
|
||||
_GridSelectionChangedCmd = value;
|
||||
}
|
||||
get
|
||||
{
|
||||
if (_GridSelectionChangedCmd == null)
|
||||
{
|
||||
_GridSelectionChangedCmd = new DelegateCommand<object>((par) => GridSelectionChangedCmdMethod(par));
|
||||
}
|
||||
return _GridSelectionChangedCmd;
|
||||
}
|
||||
}
|
||||
private void GridSelectionChangedCmdMethod(object par)
|
||||
{
|
||||
//先判断是否是正确的集合数据，防止DataGrid的数据源刷新导致的触发事件
|
||||
var Selecteddata = par as CANFdScheduleConfigDto;
|
||||
|
||||
if (Selecteddata != null)
|
||||
{
|
||||
CurSelectedItem = Selecteddata;
|
||||
}
|
||||
}
|
||||
|
||||
//OpCmd
|
||||
private DelegateCommand<string> _OpCmd;
|
||||
/// <summary>
|
||||
/// 增加方法命令
|
||||
/// </summary>
|
||||
public DelegateCommand<string> OpCmd
|
||||
{
|
||||
set
|
||||
{
|
||||
_OpCmd = value;
|
||||
}
|
||||
get
|
||||
{
|
||||
if (_OpCmd == null)
|
||||
{
|
||||
_OpCmd = new DelegateCommand<string>((Par) => OpCmdCall(Par));
|
||||
}
|
||||
return _OpCmd;
|
||||
}
|
||||
}
|
||||
|
||||
private void OpCmdCall(string Par)
|
||||
{
|
||||
switch (Par)
|
||||
{
|
||||
case "Add":
|
||||
ListCANFdScheduleConfigDto.Add(new CANFdScheduleConfigDto
|
||||
{
|
||||
CanLinConfigProId = SelectCanLinConfigProId,
|
||||
Cycle = 100,
|
||||
SchTabIndex = 0,
|
||||
OrderSend = 1,
|
||||
});
|
||||
break;
|
||||
case "Delete":
|
||||
if (CurSelectedItem != null)
|
||||
{
|
||||
//直接删除掉，如果没有ID的话，这就不需要删除了
|
||||
FreeSql.Delete<CANFdScheduleConfig>(CurSelectedItem.Id).ExecuteAffrows();
|
||||
ListCANFdScheduleConfigDto.Remove(CurSelectedItem);
|
||||
|
||||
CurSelectedItem = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageBox.Show("请选中后再进行【删除】操作？", "提示", MessageBoxButton.OK, MessageBoxImage.Hand);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private DelegateCommand saveCmd;
|
||||
/// <summary>
|
||||
/// 保存命令
|
||||
/// </summary>
|
||||
public DelegateCommand SaveCmd
|
||||
{
|
||||
set
|
||||
{
|
||||
saveCmd = value;
|
||||
}
|
||||
get
|
||||
{
|
||||
if (saveCmd == null)
|
||||
{
|
||||
saveCmd = new DelegateCommand(() => SaveCmdMethod());
|
||||
}
|
||||
return saveCmd;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 保存命令方法
|
||||
/// </summary>
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
private void SaveCmdMethod()
|
||||
{
|
||||
//检查空的数据
|
||||
foreach (var item in ListCANFdScheduleConfigDto)
|
||||
{
|
||||
//整个的发送方式赋值给每个子项
|
||||
item.OrderSend = CurSendOrder == "0" ? 0 : 1;
|
||||
|
||||
if (string.IsNullOrEmpty(item.MsgName))
|
||||
{
|
||||
MessageBox.Show("请确认消息名称是否正确", "提示", MessageBoxButton.OK, MessageBoxImage.Hand);
|
||||
return;
|
||||
}
|
||||
if (item.Cycle == 0)
|
||||
{
|
||||
MessageBox.Show("请确认周期是否正确", "提示", MessageBoxButton.OK, MessageBoxImage.Hand);
|
||||
return;
|
||||
}
|
||||
if (item.OrderSend >= 2)
|
||||
{
|
||||
MessageBox.Show("请确认发送方式是否正确", "提示", MessageBoxButton.OK, MessageBoxImage.Hand);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//发送的控制帧都放到同一个调度表中，不需要检查了
|
||||
////检查重复设置问题
|
||||
//bool isRepeat = ListCANScheduleConfigDto.GroupBy(i => i.MsgName).Any(g => g.Count() > 1);
|
||||
//if (isRepeat)
|
||||
//{
|
||||
// MessageBox.Show("请确认是否重复设置", "提示", MessageBoxButton.OK, MessageBoxImage.Hand);
|
||||
// return;
|
||||
//}
|
||||
|
||||
//检查数据是否正常
|
||||
foreach (var item in ListCANFdScheduleConfigDto)
|
||||
{
|
||||
FreeSql.InsertOrUpdate<CANFdScheduleConfig>()
|
||||
.SetSource(Mapper.Map<CANFdScheduleConfig>(item)).
|
||||
ExecuteAffrows();
|
||||
}
|
||||
|
||||
ListCANFdScheduleConfigDto = new ObservableCollection<CANFdScheduleConfigDto>(Mapper.Map<List<CANFdScheduleConfigDto>>(FreeSql.Select<CANFdScheduleConfig>().Where(a => a.CanLinConfigProId == SelectCanLinConfigProId).ToList()));
|
||||
|
||||
DialogParameters pars = new DialogParameters
|
||||
{
|
||||
{ "ReturnValue", ListCANFdScheduleConfigDto }
|
||||
};
|
||||
|
||||
RaiseRequestClose(new DialogResult(ButtonResult.OK, pars));
|
||||
}
|
||||
|
||||
private DelegateCommand cancelCmd;
|
||||
/// <summary>
|
||||
/// 保存命令
|
||||
/// </summary>
|
||||
public DelegateCommand CancelCmd
|
||||
{
|
||||
set
|
||||
{
|
||||
cancelCmd = value;
|
||||
}
|
||||
get
|
||||
{
|
||||
if (cancelCmd == null)
|
||||
{
|
||||
cancelCmd = new DelegateCommand(() => CancelCmdMethod());
|
||||
}
|
||||
return cancelCmd;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 取消命令方法
|
||||
/// </summary>
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
private void CancelCmdMethod()
|
||||
{
|
||||
RaiseRequestClose(new DialogResult(ButtonResult.Cancel));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 窗口打开时的传递的参数
|
||||
/// </summary>
|
||||
/// <param name="parameters"></param>
|
||||
public override void OnDialogOpened(IDialogParameters parameters)
|
||||
{
|
||||
ListMsg = parameters.GetValue<List<string>>("ListMsg");
|
||||
// 转换为CbxItems集合，都是文本内容
|
||||
MsgCbxItems = new ObservableCollection<CbxItems>(
|
||||
ListMsg.Select(value => new CbxItems
|
||||
{
|
||||
Key = value,
|
||||
Text = value
|
||||
}));
|
||||
|
||||
ListCANFdScheduleConfigDto = parameters.GetValue<ObservableCollection<CANFdScheduleConfigDto>>("ListCANFdScheduleConfigDto");
|
||||
//防止返回的数据为空，就无法增加了
|
||||
if (ListCANFdScheduleConfigDto == null) ListCANFdScheduleConfigDto = new ObservableCollection<CANFdScheduleConfigDto>();
|
||||
//Name = parameters.GetValue<string>("Name");
|
||||
if (ListCANFdScheduleConfigDto.Count > 0)
|
||||
{
|
||||
CurSendOrder = ListCANFdScheduleConfigDto.FirstOrDefault()!.OrderSend.ToString();
|
||||
}
|
||||
|
||||
SelectCanLinConfigProId = parameters.GetValue<long>("SelectCanLinConfigProId");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -15,8 +15,8 @@ using Prism.Events;
|
||||
using Prism.Regions;
|
||||
using Prism.Services.Dialogs;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Diagnostics;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
@@ -51,7 +51,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
/// <param name="eventAggregator"></param>
|
||||
/// <param name="mapper"></param>
|
||||
/// <param name="logger"></param>
|
||||
public HistoryDataViewModel(IDialogService dialogService, IFreeSql freeSql, IEventAggregator eventAggregator, IMapper mapper,ConfigService configService)
|
||||
public HistoryDataViewModel(IDialogService dialogService, IFreeSql freeSql, IEventAggregator eventAggregator, IMapper mapper, ConfigService configService)
|
||||
{
|
||||
DialogService = dialogService;
|
||||
FreeSql = freeSql;
|
||||
@@ -132,6 +132,20 @@ namespace CapMachine.Wpf.ViewModels
|
||||
set { _IsLeftDrawerOpen = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
private bool _IsBusy;
|
||||
public bool IsBusy
|
||||
{
|
||||
get { return _IsBusy; }
|
||||
set { _IsBusy = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
private string _BusyMessage = "正在加载，请稍候...";
|
||||
public string BusyMessage
|
||||
{
|
||||
get { return _BusyMessage; }
|
||||
set { _BusyMessage = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
@@ -224,15 +238,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
set { _SelectedHistoryExp = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
private HistoryWorkCondFile _SelectedHistoryWorkCondFile;
|
||||
/// <summary>
|
||||
/// 选中的历史数据文件
|
||||
/// </summary>
|
||||
public HistoryWorkCondFile SelectedHistoryWorkCondFile
|
||||
{
|
||||
get { return _SelectedHistoryWorkCondFile; }
|
||||
set { _SelectedHistoryWorkCondFile = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 当前搜索的工况条件
|
||||
@@ -268,7 +274,13 @@ namespace CapMachine.Wpf.ViewModels
|
||||
if (par is HistoryExp)
|
||||
{
|
||||
SelectedHistoryExp = par as HistoryExp;
|
||||
ListHistoryWorkCondFile = SelectedHistoryExp!.HistoryWorkCondFiles!;
|
||||
var files = SelectedHistoryExp!.HistoryWorkCondFiles!;
|
||||
foreach (var f in files)
|
||||
{
|
||||
if (f != null) f.IsSelected = false;
|
||||
}
|
||||
ListHistoryWorkCondFile = files.ToList();
|
||||
//ListHistoryWorkCondFile = ListHistoryWorkCondFile.ToList();
|
||||
return;
|
||||
}
|
||||
if ((par as SelectionChangedEventArgs)!.AddedItems.Count == 0)
|
||||
@@ -290,63 +302,18 @@ namespace CapMachine.Wpf.ViewModels
|
||||
if (Selecteddata != null)
|
||||
{
|
||||
SelectedHistoryExp = Selecteddata;
|
||||
ListHistoryWorkCondFile = SelectedHistoryExp.HistoryWorkCondFiles!;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private DelegateCommand<object> _FileGridSelectionChangedCmd;
|
||||
/// <summary>
|
||||
/// 试验信息选中行数据命令
|
||||
/// </summary>
|
||||
public DelegateCommand<object> FileGridSelectionChangedCmd
|
||||
{
|
||||
set
|
||||
{
|
||||
_FileGridSelectionChangedCmd = value;
|
||||
}
|
||||
get
|
||||
{
|
||||
if (_FileGridSelectionChangedCmd == null)
|
||||
var files = SelectedHistoryExp.HistoryWorkCondFiles!;
|
||||
foreach (var f in files)
|
||||
{
|
||||
_FileGridSelectionChangedCmd = new DelegateCommand<object>((par) => FileGridSelectionChangedCmdMethod(par));
|
||||
if (f != null) f.IsSelected = false;
|
||||
}
|
||||
return _FileGridSelectionChangedCmd;
|
||||
ListHistoryWorkCondFile = files;
|
||||
ListHistoryWorkCondFile = ListHistoryWorkCondFile.ToList();
|
||||
}
|
||||
}
|
||||
private void FileGridSelectionChangedCmdMethod(object par)
|
||||
{
|
||||
if (par == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (par is HistoryWorkCondFile)
|
||||
{
|
||||
SelectedHistoryWorkCondFile = par as HistoryWorkCondFile;
|
||||
return;
|
||||
}
|
||||
if ((par as SelectionChangedEventArgs)!.AddedItems.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
//先判断是否是正确的集合数据，防止DataGrid的数据源刷新导致的触发事件
|
||||
var Selecteddata = (par as SelectionChangedEventArgs)!.AddedItems[0] as HistoryWorkCondFile;
|
||||
|
||||
////选中的行数据
|
||||
//var Selecteddata = (par as DataGrid)!.SelectedItem as HistoryExp;
|
||||
////选中的列数据
|
||||
//var selectedColumn = (par as DataGrid)!.CurrentColumn;
|
||||
|
||||
//SelectedIndex= ProParsHelper.GetIndexByName(selectedColumn);
|
||||
|
||||
//SelectedProStepDto = par as ProStepDto;
|
||||
if (Selecteddata != null)
|
||||
{
|
||||
SelectedHistoryWorkCondFile = Selecteddata;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private DelegateCommand _FilterHistoryDataFileCmd;
|
||||
/// <summary>
|
||||
@@ -397,6 +364,48 @@ namespace CapMachine.Wpf.ViewModels
|
||||
HasHeaderRecord = false,
|
||||
};
|
||||
|
||||
private DelegateCommand<object> _SelectAllFilesCmd;
|
||||
public DelegateCommand<object> SelectAllFilesCmd
|
||||
{
|
||||
set
|
||||
{
|
||||
_SelectAllFilesCmd = value;
|
||||
}
|
||||
get
|
||||
{
|
||||
if (_SelectAllFilesCmd == null)
|
||||
{
|
||||
_SelectAllFilesCmd = new DelegateCommand<object>((par) => SelectAllFilesCmdMethod(par));
|
||||
}
|
||||
return _SelectAllFilesCmd;
|
||||
}
|
||||
}
|
||||
private void SelectAllFilesCmdMethod(object par)
|
||||
{
|
||||
bool isChecked = false;
|
||||
if (par is bool b) { isChecked = b; }
|
||||
else
|
||||
{
|
||||
var nb = par as bool?;
|
||||
if (nb.HasValue) isChecked = nb.Value;
|
||||
else
|
||||
{
|
||||
var sb = par as string;
|
||||
if (!string.IsNullOrWhiteSpace(sb))
|
||||
{
|
||||
bool.TryParse(sb, out isChecked);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ListHistoryWorkCondFile == null) return;
|
||||
foreach (var f in ListHistoryWorkCondFile)
|
||||
{
|
||||
if (f != null) f.IsSelected = isChecked;
|
||||
}
|
||||
// 触发刷新
|
||||
ListHistoryWorkCondFile = ListHistoryWorkCondFile.ToList();
|
||||
}
|
||||
|
||||
Stopwatch stopwatch = new Stopwatch();
|
||||
|
||||
private DelegateCommand _HistoryDataFileCmd;
|
||||
@@ -422,118 +431,134 @@ namespace CapMachine.Wpf.ViewModels
|
||||
/// <summary>
|
||||
/// 获取试验数据的命令的执行方法
|
||||
/// </summary>
|
||||
private void HistoryDataFileCmdMethod()
|
||||
private async void HistoryDataFileCmdMethod()
|
||||
{
|
||||
//SelectedHistoryWorkCondFile
|
||||
if (SelectedHistoryExp != null && SelectedHistoryWorkCondFile != null)
|
||||
{
|
||||
CsvRecordModels = new List<CsvRecordModel>();
|
||||
|
||||
////第一次计时
|
||||
stopwatch.Start(); //启动Stopwatch
|
||||
|
||||
if (!string.IsNullOrEmpty(SelectedHistoryWorkCondFile.FilePath))
|
||||
{
|
||||
if (File.Exists(SelectedHistoryWorkCondFile.FilePath))//是否存在文件
|
||||
{
|
||||
lock (ConfigService.CsvFileLock)
|
||||
{
|
||||
using (var reader = new StreamReader(SelectedHistoryWorkCondFile.FilePath))
|
||||
using (var csv = new CsvReader(reader, CultureInfo.CurrentCulture))
|
||||
{
|
||||
csv.Context.RegisterClassMap<CsvRecordModelMap>();
|
||||
//GetRecords<CsvRecordModel>().ToList();
|
||||
|
||||
CsvRecordModels.AddRange(csv.GetRecords<CsvRecordModel>().ToList());
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Windows.MessageBox.Show("没有发现地址对应的文件");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Windows.MessageBox.Show("发现空的文件地址");
|
||||
}
|
||||
|
||||
//数据加载完毕后进入到Chart曲线中
|
||||
if (CsvRecordModels.Count > 0)
|
||||
{
|
||||
EventAggregator.GetEvent<HistoryDataToChartEvent>().Publish(new HistoryDataToChartMsg() { Machine = "History", Data = CsvRecordModels });
|
||||
}
|
||||
|
||||
stopwatch.Stop(); //停止Stopwatch
|
||||
Console.WriteLine("加载CSV数据耗时：:{0}", stopwatch.Elapsed.TotalSeconds.ToString());
|
||||
stopwatch.Reset();
|
||||
|
||||
IsLeftDrawerOpen = false;
|
||||
}
|
||||
else
|
||||
if (SelectedHistoryExp == null)
|
||||
{
|
||||
System.Windows.MessageBox.Show("请选中后再操作", "提示", MessageBoxButton.OK, MessageBoxImage.Hand);
|
||||
return;
|
||||
}
|
||||
|
||||
var files = new List<HistoryWorkCondFile>();
|
||||
if (ListHistoryWorkCondFile != null)
|
||||
{
|
||||
foreach (var f in ListHistoryWorkCondFile)
|
||||
{
|
||||
if (f != null && f.IsSelected)
|
||||
{
|
||||
files.Add(f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#region 整个工况
|
||||
//整个试验工况一起加载数据
|
||||
//if (SelectedHistoryExp != null && SelectedHistoryExp.HistoryWorkCondFiles != null)
|
||||
//{
|
||||
// CsvRecordModels = new List<CsvRecordModel>();
|
||||
files = files
|
||||
.Where(f => f != null)
|
||||
.GroupBy(f => string.IsNullOrWhiteSpace(f.FilePath) ? $"ID:{f.Id}" : f.FilePath)
|
||||
.Select(g => g.First())
|
||||
.ToList();
|
||||
|
||||
// ////第一次计时
|
||||
// stopwatch.Start(); //启动Stopwatch
|
||||
if (files.Count == 0)
|
||||
{
|
||||
System.Windows.MessageBox.Show("请先在右侧勾选至少一个CSV文件", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
|
||||
return;
|
||||
}
|
||||
|
||||
// foreach (var item in SelectedHistoryExp.HistoryWorkCondFiles)
|
||||
// {
|
||||
// if (!string.IsNullOrEmpty(item.FilePath))
|
||||
// {
|
||||
// if (File.Exists(item.FilePath))//是否存在文件
|
||||
// {
|
||||
// lock (ConfigService.CsvFileLock)
|
||||
// {
|
||||
// using (var reader = new StreamReader(item.FilePath))
|
||||
// using (var csv = new CsvReader(reader, CultureInfo.CurrentCulture))
|
||||
// {
|
||||
// csv.Context.RegisterClassMap<CsvRecordModelMap>();
|
||||
// //GetRecords<CsvRecordModel>().ToList();
|
||||
BusyMessage = "正在加载CSV数据，请稍候...";
|
||||
IsBusy = true;
|
||||
|
||||
// CsvRecordModels.AddRange(csv.GetRecords<CsvRecordModel>().ToList());
|
||||
// }
|
||||
// }
|
||||
var loaded = new List<CsvRecordModel>();
|
||||
string errorText = string.Empty;
|
||||
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// System.Windows.MessageBox.Show("没有发现地址对应的文件");
|
||||
// }
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// System.Windows.MessageBox.Show("发现空的文件地址");
|
||||
// }
|
||||
// }
|
||||
stopwatch.Start();
|
||||
|
||||
// //数据加载完毕后进入到Chart曲线中
|
||||
// if (CsvRecordModels.Count > 0)
|
||||
// {
|
||||
// EventAggregator.GetEvent<HistoryDataToChartEvent>().Publish(new HistoryDataToChartMsg() { Machine = "History", Data = CsvRecordModels });
|
||||
// }
|
||||
try
|
||||
{
|
||||
await Task.Run(() =>
|
||||
{
|
||||
var errors = new StringBuilder();
|
||||
for (int i = 0; i < files.Count; i++)
|
||||
{
|
||||
var f = files[i];
|
||||
try
|
||||
{
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
{
|
||||
BusyMessage = $"正在加载({i + 1}/{files.Count})：{System.IO.Path.GetFileName(f?.FilePath)}";
|
||||
});
|
||||
|
||||
// stopwatch.Stop(); //停止Stopwatch
|
||||
// Console.WriteLine("加载CSV数据耗时：:{0}", stopwatch.Elapsed.TotalSeconds.ToString());
|
||||
// stopwatch.Reset();
|
||||
if (f == null) continue;
|
||||
if (string.IsNullOrWhiteSpace(f.FilePath))
|
||||
{
|
||||
errors.AppendLine("发现空的文件地址");
|
||||
continue;
|
||||
}
|
||||
if (!File.Exists(f.FilePath))
|
||||
{
|
||||
errors.AppendLine($"没有发现地址对应的文件: {f.FilePath}");
|
||||
continue;
|
||||
}
|
||||
|
||||
// IsLeftDrawerOpen = false;
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// System.Windows.MessageBox.Show("请选中后再操作", "提示", MessageBoxButton.OK, MessageBoxImage.Hand);
|
||||
//}
|
||||
var rec = ReadCsvFile(f.FilePath);
|
||||
if (rec != null && rec.Count > 0)
|
||||
{
|
||||
loaded.AddRange(rec);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
errors.AppendLine($"读取CSV失败: {ex.Message}");
|
||||
}
|
||||
}
|
||||
errorText = errors.ToString();
|
||||
});
|
||||
|
||||
#endregion
|
||||
if (!string.IsNullOrWhiteSpace(errorText))
|
||||
{
|
||||
System.Windows.MessageBox.Show(errorText, "读取提示", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||
}
|
||||
|
||||
CsvRecordModels = new List<CsvRecordModel>();
|
||||
if (loaded != null && loaded.Count > 0)
|
||||
{
|
||||
CsvRecordModels = loaded
|
||||
.Where(r => r != null)
|
||||
.OrderBy(r => r.CreateTime)
|
||||
.ToList();
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
{
|
||||
EventAggregator.GetEvent<HistoryDataToChartEvent>().Publish(new HistoryDataToChartMsg() { Machine = "History", Data = CsvRecordModels });
|
||||
});
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
stopwatch.Stop();
|
||||
Console.WriteLine("加载CSV数据耗时：:{0}", stopwatch.Elapsed.TotalSeconds.ToString());
|
||||
stopwatch.Reset();
|
||||
IsBusy = false;
|
||||
IsLeftDrawerOpen = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private List<CsvRecordModel> ReadCsvFile(string filePath)
|
||||
{
|
||||
var result = new List<CsvRecordModel>();
|
||||
lock (ConfigService.CsvFileLock)
|
||||
{
|
||||
using (var reader = new StreamReader(filePath, Encoding.UTF8))
|
||||
using (var csv = new CsvReader(reader, CultureInfo.CurrentCulture))
|
||||
{
|
||||
csv.Context.RegisterClassMap<CsvRecordModelMap>();
|
||||
var list = csv.GetRecords<CsvRecordModel>().ToList();
|
||||
if (list != null && list.Count > 0)
|
||||
{
|
||||
// 过滤无效时间，避免排序异常
|
||||
result = list.Where(r => r != null && r.CreateTime != default && r.CreateTime != DateTime.MinValue).ToList();
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@@ -1075,7 +1100,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
SeletedGroup6ListViewTabIndex = 0;
|
||||
SeletedGroup7ListViewTabIndex = 0;
|
||||
SeletedGroup8ListViewTabIndex = 0;
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user