增加LIN的规则功能

CapMachine.Wpf/LinDrive/LinCmdData.cs

@@ -1,4 +1,5 @@
-using System;
+using CapMachine.Wpf.Dtos;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -31,5 +32,17 @@ namespace CapMachine.Wpf.LinDrive
         /// 没有的话，则给默认值
         /// </summary>
         public double SignalCmdValue { get; set; }
+
+        ///// <summary>
+        ///// 逻辑规则Id
+        ///// </summary>
+        //public long LogicRuleId { get; set; }
+
+        /// <summary>
+        /// CanLinConfig的逻辑转换规则
+        /// 比如：速度下发的数据SV是4000，但是下发到CAN的值是40，可能是其他的逻辑转换规则，这里就是保存其中的逻辑规则
+        /// </summary>
+        public LogicRuleDto? LogicRuleDto { get; set; }
+
     }
 }

CapMachine.Wpf/Services/LinDriveService.cs

@@ -1,15 +1,9 @@
 using CapMachine.Model.CANLIN;
-using CapMachine.Wpf.CanDrive;
 using CapMachine.Wpf.LinDrive;
 using ImTools;
 using Prism.Ioc;
 using Prism.Mvvm;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CapMachine.Wpf.Services
 {
@@ -20,15 +14,19 @@ namespace CapMachine.Wpf.Services
     {
         public HighSpeedDataService HighSpeedDataService { get; }
 
+        public LogicRuleService LogicRuleService { get; }
+
         /// <summary>
         /// 实例化函数
         /// </summary>
-        public LinDriveService(HighSpeedDataService highSpeedDataService, IContainerProvider containerProvider)
+        public LinDriveService(HighSpeedDataService highSpeedDataService, IContainerProvider containerProvider, LogicRuleService logicRuleService)
         {
             ToomossLinDrive = new ToomossLin(containerProvider);
             //高速数据服务
             HighSpeedDataService = highSpeedDataService;
 
+            LogicRuleService = logicRuleService;
+
             //ToomossLinDrive.StartLinDrive();
         }
 
@@ -171,16 +169,32 @@ namespace CapMachine.Wpf.Services
         /// <param name="canCmdData"></param>
         public void UpdateSpeedCmdData(double SpeedData)
         {
+            //if (SpeedLinCmdData != null)
+            //{
+            //    SpeedLinCmdData.SignalCmdValue = SpeedData;
+            //}
+
             if (SpeedLinCmdData != null)
             {
-                SpeedLinCmdData.SignalCmdValue = SpeedData;
+                //首先是否判断是有斜率
-            }
+                if (SpeedLinCmdData.LogicRuleDto == null)
-            //if (EnableLinCmdData != null)
+                {
-            //{
+                    //没有启动逻辑规则处理
-            //    EnableLinCmdData.SignalCmdValue = 1;
+                    SpeedLinCmdData.SignalCmdValue = SpeedData;
-            //}
+                }
-        }
+                else
+                {
+                    //LogicRuleService.ApplyExpressionFast(SpeedData, SpeedCanCmdData.LogicRuleDto);
+                    SpeedLinCmdData.SignalCmdValue = LogicRuleService.ApplyExpressionFast(SpeedData, SpeedLinCmdData.LogicRuleDto);
+                    //Console.WriteLine($"实时转换后转速值：{SpeedCanCmdData.SignalCmdValue}-SV值:{SpeedData}");
+                }
 
+                //if (EnableLinCmdData != null)
+                //{
+                //    EnableLinCmdData.SignalCmdValue = 1;
+                //}
+            }
+        }
 
         /// <summary>
         /// 更新压缩机使能数据

CapMachine.Wpf/ViewModels/LinConfigViewModel.cs

@@ -38,7 +38,7 @@ namespace CapMachine.Wpf.ViewModels
         /// <param name="machineRtDataService"></param>
         public LinConfigViewModel(IDialogService dialogService, IFreeSql freeSql,
            IEventAggregator eventAggregator, IRegionManager regionManager, SysRunService sysRunService,
-           ConfigService configService, LinDriveService linDriveService, ComActionService comActionService,
+           ConfigService configService, LinDriveService linDriveService, ComActionService comActionService, LogicRuleService logicRuleService,
            IMapper mapper, MachineRtDataService machineRtDataService)
         {
             //LogService = logService;
@@ -49,6 +49,7 @@ namespace CapMachine.Wpf.ViewModels
             ConfigService = configService;
             LinDriveService = linDriveService;
             ComActionService = comActionService;
+            LogicRuleService = logicRuleService;
             Mapper = mapper;
             this.MachineRtDataService = machineRtDataService;
 
@@ -95,7 +96,8 @@ namespace CapMachine.Wpf.ViewModels
                 new CbxItems(){ Key="通讯PTC模块温度",Text="通讯PTC模块温度"},
             };
             InitLoadLinConfigPro();
-
+            //初始化写规则下拉框
+            InitWriteRuleCbx();
         }
 
 
@@ -109,6 +111,7 @@ namespace CapMachine.Wpf.ViewModels
         public ConfigService ConfigService { get; }
         public LinDriveService LinDriveService { get; }
         public ComActionService ComActionService { get; }
+        public LogicRuleService LogicRuleService { get; }
         public IMapper Mapper { get; }
         private MachineRtDataService MachineRtDataService { get; }
 
@@ -118,6 +121,50 @@ namespace CapMachine.Wpf.ViewModels
         public IDialogService DialogService { get; }
 
 
+        private ObservableCollection<CbxItems> _WriteRuleCbxItems;
+        /// <summary>
+        /// 写入的规格集合
+        /// </summary>
+        public ObservableCollection<CbxItems> WriteRuleCbxItems
+        {
+            get { return _WriteRuleCbxItems; }
+            set { _WriteRuleCbxItems = value; RaisePropertyChanged(); }
+        }
+
+
+        #region 规则
+
+
+        /// <summary>
+        /// 逻辑更改事件
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void LogicRuleChangeEventCall(string msg)
+        {
+            //InitWriteRuleCbx();
+        }
+
+        /// <summary>
+        /// 初始化写规则下拉框
+        /// </summary>
+        private void InitWriteRuleCbx()
+        {
+            WriteRuleCbxItems = new ObservableCollection<CbxItems>();
+            //选择的读写规则
+            foreach (var itemRule in LogicRuleService.LogicRuleDtos)
+            {
+                WriteRuleCbxItems.Add(new CbxItems()
+                {
+                    Key = itemRule.Id.ToString(),
+                    Text = itemRule.Name
+                });
+            }
+        }
+
+
+        #endregion
+
 
         #region LinConfigPro
 
@@ -157,6 +204,7 @@ namespace CapMachine.Wpf.ViewModels
                             MsgName = item.MsgFrameName,
                             SignalName = item.SignalName,
                             SignalCmdValue = double.TryParse(item.DefautValue, out double result) == true ? result : 0,
+                            LogicRuleDto = Mapper.Map<LogicRuleDto>(item.LogicRule),
                         });
                         //LinDriveService.CmdData.Add(new LinCmdData()
                         //{
@@ -523,6 +571,7 @@ namespace CapMachine.Wpf.ViewModels
                             MsgName = item.MsgFrameName,
                             SignalName = item.SignalName,
                             SignalCmdValue = double.TryParse(item.DefautValue, out double result) == true ? result : 0,
+                            LogicRuleDto = Mapper.Map<LogicRuleDto>(item.LogicRule),
                         });
 
                         //LinDriveService.CmdData.Add(new LinCmdData()
@@ -1174,6 +1223,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);

CapMachine.Wpf/Views/LINConfigView.xaml

@@ -813,13 +813,26 @@
                                     </DataGridTextColumn.Header>
                                 </DataGridTextColumn>
 
-
                                 <DataGridTextColumn Binding="{Binding DefautValue}">
                                     <DataGridTextColumn.Header>
                                         <TextBlock FontWeight="Bold" Text="默认值" />
                                     </DataGridTextColumn.Header>
                                 </DataGridTextColumn>
+
+                                <DataGridTemplateColumn Width="200" Header="规则名称">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <ComboBox
+                                                DisplayMemberPath="Text"
+                                                ItemsSource="{Binding Source={StaticResource Proxy}, Path=Data.WriteRuleCbxItems}"
+                                                SelectedValue="{Binding LogicRuleId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                SelectedValuePath="Key" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+
                             </DataGrid.Columns>
+
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="SelectionChanged">
                                     <prism:InvokeCommandAction Command="{Binding WriteGridSelectionChangedCmd}" CommandParameter="{Binding ElementName=LINWriteDatagrid, Path=SelectedItem}" />