diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json index b40e9df5..df065e3c 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json +++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json @@ -850,8 +850,8 @@ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": { "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" }, "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": { "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj" @@ -894,6 +894,67 @@ } } }, + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "projectName": "Aucma.Core.HwPLc", + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj", + "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\", + "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "netstandard2.1" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netstandard2.1": { + "targetAlias": "netstandard2.1", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "netstandard2.1": { + "targetAlias": "netstandard2.1", + "dependencies": { + "log4net": { + "target": "Package", + "version": "[2.0.15, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "NETStandard.Library": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json" + } + } + }, "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { "version": "1.0.0", "restore": { @@ -982,8 +1043,8 @@ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": { "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj" }, - "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": { - "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj" + "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": { + "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj" } } } diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache index 442792fa..d57995ef 100644 Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache differ diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json index eec9a1f0..c93f6930 100644 --- a/Admin.Core.Api/obj/project.assets.json +++ b/Admin.Core.Api/obj/project.assets.json @@ -4157,7 +4157,7 @@ "Admin.Core.Common": "1.0.0", "Admin.Core.Model": "1.0.0", "Admin.Core.Service": "1.0.0", - "Aucma.Core.PLc": "1.0.0", + "Aucma.Core.HwPLc": "1.0.0", "Aucma.Core.Scanner": "1.0.0", "Quartz": "3.3.3" }, @@ -4168,6 +4168,19 @@ "bin/placeholder/Admin.Core.Tasks.dll": {} } }, + "Aucma.Core.HwPLc/1.0.0": { + "type": "project", + "framework": ".NETStandard,Version=v2.1", + "dependencies": { + "log4net": "2.0.15" + }, + "compile": { + "bin/placeholder/Aucma.Core.HwPLc.dll": {} + }, + "runtime": { + "bin/placeholder/Aucma.Core.HwPLc.dll": {} + } + }, "Aucma.Core.PLc/1.0.0": { "type": "project", "framework": ".NETStandard,Version=v2.1", @@ -4186,7 +4199,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "Admin.Core.Common": "1.0.0", - "Aucma.Core.PLc": "1.0.0" + "Aucma.Core.HwPLc": "1.0.0" }, "compile": { "bin/placeholder/Aucma.Core.RunPlc.dll": {} @@ -11203,6 +11216,11 @@ "path": "../Admin.Core.Tasks/Admin.Core.Tasks.csproj", "msbuildProject": "../Admin.Core.Tasks/Admin.Core.Tasks.csproj" }, + "Aucma.Core.HwPLc/1.0.0": { + "type": "project", + "path": "../Aucma.Core.HwPLc/Aucma.Core.HwPLc.csproj", + "msbuildProject": "../Aucma.Core.HwPLc/Aucma.Core.HwPLc.csproj" + }, "Aucma.Core.PLc/1.0.0": { "type": "project", "path": "../Aucma.Core.PLc/Aucma.Core.PLc.csproj", diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache index f120394d..01fafd2c 100644 --- a/Admin.Core.Api/obj/project.nuget.cache +++ b/Admin.Core.Api/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "uEPuLSS/sVT2PWbiKIvEEH0CSwxk2oZpc/IrO17Q6Rf9Pipii14coKMF91zQ8TRFgG3IsJy413J+wCgHBjUbmQ==", + "dgSpecHash": "fbBV4ohCpQ4tS1CZehkGz8FzvBy3W1ZgjJtJwKbO0UVSf1BnliGYGI+Eknp9PrG2Bzwmirj5uYJZhHC5mDx/2Q==", "success": true, "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj", "expectedPackageFiles": [ diff --git a/Admin.Core.Tasks/Admin.Core.Tasks.csproj b/Admin.Core.Tasks/Admin.Core.Tasks.csproj index 4575ef40..635e3086 100644 --- a/Admin.Core.Tasks/Admin.Core.Tasks.csproj +++ b/Admin.Core.Tasks/Admin.Core.Tasks.csproj @@ -12,7 +12,7 @@ - + diff --git a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs index 99eda422..7663b7b5 100644 --- a/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs +++ b/Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs @@ -1,18 +1,13 @@ using Admin.Core.IService.ISys; using Admin.Core.IService; -using Admin.Core.Service; using Quartz; using System; using System.Threading.Tasks; using log4net; using Admin.Core.Model; -using Admin.Core.Common; using System.Linq; -using StackExchange.Profiling.Internal; using Admin.Core.Model.Model_New; -using NPOI.POIFS.Crypt.Dsig; -using Aucma.Core.PLc; -using System.Diagnostics; +using Aucma.Core.HwPLc; /// /// 发泡数据采集 diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfo.cs b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfo.cs deleted file mode 100644 index 52b75da9..00000000 --- a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; - -[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.BoxFoam")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.BoxFoam")] -[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.BoxFoam")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] -[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] - -// 由 MSBuild WriteCodeFragment 类生成。 - diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfoInputs.cache b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfoInputs.cache deleted file mode 100644 index e97e3bb8..00000000 --- a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -df08a2a08d7edbb21dfefa66e8c77f42ecf4f312 diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index 4129ed4a..00000000 --- a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,17 +0,0 @@ -is_global = true -build_property.ApplicationManifest = -build_property.StartupObject = -build_property.ApplicationDefaultFont = -build_property.ApplicationHighDpiMode = -build_property.ApplicationUseCompatibleTextRendering = -build_property.ApplicationVisualStyles = -build_property.TargetFramework = net6.0-windows -build_property.TargetPlatformMinVersion = 7.0 -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Aucma.Core.BoxFoam -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\ diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfo.cs b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfo.cs deleted file mode 100644 index f31ec408..00000000 --- a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; - -[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.DoorFoam")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.DoorFoam")] -[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.DoorFoam")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] -[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] - -// 由 MSBuild WriteCodeFragment 类生成。 - diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfoInputs.cache b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfoInputs.cache deleted file mode 100644 index 2b81c4b1..00000000 --- a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -ec5030fab02bcdc0b7fa4a01ff00968122cbc5ce diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index e3835487..00000000 --- a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,17 +0,0 @@ -is_global = true -build_property.ApplicationManifest = -build_property.StartupObject = -build_property.ApplicationDefaultFont = -build_property.ApplicationHighDpiMode = -build_property.ApplicationUseCompatibleTextRendering = -build_property.ApplicationVisualStyles = -build_property.TargetFramework = net6.0-windows -build_property.TargetPlatformMinVersion = 7.0 -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Aucma.Core.DoorFoam -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\ diff --git a/Aucma.Core.HwPLc/IPlc.cs b/Aucma.Core.HwPLc/IPlc.cs index a89b3ad5..71ad19e5 100644 --- a/Aucma.Core.HwPLc/IPlc.cs +++ b/Aucma.Core.HwPLc/IPlc.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Aucma.Core.PLc +namespace Aucma.Core.HwPLc { public interface IPlc { diff --git a/Aucma.Core.HwPLc/Impl/MelsecPlc.cs b/Aucma.Core.HwPLc/Impl/MelsecPlc.cs index 0e3c9d94..8c08dfaa 100644 --- a/Aucma.Core.HwPLc/Impl/MelsecPlc.cs +++ b/Aucma.Core.HwPLc/Impl/MelsecPlc.cs @@ -5,7 +5,7 @@ using System; using System.Text; using System.Threading.Tasks; -namespace Aucma.Core.PLc +namespace Aucma.Core.HwPLc { /// /// 三菱PLC diff --git a/Aucma.Core.HwPLc/Impl/SiemensPlc.cs b/Aucma.Core.HwPLc/Impl/SiemensPlc.cs index f76de863..f4e260d9 100644 --- a/Aucma.Core.HwPLc/Impl/SiemensPlc.cs +++ b/Aucma.Core.HwPLc/Impl/SiemensPlc.cs @@ -6,7 +6,7 @@ using System; using System.Text; using System.Threading.Tasks; -namespace Aucma.Core.PLc +namespace Aucma.Core.HwPLc { /// /// 西门子PLC diff --git a/Aucma.Core.HwPLc/Model/PlcModel.cs b/Aucma.Core.HwPLc/Model/PlcModel.cs index 1c76ebf0..780cce12 100644 --- a/Aucma.Core.HwPLc/Model/PlcModel.cs +++ b/Aucma.Core.HwPLc/Model/PlcModel.cs @@ -1,5 +1,5 @@  -namespace Aucma.Core.PLc +namespace Aucma.Core.HwPLc { /// /// PLC diff --git a/Aucma.Core.HwPLc/PlcHelper.cs b/Aucma.Core.HwPLc/PlcHelper.cs index b2901806..d8466ba0 100644 --- a/Aucma.Core.HwPLc/PlcHelper.cs +++ b/Aucma.Core.HwPLc/PlcHelper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Aucma.Core.PLc +namespace Aucma.Core.HwPLc { public class PlcHelper { diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.AssemblyInfo.cs b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.AssemblyInfo.cs deleted file mode 100644 index d691a125..00000000 --- a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; - -[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.Palletiz")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.Palletiz")] -[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.Palletiz")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] -[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] - -// 由 MSBuild WriteCodeFragment 类生成。 - diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.AssemblyInfoInputs.cache b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.AssemblyInfoInputs.cache deleted file mode 100644 index b394662f..00000000 --- a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -db07d866d64485ddee91e2b5350d73c814393883 diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index 9a3ae24d..00000000 --- a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,17 +0,0 @@ -is_global = true -build_property.ApplicationManifest = -build_property.StartupObject = -build_property.ApplicationDefaultFont = -build_property.ApplicationHighDpiMode = -build_property.ApplicationUseCompatibleTextRendering = -build_property.ApplicationVisualStyles = -build_property.TargetFramework = net6.0-windows -build_property.TargetPlatformMinVersion = 7.0 -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Aucma.Core.Palletiz -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\ diff --git a/Aucma.Core.RunPlc/Aucma.Core.RunPlc.csproj b/Aucma.Core.RunPlc/Aucma.Core.RunPlc.csproj index 5f6c5854..b8dc25c9 100644 --- a/Aucma.Core.RunPlc/Aucma.Core.RunPlc.csproj +++ b/Aucma.Core.RunPlc/Aucma.Core.RunPlc.csproj @@ -8,7 +8,7 @@ - + diff --git a/Aucma.Core.RunPlc/RunPlcService.cs b/Aucma.Core.RunPlc/RunPlcService.cs index 45797297..52394039 100644 --- a/Aucma.Core.RunPlc/RunPlcService.cs +++ b/Aucma.Core.RunPlc/RunPlcService.cs @@ -12,6 +12,7 @@ namespace Aucma.Core.RunPlc public class RunPlcService : IRunPlcService { System.Timers.Timer timer = new System.Timers.Timer(5000);//创建定时器，设置间隔时间为1000毫秒； + #region 构造函数 public RunPlcService() { @@ -20,38 +21,10 @@ namespace Aucma.Core.RunPlc await StartMelsecMcPlcServer();//三菱PLC //StartSiemensPlcServer();//西门子 }); - } #endregion - /// - /// 三菱PLC读取 - /// - /// - /// - /// - /// - /// - public static bool LinerReadData_In(int Block, int Start, int Len, out object[] Buffer) - { - bool TempResult = false; - Buffer = new object[Len]; - try - { - //TempResult = MasterPLC_Mitsubishi.Read(Block.ToString(), Start, Len, out Buffer); - } - catch - { - TempResult = false; - } - finally - { - - } - return TempResult; - - } - + #region 心跳 public Task StartPlcAsync() diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.AssemblyInfo.cs b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.AssemblyInfo.cs deleted file mode 100644 index 9fa6a756..00000000 --- a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.AssemblyInfo.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; - -[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.SheetMetal")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.SheetMetal")] -[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.SheetMetal")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] -[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] - -// 由 MSBuild WriteCodeFragment 类生成。 - diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.AssemblyInfoInputs.cache b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.AssemblyInfoInputs.cache deleted file mode 100644 index a69e2636..00000000 --- a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -77683b6629df1d75b131603fea0b9ef0d8738544 diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index 53eeb543..00000000 --- a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,17 +0,0 @@ -is_global = true -build_property.ApplicationManifest = -build_property.StartupObject = -build_property.ApplicationDefaultFont = -build_property.ApplicationHighDpiMode = -build_property.ApplicationUseCompatibleTextRendering = -build_property.ApplicationVisualStyles = -build_property.TargetFramework = net6.0-windows -build_property.TargetPlatformMinVersion = 7.0 -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Aucma.Core.SheetMetal -build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\