01-api/Component/IStation.Epanet/dll/EpanetMethods.cs
@@ -7,6 +7,7 @@ /// <summary> /// IStation.Epanet 程序员工具包(EPANET2.2.DLL)中的函数声明。 /// 这些是构成 DLL 的外部函数。 /// 必须 x86 架构 才能使用这些函数。 后续修改x64 /// </summary> public class EpanetMethods { 01-api/Entry/IStation.Entry/IStation.Entry.csproj.user
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <NameOfLastUsedPublishProfile>D:\WorkCode\Schedule\Schedule.Ch.V1.0\01-api\Entry\IStation.Entry\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\WorkCode\Project\ChDt1\Schedule.Ch.V1.0\01-api\Entry\IStation.Entry\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <ActiveDebugProfile>IIS Express</ActiveDebugProfile> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> 01-api/Entry/IStation.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@ --> <Project> <PropertyGroup> <_PublishTargetUrl>D:\WorkCode\Schedule\Schedule.Ch.V1.0\01-api\Entry\IStation.Entry\bin\Release\net6.0\publish\</_PublishTargetUrl> <History>True|2025-02-11T04:56:06.0150407Z||;True|2025-02-11T12:53:25.2984928+08:00||;True|2025-02-11T12:53:07.8461804+08:00||;True|2025-02-11T12:25:40.4739526+08:00||;True|2025-02-11T12:15:43.0779684+08:00||;True|2025-02-11T11:24:38.9435901+08:00||;True|2025-02-11T10:07:09.9907346+08:00||;True|2025-02-11T10:06:24.2854311+08:00||;True|2024-12-05T13:41:38.8531031+08:00||;True|2024-11-09T09:37:13.3682027+08:00||;True|2024-11-06T17:38:55.4076801+08:00||;True|2024-11-06T17:09:19.3816798+08:00||;True|2024-11-05T13:14:01.6952365+08:00||;True|2024-10-29T17:47:24.1461492+08:00||;True|2024-10-29T17:44:54.7943890+08:00||;True|2024-10-29T14:23:21.2176559+08:00||;True|2024-10-28T13:23:34.4772009+08:00||;True|2024-10-28T09:52:02.6105686+08:00||;True|2024-10-21T13:45:41.4184337+08:00||;False|2024-10-21T13:45:28.6526687+08:00||;True|2024-10-21T13:44:32.5042437+08:00||;True|2024-10-21T13:43:41.9121028+08:00||;True|2024-10-21T12:21:54.3858141+08:00||;True|2024-10-21T12:21:49.0790357+08:00||;True|2024-10-21T12:21:38.3606377+08:00||;True|2024-10-21T10:41:49.7087919+08:00||;True|2024-10-21T10:22:56.7510287+08:00||;True|2024-10-21T10:20:14.9765083+08:00||;True|2024-09-04T12:23:06.8396065+08:00||;True|2024-09-04T12:21:53.1509115+08:00||;True|2024-09-04T12:03:26.9628398+08:00||;True|2024-09-04T11:57:24.6077432+08:00||;True|2024-09-04T10:44:08.5232129+08:00||;True|2024-09-04T10:31:08.0493769+08:00||;True|2024-08-27T10:39:49.3050134+08:00||;True|2024-08-15T10:51:00.0736675+08:00||;True|2024-08-07T10:34:56.6363692+08:00||;True|2024-08-07T10:23:23.5959249+08:00||;True|2024-08-07T10:18:55.3553323+08:00||;True|2024-08-05T10:03:03.1020499+08:00||;True|2024-08-05T10:00:42.1282571+08:00||;True|2024-08-01T17:23:11.3983389+08:00||;True|2024-08-01T17:22:31.0342192+08:00||;True|2024-08-01T17:20:38.4331763+08:00||;True|2024-07-25T13:35:25.1478492+08:00||;True|2024-07-16T17:39:33.3835168+08:00||;True|2024-07-16T17:14:00.9398568+08:00||;False|2024-07-16T17:13:27.9996953+08:00||;True|2024-07-16T13:09:16.9500768+08:00||;True|2024-07-15T12:48:47.2966278+08:00||;False|2024-07-15T12:48:32.1828646+08:00||;True|2024-07-12T16:40:50.3694799+08:00||;True|2024-07-12T10:40:34.0007726+08:00||;True|2024-07-12T10:36:32.4601011+08:00||;True|2024-07-12T10:33:14.3243625+08:00||;True|2024-07-11T14:10:11.4665289+08:00||;True|2024-07-11T14:08:13.0064903+08:00||;True|2024-07-11T14:06:32.4662645+08:00||;True|2024-07-09T09:51:25.7986637+08:00||;False|2024-07-09T09:50:56.5778877+08:00||;False|2024-07-09T09:50:23.0123211+08:00||;True|2024-06-26T16:20:21.3981649+08:00||;False|2024-06-26T16:19:59.2162840+08:00||;True|2024-06-26T15:20:17.9242271+08:00||;True|2024-06-19T15:01:43.3271769+08:00||;True|2024-06-18T09:51:50.4178295+08:00||;True|2024-06-18T09:41:19.5989782+08:00||;True|2024-06-18T09:41:10.7867036+08:00||;True|2024-06-18T09:38:57.0128861+08:00||;True|2024-06-17T15:22:17.6153518+08:00||;False|2024-06-17T15:22:01.3404718+08:00||;True|2024-06-13T11:15:55.4873247+08:00||;True|2024-06-13T11:14:52.9075916+08:00||;True|2024-06-13T10:09:13.5966875+08:00||;True|2024-06-13T09:58:26.1880685+08:00||;True|2024-06-13T09:49:29.6928004+08:00||;True|2024-06-13T09:46:16.2707476+08:00||;True|2024-05-30T14:57:39.3412922+08:00||;True|2024-05-30T11:59:44.7664433+08:00||;True|2024-05-30T11:53:59.9799057+08:00||;True|2024-05-30T11:21:35.4761141+08:00||;True|2024-05-30T11:16:55.6157765+08:00||;True|2024-05-30T11:07:45.8336241+08:00||;True|2024-05-30T10:59:58.8877118+08:00||;True|2024-05-30T10:36:09.0290592+08:00||;True|2024-05-30T10:35:17.5448779+08:00||;True|2024-05-27T17:06:29.6833574+08:00||;False|2024-05-27T17:06:07.6398727+08:00||;False|2024-05-27T17:05:20.1523960+08:00||;False|2024-05-27T17:05:04.1140399+08:00||;False|2024-05-27T17:04:44.5872009+08:00||;True|2024-05-11T15:21:00.4779174+08:00||;True|2024-04-23T10:14:25.7074885+08:00||;True|2024-04-22T16:37:12.5852855+08:00||;True|2024-04-22T16:34:52.0894541+08:00||;True|2024-04-19T10:53:01.1630050+08:00||;True|2024-04-19T10:52:02.7021209+08:00||;True|2024-03-30T11:56:28.7775554+08:00||;True|2024-03-13T14:48:09.8998210+08:00||;True|2024-03-13T14:47:27.2433264+08:00||;</History> <_PublishTargetUrl>D:\WorkCode\Project\ChDt1\Schedule.Ch.V1.0\01-api\Entry\IStation.Entry\bin\Release\net6.0\publish\</_PublishTargetUrl> <History>True|2025-03-06T04:22:24.3024074Z||;True|2025-02-19T13:26:43.5272277+08:00||;True|2025-02-19T13:25:05.8482250+08:00||;True|2025-02-11T12:56:06.0150407+08:00||;True|2025-02-11T12:53:25.2984928+08:00||;True|2025-02-11T12:53:07.8461804+08:00||;True|2025-02-11T12:25:40.4739526+08:00||;True|2025-02-11T12:15:43.0779684+08:00||;True|2025-02-11T11:24:38.9435901+08:00||;True|2025-02-11T10:07:09.9907346+08:00||;True|2025-02-11T10:06:24.2854311+08:00||;True|2024-12-05T13:41:38.8531031+08:00||;True|2024-11-09T09:37:13.3682027+08:00||;True|2024-11-06T17:38:55.4076801+08:00||;True|2024-11-06T17:09:19.3816798+08:00||;True|2024-11-05T13:14:01.6952365+08:00||;True|2024-10-29T17:47:24.1461492+08:00||;True|2024-10-29T17:44:54.7943890+08:00||;True|2024-10-29T14:23:21.2176559+08:00||;True|2024-10-28T13:23:34.4772009+08:00||;True|2024-10-28T09:52:02.6105686+08:00||;True|2024-10-21T13:45:41.4184337+08:00||;False|2024-10-21T13:45:28.6526687+08:00||;True|2024-10-21T13:44:32.5042437+08:00||;True|2024-10-21T13:43:41.9121028+08:00||;True|2024-10-21T12:21:54.3858141+08:00||;True|2024-10-21T12:21:49.0790357+08:00||;True|2024-10-21T12:21:38.3606377+08:00||;True|2024-10-21T10:41:49.7087919+08:00||;True|2024-10-21T10:22:56.7510287+08:00||;True|2024-10-21T10:20:14.9765083+08:00||;True|2024-09-04T12:23:06.8396065+08:00||;True|2024-09-04T12:21:53.1509115+08:00||;True|2024-09-04T12:03:26.9628398+08:00||;True|2024-09-04T11:57:24.6077432+08:00||;True|2024-09-04T10:44:08.5232129+08:00||;True|2024-09-04T10:31:08.0493769+08:00||;True|2024-08-27T10:39:49.3050134+08:00||;True|2024-08-15T10:51:00.0736675+08:00||;True|2024-08-07T10:34:56.6363692+08:00||;True|2024-08-07T10:23:23.5959249+08:00||;True|2024-08-07T10:18:55.3553323+08:00||;True|2024-08-05T10:03:03.1020499+08:00||;True|2024-08-05T10:00:42.1282571+08:00||;True|2024-08-01T17:23:11.3983389+08:00||;True|2024-08-01T17:22:31.0342192+08:00||;True|2024-08-01T17:20:38.4331763+08:00||;True|2024-07-25T13:35:25.1478492+08:00||;True|2024-07-16T17:39:33.3835168+08:00||;True|2024-07-16T17:14:00.9398568+08:00||;False|2024-07-16T17:13:27.9996953+08:00||;True|2024-07-16T13:09:16.9500768+08:00||;True|2024-07-15T12:48:47.2966278+08:00||;False|2024-07-15T12:48:32.1828646+08:00||;True|2024-07-12T16:40:50.3694799+08:00||;True|2024-07-12T10:40:34.0007726+08:00||;True|2024-07-12T10:36:32.4601011+08:00||;True|2024-07-12T10:33:14.3243625+08:00||;True|2024-07-11T14:10:11.4665289+08:00||;True|2024-07-11T14:08:13.0064903+08:00||;True|2024-07-11T14:06:32.4662645+08:00||;True|2024-07-09T09:51:25.7986637+08:00||;False|2024-07-09T09:50:56.5778877+08:00||;False|2024-07-09T09:50:23.0123211+08:00||;True|2024-06-26T16:20:21.3981649+08:00||;False|2024-06-26T16:19:59.2162840+08:00||;True|2024-06-26T15:20:17.9242271+08:00||;True|2024-06-19T15:01:43.3271769+08:00||;True|2024-06-18T09:51:50.4178295+08:00||;True|2024-06-18T09:41:19.5989782+08:00||;True|2024-06-18T09:41:10.7867036+08:00||;True|2024-06-18T09:38:57.0128861+08:00||;True|2024-06-17T15:22:17.6153518+08:00||;False|2024-06-17T15:22:01.3404718+08:00||;True|2024-06-13T11:15:55.4873247+08:00||;True|2024-06-13T11:14:52.9075916+08:00||;True|2024-06-13T10:09:13.5966875+08:00||;True|2024-06-13T09:58:26.1880685+08:00||;True|2024-06-13T09:49:29.6928004+08:00||;True|2024-06-13T09:46:16.2707476+08:00||;True|2024-05-30T14:57:39.3412922+08:00||;True|2024-05-30T11:59:44.7664433+08:00||;True|2024-05-30T11:53:59.9799057+08:00||;True|2024-05-30T11:21:35.4761141+08:00||;True|2024-05-30T11:16:55.6157765+08:00||;True|2024-05-30T11:07:45.8336241+08:00||;True|2024-05-30T10:59:58.8877118+08:00||;True|2024-05-30T10:36:09.0290592+08:00||;True|2024-05-30T10:35:17.5448779+08:00||;True|2024-05-27T17:06:29.6833574+08:00||;False|2024-05-27T17:06:07.6398727+08:00||;False|2024-05-27T17:05:20.1523960+08:00||;False|2024-05-27T17:05:04.1140399+08:00||;False|2024-05-27T17:04:44.5872009+08:00||;True|2024-05-11T15:21:00.4779174+08:00||;True|2024-04-23T10:14:25.7074885+08:00||;True|2024-04-22T16:37:12.5852855+08:00||;True|2024-04-22T16:34:52.0894541+08:00||;True|2024-04-19T10:53:01.1630050+08:00||;True|2024-04-19T10:52:02.7021209+08:00||;</History> <LastFailureDetails /> </PropertyGroup> </Project> 01-api/Entry/IStation.Entry/appsettings.json
@@ -2,7 +2,7 @@ "AppSettings": { "EnabledReferenceAssemblyScan": true, "SupportPackageNamePrefixs": [ "Yw.Application.Core" //"Yw.Application.Core" ] }, "Logging": { 01-api/IStation.Schedule.Ch.sln
@@ -46,58 +46,105 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {31D62A4A-F697-416E-A4F1-C5A42AA92010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {31D62A4A-F697-416E-A4F1-C5A42AA92010}.Debug|Any CPU.Build.0 = Debug|Any CPU {31D62A4A-F697-416E-A4F1-C5A42AA92010}.Debug|x86.ActiveCfg = Debug|Any CPU {31D62A4A-F697-416E-A4F1-C5A42AA92010}.Debug|x86.Build.0 = Debug|Any CPU {31D62A4A-F697-416E-A4F1-C5A42AA92010}.Release|Any CPU.ActiveCfg = Release|Any CPU {31D62A4A-F697-416E-A4F1-C5A42AA92010}.Release|Any CPU.Build.0 = Release|Any CPU {31D62A4A-F697-416E-A4F1-C5A42AA92010}.Release|x86.ActiveCfg = Release|Any CPU {31D62A4A-F697-416E-A4F1-C5A42AA92010}.Release|x86.Build.0 = Release|Any CPU {09AAD314-5A3E-4BEC-B012-60423D3B3E3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {09AAD314-5A3E-4BEC-B012-60423D3B3E3C}.Debug|Any CPU.Build.0 = Debug|Any CPU {09AAD314-5A3E-4BEC-B012-60423D3B3E3C}.Debug|x86.ActiveCfg = Debug|Any CPU {09AAD314-5A3E-4BEC-B012-60423D3B3E3C}.Debug|x86.Build.0 = Debug|Any CPU {09AAD314-5A3E-4BEC-B012-60423D3B3E3C}.Release|Any CPU.ActiveCfg = Release|Any CPU {09AAD314-5A3E-4BEC-B012-60423D3B3E3C}.Release|Any CPU.Build.0 = Release|Any CPU {09AAD314-5A3E-4BEC-B012-60423D3B3E3C}.Release|x86.ActiveCfg = Release|Any CPU {09AAD314-5A3E-4BEC-B012-60423D3B3E3C}.Release|x86.Build.0 = Release|Any CPU {AF3961EA-957B-40BB-82CF-A972DE0DACF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AF3961EA-957B-40BB-82CF-A972DE0DACF6}.Debug|Any CPU.Build.0 = Debug|Any CPU {AF3961EA-957B-40BB-82CF-A972DE0DACF6}.Debug|x86.ActiveCfg = Debug|Any CPU {AF3961EA-957B-40BB-82CF-A972DE0DACF6}.Debug|x86.Build.0 = Debug|Any CPU {AF3961EA-957B-40BB-82CF-A972DE0DACF6}.Release|Any CPU.ActiveCfg = Release|Any CPU {AF3961EA-957B-40BB-82CF-A972DE0DACF6}.Release|Any CPU.Build.0 = Release|Any CPU {AF3961EA-957B-40BB-82CF-A972DE0DACF6}.Release|x86.ActiveCfg = Release|Any CPU {AF3961EA-957B-40BB-82CF-A972DE0DACF6}.Release|x86.Build.0 = Release|Any CPU {659E03AD-FA65-4656-9DC6-82232953365B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {659E03AD-FA65-4656-9DC6-82232953365B}.Debug|Any CPU.Build.0 = Debug|Any CPU {659E03AD-FA65-4656-9DC6-82232953365B}.Debug|x86.ActiveCfg = Debug|Any CPU {659E03AD-FA65-4656-9DC6-82232953365B}.Debug|x86.Build.0 = Debug|Any CPU {659E03AD-FA65-4656-9DC6-82232953365B}.Release|Any CPU.ActiveCfg = Release|Any CPU {659E03AD-FA65-4656-9DC6-82232953365B}.Release|Any CPU.Build.0 = Release|Any CPU {659E03AD-FA65-4656-9DC6-82232953365B}.Release|x86.ActiveCfg = Release|Any CPU {659E03AD-FA65-4656-9DC6-82232953365B}.Release|x86.Build.0 = Release|Any CPU {F3908D17-D4A0-4B7B-9DB7-7FA1293FF9D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F3908D17-D4A0-4B7B-9DB7-7FA1293FF9D3}.Debug|Any CPU.Build.0 = Debug|Any CPU {F3908D17-D4A0-4B7B-9DB7-7FA1293FF9D3}.Debug|x86.ActiveCfg = Debug|Any CPU {F3908D17-D4A0-4B7B-9DB7-7FA1293FF9D3}.Debug|x86.Build.0 = Debug|Any CPU {F3908D17-D4A0-4B7B-9DB7-7FA1293FF9D3}.Release|Any CPU.ActiveCfg = Release|Any CPU {F3908D17-D4A0-4B7B-9DB7-7FA1293FF9D3}.Release|Any CPU.Build.0 = Release|Any CPU {F3908D17-D4A0-4B7B-9DB7-7FA1293FF9D3}.Release|x86.ActiveCfg = Release|Any CPU {F3908D17-D4A0-4B7B-9DB7-7FA1293FF9D3}.Release|x86.Build.0 = Release|Any CPU {19DEEB99-7E3B-4082-AE69-96AD0E5E7FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19DEEB99-7E3B-4082-AE69-96AD0E5E7FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU {19DEEB99-7E3B-4082-AE69-96AD0E5E7FD1}.Debug|x86.ActiveCfg = Debug|Any CPU {19DEEB99-7E3B-4082-AE69-96AD0E5E7FD1}.Debug|x86.Build.0 = Debug|Any CPU {19DEEB99-7E3B-4082-AE69-96AD0E5E7FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {19DEEB99-7E3B-4082-AE69-96AD0E5E7FD1}.Release|Any CPU.Build.0 = Release|Any CPU {19DEEB99-7E3B-4082-AE69-96AD0E5E7FD1}.Release|x86.ActiveCfg = Release|Any CPU {19DEEB99-7E3B-4082-AE69-96AD0E5E7FD1}.Release|x86.Build.0 = Release|Any CPU {3B07958F-B569-47B8-A3CF-FAC38E5FCC83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3B07958F-B569-47B8-A3CF-FAC38E5FCC83}.Debug|Any CPU.Build.0 = Debug|Any CPU {3B07958F-B569-47B8-A3CF-FAC38E5FCC83}.Debug|x86.ActiveCfg = Debug|Any CPU {3B07958F-B569-47B8-A3CF-FAC38E5FCC83}.Debug|x86.Build.0 = Debug|Any CPU {3B07958F-B569-47B8-A3CF-FAC38E5FCC83}.Release|Any CPU.ActiveCfg = Release|Any CPU {3B07958F-B569-47B8-A3CF-FAC38E5FCC83}.Release|Any CPU.Build.0 = Release|Any CPU {3B07958F-B569-47B8-A3CF-FAC38E5FCC83}.Release|x86.ActiveCfg = Release|Any CPU {3B07958F-B569-47B8-A3CF-FAC38E5FCC83}.Release|x86.Build.0 = Release|Any CPU {AAA54908-096A-4180-AF5B-7D0D56A4F52F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AAA54908-096A-4180-AF5B-7D0D56A4F52F}.Debug|Any CPU.Build.0 = Debug|Any CPU {AAA54908-096A-4180-AF5B-7D0D56A4F52F}.Debug|x86.ActiveCfg = Debug|Any CPU {AAA54908-096A-4180-AF5B-7D0D56A4F52F}.Debug|x86.Build.0 = Debug|Any CPU {AAA54908-096A-4180-AF5B-7D0D56A4F52F}.Release|Any CPU.ActiveCfg = Release|Any CPU {AAA54908-096A-4180-AF5B-7D0D56A4F52F}.Release|Any CPU.Build.0 = Release|Any CPU {AAA54908-096A-4180-AF5B-7D0D56A4F52F}.Release|x86.ActiveCfg = Release|Any CPU {AAA54908-096A-4180-AF5B-7D0D56A4F52F}.Release|x86.Build.0 = Release|Any CPU {3504B78F-0462-456B-9DF6-0470D6D07E94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3504B78F-0462-456B-9DF6-0470D6D07E94}.Debug|Any CPU.Build.0 = Debug|Any CPU {3504B78F-0462-456B-9DF6-0470D6D07E94}.Debug|x86.ActiveCfg = Debug|Any CPU {3504B78F-0462-456B-9DF6-0470D6D07E94}.Debug|x86.Build.0 = Debug|Any CPU {3504B78F-0462-456B-9DF6-0470D6D07E94}.Release|Any CPU.ActiveCfg = Release|Any CPU {3504B78F-0462-456B-9DF6-0470D6D07E94}.Release|Any CPU.Build.0 = Release|Any CPU {3504B78F-0462-456B-9DF6-0470D6D07E94}.Release|x86.ActiveCfg = Release|Any CPU {3504B78F-0462-456B-9DF6-0470D6D07E94}.Release|x86.Build.0 = Release|Any CPU {1A3BE697-9C98-465C-ABE8-60003490953E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1A3BE697-9C98-465C-ABE8-60003490953E}.Debug|Any CPU.Build.0 = Debug|Any CPU {1A3BE697-9C98-465C-ABE8-60003490953E}.Debug|x86.ActiveCfg = Debug|x86 {1A3BE697-9C98-465C-ABE8-60003490953E}.Debug|x86.Build.0 = Debug|x86 {1A3BE697-9C98-465C-ABE8-60003490953E}.Release|Any CPU.ActiveCfg = Release|Any CPU {1A3BE697-9C98-465C-ABE8-60003490953E}.Release|Any CPU.Build.0 = Release|Any CPU {1A3BE697-9C98-465C-ABE8-60003490953E}.Release|x86.ActiveCfg = Release|x86 {1A3BE697-9C98-465C-ABE8-60003490953E}.Release|x86.Build.0 = Release|x86 {1269FDA7-38ED-4640-99B4-871F1CF4E368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1269FDA7-38ED-4640-99B4-871F1CF4E368}.Debug|Any CPU.Build.0 = Debug|Any CPU {1269FDA7-38ED-4640-99B4-871F1CF4E368}.Debug|x86.ActiveCfg = Debug|Any CPU {1269FDA7-38ED-4640-99B4-871F1CF4E368}.Debug|x86.Build.0 = Debug|Any CPU {1269FDA7-38ED-4640-99B4-871F1CF4E368}.Release|Any CPU.ActiveCfg = Release|Any CPU {1269FDA7-38ED-4640-99B4-871F1CF4E368}.Release|Any CPU.Build.0 = Release|Any CPU {1269FDA7-38ED-4640-99B4-871F1CF4E368}.Release|x86.ActiveCfg = Release|Any CPU {1269FDA7-38ED-4640-99B4-871F1CF4E368}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {DE85C7A6-BCE1-46D1-B8CE-7F3F4B0F1E22} = {717DE2F8-71FB-4406-BEF7-CC5716721AEF} {31D62A4A-F697-416E-A4F1-C5A42AA92010} = {F4397911-D951-4187-8DC4-EED004E38B3F} {09AAD314-5A3E-4BEC-B012-60423D3B3E3C} = {FC81BD0A-513E-4164-8444-C5AD17D31DF8} {AF3961EA-957B-40BB-82CF-A972DE0DACF6} = {DE85C7A6-BCE1-46D1-B8CE-7F3F4B0F1E22} 01-api/Service/IStation.Service/00-core/01-helper/ConfigHelper.cs
@@ -106,8 +106,8 @@ { OnLogExecuting = (sql, p) => { var sqlString = UtilMethods.GetNativeSql(sql, p); Yw.LogHelper.Error(sqlString); //var sqlString = UtilMethods.GetNativeSql(sql, p); //Yw.LogHelper.Error(sqlString); } }, ConfigureExternalServices = new ConfigureExternalServices() 01-api/Service/IStation.Service/04-dal/03-sqlite/03-monitor/MonitorRecord.cs
@@ -310,8 +310,9 @@ { if (list == null || list.Count < 1) return false; using (var db = new SqlSugarClient(ConnectionConfig)) { { return db.Insertable(list).ExecuteCommand() > 0; //try 01-api/Service/IStation.Service/07-helper/02-schedule/ScheduleHelper.cs
@@ -16,7 +16,7 @@ this.Flag = flag; } public int Flag { get; set; } } } #endregion #region Private Variable @@ -30,7 +30,7 @@ private double _sel_opt_flow_excess = 1;//可选方案的流量余量 private readonly double _sel_opt_pump_pressure_excess = 0;//可选方案的单泵扬程默认抬升余量 private readonly double _sel_opt_flow_deviation_ratio = 0.05;//可选方案的流量偏差比 private double _sel_opt_flow_deviation_ratio = 0.05;//可选方案的流量偏差比 private readonly double _sel_opt_reasonable_flow_deviation_ratio = 0.005;//合理的方案的流量偏差比 private readonly Service.AnalysisParameter _service_analysis_parameter = new(); @@ -60,7 +60,6 @@ /// </summary> public void Initial(List<int> current_open_flag_list, Model.ScheduleConfig schedule_config, List<Model.AnalysisDeviation> analysis_deviation_list) { _current_open_flag_list = current_open_flag_list; _min_open_count = 1; _max_open_count = 0; @@ -94,7 +93,7 @@ #region OptAnaCombine /// <summary> /// 获取最优组合 /// </summary> @@ -510,7 +509,7 @@ return default; //先修正组合曲线和模型的偏差扬程 var combine_deviation_factor_dict = GetCombineDeviationFactorDict(target_flow, combine); var combine_deviation_factor_dict = GetCombineDeviationFactorDict(target_flow, combine); var conclusion_ex_list_list = new List<List<AnalysisConclusionViewModel>>(); var conclusion_ex_list_dict = new Dictionary<int, List<AnalysisConclusionViewModel>>(); double max_supply_flow = 0; @@ -566,14 +565,24 @@ } if (conclusion_ex_list_list.Count != combine.Count()) return default; return default; if (max_supply_flow < target_flow * _sel_opt_flow_excess) { if (GlobalHelper.IsStation1(combine)) { _sel_opt_flow_excess= 0.995; _sel_opt_flow_excess = 0.995; } else { //人为修正 if (combine.Count() < 3) { _sel_opt_flow_excess = 0.92; _sel_opt_flow_deviation_ratio = 0.08; } } var flow_excess = target_flow * _sel_opt_flow_excess; if (max_supply_flow < flow_excess) return default; @@ -698,7 +707,7 @@ ana_combine.TotalPower += opt_cl_ex.Power; var ana_fre_pump = new AnaFrePump(); ana_fre_pump.Flag = flag; ana_fre_pump.Flag = flag; ana_fre_pump.Flow = opt_cl_ex.Flow; ana_fre_pump.Head = opt_cl_ex.Head; ana_fre_pump.PressureDiff = opt_cl_ex.PressureDiff; @@ -943,7 +952,7 @@ Yw.LogHelper.Error($"[{Yw.Untity.IntListHelper.ToString(flags)}]组合不存在偏差系数!"); return deviation_factor_dict; } var a = flow; var flow_dev = flow; Model.AnalysisDeviation analysis_deviation = null; @@ -953,8 +962,8 @@ analysis_deviation = analysis_deviation_list.Where(x => x.MinFlow <= flow_dev && flow_dev <= x.MaxFlow).FirstOrDefault(); if (analysis_deviation != null) break; } } if (analysis_deviation == null) { Yw.LogHelper.Error($"[{Yw.Untity.IntListHelper.ToString(flags)}]组合不存在偏差系数!"); @@ -977,7 +986,7 @@ #endregion #region Expand /// <summary> /// 获取变频泵列表 根据工况计算 /// </summary> @@ -1048,7 +1057,7 @@ var fre_pump = new AnaFrePump(); fre_pump.Flag = flag; fre_pump.Flag = flag; fre_pump.Flow = flow; fre_pump.Head = head; fre_pump.Power = curveQP.GetFitPointY(flow); @@ -1114,7 +1123,7 @@ var CurveQH50 = pump.CurveQH; var CurveQP50 = pump.CurveQP; var curveQH = Curve.PumpCalculateHelper.CalculateSimilarQH(CurveQH50, pump.Nr, rpm); var curveQP = Curve.PumpCalculateHelper.CalculateSimilarQP(CurveQP50, pump.Nr, rpm); @@ -1148,7 +1157,7 @@ flag_curve_head_dic[flag] = curveQH.GetFitPointY(working_flow); var fre_pump = new AnaFrePump(); fre_pump.Flag = flag; fre_pump.Flag = flag; fre_pump.Flow = flow; fre_pump.Head = head; fre_pump.Power = curveQP.GetFitPointY(flow); @@ -1157,7 +1166,7 @@ fre_pump.Frequency = rpm / pump.Nr * 50; fre_pump.Speed = rpm; ana_fre_pump_list.Add(fre_pump); ana_fre_pump_list.Add(fre_pump); }
@@ -458,8 +458,7 @@ } #endregion log_title = "验证"; var model_id_build = new StringBuilder(31); var pattern_init = true; @@ -490,6 +489,7 @@ HydraulicLog.Info(verify_id, log_title, log_msg); continue; } err = EpanetMethods.ENsetpattern(pattern_index, pattern_factor_array, pattern_factor_array_count); if (err != ErrorCode.Ok) { @@ -498,6 +498,7 @@ HydraulicLog.Info(verify_id, log_title, log_msg); continue; } } if (!pattern_init) 01-api/_Expand/IStation.Test/IStation.Test.csproj
@@ -5,10 +5,12 @@ <TargetFramework>net6.0</TargetFramework> <ImplicitUsings>enable</ImplicitUsings> <Nullable>disable</Nullable> <Platforms>AnyCPU;x86</Platforms> </PropertyGroup> <ItemGroup> <Compile Remove="Program - 复制%282%29.cs" /> <Compile Remove="Program - 复制%283%29.cs" /> <Compile Remove="Program - 复制.cs" /> <Compile Remove="Program - 定时数据.cs" /> </ItemGroup> 01-api/_Expand/IStation.Test/Program.cs
@@ -2,6 +2,8 @@ using IStation; using IStation.Application; using IStation.Epanet.Network.Structures; using Microsoft.IdentityModel.Logging; using Yw; @@ -15,12 +17,11 @@ var log_title = string.Empty; Console.WriteLine("初始化基础信息文件"); var station_info = _service_station.Get(); var is_monitor_record_debug = true; var station_info = _service_station.Get(); var is_monitor_record_debug = true; Console.WriteLine("实时ZyScada请求"); var get_msg = GlobalHelper.GetMonitorRecordList(receipt_time, out List<IStation.Model.MonitorRecord> monitor_record_list, is_monitor_record_debug); Console.WriteLine(Yw.JsonHelper.Object2Json(monitor_record_list)); var station1 = station_info.Station1; @@ -56,8 +57,25 @@ { Console.WriteLine($"2输水:{Yw.Untity.IntListHelper.ToString(station2_priority_flag_list)}"); station2_schedule_config.PriorityOpenFlagList.AddRange(station2_priority_flag_list); } } var analysis_deviation_list = new IStation.Service.AnalysisDeviation().GetList(); log_title = "调度返回"; var helper = new IStation.Service.ScheduleHelper(); var target_flow1 = 21459.379000000004; var target_mpa_pressure1 = 0.2615; var target_flow2 = 31602.6; var target_mpa_pressure2 = 0.174; //helper.Initial(station1_open_flag_list, station1_schedule_config, analysis_deviation_list); //var optimal_combine1 = helper.GetOptAnaCombine(station1, station1_flag_inlet_water_level_dict, target_flow1, target_pressure1); var target_pressure1 = IStation.Curve.PumpCalculateHelper.Mpa2M(target_mpa_pressure1); var target_pressure2 = IStation.Curve.PumpCalculateHelper.Mpa2M(target_mpa_pressure2); helper.Initial(station2_open_flag_list, station2_schedule_config, analysis_deviation_list); var optimal_combine2 = helper.GetOptAnaCombine(station2, station2_flag_inlet_water_level_dict, target_flow2, target_pressure2); Console.ReadKey(); 01-api/_Expand/IStation.Win.Schedule/Program.cs
@@ -74,7 +74,7 @@ }
