增加了CAN调度表发送，但是没有测试成功
This commit is contained in:
@@ -182,6 +182,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
canLinConfigPros = FreeSql.Select<CanLinConfigPro>().Where(a => a.CANLINInfo == CANLIN.CAN)
|
||||
.Include(a => a.CANConfigExd)
|
||||
.IncludeMany(a => a.CanLinConfigContents, then => then.Include(b => b.LogicRule))//,then=> then.Include(b=>b.LogicRule) //.IncludeMany(a => a.CanLinConfigContents)
|
||||
.IncludeMany(a => a.CanScheduleConfigs)//
|
||||
.ToList();
|
||||
|
||||
ListCanLinConfigPro = new ObservableCollection<CanLinConfigPro>(canLinConfigPros);
|
||||
@@ -225,6 +226,12 @@ namespace CapMachine.Wpf.ViewModels
|
||||
{
|
||||
ListReadCanLinRWConfigDto = new ObservableCollection<CanLinRWConfigDto>(Mapper.Map<List<CanLinRWConfigDto>>(ReadData));
|
||||
}
|
||||
//调度表配置信息
|
||||
if (SelectCanLinConfigPro.CanScheduleConfigs != null && SelectCanLinConfigPro.CanScheduleConfigs.Count() > 0)
|
||||
{
|
||||
ListCANScheduleConfigDto = new ObservableCollection<CANScheduleConfigDto>(Mapper.Map<List<CANScheduleConfigDto>>(SelectCanLinConfigPro.CanScheduleConfigs));
|
||||
}
|
||||
|
||||
|
||||
//匹配选中的SelectCanLinConfigPro.CanLinConfigContents和ListCanDbcModel
|
||||
MatchSeletedAndCanDbcModel();
|
||||
@@ -584,6 +591,17 @@ namespace CapMachine.Wpf.ViewModels
|
||||
|
||||
SelectCanLinConfigProConfigName = SelectCanLinConfigPro.ConfigName;
|
||||
|
||||
//调度表配置信息
|
||||
if (SelectCanLinConfigPro.CanScheduleConfigs != null && SelectCanLinConfigPro.CanScheduleConfigs.Count() > 0)
|
||||
{
|
||||
ListCANScheduleConfigDto = new ObservableCollection<CANScheduleConfigDto>(Mapper.Map<List<CANScheduleConfigDto>>(SelectCanLinConfigPro.CanScheduleConfigs));
|
||||
}
|
||||
else
|
||||
{
|
||||
ListCANScheduleConfigDto = new ObservableCollection<CANScheduleConfigDto>();
|
||||
}
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
//先判断是否是正确的集合数据，防止DataGrid的数据源刷新导致的触发事件
|
||||
@@ -868,7 +886,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
|
||||
private ObservableCollection<CbxItems> _DataBaudRateCbxItems;
|
||||
/// <summary>
|
||||
/// CAN FD 数据波特率
|
||||
/// CAN 数据波特率
|
||||
/// </summary>
|
||||
public ObservableCollection<CbxItems> DataBaudRateCbxItems
|
||||
{
|
||||
@@ -876,6 +894,47 @@ namespace CapMachine.Wpf.ViewModels
|
||||
set { _DataBaudRateCbxItems = 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)
|
||||
{
|
||||
CanDriveService.ToomossCanDrive.SchEnable = true;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
CanDriveService.ToomossCanDrive.SchEnable = false;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private DelegateCommand<string> _CanOpCmd;
|
||||
/// <summary>
|
||||
/// CAN操作的指令
|
||||
@@ -963,6 +1022,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
.Set(a => a.DbcPath, SelectedCANConfigExdDto.DbcPath)
|
||||
.Set(a => a.Cycle, SelectedCANConfigExdDto.Cycle)
|
||||
.Set(a => a.BaudRate, SelectedCANConfigExdDto.BaudRate)
|
||||
.Set(a => a.SchEnable, SelectedCANConfigExdDto.SchEnable)
|
||||
.Where(a => a.Id == SelectedCANConfigExdDto.Id)
|
||||
.ExecuteUpdated();
|
||||
}
|
||||
@@ -1024,7 +1084,12 @@ namespace CapMachine.Wpf.ViewModels
|
||||
|
||||
break;
|
||||
case "CycleSend"://循环发送你
|
||||
//循环发送数据
|
||||
|
||||
//有可能加载完毕后不手动改变状态，导致值没有传输，所以这里赋值
|
||||
CanDriveService.ToomossCanDrive.SchEnable = SelectedCANConfigExdDto.SchEnable;
|
||||
//无论有没有调度表，都要把这个配置给CanDriveService
|
||||
CanDriveService.ListCANScheduleConfig = ListCANScheduleConfigDto.ToList();
|
||||
|
||||
CanDriveService.CycleSendMsg();
|
||||
|
||||
//Listen
|
||||
@@ -1099,6 +1164,17 @@ namespace CapMachine.Wpf.ViewModels
|
||||
}
|
||||
|
||||
|
||||
private ObservableCollection<CANScheduleConfigDto> _ListCANScheduleConfigDto;
|
||||
/// <summary>
|
||||
///调度表集合
|
||||
/// </summary>
|
||||
public ObservableCollection<CANScheduleConfigDto> ListCANScheduleConfigDto
|
||||
{
|
||||
get { return _ListCANScheduleConfigDto; }
|
||||
set { _ListCANScheduleConfigDto = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
|
||||
//private string _SelectedWriteName;
|
||||
///// <summary>
|
||||
///// 选中的写入的Name
|
||||
@@ -1244,6 +1320,44 @@ namespace CapMachine.Wpf.ViewModels
|
||||
System.Windows.MessageBox.Show("请选中后再进行【删除】操作？", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
|
||||
}
|
||||
|
||||
break;
|
||||
case "WriteSch"://调度表
|
||||
|
||||
var data = CanDriveService.CmdData.GroupBy(a => a.MsgName).Select(a => a.Key).ToList();
|
||||
|
||||
if (data != null && data.Count > 0)
|
||||
{
|
||||
//弹窗
|
||||
DialogService.ShowDialog("DialogCANSchConfigView", new DialogParameters() {
|
||||
{"ListMsg", CanDriveService.CmdData.GroupBy(a=>a.MsgName).Select(a=>a.Key).ToList() },
|
||||
{ "ListCANScheduleConfigDto",ListCANScheduleConfigDto},
|
||||
{ "SelectCanLinConfigProId",SelectCanLinConfigPro.Id},
|
||||
|
||||
}, (par) =>
|
||||
{
|
||||
if (par.Result == ButtonResult.OK)
|
||||
{
|
||||
////程序名称
|
||||
ListCANScheduleConfigDto = par.Parameters.GetValue<ObservableCollection<CANScheduleConfigDto>>("ReturnValue");
|
||||
//把更新后的最新值给当前的主集合中
|
||||
SelectCanLinConfigPro.CanScheduleConfigs = Mapper.Map<List<CANScheduleConfig>>(ListCANScheduleConfigDto.ToList());
|
||||
|
||||
}
|
||||
else if (par.Result == ButtonResult.Cancel)
|
||||
{
|
||||
//取消
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
System.Windows.MessageBox.Show("未发现写入的执行的命令数据，无法配置？", "提示", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Hand);
|
||||
}
|
||||
|
||||
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
356
CapMachine.Wpf/ViewModels/DialogCANSchConfigViewModel.cs
Normal file
356
CapMachine.Wpf/ViewModels/DialogCANSchConfigViewModel.cs
Normal file
@@ -0,0 +1,356 @@
|
||||
using AutoMapper;
|
||||
using CapMachine.Core;
|
||||
using CapMachine.Model;
|
||||
using CapMachine.Model.CANLIN;
|
||||
using CapMachine.Wpf.Dtos;
|
||||
using CapMachine.Wpf.Services;
|
||||
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 调度表配置
|
||||
/// </summary>
|
||||
public class DialogCANSchConfigViewModel : DialogViewModel
|
||||
{
|
||||
/// <summary>
|
||||
/// 构造函数
|
||||
/// </summary>
|
||||
public DialogCANSchConfigViewModel(IFreeSql freeSql, IMapper mapper)
|
||||
{
|
||||
Title = "调度表 CAN 配置";
|
||||
FreeSql = freeSql;
|
||||
Mapper = mapper;
|
||||
|
||||
|
||||
SendOrderCbxItems = new ObservableCollection<CbxItems>()
|
||||
{
|
||||
new CbxItems(){
|
||||
Key="0",
|
||||
Text="并行",
|
||||
},
|
||||
new CbxItems(){
|
||||
Key="1",
|
||||
Text="顺序",
|
||||
},
|
||||
};
|
||||
|
||||
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<CANScheduleConfigDto> _ListCANScheduleConfigDto = new ObservableCollection<CANScheduleConfigDto>();
|
||||
/// <summary>
|
||||
/// CAN 调度表数据集合
|
||||
/// </summary>
|
||||
public ObservableCollection<CANScheduleConfigDto> ListCANScheduleConfigDto
|
||||
{
|
||||
get { return _ListCANScheduleConfigDto; }
|
||||
set { _ListCANScheduleConfigDto = 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 ObservableCollection<CbxItems> _SchTabIndexCbxItems;
|
||||
/// <summary>
|
||||
/// 调度器序号 集合信息
|
||||
/// </summary>
|
||||
public ObservableCollection<CbxItems> SchTabIndexCbxItems
|
||||
{
|
||||
get { return _SchTabIndexCbxItems; }
|
||||
set { _SchTabIndexCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
private CANScheduleConfigDto _CurSelectedItem;
|
||||
/// <summary>
|
||||
/// 选中的数据
|
||||
/// </summary>
|
||||
public CANScheduleConfigDto 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 CANScheduleConfigDto;
|
||||
|
||||
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":
|
||||
ListCANScheduleConfigDto.Add(new CANScheduleConfigDto
|
||||
{
|
||||
CanLinConfigProId = SelectCanLinConfigProId,
|
||||
Cycle = 100,
|
||||
SchTabIndex = 0,
|
||||
OrderSend = 1,
|
||||
});
|
||||
break;
|
||||
case "Delete":
|
||||
if (CurSelectedItem != null)
|
||||
{
|
||||
//直接删除掉，如果没有ID的话，这就不需要删除了
|
||||
FreeSql.Delete<CANScheduleConfig>(CurSelectedItem.Id).ExecuteAffrows();
|
||||
ListCANScheduleConfigDto.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 ListCANScheduleConfigDto)
|
||||
{
|
||||
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 ListCANScheduleConfigDto)
|
||||
{
|
||||
FreeSql.InsertOrUpdate<CANScheduleConfig>()
|
||||
.SetSource(Mapper.Map<CANScheduleConfig>(item)).
|
||||
ExecuteAffrows();
|
||||
}
|
||||
|
||||
ListCANScheduleConfigDto = new ObservableCollection<CANScheduleConfigDto>(Mapper.Map<List<CANScheduleConfigDto>>(FreeSql.Select<CANScheduleConfig>().Where(a => a.CanLinConfigProId == SelectCanLinConfigProId).ToList()));
|
||||
|
||||
DialogParameters pars = new DialogParameters
|
||||
{
|
||||
{ "ReturnValue", ListCANScheduleConfigDto }
|
||||
};
|
||||
|
||||
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
|
||||
}));
|
||||
|
||||
ListCANScheduleConfigDto = parameters.GetValue<ObservableCollection<CANScheduleConfigDto>>("ListCANScheduleConfigDto");
|
||||
//防止返回的数据为空，就无法增加了
|
||||
if (ListCANScheduleConfigDto == null) ListCANScheduleConfigDto = new ObservableCollection<CANScheduleConfigDto>();
|
||||
//Name = parameters.GetValue<string>("Name");
|
||||
|
||||
SelectCanLinConfigProId = parameters.GetValue<long>("SelectCanLinConfigProId");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user