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

更换通讯组件

Browse Source
dev
liulb@mesnac.com 1 year ago
parent 820f8660d9
commit 397ec682d8
25 changed files with 96 additions and 221 deletions
Show Stats Download Patch File Download Diff File

69
Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
Unescape Escape View File

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

BIN
Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache
View File

Binary file not shown.

22
Admin.Core.Api/obj/project.assets.json
Unescape Escape View File

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

2
Admin.Core.Api/obj/project.nuget.cache
Unescape Escape View File

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

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

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

7
Admin.Core.Tasks/QuartzNet/Jobs/Job_BoxFoamData_Quartz.cs
Unescape Escape View File

@ -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;
/// <summary>
/// 发泡数据采集

25
Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfo.cs
Unescape Escape View File

@ -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 类生成。

1
Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +0,0 @@
df08a2a08d7edbb21dfefa66e8c77f42ecf4f312

17
Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

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

25
Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfo.cs
Unescape Escape View File

@ -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 类生成。

1
Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +0,0 @@
ec5030fab02bcdc0b7fa4a01ff00968122cbc5ce

17
Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

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

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

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

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

@ -5,7 +5,7 @@ using System;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Core.PLc
namespace Aucma.Core.HwPLc
{
/// <summary>
/// 三菱PLC

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

@ -6,7 +6,7 @@ using System;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Core.PLc
namespace Aucma.Core.HwPLc
{
/// <summary>
/// 西门子PLC

2
Aucma.Core.HwPLc/Model/PlcModel.cs
Unescape Escape View File

@ -1,5 +1,5 @@

namespace Aucma.Core.PLc
namespace Aucma.Core.HwPLc
{
/// <summary>
/// PLC

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

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
namespace Aucma.Core.PLc
namespace Aucma.Core.HwPLc
{
public class PlcHelper
{

25
Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.AssemblyInfo.cs
Unescape Escape View File

@ -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 类生成。

1
Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +0,0 @@
db07d866d64485ddee91e2b5350d73c814393883

17
Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

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

2
Aucma.Core.RunPlc/Aucma.Core.RunPlc.csproj
Unescape Escape View File

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

31
Aucma.Core.RunPlc/RunPlcService.cs
Unescape Escape View File

@ -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
/// <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 心跳
public Task StartPlcAsync()

25
Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.AssemblyInfo.cs
Unescape Escape View File

@ -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 类生成。

1
Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.AssemblyInfoInputs.cache
Unescape Escape View File

@ -1 +0,0 @@
77683b6629df1d75b131603fea0b9ef0d8738544

17
Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.GeneratedMSBuildEditorConfig.editorconfig
Unescape Escape View File

@ -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\
Write Preview
Loading…
Cancel
Save