Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

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": {
+              "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
-                "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.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": {
+              "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
-                "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj"
+                "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
               }
             }
           }

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",

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": [

Admin.Core.Tasks/Admin.Core.Tasks.csproj

@@ -12,7 +12,7 @@
     <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.PLc\Aucma.Core.PLc.csproj" />
+    <ProjectReference Include="..\Aucma.Core.HwPLc\Aucma.Core.HwPLc.csproj" />
     <ProjectReference Include="..\Aucma.Core.Scanner\Aucma.Core.Scanner.csproj" />
   </ItemGroup>
 

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.HwPLc;
-using Aucma.Core.PLc;
-using System.Diagnostics;
 
 /// <summary>
 /// 发泡数据采集

Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfo.cs

@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-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 类生成。
-

Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfoInputs.cache

@@ -1 +0,0 @@
-df08a2a08d7edbb21dfefa66e8c77f42ecf4f312

Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.GeneratedMSBuildEditorConfig.editorconfig

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

Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfo.cs

@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-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 类生成。
-

Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfoInputs.cache

@@ -1 +0,0 @@
-ec5030fab02bcdc0b7fa4a01ff00968122cbc5ce

Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig

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

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
     {

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
 {
     /// <summary>
     /// 三菱PLC

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
 {
     /// <summary>
     /// 西门子PLC

Aucma.Core.HwPLc/Model/PlcModel.cs

@@ -1,5 +1,5 @@
 
-namespace Aucma.Core.PLc
+namespace Aucma.Core.HwPLc
 {
     /// <summary>
     /// PLC

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
     {

Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.AssemblyInfo.cs

@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-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 类生成。
-

Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.AssemblyInfoInputs.cache

@@ -1 +0,0 @@
-db07d866d64485ddee91e2b5350d73c814393883

Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.GeneratedMSBuildEditorConfig.editorconfig

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

Aucma.Core.RunPlc/Aucma.Core.RunPlc.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Admin.Core.Common\Admin.Core.Common.csproj" />
-    <ProjectReference Include="..\Aucma.Core.PLc\Aucma.Core.PLc.csproj" />
+    <ProjectReference Include="..\Aucma.Core.HwPLc\Aucma.Core.HwPLc.csproj" />
   </ItemGroup>
 
 </Project>

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,37 +21,9 @@ namespace Aucma.Core.RunPlc
                 await StartMelsecMcPlcServer();//三菱PLC
                 //StartSiemensPlcServer();//西门子
             });
-
         }
         #endregion
 
-        /// <summary>
-        /// 三菱PLC读取
-        /// </summary>
-        /// <param name="Block"></param>
-        /// <param name="Start"></param>
-        /// <param name="Len"></param>
-        /// <param name="Buffer"></param>
-        /// <returns></returns>
-        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 心跳

Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.AssemblyInfo.cs

@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-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 类生成。
-

Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.AssemblyInfoInputs.cache

@@ -1 +0,0 @@
-77683b6629df1d75b131603fea0b9ef0d8738544

Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.GeneratedMSBuildEditorConfig.editorconfig

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