diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs index 86bc26c..4e087cd 100644 --- a/CapMachine.Wpf/Models/CsvRecordModel.cs +++ b/CapMachine.Wpf/Models/CsvRecordModel.cs @@ -33,30 +33,35 @@ namespace CapMachine.Wpf.Models /// /// 转速[rpm] + /// V /// [Name("转速[rpm]")] public int Speed { get; set; } /// /// 排气压力[BarA] + /// V /// [Name("排气压力[BarA]")] public double ExPress { get; set; } /// /// 吸气压力[BarA] + /// V /// [Name("吸气压力[BarA]")] public double InhPress { get; set; } /// /// 吸气温度[℃] + /// V /// [Name("吸气温度[℃]")] public double InhTemp { get; set; } /// /// COND1温度[℃] + /// V /// [Name("COND1温度[℃]")] public double Cond1Temp { get; set; } @@ -81,42 +86,49 @@ namespace CapMachine.Wpf.Models /// /// HV[V] + /// V /// [Name("HV[V]")] public double HV { get; set; } /// /// HV[A] + /// V /// [Name("HV[A]")] public double HVCur { get; set; } /// /// HV[W] + /// V /// [Name("HV[W]")] public double HVPw { get; set; } /// /// LV[V] + /// V /// [Name("LV[V]")] public double LV { get; set; } /// /// LV[A] + /// V /// [Name("LV[A]")] public double LVCur { get; set; } /// /// 环境温度[℃] + /// V /// [Name("环境温度[℃]")] public double EnvTemp { get; set; } /// /// 环境湿度[%] + /// V /// [Name("环境湿度[%]")] public double EnvRH { get; set; } @@ -129,6 +141,7 @@ namespace CapMachine.Wpf.Models /// /// OS2温度[℃] + /// V /// [Name("OS2温度[℃]")] public double OS2Temp { get; set; } @@ -159,28 +172,80 @@ namespace CapMachine.Wpf.Models /// /// 排气温度[℃] + /// V /// [Name("排气温度[℃]")] public double ExTemp { get; set; } /// /// 膨胀阀前压力[BarA] + /// V /// [Name("膨胀阀前压力[BarA]")] public double TxvFrPress { get; set; } /// /// 膨胀阀前温度[℃] + /// V /// [Name("膨胀阀前温度[℃]")] public double TxvFrTemp { get; set; } + /// + /// 冷凝器进口温度[℃] + /// V + /// + [Name("冷凝器进口温度[℃]")] + public double CondInTemp { get; set; } + + /// + /// 冷凝器进口压力[BarA] + /// V + /// + [Name("冷凝器进口压力[BarA]")] + public double CondInPress { get; set; } + /// /// EVAP出口压力[BarA] /// [Name("EVAP出口压力[BarA]")] public double EVAPExpPress { get; set; } + /// + /// 水箱进水温度[℃] + /// V + /// + [Name("水箱进水温度[℃]")] + public double WaterTankInTemp { get; set; } + + /// + /// 水加热温度H1[℃] + /// V + /// + [Name("水加热温度H1[℃]")] + public double WaterHeatTempH1 { get; set; } + + /// + /// 压缩机表面温度1[℃] + /// V + /// + [Name("压缩机表面温度1[℃]")] + public double CapSurfTemp1 { get; set; } + + /// + /// 压缩机表面温度2[℃] + /// V + /// + [Name("压缩机表面温度2[℃]")] + public double CapSurfTemp2 { get; set; } + + /// + /// 压缩机表面温度3[℃] + /// V + /// + [Name("压缩机表面温度3[℃]")] + public double CapSurfTemp3 { get; set; } + /// /// 腔内压力[BarA] /// @@ -213,12 +278,14 @@ namespace CapMachine.Wpf.Models /// /// 通讯Cmp母线电流[A] + /// V /// [Name("通讯Cmp母线电流[A]")] public double ComCapBusCur { get; set; } /// /// 通讯Cmp母线电压[V] + /// V /// [Name("通讯Cmp母线电压[V]")] public double ComCapBusVol { get; set; } @@ -231,18 +298,21 @@ namespace CapMachine.Wpf.Models /// /// 通讯Cmp相电流[A] + /// V /// [Name("通讯Cmp相电流[A]")] public double ComCapPhCur { get; set; } /// /// 通讯Cmp功率[W] + /// V /// [Name("通讯Cmp功率[W]")] public double ComCapPw { get; set; } /// /// 通讯Cmp芯片温度[℃] + /// V /// [Name("通讯Cmp芯片温度[℃]")] public double ComCapChipTemp { get; set; } @@ -283,6 +353,20 @@ namespace CapMachine.Wpf.Models [Name("通讯PTC模块温度[℃]")] public double ComPTCMdTemp { get; set; } + /// + /// 过冷度[K] + /// V + /// + [Name("过冷度[K]")] + public double Subcooling { get; set; } + + /// + /// 过热度[K] + /// V + /// + [Name("过热度[K]")] + public double Superheat { get; set; } + /// /// 创建时间 /// diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs index 1aaa0cf..aad145f 100644 --- a/CapMachine.Wpf/Services/DataRecordService.cs +++ b/CapMachine.Wpf/Services/DataRecordService.cs @@ -341,6 +341,7 @@ namespace CapMachine.Wpf.Services //List models = Datas.Select(dict => ConvertToCsvRecordModel(dict)).ToList(); + //转换到CSV的数据 var models = ConvertToCsvRecordModel(recordChannelData.Data); //数据库保存 diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs index 6e7104b..64e42a5 100644 --- a/CapMachine.Wpf/Services/MachineRtDataService.cs +++ b/CapMachine.Wpf/Services/MachineRtDataService.cs @@ -313,7 +313,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW114",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 2, DecimalPoint = 1, Samp = 1, @@ -332,7 +332,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW116",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 0, DecimalPoint = 1, Samp = 1, @@ -370,7 +370,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW120",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 2, DecimalPoint = 1, Samp = 1, @@ -427,7 +427,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW126",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1, @@ -446,7 +446,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW128",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1, @@ -465,7 +465,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW130",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 3, DecimalPoint = 1, Samp = 1, @@ -484,7 +484,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW132",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1, @@ -503,7 +503,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW134",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 3, DecimalPoint = 1, Samp = 1, @@ -522,7 +522,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW136",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 0, DecimalPoint = 1, Samp = 1, @@ -541,7 +541,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW138",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1, @@ -560,7 +560,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW140",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1, @@ -579,7 +579,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW142",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1, @@ -598,7 +598,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW144",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1, @@ -617,7 +617,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW146",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1, @@ -636,7 +636,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW148",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 2, DecimalPoint = 1, Samp = 1, @@ -655,7 +655,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW150",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 2, DecimalPoint = 1, Samp = 1, @@ -674,7 +674,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW152",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 0, DecimalPoint = 1, Samp = 1, @@ -693,7 +693,7 @@ namespace CapMachine.Wpf.Services PVAddress = "VW154",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1, @@ -712,7 +712,7 @@ namespace CapMachine.Wpf.Services PVAddress = "",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1, @@ -731,7 +731,7 @@ namespace CapMachine.Wpf.Services PVAddress = "",//地址信息 SVAddress = "", MVAddress = "", - IsMeter = true, + IsMeter = false, Precision = 1, DecimalPoint = 1, Samp = 1,