change - 电表采集修改

dev^2
wenjy 1 year ago
parent 65b33b663b
commit 58cf08db34

@ -15,7 +15,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
d876449b0e8a05ad524d60c64b588e410c53f85521599b7ff943b815ccce8343
012b5feb0b100630b160bba1ad7e15dc9f608b7fe941c8b2f95acdeff5cfc527

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
6be9db650a8d8bff4140d0bbf31c83bd11865db201599fd593f5a315e63ce2bf
ad6df547e11a08c3b107e98014be2fe40f25ffbe2528e2bc9da5ff2d84ecf84a

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
0ee46d7000a959c5af737321e5a6fa9902809161139b4d504e5b9ce11007b118
e19b6aebe727a5a1ca87143f5459358cca0dd8c38fca590f08beac03455a793e

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
0067d3d82de1193dcddb43c7d3e102921aadf588776d3e1ec96644e223ad55dc
e601dac2316b123489036e6e19406cbe1752d349cfd7ec44ebeaeb35d8fbd8c6

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
b9ee2cda1f5bf1572094fc104d8a4ebb8e8bca2323bfccbd0589759456144781
add35215afdba91ae6d5729ec949c68d36620b4aa4f78635f379d4723bdc1e0b

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
d398f3b0eab633951c1c8519654d02bbe6acbd8ccfe1cd726a70d2fe1f12f0a8
c2c91f24ed08cfc337a8312aacb728e9c70a6bae5e7839e73c4de3b67fa147f6

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
99a95143dfe1df5d5d28153c6b714eb0c8be066326c7d297e89d609c9328934b
04fab3d23ecf2eec2dc4b10c2ebe78d422766a7129e575c314cbb623916d6b65

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
4585e0f8a2b4013148250ceaa63875923bfb14b411030bcd783fc8a6e36fb829
a7541d823c489a44fbdb0be03d93f5a8a937a2a41658588ed28887708313a241

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
8140cee0110192d338783b7d890859de94d8e7ce570515eb1724f535615ad9db
047a3956c934ff42d64eac8ec8a757198b24f60dc725b38a51a9f1cba68521a9

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
97962d578fd64685d0ef3a4a853a70a8c076186aeba8bc5ae941a5bd4a5f80bc
004fe946d46cbbb81e13a900fe5d715dbe7ab6e778d4ff6d448cbaca46f8b231

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
afc06f10a959a325d63a96d622d3efb448e14ac9b2cbea6611ea5b02ee0c233c
de53cafa263b9828b6828805393c8fbc81f8a366d8c8566b32deb1f40c873002

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
2abb3a48977f91def2b27b81fa2d16987041c6823d1a2c8d734d8ee095f2989a
f02b0a3c7821ffaa88f331e5e87a990a42ad879c3d2b2379f7e8ece462e5251b

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
81197e7a019dbcaf54123c23552597fbc7c696b79a7fcaa2c269210f12d6d871
806d62ca96994a5fd35346f3b839395e8a97eef74b30bd2e11c1dd9e26085bf8

@ -3,6 +3,8 @@ using Admin.Core.Model.Model_New;
using Aucma.Core.DataCollector.Factory;
using Aucma.Core.HwPLc;
using log4net;
using NPOI.SS.Formula.Functions;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@ -22,7 +24,7 @@ namespace Aucma.Core.DataCollector
public readonly IRecordDeviceAlarmInfoServices _deviceAlarmInfoServices;
public readonly IRecordDeviceElectricityServices _deviceElectricityServices;
public int AlarmReadTimer = (1000 * 20);
public int AlarmReadTimer = (1000 * 5);
public int EleReadTimer = (1000 * 20);
public DataCollectorFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices)
@ -52,21 +54,31 @@ namespace Aucma.Core.DataCollector
/// <param name="deviceElectricity"></param>
public void ReadDeviceElectricity(string[] address,IPlc plc,ref Record_DeviceElectricity deviceElectricity)
{
var ground = plc.ReadRandomInt16(address);
var ground = plc.ReadRandomInt32(address);
if (ground != null)
{
if (ground.Length >= 10)
{
//deviceElectricity.Glys = ground[0];
deviceElectricity.Va = ground[0];
deviceElectricity.Vb = ground[1];
deviceElectricity.Vc = ground[2];
deviceElectricity.Ia = ground[6];
deviceElectricity.Ib = ground[7];
deviceElectricity.Ic = ground[8];
deviceElectricity.Zxyg = ground[9];
deviceElectricity.CollectTime = DateTime.Now;
deviceElectricity.RecordTime = DateTime.Now;
var info = ParseAndReverseByteArray(ground, 0, address.Length * 2);
if(info != null)
{
if(info.Length >= 10)
{
//deviceElectricity.Glys = ground[0];
deviceElectricity.Va = (decimal)info[0]/100;
deviceElectricity.Vb = (decimal)info[1]/100;
deviceElectricity.Vc = (decimal)info[2]/100;
deviceElectricity.Ia = (decimal)info[6]/100;
deviceElectricity.Ib = (decimal)info[7]/100;
deviceElectricity.Ic = (decimal)info[8]/100;
deviceElectricity.Zxyg = (decimal)info[9]/100;
deviceElectricity.CollectType = 0;
deviceElectricity.CollectTime = DateTime.Now;
deviceElectricity.RecordTime = DateTime.Now;
}
}
}
}
else
@ -108,5 +120,33 @@ namespace Aucma.Core.DataCollector
paramValue = Convert.ToInt32(result);
}
/// <summary>
/// 电表数据解析
/// </summary>
/// <param name="data"></param>
/// <param name="startIndex"></param>
/// <param name="length"></param>
/// <returns></returns>
/// <exception cref="ArgumentException"></exception>
private int[] ParseAndReverseByteArray(byte[] data, int startIndex, int length)
{
if (data == null || data.Length < startIndex + length)
{
throw new ArgumentException("Invalid data or startIndex/length parameter.");
}
int[] resultArray = new int[length / 2];
for (int i = 0; i < resultArray.Length; i++)
{
byte[] subset = new byte[2];
Array.Copy(data, startIndex + (i * 2), subset, 0, 2);
Array.Reverse(subset);
string hexString = BitConverter.ToString(subset).Replace("-", "");
resultArray[i] = Convert.ToInt32(hexString, 16);
}
return resultArray;
}
}
}

@ -29,6 +29,8 @@ namespace Aucma.Core.HwPLc
public short[] ReadRandomInt16(string[] address);
public byte[] ReadRandomInt32(string[] address);
/// <summary>
/// 读取byte数据
/// </summary>

@ -653,7 +653,32 @@ namespace Aucma.Core.HwPLc
iflag = false;
}
return iflag;
}
}
public byte[] ReadRandomInt32(string[] address)
{
try
{
var info = melsecMcNet.ReadRandom(address);
if (info.IsSuccess)
{
IsConnected = true;
return info.Content;
}
else
{
Console.WriteLine($"读取失败信息:{info.Message}");
}
}
catch (Exception ex)
{
Console.WriteLine($"读取失败信息:{ex.Message}");
}
return null;
}
#endregion
}
}

@ -570,5 +570,10 @@ namespace Aucma.Core.HwPLc
{
throw new NotImplementedException();
}
public byte[] ReadRandomInt32(string[] address)
{
throw new NotImplementedException();
}
}
}

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+65b33b663b68e04b5294882dfabf68f4a2439e52")]
[assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
884193e333d4b722a3816ea6e579b624e393398a42dd9b3834e4ef7fa5893d77
c2a5f27f8e68e14e00de73c811ff79920e8c972b62f3f27109ea60e57b5d2193

Loading…
Cancel
Save