diff --git a/JY.Inspection/Mes/MESDataCombin.cs b/JY.Inspection/Mes/MESDataCombin.cs index 1d5d6b5..771050f 100644 --- a/JY.Inspection/Mes/MESDataCombin.cs +++ b/JY.Inspection/Mes/MESDataCombin.cs @@ -1,4 +1,5 @@ -using JY.MES; +using JY.Inspection.Common; +using JY.MES; using JY.MES.Entity; using JY.MES.Enum; using JY.MES.Exceptions; @@ -8,6 +9,7 @@ using JY.Utility; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using NPOI.OpenXmlFormats.Spreadsheet; +using Org.BouncyCastle.Ocsp; using System; using System.Collections.Generic; using System.Diagnostics; @@ -55,6 +57,7 @@ namespace JY.Inspection.Mes // TODO 上传设备报警信息 // TODO 能耗 + void UpEnergyDataMqtt(List dataList); // TODO 设备打标 } @@ -380,5 +383,46 @@ namespace JY.Inspection.Mes return resp; } + + // TODO 能耗定时上传 + public void UpEnergyDataMqtt(List dataList) + { + if (dataList == null || dataList.Count == 0) + { + return; + } + + string topic = $"EVE/{Global.systemConfig.siteCode}/EQP/{Global.systemConfig.equipCode}"; + + CmdEnergyData cmd = new CmdEnergyData() { + // TODO BU编码 + Bu_id = string.Empty, + // TODO 区域简称 + District_id = string.Empty, + Factory_id = Global.systemConfig.siteCode, + Production_line_id = Global.systemConfig.lineCode, + Production_processes_id = string.Empty, + Work_center_id = string.Empty, + Station_id = string.Empty, + Device_name = Global.systemConfig.equipCode, + }; + + string[] dataNameArr = new string[] { + "相电压UA", "相电压UB","相电压UC","线电压UAB","线电压UBC","线电压UAC","电流IA","电流IB", + "电流IC","A相有功功率","B相有功功率","C相有功功率","总有功功率" + }; + for (int i = 0; i < dataList.Count; i++) + { + cmd.Taglist.Add(new CollectionItem() { + Equipment_Code = Global.systemConfig.equipCode, + EMeter_Name = dataNameArr[i], + EMeter_Value = dataList[i].ToString() + }); + } + + string payload = JsonHelper.Serialize(cmd); + + MqttSingleton.Instance.SendAsync(topic, payload).ConfigureAwait(false); + } } } diff --git a/JY.MES/JY.MES.csproj b/JY.MES/JY.MES.csproj index a31c8d8..09ea711 100644 --- a/JY.MES/JY.MES.csproj +++ b/JY.MES/JY.MES.csproj @@ -69,6 +69,7 @@ + diff --git a/JY.MES/MES/CmdEnergyData.cs b/JY.MES/MES/CmdEnergyData.cs new file mode 100644 index 0000000..4e4cad8 --- /dev/null +++ b/JY.MES/MES/CmdEnergyData.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JY.MES.MES +{ + /// + /// 能耗数据 + /// + public class CmdEnergyData + { + /// + /// BU编码, 如: EVE6BU + /// + public string Bu_id { get; set; } + + /// + /// 区域简称, 如: JM + /// + public string District_id { get; set; } + + /// + /// 工厂编码 + /// + public string Factory_id { get; set; } + + /// + /// 产线编码 + /// + public string Production_line_id { get; set; } + + /// + /// 工序编码 + /// + public string Production_processes_id { get; set; } + + /// + /// 工作中心编码 + /// + public string Work_center_id { get; set; } + + /// + /// 工站 + /// + public string Station_id { get; set; } + + /// + /// 设备编码 + /// + public string Device_name { get; set; } + + /// + /// 采集数组 + /// + public List Taglist { get; set; } + } + + public class CollectionItem + { + /// + /// 设备编码 + /// + public string Equipment_Code { get; set; } + + /// + /// 电表名称 + /// + public string EMeter_Name { get; set; } + + /// + /// 显示值 + /// + public string EMeter_Value { get; set; } + } +}