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 fe5e8758..0a98b80a 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
@@ -1,46 +1,41 @@
{
"format": 1,
"restore": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {}
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {}
},
"projects": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"projectName": "Admin.Core.Api",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "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"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
}
}
}
@@ -83,41 +78,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj",
"projectName": "Admin.Core.Common",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj"
}
}
}
@@ -273,41 +263,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
"projectName": "Admin.Core.EventBus",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "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"
}
}
}
@@ -347,65 +332,60 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
"projectName": "Admin.Core.Extensions",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "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"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "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"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.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"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj"
}
}
}
@@ -441,44 +421,39 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
"projectName": "Admin.Core.IRepository",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "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"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
}
}
}
@@ -508,44 +483,39 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj",
"projectName": "Admin.Core.IService",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "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"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
}
}
}
@@ -575,41 +545,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj",
"projectName": "Admin.Core.Model",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "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"
}
}
}
@@ -639,41 +604,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
"projectName": "Admin.Core.Repository",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
}
}
}
@@ -703,34 +663,29 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
"projectName": "Admin.Core.Serilog.Es",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
@@ -793,47 +748,42 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj",
"projectName": "Admin.Core.Service",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.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"
}
}
}
@@ -863,53 +813,48 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
"projectName": "Admin.Core.Tasks",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "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"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "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"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.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"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.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"
}
}
}
@@ -945,34 +890,29 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj",
"projectName": "Aucma.Core.HwPLc",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\obj\\",
+ "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",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netstandard2.1"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netstandard2.1": {
@@ -1011,34 +951,29 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
"projectName": "Aucma.Core.PLc",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netstandard2.1"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netstandard2.1": {
@@ -1077,44 +1012,39 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
"projectName": "Aucma.Core.RunPlc",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "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"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.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"
}
}
}
@@ -1144,41 +1074,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
"projectName": "Aucma.Core.ScannerGun",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "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"
}
}
}
@@ -1214,41 +1139,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
"projectName": "Aucma.Core.Scanner",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "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"
}
}
}
@@ -1284,47 +1204,42 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
"projectName": "Aucma.Core.Tasks",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "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"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.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"
}
}
}
@@ -1354,7 +1269,7 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
index 15920027..a5a55588 100644
--- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
+++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
@@ -5,20 +5,18 @@
NuGet
$(MSBuildThisFileDirectory)project.assets.json
$(UserProfile)\.nuget\packages\
- C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder
+ C:\Users\admin\.nuget\packages\
PackageReference
- 6.5.0
+ 6.7.0
-
-
-
+
- C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0
+ C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0
\ No newline at end of file
diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig
index d1d06cea..601c80d9 100644
--- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig
@@ -9,9 +9,9 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Api
build_property.RootNamespace = Admin.Core.Api
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\
build_property.RazorLangVersion = 6.0
build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes =
-build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api
+build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api
build_property._RazorSourceGeneratorDebug =
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 d8850da5..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 209a19d7..6f928a74 100644
--- a/Admin.Core.Api/obj/project.assets.json
+++ b/Admin.Core.Api/obj/project.assets.json
@@ -7052,11 +7052,12 @@
]
},
"System.Collections.NonGeneric/4.3.0": {
- "sha512": "LE/oChpRvkSi3U25u0KnJcI44JeDZ1QJCyN4qFDx2uusEypdqR24w7lKYw21eYe5esuCBuc862wRmpF63Yy1KQ==",
+ "sha512": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==",
"type": "package",
"path": "system.collections.nongeneric/4.3.0",
"files": [
".nupkg.metadata",
+ ".signature.p7s",
"ThirdPartyNotices.txt",
"dotnet_library_license.txt",
"lib/MonoAndroid10/_._",
@@ -9789,11 +9790,12 @@
]
},
"System.Runtime.Serialization.Primitives/4.3.0": {
- "sha512": "2Z5t70a2SwMsfQDp9KOclaZNyQhfIga2gppq9lIUDM1A4ohTshn4JqT7ir8bvIhXgorWKYDAr6rPzEbi/nTGKg==",
+ "sha512": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==",
"type": "package",
"path": "system.runtime.serialization.primitives/4.3.0",
"files": [
".nupkg.metadata",
+ ".signature.p7s",
"ThirdPartyNotices.txt",
"dotnet_library_license.txt",
"lib/MonoAndroid10/_._",
@@ -11255,47 +11257,40 @@
]
},
"packageFolders": {
- "C:\\Users\\Lenovo\\.nuget\\packages\\": {},
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {},
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
+ "C:\\Users\\admin\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"projectName": "Admin.Core.Api",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "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"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
}
}
}
@@ -11338,7 +11333,7 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache
index c8cd40d1..66791f7b 100644
--- a/Admin.Core.Api/obj/project.nuget.cache
+++ b/Admin.Core.Api/obj/project.nuget.cache
@@ -1,233 +1,233 @@
{
"version": 2,
- "dgSpecHash": "HsMojseCVmTxRPG4iGkEf/2OvAGUxYsYPY9resKB+wCYzU12wwdfiUulJ6iIYjBrrvQkt9KbYTYesAxpAJXRFg==",
+ "dgSpecHash": "ikzDviTkPCZihaCgfwo8AuzSJtovmijOXuLwxKtGKgxnoK/TUK28Ezke2gSYzzQArjgQtsTmEg3YwxUUY0FkCg==",
"success": true,
- "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"expectedPackageFiles": [
- "C:\\Users\\Lenovo\\.nuget\\packages\\aspnetcoreratelimit\\4.0.1\\aspnetcoreratelimit.4.0.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\autofac\\6.2.0\\autofac.6.2.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\autofac.extensions.dependencyinjection\\7.1.0\\autofac.extensions.dependencyinjection.7.1.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\autofac.extras.dynamicproxy\\6.0.0\\autofac.extras.dynamicproxy.6.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\automapper\\10.1.1\\automapper.10.1.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\8.1.1\\automapper.extensions.microsoft.dependencyinjection.8.1.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\castle.core\\4.4.0\\castle.core.4.4.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\consul\\1.6.10.3\\consul.1.6.10.3.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\elasticsearch.net\\7.8.1\\elasticsearch.net.7.8.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\initq\\1.0.0.7\\initq.1.0.0.7.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\log4net\\2.0.15\\log4net.2.0.15.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\5.0.9\\microsoft.aspnetcore.authentication.jwtbearer.5.0.9.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.connections.abstractions\\5.0.9\\microsoft.aspnetcore.connections.abstractions.5.0.9.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.2\\microsoft.aspnetcore.http.2.2.2.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.9\\microsoft.aspnetcore.http.features.5.0.9.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\5.0.9\\microsoft.aspnetcore.jsonpatch.5.0.9.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.mvc.newtonsoftjson.5.0.9.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.session\\2.2.0\\microsoft.aspnetcore.session.2.2.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.signalr.common\\5.0.9\\microsoft.aspnetcore.signalr.common.5.0.9.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson.5.0.9.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlite\\7.0.5\\microsoft.data.sqlite.7.0.5.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlite.core\\7.0.5\\microsoft.data.sqlite.core.7.0.5.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.2\\microsoft.extensions.dependencyinjection.5.0.2.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencymodel\\3.1.6\\microsoft.extensions.dependencymodel.3.1.6.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.8\\microsoft.extensions.hosting.abstractions.3.1.8.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.debug\\5.0.0\\microsoft.extensions.logging.debug.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.log4net.aspnetcore\\5.0.3\\microsoft.extensions.logging.log4net.aspnetcore.5.0.3.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.1\\microsoft.extensions.primitives.5.0.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\newtonsoft.json\\13.0.2\\newtonsoft.json.13.0.2.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\npgsql\\5.0.7\\npgsql.5.0.7.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\npoi\\2.5.5\\npoi.2.5.5.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.0\\pipelines.sockets.unofficial.2.2.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\polly\\7.2.2\\polly.7.2.2.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\quartz\\3.3.3\\quartz.3.3.3.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\rabbitmq.client\\6.2.2\\rabbitmq.client.6.2.2.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\scrutor\\3.3.0\\scrutor.3.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.extensions.logging\\3.0.1\\serilog.extensions.logging.3.0.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.formatting.compact\\1.1.0\\serilog.formatting.compact.1.1.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.formatting.elasticsearch\\8.4.1\\serilog.formatting.elasticsearch.8.4.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.settings.configuration\\3.1.0\\serilog.settings.configuration.3.1.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.console\\3.1.1\\serilog.sinks.console.3.1.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.debug\\2.0.0\\serilog.sinks.debug.2.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.elasticsearch\\8.4.1\\serilog.sinks.elasticsearch.8.4.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.file\\4.1.0\\serilog.sinks.file.4.1.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.periodicbatching\\2.1.1\\serilog.sinks.periodicbatching.2.1.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.4\\sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.core\\2.1.4\\sqlitepclraw.core.2.1.4.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.4\\sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.4\\sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore\\5.1.4.100\\sqlsugarcore.5.1.4.100.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore.dm\\1.2.0\\sqlsugarcore.dm.1.2.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore.kdbndp\\7.4.0\\sqlsugarcore.kdbndp.7.4.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\stackexchange.redis\\2.2.50\\stackexchange.redis.2.2.50.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore\\5.6.3\\swashbuckle.aspnetcore.5.6.3.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.filters\\7.0.2\\swashbuckle.aspnetcore.filters.7.0.2.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.filters.abstractions\\7.0.2\\swashbuckle.aspnetcore.filters.abstractions.7.0.2.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.1.5\\swashbuckle.aspnetcore.swaggerui.6.1.5.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.immutable\\1.3.0\\system.collections.immutable.1.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.nongeneric\\4.3.0\\system.collections.nongeneric.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.specialized\\4.3.0\\system.collections.specialized.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel\\4.3.0\\system.componentmodel.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel.primitives\\4.3.0\\system.componentmodel.primitives.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel.typeconverter\\4.3.0\\system.componentmodel.typeconverter.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\system.configuration.configurationmanager.6.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tracesource\\4.3.0\\system.diagnostics.tracesource.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit\\4.7.0\\system.reflection.emit.4.7.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.reflection.metadata\\1.4.1\\system.reflection.metadata.1.4.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.6.0\\system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.protecteddata\\6.0.0\\system.security.cryptography.protecteddata.6.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.permissions\\6.0.0\\system.security.permissions.6.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.channels\\4.7.1\\system.threading.channels.4.7.1.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
- "C:\\Users\\Lenovo\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512"
+ "C:\\Users\\admin\\.nuget\\packages\\aspnetcoreratelimit\\4.0.1\\aspnetcoreratelimit.4.0.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\autofac\\6.2.0\\autofac.6.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\autofac.extensions.dependencyinjection\\7.1.0\\autofac.extensions.dependencyinjection.7.1.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\autofac.extras.dynamicproxy\\6.0.0\\autofac.extras.dynamicproxy.6.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\automapper\\10.1.1\\automapper.10.1.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\8.1.1\\automapper.extensions.microsoft.dependencyinjection.8.1.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\castle.core\\4.4.0\\castle.core.4.4.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\consul\\1.6.10.3\\consul.1.6.10.3.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\elasticsearch.net\\7.8.1\\elasticsearch.net.7.8.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\initq\\1.0.0.7\\initq.1.0.0.7.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\log4net\\2.0.15\\log4net.2.0.15.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\5.0.9\\microsoft.aspnetcore.authentication.jwtbearer.5.0.9.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.connections.abstractions\\5.0.9\\microsoft.aspnetcore.connections.abstractions.5.0.9.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.2\\microsoft.aspnetcore.http.2.2.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.9\\microsoft.aspnetcore.http.features.5.0.9.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\5.0.9\\microsoft.aspnetcore.jsonpatch.5.0.9.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.mvc.newtonsoftjson.5.0.9.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.session\\2.2.0\\microsoft.aspnetcore.session.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.signalr.common\\5.0.9\\microsoft.aspnetcore.signalr.common.5.0.9.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson.5.0.9.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlite\\7.0.5\\microsoft.data.sqlite.7.0.5.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.data.sqlite.core\\7.0.5\\microsoft.data.sqlite.core.7.0.5.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.2\\microsoft.extensions.dependencyinjection.5.0.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.dependencymodel\\3.1.6\\microsoft.extensions.dependencymodel.3.1.6.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.8\\microsoft.extensions.hosting.abstractions.3.1.8.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging.debug\\5.0.0\\microsoft.extensions.logging.debug.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.logging.log4net.aspnetcore\\5.0.3\\microsoft.extensions.logging.log4net.aspnetcore.5.0.3.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.1\\microsoft.extensions.primitives.5.0.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\newtonsoft.json\\13.0.2\\newtonsoft.json.13.0.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\npgsql\\5.0.7\\npgsql.5.0.7.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\npoi\\2.5.5\\npoi.2.5.5.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.0\\pipelines.sockets.unofficial.2.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\polly\\7.2.2\\polly.7.2.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\quartz\\3.3.3\\quartz.3.3.3.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\rabbitmq.client\\6.2.2\\rabbitmq.client.6.2.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\scrutor\\3.3.0\\scrutor.3.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.extensions.logging\\3.0.1\\serilog.extensions.logging.3.0.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.formatting.compact\\1.1.0\\serilog.formatting.compact.1.1.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.formatting.elasticsearch\\8.4.1\\serilog.formatting.elasticsearch.8.4.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.settings.configuration\\3.1.0\\serilog.settings.configuration.3.1.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.console\\3.1.1\\serilog.sinks.console.3.1.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.debug\\2.0.0\\serilog.sinks.debug.2.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.elasticsearch\\8.4.1\\serilog.sinks.elasticsearch.8.4.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.file\\4.1.0\\serilog.sinks.file.4.1.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\serilog.sinks.periodicbatching\\2.1.1\\serilog.sinks.periodicbatching.2.1.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.4\\sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.core\\2.1.4\\sqlitepclraw.core.2.1.4.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.4\\sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.4\\sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\sqlsugarcore\\5.1.4.100\\sqlsugarcore.5.1.4.100.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\sqlsugarcore.dm\\1.2.0\\sqlsugarcore.dm.1.2.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\sqlsugarcore.kdbndp\\7.4.0\\sqlsugarcore.kdbndp.7.4.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\stackexchange.redis\\2.2.50\\stackexchange.redis.2.2.50.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore\\5.6.3\\swashbuckle.aspnetcore.5.6.3.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.filters\\7.0.2\\swashbuckle.aspnetcore.filters.7.0.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.filters.abstractions\\7.0.2\\swashbuckle.aspnetcore.filters.abstractions.7.0.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.1.5\\swashbuckle.aspnetcore.swaggerui.6.1.5.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.collections.immutable\\1.3.0\\system.collections.immutable.1.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.collections.nongeneric\\4.3.0\\system.collections.nongeneric.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.collections.specialized\\4.3.0\\system.collections.specialized.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.componentmodel\\4.3.0\\system.componentmodel.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.componentmodel.primitives\\4.3.0\\system.componentmodel.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.componentmodel.typeconverter\\4.3.0\\system.componentmodel.typeconverter.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\system.configuration.configurationmanager.6.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.tracesource\\4.3.0\\system.diagnostics.tracesource.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.reflection.emit\\4.7.0\\system.reflection.emit.4.7.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.reflection.metadata\\1.4.1\\system.reflection.metadata.1.4.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.6.0\\system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.protecteddata\\6.0.0\\system.security.cryptography.protecteddata.6.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.permissions\\6.0.0\\system.security.permissions.6.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.threading.channels\\4.7.1\\system.threading.channels.4.7.1.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
+ "C:\\Users\\admin\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512"
],
"logs": []
}
\ No newline at end of file
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
index 1fdeb046..2ffa7b25 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Extensions
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Extensions\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\
diff --git a/Admin.Core.IRepository/IRepository_New/IExecutePlanInfoRepository.cs b/Admin.Core.IRepository/IRepository_New/IExecutePlanInfoRepository.cs
index 420d63e9..69c6e8bd 100644
--- a/Admin.Core.IRepository/IRepository_New/IExecutePlanInfoRepository.cs
+++ b/Admin.Core.IRepository/IRepository_New/IExecutePlanInfoRepository.cs
@@ -14,5 +14,7 @@ namespace Admin.Core.IRepository
Task> GetStationHourAmount(string stationCode);
Task> GetStationSheetMetalHourAmountAsync(string stationCode);
+
+ List GetStationSheetMetalStats(string stationCode);
}
}
\ No newline at end of file
diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
index 968ed779..2b7e2280 100644
--- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IRepository
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IRepository\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\
diff --git a/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs b/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs
index 273d5c40..7fc83e73 100644
--- a/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs
+++ b/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs
@@ -110,7 +110,7 @@ namespace Admin.Core.IService
Task> GetStationSheetMetalHourAmountAsync(string stationCode);
-
+ List GetStationSheetMetalStats(string stationCode);
#endregion
}
}
\ No newline at end of file
diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
index 1e7c9f10..ba998751 100644
--- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IService
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IService\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
index 173f98e4..f17e3fdc 100644
--- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Model
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\
diff --git a/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs b/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs
index 89bf2811..c2fee739 100644
--- a/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs
+++ b/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs
@@ -1,8 +1,12 @@
using Admin.Core.IRepository;
using Admin.Core.Model;
+using Consul.Filtering;
+using Microsoft.IdentityModel.Logging;
using SqlSugar;
+using System;
using System.Collections.Generic;
using System.Linq;
+using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace Admin.Core.Repository
@@ -33,7 +37,26 @@ namespace Admin.Core.Repository
///
public async Task> GetStationSheetMetalHourAmountAsync(string stationCode)
{
- return await Db.Queryable().AS("GET_STATION_SHEETMETALHOURAMOUNT").ToListAsync();
+ return await Db.Queryable().AS("GET_STATION_SHEETMETALHOURAMOUNT").Where("PRODUCTLINE_CODE = @stationCode", new { stationCode = stationCode }).ToListAsync();
+ }
+
+ public List GetStationSheetMetalStats(string stationCode)
+ {
+ List result = null;
+ try
+ {
+ string sql = @"SELECT b.MATERIAL_NAME, r.PRODUCTLINE_CODE, SUM(r.complete_amount) AS PRODUCT_AMOUNT
+ FROM(select p.*, s.complete_amount from EXECUTE_PLANINFO p inner join RECORD_SIDEPANEL_COMPLATE s on p.TASK_CODE = s.PLAN_CODE) r
+ JOIN C##AUCMA_MES.BASE_BOMINFO b ON r.MATERIAL_CODE = b.MATERIAL_CODE
+ WHERE TRUNC(r.RECORD_TIME) = TRUNC(SYSDATE)
+ GROUP BY b.MATERIAL_NAME, r.PRODUCTLINE_CODE";
+ result = Db.SqlQueryable(sql).Where("PRODUCTLINE_CODE = @stationCode", new { stationCode = stationCode }).ToList();
+ }
+ catch (Exception ex)
+ {
+
+ }
+ return result;
}
}
}
\ No newline at end of file
diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
index 67886d71..41538400 100644
--- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Repository
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Repository\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\
diff --git a/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs b/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs
index 87eb28d9..f94c13b7 100644
--- a/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs
+++ b/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs
@@ -396,5 +396,10 @@ namespace Admin.Core.Service
{
return await _executePlanInfoRepository.GetStationSheetMetalHourAmountAsync(stationCode);
}
+ public List GetStationSheetMetalStats(string stationCode)
+ {
+ return _executePlanInfoRepository.GetStationSheetMetalStats(stationCode);
+ }
+
}
}
\ No newline at end of file
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
index 9c6bffa2..19486c3e 100644
--- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Service
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Service\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
index 48679c0e..d114eba8 100644
--- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Tasks
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Tasks\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\
diff --git a/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj b/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj
index 18b7ed36..87091b19 100644
--- a/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj
+++ b/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj
@@ -79,6 +79,9 @@
+
+ Code
+
Code
diff --git a/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj.user b/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj.user
index 951b24be..e085db73 100644
--- a/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj.user
+++ b/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj.user
@@ -12,6 +12,9 @@
+
+ Designer
+
Designer
diff --git a/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs b/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs
new file mode 100644
index 00000000..76a82503
--- /dev/null
+++ b/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs
@@ -0,0 +1,323 @@
+using Admin.Core.Common.Helper;
+using Admin.Core.IService;
+using Admin.Core.Model;
+using Aucma.Core.DoorFoam.Models;
+using Aucma.Core.HwPLc;
+using Microsoft.Extensions.DependencyInjection;
+using NetTaste;
+using NPOI.Util;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Documents;
+
+namespace Aucma.Core.DoorFoam.Business
+{
+ ///
+ /// 采集发泡机数据
+ ///
+ public class CollectionFoamMachine
+ {
+ ///
+ /// 刷新最后一枪DATAGRID
+ ///
+ public delegate void RefreshLastShotDataDelegate(BoxLastShotRecord record);
+ public static event RefreshLastShotDataDelegate RefreshLastShotDataDelegateEvent;
+
+ ///
+ /// 刷新每一枪数据
+ ///
+ public delegate void RefreshGunDataDelegate(Dictionary keys);
+ public static event RefreshGunDataDelegate RefreshGunDataDelegateEvent;
+
+ ///
+ /// 刷新系统数据
+ ///
+ public delegate void RefreshSystemDataDelegate(Dictionary keys);
+ public static event RefreshSystemDataDelegate RefreshSystemDataDelegateEvent;
+
+ private static System.Text.ASCIIEncoding asciiEncoding = new System.Text.ASCIIEncoding();
+ List foamMachinesList = new List();
+
+ Dictionary gunKeys = new Dictionary();
+ Dictionary tempKeys = new Dictionary();
+ // 系统参数
+ Dictionary systemKeys = new Dictionary();
+ Semaphore semaphore = new Semaphore(1, 1);
+
+ private readonly IBoxLastShotRecordServices? _lastShotRecordServices = App.ServiceProvider.GetService();
+
+
+ public CollectionFoamMachine()
+ {
+
+ }
+
+ public void startCollect()
+ {
+ Task.Run(() =>
+ {
+ while (true)
+ {
+
+ try
+ {
+ Thread.Sleep(3000);
+ var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("FoamPlc"));
+ if (obj != null)
+ {
+ ReadEquipSystem(obj, "DB50.388", systemKeys, "1"); //采集1系统
+ ReadEquipSystem(obj, "DB50.642", systemKeys, "2"); //采集2系统
+
+ ReadGunData(obj, "DB50.896", gunKeys, "A1"); //A1枪数据
+ ReadGunData(obj, "DB50.1084", gunKeys, "B1"); //B1枪数据
+ ReadGunData(obj, "DB50.1272", gunKeys, "A2"); //A2枪数据
+ ReadGunData(obj, "DB50.1460", gunKeys, "B2"); //A2枪数据
+ RefreshSystemDataDelegateEvent?.Invoke(systemKeys);
+ RefreshGunDataDelegateEvent?.Invoke(gunKeys);
+
+
+ foreach (KeyValuePair kvPair in gunKeys)
+ {
+ //程序启动缓存没数据查数据库
+ if (!tempKeys.ContainsKey(kvPair.Key))
+ {
+ BoxLastShotRecord record = _lastShotRecordServices.Query(x => x.System == kvPair.Value.System && x.ProductLineCode == kvPair.Value.ProductLineCode && x.GunCode == kvPair.Value.GunCode).OrderByDescending(x => x.CreateTime).FirstOrDefault();
+ if (record == null)
+ {
+ // 数据库也没数据
+ int a = _lastShotRecordServices.AddAsync(kvPair.Value).Result;
+ RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value);
+ continue;
+ }
+ tempKeys.Add(kvPair.Key, record);
+ }
+ if (!kvPair.Value.MixpistOff.Equals(tempKeys[kvPair.Key].MixpistOff))
+ {
+ int b = _lastShotRecordServices.AddAsync(kvPair.Value).Result;
+ RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value);
+ }
+
+
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex);
+ }
+ finally
+ {
+
+ foreach (KeyValuePair kvp in gunKeys)
+ {
+ if (tempKeys.ContainsKey(kvp.Key))
+ {
+ // 键已存在，更新值
+ tempKeys[kvp.Key] = kvp.Value;
+ }
+ else
+ {
+ // 键不存在，添加键值对
+ tempKeys.Add(kvp.Key, kvp.Value);
+ }
+ }
+ // tempKeys = gunKeys;
+ }
+ }
+
+ });
+ }
+
+ ///
+ /// 采集设备系统参数
+ ///
+ ///
+ static void ReadEquipSystem(HwPLc.PlcModel obj, string startStr, Dictionary keys, string systemId)
+ {
+ if (obj == null || !obj.plc.IsConnected) return;
+ if (obj.plc.IsConnected)
+ {
+
+ byte[] info = obj.plc.Read(startStr, 170);
+ if (info == null) return;
+ FoamMachinesModel model = new FoamMachinesModel();
+ model.systemId = systemId;
+
+ model.Machine_Status_0 = judgeStatus(ByteArrayToBinary(info.Skip(0).Take(1).ToArray())).ToString();
+ model.Machine_Status_1 = judgeStatus(ByteArrayToBinary(info.Skip(1).Take(1).ToArray())).ToString();
+ model.POL_Level = byteToFloat(info.Skip(2).Take(4).ToArray()).ToString();
+
+ model.POL_Temp = byteToFloat(info.Skip(14).Take(4).ToArray()).ToString();
+ model.POL_LP = byteToFloat(info.Skip(18).Take(4).ToArray()).ToString();
+ model.POL_HP = byteToFloat(info.Skip(22).Take(4).ToArray()).ToString();
+
+ model.POL_Vol = byteToFloat(info.Skip(34).Take(4).ToArray()).ToString();
+ model.POL_Usage = byteToFloat(info.Skip(38).Take(4).ToArray()).ToString();
+ model.POL_Freq_Speed = byteToFloat(info.Skip(42).Take(4).ToArray()).ToString();
+
+ model.ISO_Level = byteToFloat(info.Skip(82).Take(4).ToArray()).ToString();
+
+ model.ISO_Temp = byteToFloat(info.Skip(94).Take(4).ToArray()).ToString();
+ model.ISO_LP = byteToFloat(info.Skip(98).Take(4).ToArray()).ToString();
+ model.ISO_HP = byteToFloat(info.Skip(102).Take(4).ToArray()).ToString();
+
+ model.ISO_Vol = byteToFloat(info.Skip(114).Take(4).ToArray()).ToString();
+ model.ISO_Usage = byteToFloat(info.Skip(118).Take(4).ToArray()).ToString();
+ model.ISO_Freq_Speed = byteToFloat(info.Skip(122).Take(4).ToArray()).ToString();
+
+ model.Hydr_Press = byteToFloat(info.Skip(162).Take(4).ToArray()).ToString();
+ model.Hydr_Temp = byteToFloat(info.Skip(166).Take(4).ToArray()).ToString();
+
+ model.collectTime = DateTime.Now;
+
+ if (keys.ContainsKey(systemId))
+ {
+ // 键已存在，更新值
+ keys[systemId] = model;
+ }
+ else
+ {
+ // 键不存在，添加键值对
+ keys.Add(systemId, model);
+ }
+ }
+ }
+
+ ///
+ /// 每一枪数据 ---A1,B1,A2,B2
+ ///
+ ///
+ static void ReadGunData(HwPLc.PlcModel obj, string startStr, Dictionary keys, string gunCode)
+ {
+ if (obj == null || !obj.plc.IsConnected) return;
+ if (obj.plc.IsConnected)
+ {
+ byte[] info = obj.plc.Read(startStr, 88);
+ if (info == null) return;
+ BoxLastShotRecord lastShotRecord = new BoxLastShotRecord();
+ lastShotRecord.System = gunCode.Substring(1, 1);
+ lastShotRecord.GunCode = gunCode;
+ lastShotRecord.ProductLineCode = "CX_02";
+
+ lastShotRecord.PolTemp = byteToFloat(info.Skip(0).Take(4).ToArray()).ToString();
+ lastShotRecord.PolHp = byteToFloat(info.Skip(4).Take(4).ToArray()).ToString();
+ lastShotRecord.PolVol = byteToFloat(info.Skip(8).Take(4).ToArray()).ToString();
+ lastShotRecord.PolUsage = byteToFloat(info.Skip(12).Take(4).ToArray()).ToString();
+ lastShotRecord.IsoTemp = byteToFloat(info.Skip(16).Take(4).ToArray()).ToString();
+ lastShotRecord.IsoHp = byteToFloat(info.Skip(20).Take(4).ToArray()).ToString();
+ lastShotRecord.IsoVol = byteToFloat(info.Skip(24).Take(4).ToArray()).ToString();
+ lastShotRecord.IsoUsage = byteToFloat(info.Skip(28).Take(4).ToArray()).ToString();
+
+ lastShotRecord.PourNu = short.Parse(StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber).ToString();
+ lastShotRecord.SetTime = int.Parse(StringChange.bytesToHexStr(info.Skip(38).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString();
+ lastShotRecord.SetWeight = byteToFloat(info.Skip(42).Take(4).ToArray()).ToString();
+ lastShotRecord.SetRatio = byteToFloat(info.Skip(46).Take(4).ToArray()).ToString(); ;
+ lastShotRecord.PourWeight = byteToFloat(info.Skip(50).Take(4).ToArray()).ToString();
+ lastShotRecord.PourRatio = byteToFloat(info.Skip(54).Take(4).ToArray()).ToString();
+ lastShotRecord.MpTime = int.Parse(StringChange.bytesToHexStr(info.Skip(58).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString();
+ lastShotRecord.HpTime = int.Parse(StringChange.bytesToHexStr(info.Skip(62).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString();
+ lastShotRecord.HydrPress = byteToFloat(info.Skip(66).Take(4).ToArray()).ToString();
+ lastShotRecord.HydrTemp = byteToFloat(info.Skip(70).Take(4).ToArray()).ToString();
+ lastShotRecord.MixpistOn = int.Parse(StringChange.bytesToHexStr(info.Skip(74).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString();
+ lastShotRecord.MixpistOff = int.Parse(StringChange.bytesToHexStr(info.Skip(78).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString(); ;
+ lastShotRecord.TotalYield = int.Parse(StringChange.bytesToHexStr(info.Skip(82).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString(); ;
+ lastShotRecord.PourEnd = judgeStatus(ByteArrayToBinary(info.Skip(87).Take(1).ToArray())).ToString();
+
+ lastShotRecord.CreateTime = DateTime.Now;
+
+ if (keys.ContainsKey(gunCode))
+ {
+ // 键已存在，更新值
+ keys[gunCode] = lastShotRecord;
+ }
+ else
+ {
+ // 键不存在，添加键值对
+ keys.Add(gunCode, lastShotRecord);
+ }
+ }
+ }
+
+
+ #region 字符工具转换方法
+ /// byte[]转十进制ascii码
+ ///
+ ///
+ static string ByteArrayToString(byte[] bytes)
+ {
+ string result = string.Empty;
+ foreach (byte b in bytes)
+ {
+ int decimalValue = Convert.ToInt32(b); // 将字节转换为十进制值
+ result += decimalValue;
+ }
+ return result;
+ }
+ ///
+ /// byte[]转二进制
+ ///
+ ///
+ static string ByteArrayToBinary(byte[] bytes)
+ {
+ StringBuilder binaryString = new StringBuilder();
+
+ foreach (byte b in bytes)
+ {
+ binaryString.Append(Convert.ToString(b, 2).PadLeft(8, '0'));
+ }
+
+ // Console.WriteLine(binaryString);
+
+ string reversedStr = new string(binaryString.ToString().Reverse().ToArray());
+ // Console.WriteLine(reversedStr);
+
+ return reversedStr;
+ }
+
+ ///
+ /// 根据二进制字符串确定夹具状态 1正常生产 2暂停生产
+ ///
+ static int judgeStatus(string str1)
+ {
+ int item1 = 0;
+ if (str1.Substring(0, 1) == "1")
+ {
+ item1 = 1; //
+ }
+ else if (str1.Substring(1, 1) == "1")
+ {
+ item1 = 2; //
+ }
+ return item1;
+ }
+
+
+ ///
+ /// byte数组转换为float
+ ///
+ static float byteToFloat(byte[] list)
+ {
+ float result = 0.00f;
+ Array.Reverse(list);
+ result = BitConverter.ToSingle(list, 0);
+ return result;
+
+ }
+
+ #endregion
+ }
+
+
+}
+
+
+
+
+
+
diff --git a/Aucma.Core.DoorFoam/Business/DoorCollection.cs b/Aucma.Core.DoorFoam/Business/DoorCollection.cs
index a5d4ccdb..72d9b131 100644
--- a/Aucma.Core.DoorFoam/Business/DoorCollection.cs
+++ b/Aucma.Core.DoorFoam/Business/DoorCollection.cs
@@ -62,7 +62,6 @@ namespace Aucma.Core.DoorFoam.Business
//读取所有模具产量
List moldOutPutList = ReadModeProduct(obj);
-
#region 读取设备状态（1运行 2停机 3故障）、生产节拍、节拍、设备报警
byte[] info = obj.plc.Read("DB4.2086", 10);
int deviceStatus = 0;
@@ -90,6 +89,7 @@ namespace Aucma.Core.DoorFoam.Business
{
StationTrolleyNumber = moldStatus.StationTrolleyNumber,
GunNumber = moldStatus.GunNumber,
+ MoldStatus = moldStatus.MoldStatus,
MoldType_A = moldType.MoldType_A,
MoldType_B = moldType.MoldType_B,
MoldProdutionA = moldOutPut.MoldProdutionA,
diff --git a/Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs b/Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs
new file mode 100644
index 00000000..ecef0ae1
--- /dev/null
+++ b/Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs
@@ -0,0 +1,115 @@
+using Admin.Core.IService;
+using Admin.Core.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Core.DoorFoam.Models
+{
+ public partial class FoamMachinesModel
+ {
+ ///
+ /// 系统编号;1系统 2系统
+ ///
+ public string systemId { get; set; }
+
+ ///
+ /// 开关机信号
+ ///
+ public string Machine_Status_0 { get; set; }
+
+ ///
+ ///运行状态（自/手动）
+ ///
+ public string Machine_Status_1 { get; set; }
+
+ ///
+ ///POL料位
+ ///
+ public string POL_Level { get; set; }
+
+ ///
+ ///POL温度
+ ///
+ public string POL_Temp { get; set; }
+
+ ///
+ ///POL输入压力
+ ///
+ public string POL_LP { get; set; }
+
+ ///
+ ///POL输出压力
+ ///
+ public string POL_HP { get; set; }
+
+ ///
+ ///POL流量
+ ///
+ public string POL_Vol { get; set; }
+
+ ///
+ ///POL原料用量
+ ///
+ public string POL_Usage { get; set; }
+
+ ///
+ ///POL变频器转速
+ ///
+ public string POL_Freq_Speed { get; set; }
+
+ ///
+ ///ISO料位
+ ///
+ public string ISO_Level { get; set; }
+
+ ///
+ ///ISO温度
+ ///
+ public string ISO_Temp { get; set; }
+
+ ///
+ ///ISO输入压力
+ ///
+ public string ISO_LP { get; set; }
+
+ ///
+ ///ISO输出压力
+ ///
+ public string ISO_HP { get; set; }
+
+ ///
+ ///ISO流量
+ ///
+ public string ISO_Vol { get; set; }
+
+ ///
+ ///ISO原料用量
+ ///
+ public string ISO_Usage { get; set; }
+
+ ///
+ ///ISO变频器转速
+ ///
+ public string ISO_Freq_Speed { get; set; }
+
+ ///
+ ///液压压力
+ ///
+ public string Hydr_Press { get; set; }
+
+ ///
+ ///液压温度
+ ///
+ public string Hydr_Temp { get; set; }
+
+ ///
+ ///采集时间
+ ///
+ public DateTime collectTime { get; set; }
+ }
+}
diff --git a/Aucma.Core.DoorFoam/Models/LastShotRecordModel.cs b/Aucma.Core.DoorFoam/Models/LastShotRecordModel.cs
new file mode 100644
index 00000000..818421a6
--- /dev/null
+++ b/Aucma.Core.DoorFoam/Models/LastShotRecordModel.cs
@@ -0,0 +1,56 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Core.DoorFoam.Models
+{
+ public class LastShotRecordModel
+ {
+ public int No { get; set; }
+ ///
+ /// 所属系统;1系统 2系统
+ ///
+ public string System { get; set; }
+ ///
+ /// 枪头
+ ///
+ public string GunHead { get; set; }
+ ///
+ /// 工位号
+ ///
+ public string StationNumber { get; set; }
+
+ ///
+ /// POL注料压力
+ ///
+ public string PolInjectionpressure { get; set; }
+
+ ///
+ /// ISO注料压力
+ ///
+ public string IsoInjectionpressure { get; set; }
+
+ ///
+ /// POL注料温度
+ ///
+ public string PolInjectiontemperature { get; set; }
+
+ ///
+ /// ISO注料温度
+ ///
+ public string IsoInjectiontemperature { get; set; }
+
+ ///
+ /// 最后一次时间
+ ///
+ public DateTime LastTime { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime Createtime { get; set; }
+ }
+}
diff --git a/Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs
new file mode 100644
index 00000000..63425f66
--- /dev/null
+++ b/Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs
@@ -0,0 +1,675 @@
+using Admin.Core.Common;
+using Admin.Core.IService;
+using Admin.Core.Model;
+using Admin.Core.Model.ViewModels;
+using Admin.Core.Service;
+using Admin.Core.Tasks;
+using Aucma.Core.DoorFoam.Business;
+using Aucma.Core.DoorFoam.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Core.DoorFoam.ViewModels
+{
+ public partial class FoamMachinesPageViewModel : ObservableObject
+ {
+ IBoxLastShotRecordServices _boxLastShotRecordServices;
+
+ public FoamMachinesPageViewModel()
+ {
+ CollectionFoamMachine.RefreshLastShotDataDelegateEvent += RefreshData;
+ CollectionFoamMachine.RefreshGunDataDelegateEvent += RefreshGunData;
+ CollectionFoamMachine.RefreshSystemDataDelegateEvent += RefreshSystemData;
+ _boxLastShotRecordServices = App.ServiceProvider.GetService();
+ LoadData();
+ //Task.WaitAll(LoadData());
+ }
+
+
+ #region 刷新系统参数---系统1，系统2
+ ///
+ /// 系统1，系统2数据刷新
+ ///
+ public void RefreshSystemData(Dictionary keys)
+ {
+ foreach (KeyValuePair kvp in keys)
+ {
+ if (kvp.Key.Equals("1"))
+ {
+ RefreshSystem1(kvp.Value);
+ }
+ else if (kvp.Key.Equals("2"))
+ {
+ RefreshSystem2(kvp.Value);
+
+ }
+ }
+ }
+ ///
+ /// 刷新系统1
+ ///
+ ///
+ public void RefreshSystem1(FoamMachinesModel record)
+ {
+ PolInputPressure1 = record.POL_LP;
+ IsoInputPressure1 = record.ISO_LP;
+ PolOutputPressure1 = record.POL_HP;
+ IsoOutputPressure1 = record.ISO_HP;
+ PolFlow1 = record.POL_Vol;
+ IsoFlow1 = record.ISO_Vol;
+ PoleTmperature1 = record.POL_Temp;
+ IsoTemperature1 = record.ISO_Temp;
+ PolMaterialLevel1 = record.POL_Level;
+ IsoMaterialLevel1 = record.ISO_Level;
+ Pressure1 = record.Hydr_Press;
+ Temperature1 = record.Hydr_Temp;
+ }
+ ///
+ /// 刷新系统2
+ ///
+ ///
+ public void RefreshSystem2(FoamMachinesModel record)
+ {
+ PolInputPressure2 = record.POL_LP;
+ IsoInputPressure2 = record.ISO_LP;
+ PolOutputPressure2 = record.POL_HP;
+ IsoOutputPressure2 = record.ISO_HP;
+ PolFlow2 = record.POL_Vol;
+ IsoFlow2 = record.ISO_Vol;
+ PoleTmperature2 = record.POL_Temp;
+ IsoTemperature2 = record.ISO_Temp;
+ PolMaterialLevel2 = record.POL_Level;
+ IsoMaterialLevel2 = record.ISO_Level;
+ Pressure2 = record.Hydr_Press;
+ Temperature2 = record.Hydr_Temp;
+ }
+
+ #endregion
+
+
+
+ #region 刷新每一枪数据
+ ///
+ /// A1,B1,A2,B2枪数据刷新
+ ///
+ public void RefreshGunData(Dictionary keys)
+ {
+ foreach (KeyValuePair kvp in keys)
+ {
+ if (kvp.Key.Equals("A1"))
+ {
+ RefreshA1(kvp.Value);
+ }
+ else if (kvp.Key.Equals("B1"))
+ {
+ RefreshB1(kvp.Value);
+ }
+ else if (kvp.Key.Equals("A2"))
+ {
+ RefreshA2(kvp.Value);
+ }
+ else if (kvp.Key.Equals("B2"))
+ {
+ RefreshB2(kvp.Value);
+ }
+ }
+ }
+ ///
+ /// 刷新A1数据
+ ///
+ ///
+ public void RefreshA1(BoxLastShotRecord record)
+ {
+ POLPressure1a = record.PolHp;
+ POLTemperature1a = record.PolTemp;
+ ISOPressure1a = record.IsoHp;
+ ISOTemperature1a = record.IsoTemp;
+ }
+ ///
+ /// 刷新B1数据
+ ///
+ ///
+ public void RefreshB1(BoxLastShotRecord record)
+ {
+ POLPressure1b = record.PolHp;
+ POLTemperature1b = record.PolTemp;
+ ISOPressure1b = record.IsoHp;
+ ISOTemperature1b = record.IsoTemp;
+
+ }
+ ///
+ /// 刷新A2数据
+ ///
+ ///
+ public void RefreshA2(BoxLastShotRecord record)
+ {
+ POLPressure2a = record.PolHp;
+ POLTemperature2a = record.PolTemp;
+ ISOPressure2a = record.IsoHp;
+ ISOTemperature2a = record.IsoTemp;
+ }
+
+ ///
+ /// 刷新B2数据
+ ///
+ ///
+ public void RefreshB2(BoxLastShotRecord record)
+ {
+ POLPressure2b = record.PolHp;
+ POLTemperature2b = record.PolTemp;
+ ISOPressure2b = record.IsoHp;
+ ISOTemperature2b = record.IsoTemp;
+ }
+ #endregion
+
+ ///
+ /// datagrid刷新
+ ///
+ ///
+ public void RefreshData(BoxLastShotRecord record)
+ {
+ System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
+ {
+ string system = string.Empty;
+ if (record.System == "1")
+ {
+ system = "1系统";
+ // PolFlow1 = record.POLInjecFlowRate;
+ // IsoFlow1 = record.ISOInjecFlowRate;
+ // PoleTmperature1 = record.POLInjecTemperatureOfGunHead;
+ // IsoTemperature1 = record.ISOInjecTemperatureOfGunHead;
+
+ }
+ if (record.System == "2") { system = "2系统"; }
+ LastShotRecordModel model = new LastShotRecordModel();
+ model.No = LastShotRecordDataGrid.Count + 1;
+ model.System = system;
+ model.GunHead = record.GunCode;
+ // StationNumber = record.StationNumber,
+ model.IsoInjectionpressure = record.PolHp;
+ model.IsoInjectionpressure = record.IsoHp;
+ model.PolInjectiontemperature = record.PolTemp;
+ model.IsoInjectiontemperature = record.IsoTemp;
+ model.PolInjectionpressure = record.PolHp;
+ model.StationNumber = record.PourNu;
+ model.LastTime = record.CreateTime;
+ model.Createtime = record.CreateTime;
+ LastShotRecordDataGrid.Insert(0, model);
+ }));
+
+ }
+
+ #region 加载DataGrid数据
+ private async Task LoadData()
+ {
+ System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
+ {
+ LastShotRecordDataGrid.Clear();
+
+ int i = 1;
+ var list = await _boxLastShotRecordServices.QueryAsync();
+ if (list == null) return;
+ list.OrderByDescending(d => d.CreateTime).Take(30);
+ foreach (var item in list)
+ {
+ string system = string.Empty;
+ if (item.System == "1") { system = "1系统"; }
+ if (item.System == "2") { system = "2系统"; }
+ LastShotRecordModel model = new LastShotRecordModel();
+ if (LastShotRecordDataGrid.Count() == 0)
+ {
+ model.No = 1;
+ }
+ else
+ {
+ model.No = LastShotRecordDataGrid.Count() + 1;
+ }
+ model.No = i;
+ model.System = system;
+ model.GunHead = item.GunCode;
+ model.PolInjectionpressure = item.PolHp;
+ model.IsoInjectionpressure = item.IsoHp;
+ model.PolInjectiontemperature = item.PolTemp;
+ model.IsoInjectiontemperature = item.IsoTemp;
+ model.LastTime = item.CreateTime;
+ model.Createtime = item.CreateTime;
+ model.StationNumber = item.PourNu;
+ LastShotRecordDataGrid.Insert(0, model);
+ }
+ }));
+ }
+
+ #endregion
+
+ #region 初始化datagrid
+ private ObservableCollection _lastShotRecordDataGrid = new ObservableCollection();
+ public ObservableCollection LastShotRecordDataGrid
+ {
+ get { return _lastShotRecordDataGrid; }
+ set
+ {
+ _lastShotRecordDataGrid = value;
+ OnPropertyChanged();//属性通知
+ }
+ }
+ #endregion
+
+
+ #region 1系统属性
+ ///
+ /// POL输入压力
+ ///
+ private string _PolInputPressure = "0.00";
+ public string PolInputPressure1
+ {
+ get => _PolInputPressure;
+ set => SetProperty(ref _PolInputPressure, value);
+ }
+ ///
+ /// ISO输入压力
+ ///
+ private string _IsoInputPressure = "0.00";
+ public string IsoInputPressure1
+ {
+ get => _IsoInputPressure;
+ set => SetProperty(ref _IsoInputPressure, value);
+ }
+ ///
+ /// POL输出压力
+ ///
+ private string _polOutputPressure = "0.0";
+ public string PolOutputPressure1
+ {
+ get => _polOutputPressure;
+ set => SetProperty(ref _polOutputPressure, value);
+ }
+ ///
+ /// ISO输出压力
+ ///
+ private string _isoOutputPressure1 = "0.0";
+ public string IsoOutputPressure1
+ {
+ get => _isoOutputPressure1;
+ set => SetProperty(ref _isoOutputPressure1, value);
+ }
+ ///
+ /// Pol流量
+ ///
+ private string _Polflow1 = "0";
+ public string PolFlow1
+ {
+ get => _Polflow1;
+ set => SetProperty(ref _Polflow1, value);
+ }
+ ///
+ /// Iso流量
+ ///
+ private string _isoflow1 = "0";
+ public string IsoFlow1
+ {
+ get => _isoflow1;
+ set => SetProperty(ref _isoflow1, value);
+ }
+
+ ///
+ /// Pol温度
+ ///
+ private string _PoleTmperature = "0";
+ public string PoleTmperature1
+ {
+ get => _PoleTmperature;
+ set => SetProperty(ref _PoleTmperature, value);
+ }
+ ///
+ /// Iso温度
+ ///
+ private string _isoTemperature = "0";
+ public string IsoTemperature1
+ {
+ get => _isoTemperature;
+ set => SetProperty(ref _isoTemperature, value);
+ }
+
+ ///
+ /// 料位
+ ///
+ private string _PolMaterialLevel1 = "0";
+ public string PolMaterialLevel1
+ {
+ get => _PolMaterialLevel1;
+ set => SetProperty(ref _PolMaterialLevel1, value);
+ }
+ ///
+ /// Iso温度
+ ///
+ private string _IsoMaterialLevel1 = "0";
+ public string IsoMaterialLevel1
+ {
+ get => _IsoMaterialLevel1;
+ set => SetProperty(ref _IsoMaterialLevel1, value);
+ }
+
+ ///
+ /// 压力
+ ///
+ private string _pressure1 = "0.00";
+ public string Pressure1
+ {
+ get => _pressure1;
+ set => SetProperty(ref _pressure1, value);
+ }
+ ///
+ /// 温度
+ ///
+ private string _temperature1 = "0.00";
+ public string Temperature1
+ {
+ get => _temperature1;
+ set => SetProperty(ref _temperature1, value);
+ }
+
+
+ ///
+ /// A枪状态
+ ///
+ //private string _status1a;
+ //public string Status1a
+ //{
+ // get => _status1a;
+ // set => SetProperty(ref _status1a, value);
+ //}
+
+ ///
+ /// pol压力
+ ///
+ private string _POLPressure1a = "0.00";
+ public string POLPressure1a
+ {
+ get => _POLPressure1a;
+ set => SetProperty(ref _POLPressure1a, value);
+ }
+
+ ///
+ /// A枪POL温度
+ ///
+ private string _POLTemperature1a = "0.00";
+ public string POLTemperature1a
+ {
+ get => _POLTemperature1a;
+ set => SetProperty(ref _POLTemperature1a, value);
+ }
+ ///
+ /// iso压力
+ ///
+ private string _ISOPressure1a = "0.00";
+ public string ISOPressure1a
+ {
+ get => _ISOPressure1a;
+ set => SetProperty(ref _ISOPressure1a, value);
+ }
+ ///
+ /// iso温度
+ ///
+ private string _ISOTemperature1a = "0.0";
+ public string ISOTemperature1a
+ {
+ get => _ISOTemperature1a;
+ set => SetProperty(ref _ISOTemperature1a, value);
+ }
+
+ ///
+ /// B枪状态
+ ///
+ //private string _status1b;
+ //public string Status1b
+ //{
+ // get => _status1b;
+ // set => SetProperty(ref _status1b, value);
+ //}
+
+ ///
+ /// B枪pol压力
+ ///
+ private string _POLPressure1b = "0.00";
+ public string POLPressure1b
+ {
+ get => _POLPressure1b;
+ set => SetProperty(ref _POLPressure1b, value);
+ }
+
+ ///
+ /// B枪POL温度
+ ///
+ private string _POLTemperature1b = "0.00";
+ public string POLTemperature1b
+ {
+ get => _POLTemperature1b;
+ set => SetProperty(ref _POLTemperature1b, value);
+ }
+ ///
+ /// B枪iso压力
+ ///
+ private string _ISOPressure1b = "0.00";
+ public string ISOPressure1b
+ {
+ get => _ISOPressure1b;
+ set => SetProperty(ref _ISOPressure1b, value);
+ }
+ ///
+ /// B枪iso温度
+ ///
+ private string _ISOTemperature1b = "0.0";
+ public string ISOTemperature1b
+ {
+ get => _ISOTemperature1b;
+ set => SetProperty(ref _ISOTemperature1b, value);
+ }
+ #endregion
+
+ #region 2系统属性
+ ///
+ /// POL输入压力
+ ///
+ private string _PolInputPressure2 = "0.00";
+ public string PolInputPressure2
+ {
+ get => _PolInputPressure2;
+ set => SetProperty(ref _PolInputPressure2, value);
+ }
+ ///
+ /// ISO输入压力
+ ///
+ private string _IsoInputPressure2 = "0.00";
+ public string IsoInputPressure2
+ {
+ get => _IsoInputPressure2;
+ set => SetProperty(ref _IsoInputPressure2, value);
+ }
+ ///
+ /// POL输出压力
+ ///
+ private string _polOutputPressure2 = "0.00";
+ public string PolOutputPressure2
+ {
+ get => _polOutputPressure2;
+ set => SetProperty(ref _polOutputPressure2, value);
+ }
+ ///
+ /// ISO输出压力
+ ///
+ private string _isoOutputPressure2 = "0.00";
+ public string IsoOutputPressure2
+ {
+ get => _isoOutputPressure2;
+ set => SetProperty(ref _isoOutputPressure2, value);
+ }
+ ///
+ /// Pol流量
+ ///
+ private string _Polflow2 = "0";
+ public string PolFlow2
+ {
+ get => _Polflow2;
+ set => SetProperty(ref _Polflow2, value);
+ }
+ ///
+ /// Iso流量
+ ///
+ private string _isoflow2 = "0";
+ public string IsoFlow2
+ {
+ get => _isoflow2;
+ set => SetProperty(ref _isoflow2, value);
+ }
+
+ ///
+ /// Pol温度
+ ///
+ private string _PoleTmperature2 = "0";
+ public string PoleTmperature2
+ {
+ get => _PoleTmperature2;
+ set => SetProperty(ref _PoleTmperature2, value);
+ }
+ ///
+ /// Iso温度
+ ///
+ private string _isoTemperature2 = "0";
+ public string IsoTemperature2
+ {
+ get => _isoTemperature2;
+ set => SetProperty(ref _isoTemperature2, value);
+ }
+
+ ///
+ /// 料位
+ ///
+ private string _PolMaterialLevel2 = "0";
+ public string PolMaterialLevel2
+ {
+ get => _PolMaterialLevel2;
+ set => SetProperty(ref _PolMaterialLevel2, value);
+ }
+ ///
+ /// Iso温度
+ ///
+ private string _IsoMaterialLevel2 = "0";
+ public string IsoMaterialLevel2
+ {
+ get => _IsoMaterialLevel2;
+ set => SetProperty(ref _IsoMaterialLevel2, value);
+ }
+
+ ///
+ /// 压力
+ ///
+ private string _pressure2 = "0.00";
+ public string Pressure2
+ {
+ get => _pressure2;
+ set => SetProperty(ref _pressure2, value);
+ }
+ ///
+ /// 温度
+ ///
+ private string _temperature2 = "0.00";
+ public string Temperature2
+ {
+ get => _temperature2;
+ set => SetProperty(ref _temperature2, value);
+ }
+
+ ///
+ /// A枪POL压力
+ ///
+ private string _POLPressure2a = "0.00";
+ public string POLPressure2a
+ {
+ get => _POLPressure2a;
+ set => SetProperty(ref _POLPressure2a, value);
+ }
+ ///
+ /// A枪POL温度
+ ///
+ private string _POLTemperature2a = "0.00";
+ public string POLTemperature2a
+ {
+ get => _POLTemperature2a;
+ set => SetProperty(ref _POLTemperature2a, value);
+ }
+ ///
+ /// iso压力
+ ///
+ private string _ISOPressure2a = "0.00";
+ public string ISOPressure2a
+ {
+ get => _ISOPressure2a;
+ set => SetProperty(ref _ISOPressure2a, value);
+ }
+ ///
+ /// iso温度
+ ///
+ private string _ISOTemperature2a = "0.0";
+ public string ISOTemperature2a
+ {
+ get => _ISOTemperature2a;
+ set => SetProperty(ref _ISOTemperature2a, value);
+ }
+
+ ///
+ /// B枪状态
+ ///
+ //private string _status2b;
+ //public string Status2b
+ //{
+ // get => _status2b;
+ // set => SetProperty(ref _status2b, value);
+ //}
+
+ ///
+ /// B枪pol压力
+ ///
+ private string _POLPressure2b = "0.00";
+ public string POLPressure2b
+ {
+ get => _POLPressure2b;
+ set => SetProperty(ref _POLPressure2b, value);
+ }
+
+ ///
+ /// B枪POL温度
+ ///
+ private string _POLTemperature2b = "0.00";
+ public string POLTemperature2b
+ {
+ get => _POLTemperature2b;
+ set => SetProperty(ref _POLTemperature2b, value);
+ }
+ ///
+ /// B枪iso压力
+ ///
+ private string _ISOPressure2b = "0.00";
+ public string ISOPressure2b
+ {
+ get => _ISOPressure2b;
+ set => SetProperty(ref _ISOPressure2b, value);
+ }
+ ///
+ /// B枪iso温度
+ ///
+ private string _ISOTemperature2b = "0.0";
+ public string ISOTemperature2b
+ {
+ get => _ISOTemperature2b;
+ set => SetProperty(ref _ISOTemperature2b, value);
+ }
+
+ #endregion
+ }
+}
diff --git a/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs
index 516ffd23..6aff577f 100644
--- a/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs
@@ -32,6 +32,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageViewModel));
private DoorCollection doorCollection = new DoorCollection();
+ private CollectionFoamMachine collectionFoam = new CollectionFoamMachine();
public IndexPageViewModel()
{
doorCollection.RefreshDoorFoamMachineEvent += info =>
@@ -41,9 +42,15 @@ namespace Aucma.Core.DoorFoam.ViewModels
Task.Run(() =>
{
- Thread.Sleep(30000);
+ Thread.Sleep(1000*10);
doorCollection.startCollect();
});
+
+ Task.Run(() =>
+ {
+ Thread.Sleep(1000 * 10);
+ collectionFoam.startCollect();
+ });
}
#region 获取今天的数据
diff --git a/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
index 462d5336..6e4c3687 100644
--- a/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
@@ -20,6 +20,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
private IndexPageView firstPage = new IndexPageView();//首页
//private StatisticsPageView recordPage = new StatisticsPageView();
RealTimePageView realTimePageView = new RealTimePageView();
+ FoamMachinesPageView foamMachinesPageView = new FoamMachinesPageView();
public MainWindowViewModel()
{
UserContent = firstPage;
@@ -193,6 +194,9 @@ namespace Aucma.Core.DoorFoam.ViewModels
case "RealTimePage":
UserContent = realTimePageView;
break;
+ case "FoamMachinesPage":
+ UserContent = foamMachinesPageView;
+ break;
default:
break;
}
diff --git a/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml b/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml
new file mode 100644
index 00000000..17d40323
--- /dev/null
+++ b/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml
@@ -0,0 +1,531 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml.cs b/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml.cs
new file mode 100644
index 00000000..f26eb259
--- /dev/null
+++ b/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml.cs
@@ -0,0 +1,30 @@
+using Aucma.Core.DoorFoam.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Aucma.Core.DoorFoam.Views
+{
+ ///
+ /// FoamMachinesPageView.xaml 的交互逻辑
+ ///
+ public partial class FoamMachinesPageView : UserControl
+ {
+ public FoamMachinesPageView()
+ {
+ InitializeComponent();
+ this.DataContext = new FoamMachinesPageViewModel();
+ }
+ }
+}
diff --git a/Aucma.Core.DoorFoam/Views/MainWindow.xaml b/Aucma.Core.DoorFoam/Views/MainWindow.xaml
index c7d2a4cd..448a039b 100644
--- a/Aucma.Core.DoorFoam/Views/MainWindow.xaml
+++ b/Aucma.Core.DoorFoam/Views/MainWindow.xaml
@@ -65,7 +65,7 @@
-
+
diff --git a/Aucma.Core.DoorFoam/appsettings.json b/Aucma.Core.DoorFoam/appsettings.json
index 03a7fd33..cd7bdc62 100644
--- a/Aucma.Core.DoorFoam/appsettings.json
+++ b/Aucma.Core.DoorFoam/appsettings.json
@@ -199,10 +199,10 @@
"PLCServer": [
{
"Id": 1,
- "EquipName": "泡前库Plc",
+ "EquipName": "FoamPlc",
"PlcType": "Siemens",
- "Enabled": false,
- "IP": "10.10.93.41",
+ "Enabled": true,
+ "IP": "10.10.92.180",
"Port": 102
},
{
diff --git a/Aucma.Core.OldBoxFoam/ViewModels/OldBoxFoamPageViewModel.cs b/Aucma.Core.OldBoxFoam/ViewModels/OldBoxFoamPageViewModel.cs
index 5c658f63..c1389ae7 100644
--- a/Aucma.Core.OldBoxFoam/ViewModels/OldBoxFoamPageViewModel.cs
+++ b/Aucma.Core.OldBoxFoam/ViewModels/OldBoxFoamPageViewModel.cs
@@ -2,6 +2,7 @@
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
+using Admin.Core.Model.ViewModels;
using Aucma.Core.HwPLc;
using Aucma.Core.OldBoxFoam.Business;
using Aucma.Core.OldBoxFoam.Models;
@@ -234,490 +235,300 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
#endregion
Semaphore semaphore = new Semaphore(1, 1);
-
- #region 将采集到的数据保存
+
+
+ #region 原数据采集方法
///
/// 将采集到的数据保存
///
///
-
public async void RealTimeFoamingTask(object? sender, ElapsedEventArgs e)
{
semaphore.WaitOne();
try
{
string productLineCode = Appsettings.app("StationInfo", "ProductLineCode");
-
+ if (Collection.listFixtureStatus == null || Collection.listFixtureStatus.Count == 0) return;
DateTime now = DateTime.Now;
- List timeList = await _currentTeamTimeServices.QueryAsync(d => d.StartTime <= now && d.EndTime >= now);
-
- if (timeList.Count > 0)
+ CurrentTeamTime time = await _currentTeamTimeServices.FirstAsync(d => d.StartTime <= now && d.EndTime >= now);
+ if (time != null)
{
- ExecHourDataAsync(productLineCode);
+ ExecHourData(productLineCode);
}
else
{
- ShiftChangeAsync(productLineCode);
+ ShiftChange(productLineCode);
}
-
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Console.WriteLine(ex.Message.ToString());
}
finally
{
semaphore.Release();
}
- }
- #endregion
+ }
- #region 获取小时数据
- public async void ExecHourDataAsync(string productLineCode)
+ private async void ShiftChange(string productLineCode)
+ {
+ //切换班组计划
+ var list = await _oldBoxFoamDataServices.QueryAsync(d => d.ProductLineCode == productLineCode);
+ List recordList = new List();
+ var currentTeamTimeList = await _sysUserInfoServices.GetTeamData();
+ if (currentTeamTimeList.Count == 0) return;
+ //更新计划表操作
+ CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync();
+ currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName;
+ currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime);
+ currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime);
+ await _currentTeamTimeServices.UpdateAsync(currentTeamTime);
+ //可以使用Mapping 映射
+ list.ForEach(d =>
+ {
+ BoxFoamDataRecord record = new BoxFoamDataRecord();
+ record.OrderCode = d.OrderCode;
+ record.ProductLineCode = d.ProductLineCode;
+ record.Fixturestatus = d.Production;
+ record.CuringTimeSettingValue = d.CuringTimeSettingValue;
+ record.ActualValue = d.ActualValue;
+ record.AnHour = d.AnHour;
+ record.TwoHour = d.TwoHour;
+ record.ThreeHour = d.ThreeHour;
+ record.FourHour = d.FourHour;
+ record.FiveHour = d.FiveHour;
+ record.SixHour = d.SixHour;
+ record.SevenHour = d.SevenHour;
+ record.EightHour = d.EightHour;
+ record.NineHour = d.NineHour;
+ record.TenHour = d.TenHour;
+ record.ElevenHour = d.ElevenHour;
+ record.TwelveHour = d.TwelveHour;
+ record.BoxFixturesideplate = d.BoxFixturesideplate;
+ record.BoxClosebetatemperature = d.BoxClosebetatemperature;
+ record.BoxBeat = d.BoxBeat;
+ record.CreateTime = DateTime.Now;
+ });
+ int result = await _boxFoamDataRecordServices.AddAsync(recordList);
+ if (result > 0)
+ {
+ var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1"));
+ if (obj2 == null) { return; }
+ obj2.plc.WriteInt16("M216", "1");//换班 数据清空
+ //清空 当班计划
+ await _oldBoxFoamDataServices.DeletesAsync(list);
+ }
+ }
+
+ private async void ExecHourData(string productLineCode)
{
- List bLis = Collection.listFixtureStatus;
- if (bLis.Count == 0) return;
- List planList = await _boxFoamPlanServices.QueryAsync();
- List bfds = await _boxFoamDataRealTimeServices.QueryAsync();
- for (int j = 0; j < bLis.Count; j++)
+ try
{
- try
+ List bList = new List();
+
+
+ var collectionList = Collection.listFixtureStatus;
+ if (collectionList.Count == 0) return;
+ bList.AddRange(collectionList);
+ List bfds = await _oldBoxFoamDataServices.QueryAsync();
+ List spaceList = await _oldBoxFoamTypeServices.QueryAsync();
+ List planList = await _boxFoamPlanServices.QueryAsync();
+ for (int j = 0; j < bList.Count; j++)
{
- if (string.IsNullOrEmpty(bLis[j].FixtureBoxType)) continue;
- BoxFoamPlan plan = planList.FirstOrDefault(d => d.MaterialCode == bLis[j].FixtureBoxType && d.PlanAmount > d.CompleteAmount);
- if (plan != null)
+ try
{
- int complateAmount = 0;
- BoxFoamDataRealTime bfd = bfds.SingleOrDefault(d => d.FixtureBoxtype == bLis[j].FixtureBoxType && d.SerialNumber == bLis[j].ObjId);
- if (bfd != null)
- {
- //更新计划数量
- complateAmount = bLis[j].Yield - bfd.FixtureProductioncapacity;
- UpdateClampData(bLis[j], bfd);
- }
- else
- {
- FixtureStatus fixtureStatus = bLis[j];
- SaveClampData(productLineCode, fixtureStatus);
- }
- plan.CompleteAmount = plan.CompleteAmount + complateAmount;
- if (complateAmount > 0)
- {
- //保存历史记录
- BoxFoamDataRealTimeHistory history = new BoxFoamDataRealTimeHistory();
-
- history.PlantCode = bfd.PlantCode;
- history.ProductlineCode = bfd.ProductlineCode;
- history.ProcessCode = bfd.ProcessCode;
- history.StationCode = bfd.StationCode;
- history.FixtureProductioncapacity = bLis[j].Yield;
- history.FixtureCuringtimesettingvalue = bLis[j].PlanCuringTime.ToString();
- history.FixtureActualtime = bLis[j].RealCuringTime.ToString();
- history.UpdatedTime = DateTime.Now;
- //事务合并
- await _boxFoamDataRealTimeHistoryServices.AddAsync(history);
- await _boxFoamPlanServices.UpdateAsync(plan);
- }
- }
- else
- {
- //更新小时数据
- BoxFoamDataRealTime bfd = bfds.SingleOrDefault(d => d.FixtureBoxtype == bLis[j].FixtureBoxType && d.SerialNumber == bLis[j].ObjId);
- if (bfd != null)
+
+ OldBoxFoamType space = spaceList.FirstOrDefault(d => d.Boxtype == bList[j].FixtureBoxType);
+ //根据夹具找货道，根据货道找物料
+ if (spaceList != null)
{
- UpdateClampData(bLis[j], bfd);
+ BoxFoamPlan plan = planList.FirstOrDefault(d => d.MaterialCode == space.MaterialCode && d.PlanAmount > d.CompleteAmount);
+ if (plan != null)
+ {
+ int complateAmount = 0;
+ //更新小时数据
+ BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
+ if (bfd != null)
+ {
+ //更新计划数量
+ complateAmount = bList[j].Yield - bfd.Production;
+ UpdateBoxData(bList[j], bfd);
+ }
+ else
+ {
+ SaveBoxData(productLineCode, bList[j]);
+ }
+ plan.CompleteAmount = plan.CompleteAmount + complateAmount;
+ await _boxFoamPlanServices.UpdateAsync(plan);
+ }
+ else
+ {
+ //更新小时数据
+ BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
+ if (bfd != null)
+ {
+ UpdateBoxData(bList[j], bfd);
+ }
+ else
+ {
+ SaveBoxData(productLineCode, bList[j]);
+ }
+ }
}
else
{
- SaveClampData(productLineCode, bLis[j]);
+ //更新小时数据
+ BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
+ if (bfd != null)
+ {
+ UpdateBoxData(bList[j], bfd);
+ }
+ else
+ {
+ SaveBoxData(productLineCode, bList[j]);
+ }
}
}
+ catch { }
+
}
- catch { }
+
+ OldBoxFoamOnLoad(bList);
}
- }
- #endregion
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ }
- #region 切换班组
- private async void ShiftChangeAsync(string productLineCode)
+ private async void UpdateBoxData(FixtureStatus item, BoxFoamData bfd)
{
- try
+ int hour = GetTeamHour(DateTime.Now).Seq;
+ switch (hour)
{
- //切换班组计划
- var currentTeamTimeList = await _sysUserInfoServices.GetTeamData();
- if (currentTeamTimeList.Count == 0) return;
- var list = await _boxFoamDataRealTimeServices.QueryAsync(d => d.ProductlineCode == productLineCode);
- //更新计划表操作
- CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync();
- currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName;
- currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime);
- currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime);
-
- bool result = await _currentTeamTimeServices.UpdateAsync(currentTeamTime);
- if (result)
- {
- var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
- if (obj2 == null) { return; }
+ case 1:
+ bfd.AnHour = item.Yield - bfd.Production;
+ break;
+ case 2:
+ bfd.TwoHour = item.Yield - bfd.Production;
+ break;
+ case 3:
+ bfd.ThreeHour = item.Yield - bfd.Production;
+ break;
+ case 4:
+ bfd.FourHour = item.Yield - bfd.Production;
+ break;
+ case 5:
+ bfd.FiveHour = item.Yield - bfd.Production;
+ break;
+ case 6:
+ bfd.SixHour = item.Yield - bfd.Production;
+ break;
+ case 7:
+ bfd.SevenHour = item.Yield - bfd.Production;
+ break;
+ case 8:
+ bfd.EightHour = item.Yield - bfd.Production;
+ break;
+ case 9:
+ bfd.NineHour = item.Yield - bfd.Production;
+ break;
+ case 10:
+ bfd.TenHour = item.Yield - bfd.Production;
+ break;
+ case 11:
+ bfd.ElevenHour = item.Yield - bfd.Production;
+ break;
+ case 12:
+ bfd.TwelveHour = item.Yield - bfd.Production;
+ break;
+ default:
+ break;
+ }
- //清空 当班计划
- var realTimeList = await _boxFoamDataRealTimeHistoryServices.QueryAsync(d => d.ProductlineCode == productLineCode);
- await _boxFoamDataRealTimeHistoryServices.DeletesAsync(realTimeList);
+ bfd.Production = item.Yield;
- var plan = await _boxFoamPlanServices.QueryAsync(d => d.ProductLineCode == productLineCode);
- await _boxFoamPlanServices.DeletesAsync(plan);
- }
- }
- catch { }
+ await _oldBoxFoamDataServices.UpdateAsync(bfd);
}
- #endregion
-
- #region 更新夹具型号
- ///
- /// 更新夹具型号
- ///
- public async void UpdateClampData(FixtureStatus fixtureStatus, BoxFoamDataRealTime bfd)
+ private async void SaveBoxData(string productLineCode, FixtureStatus item)
{
+ BoxFoamData bfdata = new BoxFoamData();
+ bfdata.MainId = item.ObjId;
+ bfdata.ProductLineCode = productLineCode;
+ bfdata.Fixtureboxtype = item.FixtureBoxType;
+ bfdata.Fixturestatus = item.Status;
+ bfdata.Production = item.Yield;
+ bfdata.CuringTimeSettingValue = item.PlanCuringTime.ToString();
+ bfdata.ActualValue = item.RealCuringTime.ToString();
+ int hour = GetTeamHour(DateTime.Now).Seq;
+ switch (hour)
+ {
+ case 1:
+ bfdata.AnHour = item.Yield = bfdata.Production;
+ break;
+ case 2:
+ bfdata.TwoHour = item.Yield = bfdata.Production;
+ break;
+ case 3:
+ bfdata.ThreeHour = item.Yield = bfdata.Production;
+ break;
+ case 4:
+ bfdata.FourHour = item.Yield = bfdata.Production;
+ break;
+ case 5:
+ bfdata.FiveHour = item.Yield = bfdata.Production;
+ break;
+ case 6:
+ bfdata.SixHour = item.Yield = bfdata.Production;
+ break;
+ case 7:
+ bfdata.SevenHour = item.Yield = bfdata.Production;
+ break;
+ case 8:
+ bfdata.EightHour = item.Yield = bfdata.Production;
+ break;
+ case 9:
+ bfdata.NineHour = item.Yield = bfdata.Production;
+ break;
+ case 10:
+ bfdata.TenHour = item.Yield = bfdata.Production;
+ break;
+ case 11:
+ bfdata.ElevenHour = item.Yield = bfdata.Production;
+ break;
+ case 12:
+ bfdata.TwelveHour = item.Yield = bfdata.Production;
+ break;
+ default:
+ break;
+ }
+ bfdata.MainId = item.ObjId;
+ await _oldBoxFoamDataServices.AddAsync(bfdata);
+ }
- try
+ public CurrentTeamTimeView GetTeamHour()
+ {
+ DateTime now = DateTime.Now;
+ var list = _sysUserInfoServices.GetTeamData().Result;
+ if (list != null)
{
- bfd.FixtureBoxtype = fixtureStatus.FixtureBoxType;
- bfd.FixtureStatus = fixtureStatus.Status.ToString();
- bfd.FixtureProductioncapacity = fixtureStatus.Yield;
- bfd.FixtureCuringtimesettingvalue = fixtureStatus.PlanCuringTime.ToString();
- bfd.FixtureActualtime = fixtureStatus.RealCuringTime.ToString();
- bfd.UpdatedTime = DateTime.Now;
-
- await _boxFoamDataRealTimeServices.UpdateAsync(bfd);
+ //var obj = list.FirstOrDefault().EndTime.ToString("HH:mm");
+ var view = list.FirstOrDefault();
+ return view;
}
- catch { }
+ return null;
}
- #endregion
- #region 新增夹具型号
- ///
- /// 更新夹具型号
- ///
- public async void SaveClampData(string productLineCode, FixtureStatus fixtureStatus)
+ public CurrentTeamTimeView GetTeamHour(DateTime now)
{
- var obj = await _sysUserInfoServices.GetProductLineInfo(productLineCode);
+ var obj = _sysUserInfoServices.GetTeamData(now).Result;
if (obj != null)
{
- BoxFoamDataRealTime bfd = new BoxFoamDataRealTime();
-
- bfd.PlantCode = obj.PlantCode;
- bfd.ProductlineCode = productLineCode;
- bfd.ProcessCode = obj.ProcessCode;
- bfd.StationCode = obj.StationCode;
- bfd.SerialNumber = fixtureStatus.ObjId;
- bfd.FixtureBoxtype = fixtureStatus.FixtureBoxType;
- bfd.FixtureStatus = fixtureStatus.Status.ToString();
- bfd.FixtureProductioncapacity = fixtureStatus.Yield;
- bfd.FixtureCuringtimesettingvalue = fixtureStatus.PlanCuringTime.ToString();
- bfd.FixtureActualtime = fixtureStatus.RealCuringTime.ToString();
-
- bfd.CreatedTime = DateTime.Now;
- bfd.UpdatedTime = DateTime.Now;
-
- await _boxFoamDataRealTimeServices.AddAsync(bfd);
+ return obj;
}
-
+ return null;
}
- #endregion
-
- #region 原数据采集方法
- ///
- /// 将采集到的数据保存
- ///
- ///
- //public async void RealTimeFoamingTask(object? sender, ElapsedEventArgs e)
- //{
- // semaphore.WaitOne();
- // try
- // {
- // string productLineCode = Appsettings.app("StationInfo", "ProductLineCode");
- // if (Collection.listFixtureStatus == null|| Collection.listFixtureStatus.Count==0) return;
- // DateTime now = DateTime.Now;
- // CurrentTeamTime time = await _currentTeamTimeServices.FirstAsync(d => d.StartTime <= now && d.EndTime >= now);
- // if (time != null)
- // {
- // ExecHourData(productLineCode);
- // }
- // else
- // {
- // ShiftChange(productLineCode);
- // }
- // }
- // catch (Exception ex)
- // {
- // Console.WriteLine(ex.Message.ToString());
- // }
- // finally
- // {
- // semaphore.Release();
- // }
- //}
-
- //private async void ShiftChange(string productLineCode)
- //{
- // //切换班组计划
- // var list = await _oldBoxFoamDataServices.QueryAsync(d => d.ProductLineCode == productLineCode);
- // List recordList = new List();
- // var currentTeamTimeList = await _sysUserInfoServices.GetTeamData();
- // if (currentTeamTimeList.Count == 0) return;
- // //更新计划表操作
- // CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync();
- // currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName;
- // currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime);
- // currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime);
- // await _currentTeamTimeServices.UpdateAsync(currentTeamTime);
- // //可以使用Mapping 映射
- // list.ForEach(d =>
- // {
- // BoxFoamDataRecord record = new BoxFoamDataRecord();
- // record.OrderCode = d.OrderCode;
- // record.ProductLineCode = d.ProductLineCode;
- // record.Fixturestatus = d.Production;
- // record.CuringTimeSettingValue = d.CuringTimeSettingValue;
- // record.ActualValue = d.ActualValue;
- // record.AnHour = d.AnHour;
- // record.TwoHour = d.TwoHour;
- // record.ThreeHour = d.ThreeHour;
- // record.FourHour = d.FourHour;
- // record.FiveHour = d.FiveHour;
- // record.SixHour = d.SixHour;
- // record.SevenHour = d.SevenHour;
- // record.EightHour = d.EightHour;
- // record.NineHour = d.NineHour;
- // record.TenHour = d.TenHour;
- // record.ElevenHour = d.ElevenHour;
- // record.TwelveHour = d.TwelveHour;
- // record.BoxFixturesideplate = d.BoxFixturesideplate;
- // record.BoxClosebetatemperature = d.BoxClosebetatemperature;
- // record.BoxBeat = d.BoxBeat;
- // record.CreateTime = DateTime.Now;
- // });
- // int result = await _boxFoamDataRecordServices.AddAsync(recordList);
- // if (result > 0)
- // {
- // var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1"));
- // if (obj2 == null) { return; }
- // obj2.plc.WriteInt16("M216", "1");//换班 数据清空
- // //清空 当班计划
- // await _oldBoxFoamDataServices.DeletesAsync(list);
- // }
- //}
- //Semaphore semaphore = new Semaphore(1, 1);
-
- //private async void ExecHourData(string productLineCode)
- //{
- // try
- // {
- // List bList = new List();
-
-
- // var collectionList = collection.listFixtureStatus;
- // if (collectionList.Count == 0) return;
- // bList.AddRange(collectionList);
- // List bfds = await _oldBoxFoamDataServices.QueryAsync();
- // List spaceList = await _oldBoxFoamTypeServices.QueryAsync();
- // List planList = await _boxFoamPlanServices.QueryAsync();
- // for (int j = 0; j < bList.Count; j++)
- // {
- // try
- // {
-
- // OldBoxFoamType space = spaceList.FirstOrDefault(d => d.Boxtype == bList[j].FixtureBoxType);
- // //根据夹具找货道，根据货道找物料
- // if (spaceList != null)
- // {
- // BoxFoamPlan plan = planList.FirstOrDefault(d => d.MaterialCode == space.MaterialCode && d.PlanAmount > d.CompleteAmount);
- // if (plan != null)
- // {
- // int complateAmount = 0;
- // //更新小时数据
- // BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
- // if (bfd != null)
- // {
- // //更新计划数量
- // complateAmount = bList[j].Yield - bfd.Production;
- // UpdateBoxData(bList[j], bfd);
- // }
- // else
- // {
- // SaveBoxData(productLineCode, bList[j]);
- // }
- // plan.CompleteAmount = plan.CompleteAmount + complateAmount;
- // await _boxFoamPlanServices.UpdateAsync(plan);
- // }
- // else
- // {
- // //更新小时数据
- // BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
- // if (bfd != null)
- // {
- // UpdateBoxData(bList[j], bfd);
- // }
- // else
- // {
- // SaveBoxData(productLineCode, bList[j]);
- // }
- // }
- // }
- // else
- // {
- // //更新小时数据
- // BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
- // if (bfd != null)
- // {
- // UpdateBoxData(bList[j], bfd);
- // }
- // else
- // {
- // SaveBoxData(productLineCode, bList[j]);
- // }
- // }
- // }
- // catch { }
-
- // }
-
- // OldBoxFoamOnLoad(bList);
- // }
- // catch (Exception ex)
- // {
- // Console.WriteLine(ex.Message);
- // }
- //}
-
- //private async void UpdateBoxData(FixtureStatus item, BoxFoamData bfd)
- //{
- // int hour = GetTeamHour(DateTime.Now).Seq;
- // switch (hour)
- // {
- // case 1:
- // bfd.AnHour = item.Yield - bfd.Production;
- // break;
- // case 2:
- // bfd.TwoHour = item.Yield - bfd.Production;
- // break;
- // case 3:
- // bfd.ThreeHour = item.Yield - bfd.Production;
- // break;
- // case 4:
- // bfd.FourHour = item.Yield - bfd.Production;
- // break;
- // case 5:
- // bfd.FiveHour = item.Yield - bfd.Production;
- // break;
- // case 6:
- // bfd.SixHour = item.Yield - bfd.Production;
- // break;
- // case 7:
- // bfd.SevenHour = item.Yield - bfd.Production;
- // break;
- // case 8:
- // bfd.EightHour = item.Yield - bfd.Production;
- // break;
- // case 9:
- // bfd.NineHour = item.Yield - bfd.Production;
- // break;
- // case 10:
- // bfd.TenHour = item.Yield - bfd.Production;
- // break;
- // case 11:
- // bfd.ElevenHour = item.Yield - bfd.Production;
- // break;
- // case 12:
- // bfd.TwelveHour = item.Yield - bfd.Production;
- // break;
- // default:
- // break;
- // }
-
- // bfd.Production = item.Yield;
-
- // await _oldBoxFoamDataServices.UpdateAsync(bfd);
- //}
-
- //private async void SaveBoxData(string productLineCode, FixtureStatus item)
- //{
- // BoxFoamData bfdata = new BoxFoamData();
- // bfdata.MainId = item.ObjId;
- // bfdata.ProductLineCode = productLineCode;
- // bfdata.Fixtureboxtype = item.FixtureBoxType;
- // bfdata.Fixturestatus = item.Status;
- // bfdata.Production = item.Yield;
- // bfdata.CuringTimeSettingValue = item.PlanCuringTime.ToString();
- // bfdata.ActualValue = item.RealCuringTime.ToString();
- // int hour = GetTeamHour(DateTime.Now).Seq;
- // switch (hour)
- // {
- // case 1:
- // bfdata.AnHour = item.Yield = bfdata.Production;
- // break;
- // case 2:
- // bfdata.TwoHour = item.Yield = bfdata.Production;
- // break;
- // case 3:
- // bfdata.ThreeHour = item.Yield = bfdata.Production;
- // break;
- // case 4:
- // bfdata.FourHour = item.Yield = bfdata.Production;
- // break;
- // case 5:
- // bfdata.FiveHour = item.Yield = bfdata.Production;
- // break;
- // case 6:
- // bfdata.SixHour = item.Yield = bfdata.Production;
- // break;
- // case 7:
- // bfdata.SevenHour = item.Yield = bfdata.Production;
- // break;
- // case 8:
- // bfdata.EightHour = item.Yield = bfdata.Production;
- // break;
- // case 9:
- // bfdata.NineHour = item.Yield = bfdata.Production;
- // break;
- // case 10:
- // bfdata.TenHour = item.Yield = bfdata.Production;
- // break;
- // case 11:
- // bfdata.ElevenHour = item.Yield = bfdata.Production;
- // break;
- // case 12:
- // bfdata.TwelveHour = item.Yield = bfdata.Production;
- // break;
- // default:
- // break;
- // }
- // bfdata.MainId = item.ObjId;
- // await _oldBoxFoamDataServices.AddAsync(bfdata);
- //}
-
- //public CurrentTeamTimeView GetTeamHour()
- //{
- // DateTime now = DateTime.Now;
- // var list = _sysUserInfoServices.GetTeamData().Result;
- // if (list != null)
- // {
- // //var obj = list.FirstOrDefault().EndTime.ToString("HH:mm");
- // var view = list.FirstOrDefault();
- // return view;
- // }
- // return null;
- //}
-
- //public CurrentTeamTimeView GetTeamHour(DateTime now)
- //{
- // var obj = _sysUserInfoServices.GetTeamData(now).Result;
- // if (obj != null)
- // {
- // return obj;
- // }
- // return null;
- //}
#endregion
diff --git a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
index c7b440b0..7dd2e166 100644
--- a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
@@ -58,7 +58,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
Task.WaitAll(LoadData());
AddSelectData();//添加下拉菜单
RefreshHourAmount();//小时产量
- //RefreshMaterialStats();//型号产量
+ RefreshMaterialStats();//型号产量
SheetMetalPlanTaskHandle.RefreshCurrentPlanInfoEvent += RefreshCurrentPlanInfo;
}
@@ -704,23 +704,11 @@ namespace Aucma.Core.SheetMetal.ViewModels
//获取物料型号统计
string stationCode = Appsettings.app("StationInfo", "StationCode");
- List materialStats = _taskExecutionPlanInfoServices.GetStationMaterialStats(stationCode).Result;
- var baseBomInfoList = _baseBomInfoServices.QueryAsync().Result;
- var taskExecutionPlanInfo=_taskExecutionPlanInfoServices.QueryAsync(d=>d.ProductLineCode== stationCode).Result;
- var recordBackPanelList = _recordBackPanelComplateServices.QueryAsync().Result;
-
- //有问题，需要修改才可以
- var list = (from d in recordBackPanelList
- join t in taskExecutionPlanInfo on d.PlanCode equals t.TaskCode
- join b in baseBomInfoList on d.MaterialCode equals b.MaterialCode
- select new
- {
- MaterialCode=b.MaterialCode,
- ProductPlanCode=t.ProductPlanCode,
- CompleteAmount= t.CompleteAmount
- }).ToList();
-
- if (list != null)
+ List materialStats = _taskExecutionPlanInfoServices.GetStationSheetMetalStats(stationCode);
+
+
+
+ if (materialStats != null)
{
ModelStatistics.Clear();
MaterialNameList = new List();
diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
index 57f88858..36288f46 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
+++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
@@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace {
/// GeneratedInternalTypeHelper
///
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.4.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
index 54fddce2..a4db58d9 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = HwControlLib
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache
index decde3af..a056af0d 100644
Binary files a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache differ
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
index eeabcb64..303b31a5 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
@@ -4,7 +4,7 @@
library
C#
.cs
-E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\
+D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\
HwControlLib
none
false
@@ -13,7 +13,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
1204305769
71208292394
-194-1617825143
+194-2067936865
Themes\Generic.xaml;
False
diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
index 7ff994f6..8d86e7ef 100644
--- a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
+++ b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
@@ -1,33 +1,28 @@
{
"format": 1,
"restore": {
- "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {}
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": {}
},
"projects": {
- "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"projectName": "HwControlLib",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0-windows"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0-windows7.0": {
@@ -63,7 +58,7 @@
"privateAssets": "none"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
index 7eb906eb..d4531802 100644
--- a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
+++ b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
@@ -5,13 +5,11 @@
NuGet
$(MSBuildThisFileDirectory)project.assets.json
$(UserProfile)\.nuget\packages\
- C:\Users\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder
+ C:\Users\admin\.nuget\packages\
PackageReference
- 6.5.0
+ 6.7.0
-
-
-
+
\ No newline at end of file
diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json
index 1558f2be..57c51ab1 100644
--- a/HwControlLib/obj/project.assets.json
+++ b/HwControlLib/obj/project.assets.json
@@ -8,34 +8,27 @@
"net6.0-windows7.0": []
},
"packageFolders": {
- "C:\\Users\\Lenovo\\.nuget\\packages\\": {},
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {},
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
+ "C:\\Users\\admin\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"projectName": "HwControlLib",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0-windows"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0-windows7.0": {
@@ -71,7 +64,7 @@
"privateAssets": "none"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache
index 248dc48c..7ca2e0be 100644
--- a/HwControlLib/obj/project.nuget.cache
+++ b/HwControlLib/obj/project.nuget.cache
@@ -1,8 +1,8 @@
{
"version": 2,
- "dgSpecHash": "ybnvfUshvvKIc46usGVB7kox/SCKkseLBijIGbMXdvJYCOdNE/0WN/DZO6u3XNrg5fccw9Qd0IkJ00WdmrPlEg==",
+ "dgSpecHash": "vdyWe2SVons+Y6get5R5Z1bsudk/C2JG+/yY8r3PrvTCQlFwmP/yYc/iedeQUqhixJt2UKO0GhNSvd1iLTRIlw==",
"success": true,
- "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"expectedPackageFiles": [],
"logs": []
}
\ No newline at end of file