逻辑规则的初步增加工能:
1)规则的界面的增删改查 2)规则服务的初步测试,目前测试是OK的
This commit is contained in:
@@ -37,7 +37,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
{
|
||||
public CANConfigViewModel(IDialogService dialogService, IFreeSql freeSql,
|
||||
IEventAggregator eventAggregator, IRegionManager regionManager, SysRunService sysRunService,
|
||||
ComActionService actionService,
|
||||
ComActionService actionService, LogicRuleService logicRuleService,
|
||||
ConfigService configService, CanDriveService canDriveService,
|
||||
IMapper mapper, MachineRtDataService machineRtDataService)
|
||||
{
|
||||
@@ -47,6 +47,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
RegionManager = regionManager;
|
||||
SysRunService = sysRunService;
|
||||
ComActionService = actionService;
|
||||
LogicRuleService = logicRuleService;
|
||||
ConfigService = configService;
|
||||
CanDriveService = canDriveService;
|
||||
Mapper = mapper;
|
||||
@@ -63,6 +64,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
new CbxItems(){ Key="Anti_Sleep",Text="Anti_Sleep"},
|
||||
};
|
||||
|
||||
|
||||
ReadNameCbxItems = new ObservableCollection<CbxItems>()
|
||||
{
|
||||
new CbxItems(){ Key="通讯转速",Text="通讯转速"},
|
||||
@@ -72,8 +74,20 @@ namespace CapMachine.Wpf.ViewModels
|
||||
new CbxItems(){ Key="通讯功率",Text="通讯功率"},
|
||||
new CbxItems(){ Key="通讯芯片温度",Text="通讯芯片温度"},
|
||||
};
|
||||
|
||||
InitLoadCanConfigPro();
|
||||
|
||||
WriteRuleCbxItems = new ObservableCollection<CbxItems>();
|
||||
//选择的读写规则
|
||||
foreach (var itemRule in LogicRuleService.LogicRuleDtos)
|
||||
{
|
||||
WriteRuleCbxItems.Add(new CbxItems()
|
||||
{
|
||||
Key = itemRule.Id.ToString(),
|
||||
Text = itemRule.Name
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -85,6 +99,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
public IRegionManager RegionManager { get; }
|
||||
public SysRunService SysRunService { get; }
|
||||
public ComActionService ComActionService { get; }
|
||||
public LogicRuleService LogicRuleService { get; }
|
||||
public ConfigService ConfigService { get; }
|
||||
public CanDriveService CanDriveService { get; }
|
||||
public IMapper Mapper { get; }
|
||||
@@ -107,7 +122,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
//CAN配置集合数据
|
||||
canLinConfigPros = FreeSql.Select<CanLinConfigPro>().Where(a => a.CANLINInfo == CANLIN.CAN)
|
||||
.Include(a => a.CANConfigExd)
|
||||
.IncludeMany(a => a.CanLinConfigContents)
|
||||
.IncludeMany(a => a.CanLinConfigContents, then => then.Include(b => b.LogicRule))//,then=> then.Include(b=>b.LogicRule)
|
||||
.ToList();
|
||||
|
||||
ListCanLinConfigPro = new ObservableCollection<CanLinConfigPro>(canLinConfigPros);
|
||||
@@ -116,7 +131,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
SelectCanLinConfigPro = canLinConfigPros.Where(a => a.Id == SelectCanLinConfigPro.Id).FirstOrDefault()!;
|
||||
//无数据就返回
|
||||
if (SelectCanLinConfigPro == null) return;
|
||||
|
||||
|
||||
SelectedCANConfigExdDto = Mapper.Map<CANConfigExdDto>(SelectCanLinConfigPro!.CANConfigExd);
|
||||
|
||||
//配置信息
|
||||
@@ -695,7 +710,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
}
|
||||
|
||||
//(par as SelectionChangedEventArgs)!.AddedItems[0] == null
|
||||
if ((par as SelectionChangedEventArgs)!.AddedItems.Count==0)
|
||||
if ((par as SelectionChangedEventArgs)!.AddedItems.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -833,7 +848,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
//系统使用了CAN
|
||||
ConfigService.CanLinRunStateModel.CurSysSelectedCanLin = CanLinEnum.Can;
|
||||
}
|
||||
|
||||
|
||||
//CAN DBC配置 有DBC配置的话,则直接加载DBC信息
|
||||
if (!string.IsNullOrEmpty(SelectCanLinConfigPro.CANConfigExd.DbcPath))
|
||||
{
|
||||
@@ -980,6 +995,16 @@ namespace CapMachine.Wpf.ViewModels
|
||||
set { _WriteNameCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
private ObservableCollection<CbxItems> _WriteRuleCbxItems;
|
||||
/// <summary>
|
||||
/// 写入的规格集合
|
||||
/// </summary>
|
||||
public ObservableCollection<CbxItems> WriteRuleCbxItems
|
||||
{
|
||||
get { return _WriteRuleCbxItems; }
|
||||
set { _WriteRuleCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
|
||||
private ObservableCollection<CbxItems> _ReadNameCbxItems;
|
||||
/// <summary>
|
||||
@@ -991,6 +1016,15 @@ namespace CapMachine.Wpf.ViewModels
|
||||
set { _ReadNameCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
private ObservableCollection<CbxItems> _ReadRuleCbxItems;
|
||||
/// <summary>
|
||||
/// 读取的规格集合
|
||||
/// </summary>
|
||||
public ObservableCollection<CbxItems> ReadRuleCbxItems
|
||||
{
|
||||
get { return _ReadRuleCbxItems; }
|
||||
set { _ReadRuleCbxItems = value; RaisePropertyChanged(); }
|
||||
}
|
||||
|
||||
//private string _SelectedWriteName;
|
||||
///// <summary>
|
||||
@@ -1106,6 +1140,7 @@ namespace CapMachine.Wpf.ViewModels
|
||||
//直接修改
|
||||
FreeSql.Update<CanLinRWConfig>(item.Id)
|
||||
.Set(a => a.Name, item.Name)
|
||||
.Set(a => a.LogicRuleId, item.LogicRuleId)
|
||||
.Set(a => a.DefautValue, item.DefautValue)
|
||||
.ExecuteAffrows();
|
||||
//ListWriteCanLinRWConfigDto.Remove(SelectedWriteCanLinRWConfigDto);
|
||||
|
||||
Reference in New Issue
Block a user