增加CAN FD和规则的功能

CapMachine.Wpf/Dtos/CANFdConfigExdDto.cs

@@ -0,0 +1,77 @@
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Wpf.Dtos
+{
+    public class CANFdConfigExdDto : BindableBase
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public long Id { get; set; }
+
+        private int _DataBaudRate;
+        /// <summary>
+        /// 数据波特率
+        /// </summary>
+        public int DataBaudRate
+        {
+            get { return _DataBaudRate; }
+            set { _DataBaudRate = value; RaisePropertyChanged(); }
+        }
+
+        private int _ArbBaudRate;
+        /// <summary>
+        /// 仲裁波特率
+        /// </summary>
+        public int ArbBaudRate
+        {
+            get { return _ArbBaudRate; }
+            set { _ArbBaudRate = value; RaisePropertyChanged(); }
+        }
+
+        private bool _ISOEnable;
+        /// <summary>
+        /// ISO 使能
+        /// </summary>
+        public bool ISOEnable
+        {
+            get { return _ISOEnable; }
+            set { _ISOEnable = value; RaisePropertyChanged(); }
+        }
+
+        private bool _ResEnable;
+        /// <summary>
+        /// 终端电阻使能
+        /// </summary>
+        public bool ResEnable
+        {
+            get { return _ResEnable; }
+            set { _ResEnable = value; RaisePropertyChanged(); }
+        }
+
+        private int _Cycle;
+        /// <summary>
+        /// 周期
+        /// </summary>
+        public int Cycle
+        {
+            get { return _Cycle; }
+            set { _Cycle = value; RaisePropertyChanged(); }
+        }
+
+        private string? _DbcPath;
+        /// <summary>
+        /// Dbc文件路径
+        /// </summary>
+        public string? DbcPath
+        {
+            get { return _DbcPath; }
+            set { _DbcPath = value; RaisePropertyChanged(); }
+        }
+    }
+}

CapMachine.Wpf/Dtos/CanLinRWConfigDto.cs

@@ -70,7 +70,12 @@ namespace CapMachine.Wpf.Dtos
             set { _DefautValue = value; RaisePropertyChanged(); }
         }
 
-
+        public long LogicRuleId { get; set; }
+        /// <summary>
+        /// CanLinConfig的逻辑转换规则
+        /// 比如：速度下发的数据SV是4000，但是下发到CAN的值是40，可能是其他的逻辑转换规则，这里就是保存其中的逻辑规则
+        /// </summary>
+        public LogicRuleDto? LogicRuleDto { get; set; }
 
     }
 }

CapMachine.Wpf/Dtos/LogicRuleDto.cs

@@ -0,0 +1,73 @@
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CapMachine.Wpf.Dtos
+{
+    /// <summary>
+    /// 逻辑转换规则模型
+    /// </summary>
+    public class LogicRuleDto : BindableBase
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        public int Id { get; set; }
+
+
+        private string _name = string.Empty;
+        /// <summary>
+        /// 规则名称
+        /// </summary>
+        public string Name
+        {
+            get { return _name; }
+            set { SetProperty(ref _name, value); }
+        }
+
+
+        private string _description = string.Empty;
+        /// <summary>
+        /// 规则描述
+        /// </summary>
+        public string Description
+        {
+            get { return _description; }
+            set { SetProperty(ref _description, value); }
+        }
+
+        private string _expression = string.Empty;
+        /// <summary>
+        /// 规则表达式
+        /// </summary>
+        public string Expression
+        {
+            get { return _expression; }
+            set { _expression = value; RaisePropertyChanged(); }
+        }
+
+
+        private string _parameterType = string.Empty;
+        /// <summary>
+        /// 适用的参数类型（如：转速、功率等）
+        /// </summary>
+        public string ParameterType
+        {
+            get { return _parameterType; }
+            set { SetProperty(ref _parameterType, value); }
+        }
+
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 适用的参数类型（如：转速、功率等）
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(); }
+        }
+    }
+}