liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

。

Browse Source
dev
liulb@mesnac.com 10 months ago
parent cf56a7204b fec2d43164
commit cdd4245837
36 changed files with 116 additions and 208 deletions
Show Stats Download Patch File Download Diff File

2
Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs
Unescape Escape View File

@ -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
Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache
Unescape Escape View File

@ -0,0 +1 @@
012b5feb0b100630b160bba1ad7e15dc9f608b7fe941c8b2f95acdeff5cfc527

2
Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
161d4fbb2dd6b79bfbc1b9969ede6d14b3625e65f3cafdf23c2de37f772bd53b
5f40515da7a6cefe352f565b4c376c2d73625b7dc81032d2ac1915b0083c9fba

2
Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
c5b8e69f273ca09b1917226ed3215b230a8c569632f40dca0e86b01947606a69
4129b6c8384b3676ecfefc4127fed82584f7904ca0a53b985e038b1b236cedec

8
Admin.Core.Extensions/Admin.Core.Extensions.csproj
Unescape Escape View File

@ -24,15 +24,7 @@
<ProjectReference Include="..\Admin.Core.EventBus\Admin.Core.EventBus.csproj" />
<ProjectReference Include="..\Admin.Core.Repository\Admin.Core.Repository.csproj" />
<ProjectReference Include="..\Admin.Core.Service\Admin.Core.Service.csproj" />
<ProjectReference Include="..\Admin.Core.Socket\Admin.Core.Socket.csproj" />
<ProjectReference Include="..\Admin.Core.Tasks\Admin.Core.Tasks.csproj" />
<ProjectReference Include="..\Aucma.Core.PerfusionTask\Aucma.Core.PerfusionTask.csproj" />
<ProjectReference Include="..\Aucma.Core.RunPlc\Aucma.Core.RunPlc.csproj" />
<ProjectReference Include="..\Aucma.Core.ScannerGun\Aucma.Core.ScannerGun.csproj" />
<ProjectReference Include="..\Aucma.Core.Scanner\Aucma.Core.Scanner.csproj" />
<ProjectReference Include="..\Aucma.Core.SheetMetalTasks\Aucma.Core.SheetMetalTasks.csproj" />
<ProjectReference Include="..\Aucma.Core.Tasks\Aucma.Core.Tasks.csproj" />
<ProjectReference Include="..\Aucma.Core.TemperatureTask\Aucma.Core.TemperatureTask.csproj" />
</ItemGroup>
<ItemGroup>

2
Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
3c5a80e298ba4df676b7cb3155ce0bd9fee11ec03017b4cffa35af5b7be80013
ee9649ce7482d968c598fd4c51755c6195adb8fa10130c73cc6455c210b72c19

2
Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
e61ceb402fc542f200613de6bfea708f7a9e7fe6074f74c54699c3ae50663b07
da2724a50cceaf8b6ae8cf719b163a954c27de3b5f287da95e0e60a10d9c1148

2
Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
16c44698a1a8b56b2abb18bac093ff8172b835d6bfafbb538484839094cc02b3
e3fc1c1bea76d04df714f16a004f8c6b0c445de5f218575ab2523d74b203c5be

2
Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
49eb347efeca05aa0f970094c69d19b0e83a12321c7cfb360a63074b86d35894
ca75383e5888e4d6d2af31387c9390a320803a1bfa5caac679f5ac002053d3ed

2
Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
821b9da0018ee2858dc21ac49f1097d59eb5a8f1c9a32409960c0c0ffac14721
4097c0062022674d82ee0856e2cdcf7267e98d4cac0aea05b8e111eca2608e60

2
Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[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")]

2
Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
f11070336e61684bb8568075e73c173c447bc05005bb1c1927504a9a82c2a3b7
047a3956c934ff42d64eac8ec8a757198b24f60dc725b38a51a9f1cba68521a9

2
Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
0c8d8efda1c243c7d2c53f0b9dc89c2f86c4bbf788ff2850f031a0b27ef2e895
aa374fe4523f3f465255c6320f370d53d6404c4537f1872f2ec0f6ed2fb58134

2
Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
3b024dd980b1bc6be9c7039e345bd7978304643d9098ff821e21b6f831089a93
ec623deec8d5b38f223962f36299fa49d1e82dd231238ea93e16407ccff39fc3

1
Admin.Core.Service/Admin.Core.Service.csproj
Unescape Escape View File

@ -21,7 +21,6 @@
<ItemGroup>
<ProjectReference Include="..\Admin.Core.IRepository\Admin.Core.IRepository.csproj" />
<ProjectReference Include="..\Admin.Core.IService\Admin.Core.IService.csproj" />
<ProjectReference Include="..\Aucma.Core.PLc\Aucma.Core.PLc.csproj" />
</ItemGroup>
</Project>

2
Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
cb59ce65a87c2e90b639505340e645c42413bbd46490e88eada82b5f2100c7bc
527a67a19fd81d93264b63bde90bf95c5fcfd8db2a48a5bdfbc6d53e511758a4

2
Admin.Core.Tasks/Admin.Core.Tasks.csproj
Unescape Escape View File

@ -12,8 +12,6 @@
<ProjectReference Include="..\Admin.Core.Common\Admin.Core.Common.csproj" />
<ProjectReference Include="..\Admin.Core.Model\Admin.Core.Model.csproj" />
<ProjectReference Include="..\Admin.Core.Service\Admin.Core.Service.csproj" />
<ProjectReference Include="..\Aucma.Core.HwPLc\Aucma.Core.HwPLc.csproj" />
<ProjectReference Include="..\Aucma.Core.Scanner\Aucma.Core.Scanner.csproj" />
</ItemGroup>
<ItemGroup>

2
Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
Unescape Escape View File

@ -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+c2ee0ac277f41f12f4e8447e25d4b4b14ee7d0fb")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+58cf08db34f86846f0e548bc48b694e930c48ea5")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
dc6d893d65230c9afbcc89c17f7705b5fceaca2c7a42c5f85e728a04371258b1
9347d5f5077767f6c9573d26331f56cfd0129031725c59191fab99fa8d9f24f7

160
Admin.Core.sln
Unescape Escape View File

@ -37,55 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.Core.EventBus", "Admi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.Core.Tasks", "Admin.Core.Tasks\Admin.Core.Tasks.csproj", "{FCCDE486-2047-492A-A81B-E2239768ACB1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.Wpf", "1.Wpf", "{BD987F3A-4E6C-4C47-B28F-1671F875EAE3}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1", "1", "{BD987F3A-4E6C-4C47-B28F-1671F875EAE3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.Console", "5.Console", "{FA2FF2A3-135E-4CA2-9042-76BB71623D5A}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5", "5", "{FA2FF2A3-135E-4CA2-9042-76BB71623D5A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.Core.RealTimeService", "Admin.Core.RealTimeService\Admin.Core.RealTimeService.csproj", "{73F3C0A3-D255-4A8A-9510-F3F556E28BCA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.SheetMetal", "Aucma.Core.SheetMetal\Aucma.Core.SheetMetal.csproj", "{AD2C008F-7D9F-43EB-9B44-F15A46F05583}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.Palletiz", "Aucma.Core.Palletiz\Aucma.Core.Palletiz.csproj", "{B7FE7F2F-D01C-421F-A7F6-23971AF9530C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.DoorFoam", "Aucma.Core.DoorFoam\Aucma.Core.DoorFoam.csproj", "{EC1A6A43-1B6B-42AF-B00E-94DF4DF42111}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.BoxFoam", "Aucma.Core.BoxFoam\Aucma.Core.BoxFoam.csproj", "{563882EC-C110-4BCB-B913-3B62124BF680}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.Scanner", "Aucma.Core.Scanner\Aucma.Core.Scanner.csproj", "{5CF85AD7-DBC9-4466-952B-6742F37E417D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6.Other", "6.Other", "{F8FB57F6-5465-4E60-B052-D3A63C3C56AE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.PLc", "Aucma.Core.PLc\Aucma.Core.PLc.csproj", "{9EE12F11-F9E4-46DD-935D-F6EDD495A6FC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.RunPlc", "Aucma.Core.RunPlc\Aucma.Core.RunPlc.csproj", "{680718C5-E39C-442F-AC9E-4A56E15AF261}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.ScannerGun", "Aucma.Core.ScannerGun\Aucma.Core.ScannerGun.csproj", "{61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.CodeBinding", "Aucma.Core.CodeBinding\Aucma.Core.CodeBinding.csproj", "{5515C937-1E2E-4111-8775-EE6898E5933A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.ProductOffLine", "Aucma.Core.ProductOffLine\Aucma.Core.ProductOffLine.csproj", "{C70810CE-041A-4880-99B3-FFCC8B672B42}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucam.Core.PerfusionService", "Aucam.Core.PerfusionService\Aucam.Core.PerfusionService.csproj", "{BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.Tasks", "Aucma.Core.Tasks\Aucma.Core.Tasks.csproj", "{A7FF5119-A6DE-4947-A1F2-90FE0C628A88}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.OldBoxFoam", "Aucma.Core.OldBoxFoam\Aucma.Core.OldBoxFoam.csproj", "{A9E66830-A801-4423-BBC6-8F03BA5EB5BF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.HwPLc", "Aucma.Core.HwPLc\Aucma.Core.HwPLc.csproj", "{A1473270-1D54-40D5-9E68-5C917347CFE8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucam.Core.TemperatureService", "Aucam.Core.TemperatureService\Aucam.Core.TemperatureService.csproj", "{87B08C88-4258-4D57-B9E5-EC6C7F3899BC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.PrintTo", "Aucma.Core.PrintTo\Aucma.Core.PrintTo.csproj", "{AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.SheetMetalTasks", "Aucma.Core.SheetMetalTasks\Aucma.Core.SheetMetalTasks.csproj", "{F78F41F3-8B38-4CA1-A254-C18CCDCA8291}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.TemperatureTask", "Aucma.Core.TemperatureTask\Aucma.Core.TemperatureTask.csproj", "{F427E68F-100D-4136-8761-F2C9CB0E7940}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.PerfusionTask", "Aucma.Core.PerfusionTask\Aucma.Core.PerfusionTask.csproj", "{9762EE52-F073-4CF6-AAAE-7FCDC894C967}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.Core.Socket", "Admin.Core.Socket\Admin.Core.Socket.csproj", "{DBF7F128-0643-43BE-AD1A-370866962BD0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aucma.Core.DataCollector", "Aucma.Core.DataCollector\Aucma.Core.DataCollector.csproj", "{C9356C95-115C-47BF-A70E-AE830A7D2DB2}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6", "6", "{F8FB57F6-5465-4E60-B052-D3A63C3C56AE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -137,94 +93,6 @@ Global
{FCCDE486-2047-492A-A81B-E2239768ACB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCCDE486-2047-492A-A81B-E2239768ACB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FCCDE486-2047-492A-A81B-E2239768ACB1}.Release|Any CPU.Build.0 = Release|Any CPU
{73F3C0A3-D255-4A8A-9510-F3F556E28BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73F3C0A3-D255-4A8A-9510-F3F556E28BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73F3C0A3-D255-4A8A-9510-F3F556E28BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73F3C0A3-D255-4A8A-9510-F3F556E28BCA}.Release|Any CPU.Build.0 = Release|Any CPU
{AD2C008F-7D9F-43EB-9B44-F15A46F05583}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AD2C008F-7D9F-43EB-9B44-F15A46F05583}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD2C008F-7D9F-43EB-9B44-F15A46F05583}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AD2C008F-7D9F-43EB-9B44-F15A46F05583}.Release|Any CPU.Build.0 = Release|Any CPU
{B7FE7F2F-D01C-421F-A7F6-23971AF9530C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B7FE7F2F-D01C-421F-A7F6-23971AF9530C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B7FE7F2F-D01C-421F-A7F6-23971AF9530C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7FE7F2F-D01C-421F-A7F6-23971AF9530C}.Release|Any CPU.Build.0 = Release|Any CPU
{EC1A6A43-1B6B-42AF-B00E-94DF4DF42111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC1A6A43-1B6B-42AF-B00E-94DF4DF42111}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC1A6A43-1B6B-42AF-B00E-94DF4DF42111}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC1A6A43-1B6B-42AF-B00E-94DF4DF42111}.Release|Any CPU.Build.0 = Release|Any CPU
{563882EC-C110-4BCB-B913-3B62124BF680}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{563882EC-C110-4BCB-B913-3B62124BF680}.Debug|Any CPU.Build.0 = Debug|Any CPU
{563882EC-C110-4BCB-B913-3B62124BF680}.Release|Any CPU.ActiveCfg = Release|Any CPU
{563882EC-C110-4BCB-B913-3B62124BF680}.Release|Any CPU.Build.0 = Release|Any CPU
{5CF85AD7-DBC9-4466-952B-6742F37E417D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5CF85AD7-DBC9-4466-952B-6742F37E417D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5CF85AD7-DBC9-4466-952B-6742F37E417D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5CF85AD7-DBC9-4466-952B-6742F37E417D}.Release|Any CPU.Build.0 = Release|Any CPU
{9EE12F11-F9E4-46DD-935D-F6EDD495A6FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9EE12F11-F9E4-46DD-935D-F6EDD495A6FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EE12F11-F9E4-46DD-935D-F6EDD495A6FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9EE12F11-F9E4-46DD-935D-F6EDD495A6FC}.Release|Any CPU.Build.0 = Release|Any CPU
{680718C5-E39C-442F-AC9E-4A56E15AF261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{680718C5-E39C-442F-AC9E-4A56E15AF261}.Debug|Any CPU.Build.0 = Debug|Any CPU
{680718C5-E39C-442F-AC9E-4A56E15AF261}.Release|Any CPU.ActiveCfg = Release|Any CPU
{680718C5-E39C-442F-AC9E-4A56E15AF261}.Release|Any CPU.Build.0 = Release|Any CPU
{61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3}.Release|Any CPU.Build.0 = Release|Any CPU
{5515C937-1E2E-4111-8775-EE6898E5933A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5515C937-1E2E-4111-8775-EE6898E5933A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5515C937-1E2E-4111-8775-EE6898E5933A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5515C937-1E2E-4111-8775-EE6898E5933A}.Release|Any CPU.Build.0 = Release|Any CPU
{C70810CE-041A-4880-99B3-FFCC8B672B42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C70810CE-041A-4880-99B3-FFCC8B672B42}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C70810CE-041A-4880-99B3-FFCC8B672B42}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C70810CE-041A-4880-99B3-FFCC8B672B42}.Release|Any CPU.Build.0 = Release|Any CPU
{BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFABE9E5-C71D-42FE-94AE-934B9F74B3D0}.Release|Any CPU.Build.0 = Release|Any CPU
{A7FF5119-A6DE-4947-A1F2-90FE0C628A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7FF5119-A6DE-4947-A1F2-90FE0C628A88}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7FF5119-A6DE-4947-A1F2-90FE0C628A88}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7FF5119-A6DE-4947-A1F2-90FE0C628A88}.Release|Any CPU.Build.0 = Release|Any CPU
{A9E66830-A801-4423-BBC6-8F03BA5EB5BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9E66830-A801-4423-BBC6-8F03BA5EB5BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9E66830-A801-4423-BBC6-8F03BA5EB5BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A9E66830-A801-4423-BBC6-8F03BA5EB5BF}.Release|Any CPU.Build.0 = Release|Any CPU
{A1473270-1D54-40D5-9E68-5C917347CFE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1473270-1D54-40D5-9E68-5C917347CFE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1473270-1D54-40D5-9E68-5C917347CFE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1473270-1D54-40D5-9E68-5C917347CFE8}.Release|Any CPU.Build.0 = Release|Any CPU
{87B08C88-4258-4D57-B9E5-EC6C7F3899BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{87B08C88-4258-4D57-B9E5-EC6C7F3899BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{87B08C88-4258-4D57-B9E5-EC6C7F3899BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{87B08C88-4258-4D57-B9E5-EC6C7F3899BC}.Release|Any CPU.Build.0 = Release|Any CPU
{AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC2B98A8-09CF-42A5-93B5-DF74185B8D3A}.Release|Any CPU.Build.0 = Release|Any CPU
{F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F78F41F3-8B38-4CA1-A254-C18CCDCA8291}.Release|Any CPU.Build.0 = Release|Any CPU
{F427E68F-100D-4136-8761-F2C9CB0E7940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F427E68F-100D-4136-8761-F2C9CB0E7940}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F427E68F-100D-4136-8761-F2C9CB0E7940}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F427E68F-100D-4136-8761-F2C9CB0E7940}.Release|Any CPU.Build.0 = Release|Any CPU
{9762EE52-F073-4CF6-AAAE-7FCDC894C967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9762EE52-F073-4CF6-AAAE-7FCDC894C967}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9762EE52-F073-4CF6-AAAE-7FCDC894C967}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9762EE52-F073-4CF6-AAAE-7FCDC894C967}.Release|Any CPU.Build.0 = Release|Any CPU
{DBF7F128-0643-43BE-AD1A-370866962BD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBF7F128-0643-43BE-AD1A-370866962BD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBF7F128-0643-43BE-AD1A-370866962BD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBF7F128-0643-43BE-AD1A-370866962BD0}.Release|Any CPU.Build.0 = Release|Any CPU
{C9356C95-115C-47BF-A70E-AE830A7D2DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9356C95-115C-47BF-A70E-AE830A7D2DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9356C95-115C-47BF-A70E-AE830A7D2DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9356C95-115C-47BF-A70E-AE830A7D2DB2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -244,28 +112,6 @@ Global
{7D547E98-0DB5-4A2F-8A8F-9C8F62E82EE3} = {CB159E16-8DA0-4125-B42F-BB5381AEDD4D}
{F8302B3D-3C01-402B-A76F-84AFB22FB5D9} = {CB159E16-8DA0-4125-B42F-BB5381AEDD4D}
{FCCDE486-2047-492A-A81B-E2239768ACB1} = {CB159E16-8DA0-4125-B42F-BB5381AEDD4D}
{73F3C0A3-D255-4A8A-9510-F3F556E28BCA} = {FA2FF2A3-135E-4CA2-9042-76BB71623D5A}
{AD2C008F-7D9F-43EB-9B44-F15A46F05583} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
{B7FE7F2F-D01C-421F-A7F6-23971AF9530C} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
{EC1A6A43-1B6B-42AF-B00E-94DF4DF42111} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
{563882EC-C110-4BCB-B913-3B62124BF680} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
{5CF85AD7-DBC9-4466-952B-6742F37E417D} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
{9EE12F11-F9E4-46DD-935D-F6EDD495A6FC} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
{680718C5-E39C-442F-AC9E-4A56E15AF261} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
{61EE37C2-A9C2-40DE-A96E-D7E4DEB5FEC3} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
{5515C937-1E2E-4111-8775-EE6898E5933A} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
{C70810CE-041A-4880-99B3-FFCC8B672B42} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
{BFABE9E5-C71D-42FE-94AE-934B9F74B3D0} = {FA2FF2A3-135E-4CA2-9042-76BB71623D5A}
{A7FF5119-A6DE-4947-A1F2-90FE0C628A88} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
{A9E66830-A801-4423-BBC6-8F03BA5EB5BF} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
{A1473270-1D54-40D5-9E68-5C917347CFE8} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
{87B08C88-4258-4D57-B9E5-EC6C7F3899BC} = {FA2FF2A3-135E-4CA2-9042-76BB71623D5A}
{AC2B98A8-09CF-42A5-93B5-DF74185B8D3A} = {BD987F3A-4E6C-4C47-B28F-1671F875EAE3}
{F78F41F3-8B38-4CA1-A254-C18CCDCA8291} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
{F427E68F-100D-4136-8761-F2C9CB0E7940} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
{9762EE52-F073-4CF6-AAAE-7FCDC894C967} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
{DBF7F128-0643-43BE-AD1A-370866962BD0} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
{C9356C95-115C-47BF-A70E-AE830A7D2DB2} = {F8FB57F6-5465-4E60-B052-D3A63C3C56AE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8047AB56-042B-4AE4-B06A-34137067A86A}

64
Aucma.Core.DataCollector/DataCollectorFactory.cs
Unescape Escape View File

@ -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;
}
}
}

2
Aucma.Core.HwPLc/IPlc.cs
Unescape Escape View File

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

27
Aucma.Core.HwPLc/Impl/MelsecPlc.cs
Unescape Escape View File

@ -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
}
}

5
Aucma.Core.HwPLc/Impl/SiemensPlc.cs
Unescape Escape View File

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

2
HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
Unescape Escape View File

@ -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")]

2
HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +1 @@
884193e333d4b722a3816ea6e579b624e393398a42dd9b3834e4ef7fa5893d77
c2a5f27f8e68e14e00de73c811ff79920e8c972b62f3f27109ea60e57b5d2193

Write Preview
Loading…
Cancel
Save