IStation.Schedule.sln
@@ -7,7 +7,9 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Console", "Schedule\IStation.Console\IStation.Console.csproj", "{373E22E4-888B-404E-BE88-FF2F6D8E47E8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IStation.Client", "Schedule\IStation.Client\IStation.Client.csproj", "{A75FB44A-239B-499F-A1FF-8EDC48D48D50}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Client", "Schedule\IStation.Client\IStation.Client.csproj", "{A75FB44A-239B-499F-A1FF-8EDC48D48D50}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Service.Core", "WebApi\IStation.Service.Core\IStation.Service.Core.csproj", "{0C5F3A1F-4164-47CB-81CA-EAB5F2D8C0AD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -27,6 +29,10 @@ {A75FB44A-239B-499F-A1FF-8EDC48D48D50}.Debug|Any CPU.Build.0 = Debug|Any CPU {A75FB44A-239B-499F-A1FF-8EDC48D48D50}.Release|Any CPU.ActiveCfg = Release|Any CPU {A75FB44A-239B-499F-A1FF-8EDC48D48D50}.Release|Any CPU.Build.0 = Release|Any CPU {0C5F3A1F-4164-47CB-81CA-EAB5F2D8C0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0C5F3A1F-4164-47CB-81CA-EAB5F2D8C0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C5F3A1F-4164-47CB-81CA-EAB5F2D8C0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C5F3A1F-4164-47CB-81CA-EAB5F2D8C0AD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Schedule/IStation.Algorithm/Data/³ÂÐÐÒ»Êä.json
ÎļþÒÑɾ³ý Schedule/IStation.Algorithm/Data/³ÂÐжþÊä.json
ÎļþÒÑɾ³ý Schedule/IStation.Algorithm/IStation.Algorithm.csproj
@@ -8,43 +8,73 @@ </PropertyGroup> <ItemGroup> <Compile Remove="Dispatch\bakbak\**" /> <Compile Remove="Dispatch\bak\**" /> <Compile Remove="Dispatch\Output\**" /> <Compile Remove="Dispatch\v1_Model\**" /> <Compile Remove="Model\Curve\**" /> <Compile Remove="Model\Pump\**" /> <Compile Remove="Schedule\bakbak\**" /> <Compile Remove="Schedule\bak\**" /> <Compile Remove="Schedule\Output\**" /> <Compile Remove="Schedule\v1_Model\**" /> <Compile Remove="V1\**" /> <EmbeddedResource Remove="Dispatch\bakbak\**" /> <EmbeddedResource Remove="Dispatch\bak\**" /> <EmbeddedResource Remove="Dispatch\Output\**" /> <EmbeddedResource Remove="Dispatch\v1_Model\**" /> <EmbeddedResource Remove="Model\Curve\**" /> <EmbeddedResource Remove="Model\Pump\**" /> <EmbeddedResource Remove="Schedule\bakbak\**" /> <EmbeddedResource Remove="Schedule\bak\**" /> <EmbeddedResource Remove="Schedule\Output\**" /> <EmbeddedResource Remove="Schedule\v1_Model\**" /> <EmbeddedResource Remove="V1\**" /> <None Remove="Dispatch\bakbak\**" /> <None Remove="Dispatch\bak\**" /> <None Remove="Dispatch\Output\**" /> <None Remove="Dispatch\v1_Model\**" /> <None Remove="Model\Curve\**" /> <None Remove="Model\Pump\**" /> <None Remove="Schedule\bakbak\**" /> <None Remove="Schedule\bak\**" /> <None Remove="Schedule\Output\**" /> <None Remove="Schedule\v1_Model\**" /> <None Remove="V1\**" /> </ItemGroup> <ItemGroup> <Compile Remove="DAL\ScheduleCombineLog.cs" /> <Compile Remove="DAL\USplit.cs" /> <Compile Remove="Entity\ScheduleCombineLog.cs" /> <Compile Remove="Model\Schedule\ScheduleCombine - å¤å¶.cs" /> <Compile Remove="Schedule\ScheduleCalc - å¤å¶.cs" /> <Compile Remove="Schedule\ScheduleCalc1.cs" /> <Compile Remove="Schedule\SchedulingAnaHelper_v1.cs" /> <Compile Remove="Schedule\SchedulingAnaHelper_v3.cs" /> <Compile Remove="Schedule\SchedulingCombineAnaHelper - å¤å¶.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%282%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%283%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%284%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%285%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%286%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%287%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶.cs" /> <Compile Remove="DAL\DispatchCombineLog.cs" /> <Compile Remove="DAL\USplit.cs" /> <Compile Remove="Entity\DispatchCombineLog.cs" /> <Compile Remove="Model\Dispatch\DispatchCombine - å¤å¶.cs" /> <Compile Remove="Dispatch\DispatchCalc - å¤å¶.cs" /> <Compile Remove="Dispatch\DispatchCalc1.cs" /> <Compile Remove="Dispatch\DispatchAnaHelper_v1.cs" /> <Compile Remove="Dispatch\DispatchAnaHelper_v3.cs" /> <Compile Remove="Dispatch\DispatchCombineAnaHelper - å¤å¶.cs" /> <Compile Remove="Dispatch\DispatchHelper - å¤å¶%282%29.cs" /> <Compile Remove="Dispatch\DispatchHelper - å¤å¶%283%29.cs" /> <Compile Remove="Dispatch\DispatchHelper - å¤å¶%284%29.cs" /> <Compile Remove="Dispatch\DispatchHelper - å¤å¶%285%29.cs" /> <Compile Remove="Dispatch\DispatchHelper - å¤å¶%286%29.cs" /> <Compile Remove="Dispatch\DispatchHelper - å¤å¶%287%29.cs" /> <Compile Remove="Dispatch\DispatchHelper - å¤å¶.cs" /> <Compile Remove="Model\Schedule\ScheduleCombine - å¤å¶.cs" /> <Compile Remove="Schedule\DispatchAnaHelper_v3.cs" /> <Compile Remove="Schedule\DispatchHelper - å¤å¶%282%29.cs" /> <Compile Remove="Schedule\DispatchHelper - å¤å¶%283%29.cs" /> <Compile Remove="Schedule\DispatchHelper - å¤å¶%284%29.cs" /> <Compile Remove="Schedule\DispatchHelper - å¤å¶%285%29.cs" /> <Compile Remove="Schedule\DispatchHelper - å¤å¶%286%29.cs" /> <Compile Remove="Schedule\DispatchHelper - å¤å¶%287%29.cs" /> <Compile Remove="Schedule\DispatchHelper - å¤å¶.cs" /> <Compile Remove="Schedule\SchedulingAnaHelper_v3.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%282%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%283%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%284%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%285%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%286%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶%287%29.cs" /> <Compile Remove="Schedule\SchedulingHelper - å¤å¶.cs" /> </ItemGroup> <ItemGroup> <PackageReference Include="log4net" Version="2.0.17" /> <PackageReference Include="MathNet.Numerics" Version="5.0.0" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.153" /> @@ -53,12 +83,22 @@ </ItemGroup> <ItemGroup> <None Update="Data\éè¡ä¸è¾.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> <None Update="Data\éè¡äºè¾.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> <ProjectReference Include="..\..\WebApi\IStation.Service.Core\IStation.Service.Core.csproj" /> </ItemGroup> <ItemGroup> <None Update="Data\StationInfo.json"> <CopyToOutputDirectory>Never</CopyToOutputDirectory> </None> <None Update="Data\éè¡ä¸è¾.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> <None Update="Data\éè¡äºè¾.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> <None Update="Data_Src\StationInfo.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> </ItemGroup> </Project> Schedule/IStation.Algorithm/Schedule/SchedulingAnaHelper.cs
@@ -8,9 +8,9 @@ public class AnaPumpItem { public AnaPumpItem() { } public AnaPumpItem(Pump rhs) public AnaPumpItem(PumpInfo rhs) { this.ID = rhs.ID; this.ID = rhs.Flag; this.Name = rhs.Name; this.Code = rhs.Code; this.IsBp = rhs.IsBp; @@ -26,7 +26,7 @@ this.AllowCalc = true; } } public AnaPumpItem(Pump rhs, double freDef, double freMin, double freMax, double freSpace) : this(rhs) public AnaPumpItem(PumpInfo rhs, double freDef, double freMin, double freMax, double freSpace) : this(rhs) { this.CalcFrequencyItems(freDef, freMin, freMax, freSpace); } @@ -124,7 +124,7 @@ /// </summary> /// <param name="pumps">æ³µå表</param> /// <returns></returns> public void AnaCombine(List<Pump> pumps) public void AnaCombine(List<PumpInfo> pumps) { InsertAnaLog("å¼å§åææ³µç»å"); Schedule/IStation.Algorithm/Schedule/SchedulingHelper.cs
@@ -173,7 +173,7 @@ DAL.ScheduleAnaLog _dalAnaLog = new DAL.ScheduleAnaLog(); public OptimalCombine AnaOptimalCombine(List<Pump> pumps, List<int> flags_part1, List<int> flags_part2, double target_flow, double target_head, List<int> current_open_pump_flags, List<int> must_open_pump_flags, List<int> must_not_open_pump_flags) public OptimalCombine AnaOptimalCombine(List<Model.PumpInfo> pumps, List<int> flags_part1, List<int> flags_part2, double target_flow, double target_head, List<int> current_open_pump_flags, List<int> must_open_pump_flags, List<int> must_not_open_pump_flags) { if (pumps == null || !pumps.Any()) { @@ -206,8 +206,8 @@ #endregion var pump_nr_dict = pumps.ToDictionary(x => x.ID, x => x.Nr); var pump_flag_list = pumps.Select(x => x.ID).ToList(); var pump_nr_dict = pumps.ToDictionary(x => x.Flag, x => x.Nr); var pump_flag_list = pumps.Select(x => x.Flag).ToList(); var optimal_combine_list = new List<OptimalCombine>(); for (int pumpCount = 1; pumpCount <= pumps.Count; pumpCount++) { @@ -499,7 +499,7 @@ } public string Ana(List<Pump> pumps, List<int> flags_part1, List<int> flags_part2, double target_flow, double target_head, List<int> current_open_pump_flags, List<int> must_open_pump_flags, List<int> must_not_open_pump_flags) public string Ana(List<PumpInfo> pumps, List<int> flags_part1, List<int> flags_part2, double target_flow, double target_head, List<int> current_open_pump_flags, List<int> must_open_pump_flags, List<int> must_not_open_pump_flags) { if (pumps == null || !pumps.Any()) { @@ -532,7 +532,7 @@ #endregion var pump_flag_list = pumps.Select(x => x.ID).ToList(); var pump_flag_list = pumps.Select(x => x.Flag).ToList(); var optimal_combine_list = new List<OptimalCombine>(); for (int pumpCount = 1; pumpCount <= pumps.Count; pumpCount++) { Schedule/IStation.Client/Form1.cs
@@ -1,3 +1,5 @@ using System.IO; namespace IStation.Client { public partial class Form1 : Form @@ -176,7 +178,7 @@ flags_part2 = new List<int>() { 21, 27 }; } var helper = new Algorithm.SchedulingHelper(); var helper = new Algorithm.DispatchHelper(); var info = helper.Ana(pumps, flags_part1, flags_part2, targetFlow, targetHead, current_open_pump_list, must_open_pump_list, must_not_open_pump_list); this.txtInfo.Text = info; Schedule/IStation.Client/IStation.Client.csproj
@@ -3,13 +3,36 @@ <PropertyGroup> <OutputType>WinExe</OutputType> <TargetFramework>net6.0-windows</TargetFramework> <Nullable>enable</Nullable> <Nullable>disable</Nullable> <UseWindowsForms>true</UseWindowsForms> <ImplicitUsings>enable</ImplicitUsings> </PropertyGroup> <ItemGroup> <Compile Remove="Form1.cs" /> <Compile Remove="Form1.Designer.cs" /> <Compile Remove="ValidForm.cs" /> <Compile Remove="ValidForm.Designer.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Remove="Form1.resx" /> <EmbeddedResource Remove="ValidForm.resx" /> </ItemGroup> <ItemGroup> <PackageReference Include="DevExpress.Win.Design" Version="22.2.4" /> <PackageReference Include="NPOI" Version="2.7.0" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\IStation.Algorithm\IStation.Algorithm.csproj" /> </ItemGroup> <ItemGroup> <Compile Update="Form2.cs"> <SubType>Form</SubType> </Compile> </ItemGroup> </Project> Schedule/IStation.Client/IStation.Client.csproj.user
@@ -1,11 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_LastSelectedProfileId>D:\WorkCode\IStation\Code\Service.Ch.V1.0\Schedule\IStation.Client\Properties\PublishProfiles\FolderProfile1.pubxml</_LastSelectedProfileId> <_LastSelectedProfileId>D:\WorkCode\IStation\Service.Ch.V1.0\Schedule\IStation.Client\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId> </PropertyGroup> <ItemGroup> <Compile Update="Form1.cs"> <SubType>Form</SubType> </Compile> </ItemGroup> </Project> Schedule/IStation.Client/Program.cs
@@ -1,3 +1,6 @@ using SqlSugar; //using SqlSugar.ClickHouse; namespace IStation.Client { internal static class Program @@ -5,11 +8,15 @@ [STAThread] static void Main() { ////ç¨åºå¯å¨æ¶å å ¥ //InstanceFactory.CustomAssemblies = // new System.Reflection.Assembly[] { typeof(ClickHouseProvider).Assembly }; DAL.DbInitial.InitTables(); SnowflakeIdHelper.SetIdGenerator(1); ApplicationConfiguration.Initialize(); Application.Run(new Form1()); Application.Run(new Form2()); } } } Schedule/IStation.Client/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@ --> <Project> <PropertyGroup> <History>True|2024-04-29T06:57:34.4301536Z;True|2024-04-29T14:54:01.3130833+08:00;True|2024-04-29T14:10:13.9117424+08:00;True|2024-04-29T14:09:09.4137798+08:00;True|2024-04-29T13:16:32.2282303+08:00;True|2024-04-29T11:47:57.4367230+08:00;True|2024-04-29T11:47:09.8955815+08:00;True|2024-04-29T11:33:32.3137788+08:00;True|2024-04-29T11:25:34.8701443+08:00;True|2024-04-29T11:14:09.2155623+08:00;True|2024-04-29T11:01:11.2894390+08:00;False|2024-04-29T11:00:53.6332448+08:00;True|2024-04-28T16:24:05.5076307+08:00;True|2024-04-28T15:58:58.9653989+08:00;True|2024-04-28T15:55:49.7244417+08:00;True|2024-04-28T15:46:51.6035165+08:00;True|2024-04-28T15:43:39.7397122+08:00;True|2024-04-28T15:39:49.3419176+08:00;True|2024-04-28T15:37:55.9061189+08:00;True|2024-04-28T15:33:57.3641855+08:00;True|2024-04-28T15:33:43.1615318+08:00;False|2024-04-28T15:32:40.1742895+08:00;True|2024-04-28T14:14:36.5581181+08:00;True|2024-04-28T14:14:32.2693146+08:00;True|2024-04-28T14:11:44.7928792+08:00;True|2024-04-28T14:10:32.8620163+08:00;True|2024-04-28T14:06:16.9371444+08:00;True|2024-04-28T14:03:42.6442782+08:00;True|2024-04-28T14:00:05.1848553+08:00;True|2024-04-28T11:20:48.2122533+08:00;True|2024-04-28T11:16:18.0658604+08:00;True|2024-04-28T11:09:37.8710424+08:00;</History> <History>True|2024-05-15T07:33:33.3388117Z;True|2024-05-15T15:33:02.6468930+08:00;False|2024-05-15T15:32:36.5236856+08:00;True|2024-05-09T13:20:12.6102745+08:00;True|2024-05-09T13:12:16.4561551+08:00;True|2024-05-09T11:39:50.3029619+08:00;True|2024-04-29T14:57:34.4301536+08:00;True|2024-04-29T14:54:01.3130833+08:00;True|2024-04-29T14:10:13.9117424+08:00;True|2024-04-29T14:09:09.4137798+08:00;True|2024-04-29T13:16:32.2282303+08:00;True|2024-04-29T11:47:57.4367230+08:00;True|2024-04-29T11:47:09.8955815+08:00;True|2024-04-29T11:33:32.3137788+08:00;True|2024-04-29T11:25:34.8701443+08:00;True|2024-04-29T11:14:09.2155623+08:00;True|2024-04-29T11:01:11.2894390+08:00;False|2024-04-29T11:00:53.6332448+08:00;True|2024-04-28T16:24:05.5076307+08:00;True|2024-04-28T15:58:58.9653989+08:00;True|2024-04-28T15:55:49.7244417+08:00;True|2024-04-28T15:46:51.6035165+08:00;True|2024-04-28T15:43:39.7397122+08:00;True|2024-04-28T15:39:49.3419176+08:00;True|2024-04-28T15:37:55.9061189+08:00;True|2024-04-28T15:33:57.3641855+08:00;True|2024-04-28T15:33:43.1615318+08:00;False|2024-04-28T15:32:40.1742895+08:00;True|2024-04-28T14:14:36.5581181+08:00;True|2024-04-28T14:14:32.2693146+08:00;True|2024-04-28T14:11:44.7928792+08:00;True|2024-04-28T14:10:32.8620163+08:00;True|2024-04-28T14:06:16.9371444+08:00;True|2024-04-28T14:03:42.6442782+08:00;True|2024-04-28T14:00:05.1848553+08:00;True|2024-04-28T11:20:48.2122533+08:00;True|2024-04-28T11:16:18.0658604+08:00;True|2024-04-28T11:09:37.8710424+08:00;</History> <LastFailureDetails /> </PropertyGroup> </Project> Schedule/IStation.Console/Program.cs
@@ -18,7 +18,7 @@ var ch2Pumps = JsonHelper.Json2Object<List<Pump>>(ch2_json); var helper = new SchedulingAnaHelper(); var helper = new DispatchAnaHelper(); helper.AnaCombine(ch1Pumps); Console.WriteLine("åæå®æ¯"); WebApi/IStation.Application.Core/0-core/3-helper/Log.cs
@@ -7,38 +7,49 @@ { /// <summary> /// åå ¥ä¿¡æ¯æ¥å¿ /// </summary> /// </summary> /// <param name="requestId"></param> /// <param name="title"></param> /// <param name="info"></param> public static void Info(string info) public static void Info(long requestId, string title, string info) { Yw.LogHelper.Info(GetLogInfo(info)); Yw.LogHelper.Info(GetLogInfo(requestId, title, info)); } /// <summary> /// åå ¥è°è¯æ¥å¿ /// </summary> /// </summary> /// <param name="requestId"></param> /// <param name="title"></param> /// <param name="info"></param> public static void Debug(string info) public static void Debug(long requestId, string title, string info) { Yw.LogHelper.Debug(GetLogInfo(info)); Yw.LogHelper.Debug(GetLogInfo(requestId, title, info)); } /// <summary> /// åå ¥é误æ¥å¿ /// </summary> /// <param name="requestId"></param> /// <param name="title"></param> /// <param name="info"></param> /// <param name="ex"></param> public static void Error(long requestId, string title, string info, Exception ex = null) { Yw.LogHelper.Error(GetLogInfo(requestId, title, info), ex); } /// <summary> /// åå ¥é误æ¥å¿ /// </summary> /// /// </summary> /// <param name="requestId"></param> /// <param name="title"></param> /// <param name="info"></param> /// <param name="ex"></param> public static void Error(string info, Exception ex = null) /// <returns></returns> private static string GetLogInfo(long requestId, string title, string info) { Yw.LogHelper.Error(GetLogInfo(info), ex); } private static string GetLogInfo(string info) { return $"{info}"; return $"{requestId}-{title} >> {info}"; } } } WebApi/IStation.Application.Core/1-dispatch/1-solution/DispatchSolution_Controller.cs
ÎļþÒÑɾ³ý WebApi/IStation.Application.Core/1-dispatch/1-solution/dto/input/ScadaDispatchInput.cs
ÎļþÒÑɾ³ý WebApi/IStation.Application.Core/1-dispatch/1-solution/dto/input/StationDispatchInput.cs
ÎļþÒÑɾ³ý WebApi/IStation.Application.Core/1-dispatch/1-solution/dto/output/ScadaDispatchOutput.cs
ÎļþÒÑɾ³ý WebApi/IStation.Application.Core/1-dispatch/1-solution/dto/output/StationDispatchOutput.cs
ÎļþÒÑɾ³ý WebApi/IStation.Application.Core/1-dispatch/1-solution/helper/ExternalPipeScada.cs
ÎļþÒÑɾ³ý WebApi/IStation.Application.Core/1-dispatch/1-solution/helper/TempOutHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Application.Core/IStation.Application.Core.csproj
@@ -18,11 +18,10 @@ <ItemGroup> <Compile Remove="0-core\3-helper\Log - å¤å¶.cs" /> <Compile Remove="1-dispatch\1-solution\DispatchSolution_Controller - å¤å¶.cs" /> <Compile Remove="1-dispatch\1-solution\dto\input\FactoryDispatchInput.cs" /> <Compile Remove="1-dispatch\1-solution\dto\output\DispatchSolutionOutput.cs" /> <Compile Remove="1-dispatch\1-solution\dto\output\PumpDispatchOutput.cs" /> <Compile Remove="1-dispatch\1-solution\helper\TempOutHelper.cs" /> <Compile Remove="1-open\2-dispatch_solution\DispatchSolution_Controller - å¤å¶.cs" /> <Compile Remove="1-open\2-dispatch_solution\dto\input\FactoryDispatchInput.cs" /> <Compile Remove="1-open\2-dispatch_solution\dto\output\DispatchSolutionOutput.cs" /> <Compile Remove="1-open\2-dispatch_solution\dto\output\PumpDispatchOutput.cs" /> </ItemGroup> <ItemGroup> @@ -58,7 +57,7 @@ </ItemGroup> <ItemGroup> <PackageReference Include="Yw.Application.Core" Version="3.0.5" /> <PackageReference Include="Yw.Application.Core" Version="3.0.7" /> <PackageReference Include="Yw.Quartz.Core" Version="3.0.0" /> </ItemGroup> @@ -68,4 +67,8 @@ <ProjectReference Include="..\IStation.Service.Core\IStation.Service.Core.csproj" /> </ItemGroup> <ItemGroup> <Folder Include="0-helper\" /> </ItemGroup> </Project> WebApi/IStation.Entry.Core/IStation.Entry.Core.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\IStation\Code\Service.Ch.V1.0\WebApi\IStation.Entry.Core\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\WorkCode\IStation\Service.Ch.V1.0\WebApi\IStation.Entry.Core\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <ActiveDebugProfile>IIS Express</ActiveDebugProfile> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> WebApi/IStation.Entry.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@ --> <Project> <PropertyGroup> <_PublishTargetUrl>D:\WorkCode\IStation\Code\Service.Ch.V1.0\WebApi\IStation.Entry.Core\bin\Release\net6.0\publish\</_PublishTargetUrl> <History>True|2024-05-07T05:47:16.3080124Z;True|2024-05-07T13:44:09.0634975+08:00;True|2024-05-07T13:43:07.6375223+08:00;True|2024-05-07T13:42:37.6279153+08:00;False|2024-05-07T13:42:22.8710353+08:00;True|2024-05-07T13:39:32.9872224+08:00;True|2024-05-07T13:39:19.1500141+08:00;True|2024-05-07T13:38:20.6940580+08:00;True|2024-05-07T13:19:21.5169757+08:00;True|2024-05-07T10:48:01.6650551+08:00;True|2024-05-07T10:33:33.1990927+08:00;True|2024-05-07T10:20:40.5715968+08:00;False|2024-05-07T10:20:22.6825823+08:00;False|2024-05-07T10:19:44.6799744+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History> <_PublishTargetUrl>D:\WorkCode\IStation\Service.Ch.V1.0\WebApi\IStation.Entry.Core\bin\Release\net6.0\publish\</_PublishTargetUrl> <History>True|2024-05-21T04:57:33.4878288Z;True|2024-05-21T12:54:10.6024559+08:00;True|2024-05-21T11:52:58.8829031+08:00;True|2024-05-20T15:33:20.6283574+08:00;True|2024-05-20T15:30:51.9319046+08:00;True|2024-05-20T15:19:26.9940286+08:00;True|2024-05-15T15:36:25.0128947+08:00;True|2024-05-14T16:41:33.4369848+08:00;True|2024-05-14T16:36:35.5235490+08:00;True|2024-05-14T15:47:27.1287271+08:00;True|2024-05-13T16:28:36.0231815+08:00;True|2024-05-13T10:02:02.7391320+08:00;True|2024-05-13T09:58:15.5185314+08:00;True|2024-05-07T13:47:16.3080124+08:00;True|2024-05-07T13:44:09.0634975+08:00;True|2024-05-07T13:43:07.6375223+08:00;True|2024-05-07T13:42:37.6279153+08:00;False|2024-05-07T13:42:22.8710353+08:00;True|2024-05-07T13:39:32.9872224+08:00;True|2024-05-07T13:39:19.1500141+08:00;True|2024-05-07T13:38:20.6940580+08:00;True|2024-05-07T13:19:21.5169757+08:00;True|2024-05-07T10:48:01.6650551+08:00;True|2024-05-07T10:33:33.1990927+08:00;True|2024-05-07T10:20:40.5715968+08:00;False|2024-05-07T10:20:22.6825823+08:00;False|2024-05-07T10:19:44.6799744+08:00;True|2023-06-26T11:38:29.6648988+08:00;True|2023-06-21T16:17:40.6226554+08:00;True|2023-06-21T13:30:18.8163322+08:00;True|2023-06-21T13:19:43.9290154+08:00;True|2023-06-21T11:35:28.3376504+08:00;</History> <LastFailureDetails /> </PropertyGroup> </Project> WebApi/IStation.Entry.Core/appsettings.json
@@ -1,7 +1,7 @@ { "AppSettings": { "EnabledReferenceAssemblyScan": true, // å¯ç¨æ¨¡ååç¨åºéæ«æ "SupportPackageNamePrefixs": [ "Yw.Application.Core" ] // é ç½®éè¿ NuGet æ¹å¼å®è£ çæ¨¡ååå ï¼å¦æä¸æ¯éè¿ NuGet æ¹å¼å¯ä¸é ç½® "EnabledReferenceAssemblyScan": true // ����ģ�黯����ɨ�� //"SupportPackageNamePrefixs": [ "Yw.Application.Core" ] // ����ͨ�� NuGet ��ʽ��װ��ģ�黯�����������ͨ�� NuGet ��ʽ�ɲ����� }, "Logging": { "LogLevel": { WebApi/IStation.Service.Core/0-core/MemoryCacheKey.cs
@@ -19,7 +19,7 @@ /// <summary> /// 模å /// </summary> public const string Module = "Monitor"; public const string Module = "Dispatch"; } } WebApi/IStation.Service.Core/1-entity/1-station/Station.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/1-entity/2-product/Product.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/1-entity/2-product/ProductGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/1-entity/3-pump_curve/PumpCurve.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/1-entity/3-pump_curve/PumpCurveMapping.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/1-entity/4-signal_type/SignalType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/1-entity/4-signal_type/SignalTypeGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/1-entity/5-monitor/MonitorPoint.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/1-entity/5-monitor/MonitorPointGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/1-entity/5-monitor/MonitorPointMapping.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/1-entity/5-monitor/Signal.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/1-station/Station.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/2-product/Product.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/2-product/ProductGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/2-product/Product_T.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/2-product/paras/1-ji_beng/EnginePump.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/2-product/paras/1-ji_beng/EnginePump_Enum.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/2-product/paras/2-dian_ji/Motor.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/2-product/paras/3-beng/Pump.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/3-pump_curve/PumpCurve.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/3-pump_curve/PumpCurveExMapping.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/3-pump_curve/PumpCurveMapping.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/3-pump_curve/PumpCurve_Model.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/3-pump_curve/enum/eReliabilityStatus.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/4-signal_type/SignalType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/4-signal_type/SignalTypeGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/4-signal_type/SignalType_Method.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/4-signal_type/SignalType_Model.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/MonitorPoint.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/MonitorPointGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/MonitorPointMapping.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/Signal.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/enum/eFormatType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/enum/eMeasureType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/enum/eProductStatus.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/enum/eSourceType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/enum/eTimeFrame.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/extend/MonitorPointExSignal.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/extend/MonitorPointExSignalWithMapping.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/extend/MonitorPointExSignalWithSignalType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/extend/SignalExSignalType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/partial/Signal_Method.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/2-model/5-monitor/partial/Signal_Model.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/3-settings/helper/Settings.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/3-settings/helper/SettingsFileHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/3-settings/paras/Paras.cs
@@ -6,14 +6,19 @@ public class Paras { /// <summary> /// File /// </summary> public Paras_File File { get; set; } /// <summary> /// Docking /// </summary> public Paras_Docking Docking { get; set; } /// <summary> /// File /// ConnectString /// </summary> public Paras_File File { get; set; } public Paras_DataBase DataBase { get; set; } /// <summary> /// MemoryCache WebApi/IStation.Service.Core/3-settings/paras/Paras_Docking.cs
@@ -6,8 +6,18 @@ public class Paras_Docking { /// <summary> /// Scadaæ°æ®è·åå°å /// 伿¯ Scadaæ°æ® è·åå°å /// </summary> public string ScadaWebSocketUrl { get; set; } public string ZyScadaHttpUrl { get; set; } /// <summary> /// 伿¯ è°åº¦è§å è·åå°å /// </summary> public string ZyDispatchRulesHttpUrl { get; set; } /// <summary> /// æ¯å¦ä½¿ç¨ /// </summary> public bool Enable { get; set; } } } WebApi/IStation.Service.Core/3-settings/paras/Paras_File.cs
@@ -28,45 +28,48 @@ public string DataFolder { get; set; } = "Data"; /// <summary> /// 工使件夹 /// æ³µç«ä¿¡æ¯æä»¶ /// </summary> public string WorkFolder { get; set; } = "WorkData"; public string StationInfoFile { get; set; } = "StationInfo.json"; /// <summary> /// çæµæ°æ®æä»¶å¤¹ /// Scadaä¿¡æ¯æä»¶ /// </summary> public string MonitorDataFolder { get; set; } = "MonitorData"; public string ScadaInfoFile { get; set; } = "ScadaInfo.json"; /// <summary> /// çæµææ°æ®æä»¶å¤¹ /// è°åº¦ä¿¡æ¯æä»¶ /// </summary> public string MonitorMonthDataFolder { get; set; } = "MonitorMonthData"; public string DispatchInfoFile { get; set; } = "DispatchInfo.json"; /// <summary> /// æ°´å©æ¨¡åæä»¶å¤¹ /// è·åæ°æ®æä»¶å¤¹ /// </summary> public string HydraulicModelFolder { get; set; } = "HydraulicModel"; /// <returns></returns> public string GetDataFolder() { var folder = Path.Combine(this.RootDirectory, this.DataFolder); if (!Directory.Exists(folder)) { Directory.CreateDirectory(folder); } return folder; } /// <summary> /// æ°´å©æ¨¡åæä»¶ /// è·åæ°æ®æä»¶å¤¹ä¸çæä»¶å ¨è·¯å¾ /// </summary> public string HydraulicModelFile { get; set; } = "chenhang2024.inp"; /// <returns></returns> public string GetFileFullPath(string file) { var folder = Path.Combine(this.RootDirectory, this.DataFolder); if (!Directory.Exists(folder)) { Directory.CreateDirectory(folder); } /// <summary> /// æä»¶æå±å /// </summary> public string FileExtension { get; set; } = ".txt"; /// <summary> /// ä¿¡å·è®°å½æä»¶æ©å±å /// </summary> public string SignalRecordFileExtension { get; set; } = ".csv"; /// <summary> /// æä»¶åé´éå符 /// </summary> public char FileNameSpacer { get; set; } = '-'; return folder + "\\" + file; } } } WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL_Sorter.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL_Sorter_Flags.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL_Sorter_Flags_TagName.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL_Sorter_Flags_TagName_UseStatus.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL_Sorter_UseStatus.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL_TreeSorter.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL_TreeSorter_Flags.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL_TreeSorter_Flags_TagName.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL_TreeSorter_Flags_TagName_UseStatus.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/base/BaseDAL_UseStatus.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/0-core/helpers/FileHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/1-station/Station.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/2-product/Product.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/2-product/ProductGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/3-pump_curve/PumpCurve.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/3-pump_curve/PumpCurveMapping.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/4-signal_type/SignalType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/4-signal_type/SignalTypeGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/5-monitor/MonitorPoint.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/5-monitor/MonitorPointGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/5-monitor/MonitorPointMapping.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/4-dal/5-monitor/Signal.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/5-cache/0-helper/RedisKeyHelper.cs
@@ -7,7 +7,7 @@ /// </summary> public static string CreateKey(string flag) { return $"{Settings.Settings.RedisCache.Prefix}:{flag}"; return $"{Settings.DispatchParasHelper.RedisCache.Prefix}:{flag}"; } } WebApi/IStation.Service.Core/6-service/0-core/Sorter_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/0-core/TraceSorter_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/0-core/TraceTreeSorter_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/0-core/TreeSorter_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/0-helper/CacheHelper.cs
@@ -1,6 +1,4 @@ using Yw; namespace IStation.Service namespace IStation.Service { /// <summary> /// ç¼åè¾ å©ç±» WebApi/IStation.Service.Core/6-service/1-station/Cache/StationCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/1-station/Station.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/1-station/Station_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/2-product/1-group/Cache/ProductGroupCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/2-product/1-group/ProductGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/2-product/1-group/ProductGroup_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/2-product/2-product/Cache/ProductCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/2-product/2-product/Product.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/2-product/2-product/Product_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/3-pump_curve/1-curve/Cache/PumpCurveCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/3-pump_curve/1-curve/PumpCurve.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/3-pump_curve/1-curve/PumpCurve_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/3-pump_curve/2-mapping/Cache/PumpCurveMappingCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/3-pump_curve/2-mapping/PumpCurveMapping.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/3-pump_curve/2-mapping/PumpCurveMapping_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/4-signal_type/1-group/Cache/SignalTypeGroupCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/4-signal_type/1-group/SignalTypeGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/4-signal_type/1-group/SignalTypeGroup_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/4-signal_type/2-type/Cache/SignalTypeCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/4-signal_type/2-type/SignalType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/4-signal_type/2-type/SignalType_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/1-group/Cache/MonitorPointGroupCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/1-group/MonitorPointGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/1-group/MonitorPointGroup_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/2-point/Cache/MonitorPointCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/2-point/MonitorPoint.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/2-point/MonitorPoint_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/3-signal/Cache/SignalCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/3-signal/Signal.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/3-signal/Signal_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/4-mapping/Cache/MonitorPointMappingCacheHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/4-mapping/MonitorPointMapping.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/6-service/5-monitor/4-mapping/MonitorPointMapping_Instance.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/IAxisCalcer.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/Ìå»ý/UnitVolHeper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/Ìå»ý/eUnitVol.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/¼ÓËÙ¶È/UnitGSpeedHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/¼ÓËÙ¶È/eUnitGSpeed.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ǧ¶ÖÄܺÄ/UnitWPHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ǧ¶ÖÄܺÄ/eUnitWP.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µ¥Î»Ã¶¾Ù/eUnitType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µ¥Î»ÄܺÄ/UnitUWPHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µ¥Î»ÄܺÄ/eUnitUWP.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ѹÁ¦/UnitPRHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ѹÁ¦/eUnitPR.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/¹Ì¶¨²ÎÊý/Constant.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ÉùÒô/UnitSouHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ÉùÒô/eUnitSou.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/Ñï³Ì/UnitHHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/Ñï³Ì/eUnitH.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ЧÂÊ/UnitEHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ЧÂÊ/eUnitE.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ÎÞ¹¦¹¦ÂÊ/UnitPQHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ÎÞ¹¦¹¦ÂÊ/eUnitPQ.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/Óй¦¹¦ÂÊ/UnitPHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/Óй¦¹¦ÂÊ/eUnitP.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/Á÷Á¿/UnitQHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/Á÷Á¿/eUnitQ.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/×ǶÈ/UnitTUHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/×ǶÈ/eUnitTU.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/Ũ¶È/UnitCOHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/Ũ¶È/eUnitCO.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ζÈ/UnitTPHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ζÈ/eUnitTP.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ʪ¶È/UnitHMHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ʪ¶È/eUnitHM.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µçѹ/UnitVoltageHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µçѹ/eUnitVoltage.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µçµ¼ÂÊ/UnitCondHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µçµ¼ÂÊ/eUnitCond.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µç¶È_ÎÞ¹¦/UnitDegreeQHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µç¶È_ÎÞ¹¦/eUnitEleDegreeQ.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µç¶È_Óй¦/UnitDegreeHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µç¶È_Óй¦/eUnitEleDegree.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µçÁ÷/UnitCurrentHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/µçÁ÷/eUnitCurrent.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ÀÛ»ýʱ¼ä/UnitSumTimeHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ÀÛ»ýʱ¼ä/eUnitSumTime.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ÊÓÔÚ¹¦ÂÊ/UnitPsHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ÊÓÔÚ¹¦ÂÊ/eUnitPs.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/תËÙ/UnitNHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/תËÙ/eUnitN.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/¸¨ÖúÀà/CalcuHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/¸¨ÖúÀà/IUnitHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/¸¨ÖúÀà/UnitHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ËÙ¶È/UnitSpeedHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ËÙ¶È/eUnitSpeed.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/³¤¶È/UnitLHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/³¤¶È/eUnitL.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ƵÂÊ/UnitHZHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/1-unit/ƵÂÊ/eUnitHZ.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/Const/ConstantParas.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÐÞÕýÇúÏß/AmendCurveHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/Å×ÎïÏß/ParabolaCurveHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÅÅÁÐ×éºÏ/PermutationAndCombination.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÎÞÁ¿¸ÙÇúÏß/DimensionlessCurvesHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏß´®²¢Áª/ConnectCurveHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏß´®²¢Áª/eConnectType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÐÅÏ¢/FeatCurveExpressGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÐÅÏ¢/FeatCurvePointGroup.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏß×ø±ê²ÎÊý/CurveCoordinateParas.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏß×ø±ê²ÎÊý/CurveCoordinateParas_Disp.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÍØÕ¹/CurvePointList_Extensions.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/FitCurveHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/FitCurveHelperInModel.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/IFitCurvePoint.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/TwinRelateCurve0.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/TwinRelateCurve1.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/TwinRelateCurve2_b0.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/TwinRelateCurve2_mathnet.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/TwinRelateCurve3_mathnet.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/TwinRelateCurve4_mathnet.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/eCurveFitPointMethod.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÄâºÏ/eCurveFitType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßö¾Ù/eCurveCreateMethod.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßö¾Ù/eCurveSourceFrom.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßö¾Ù/eCurveType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßµã/CurvePoint.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßµã/CurvePointList.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßµã/CurvePoint_Comparer.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßµã/GroupPoint.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßµã/PointHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÖ±Ïß/CurveLine.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏßÖ±Ïß/CurveLineHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏß±í´ïʽ/CurveExpress.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏß±í´ïʽ/CurveExpressStartLine.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏß¼ÆËã/CurveCalcuHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÇúÏ߽߱ç/CurveBoundary.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÌØÐÔÇúÏß/FeatCurveHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÌØÐÔÇúÏß/LxpCurveGroupExpress.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÌØÐÔÇúÏß/LxpFeatCurveHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÌØÐÔÇúÏß/PumpParaHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÌØÐÔÇúÏß/eFeatCurveType.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÏàËÆ»»Ëã/CutSimuCalculer.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/ÏàËÆ»»Ëã/SpeedSimuCalculer.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/±´Èû¶ûÇúÏß/BezierCurve2.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/±´Èû¶ûÇúÏß/BezierCurve3.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/2-curve/±´Èû¶ûÇúÏß/BezierCurveHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/DLL/EpanetMethods.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/Enumerations.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/EnumsTxt.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/Error.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/ErrorAttribute.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/ErrorCode.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/KeywordAttribute.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Enums/Keywords.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/HydraulicAnalysisHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/HydraulicModelFileHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Input/Input.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Input/InputLink.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Input/InputNode.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Out/OutLink.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Out/OutNode.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Hydraulic/Out/Output.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Constants.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/ElementCollection.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Exception/ENException.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Exception/InputException.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/FieldsMap.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Helpers/NetworkHelper.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Input/InpParser.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Input/InputParser.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Input/NetParser.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Input/NullParser.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Input/XMLParser.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Output/InpComposer.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/IO/Output/OutputComposer.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Network.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Control.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Curve.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Demand.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Element.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/EnPoint.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Field.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Junction.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Label.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Link.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/NUConvert.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Node.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Pattern.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Pipe.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Pump.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/QualSource.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Reservoir.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Rule.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Tank.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Structures/Valve.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Util/TraceExtensions.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/Network/Util/Utilities.cs
ÎļþÒÑɾ³ý WebApi/IStation.Service.Core/7-utils/3-epanet/epanet2.2.dllBinary files differ
WebApi/IStation.Service.Core/GlobalUsings.cs
@@ -1,2 +1,11 @@ global using System.Text; global using Yw; global using AutoMapper; global using SqlSugar; global using System.Text; global using Yw; global using Yw.DAL.SQLite; global using Yw.Entity; global using Yw.Model; global using Yw.Service; global using Yw.Untity; WebApi/IStation.Service.Core/IStation.Service.Core.csproj
@@ -12,21 +12,20 @@ </PropertyGroup> <ItemGroup> <Compile Remove="2-model\**" /> <Compile Remove="4-dal\**" /> <Compile Remove="5-cache\**" /> <Compile Remove="6-service\**" /> <Compile Remove="7-utils\**" /> <EmbeddedResource Remove="2-model\**" /> <EmbeddedResource Remove="4-dal\**" /> <EmbeddedResource Remove="5-cache\**" /> <EmbeddedResource Remove="6-service\**" /> <EmbeddedResource Remove="7-utils\**" /> <None Remove="2-model\**" /> <None Remove="4-dal\**" /> <None Remove="5-cache\**" /> <None Remove="6-service\**" /> <None Remove="7-utils\**" /> </ItemGroup> <ItemGroup> <Compile Remove="2-model\1-dispatch_analysis\ScadaInfo - å¤å¶.cs" /> <Compile Remove="3-settings\paras\Paras_DataBase_PostgreSql.cs" /> </ItemGroup> <ItemGroup> @@ -42,12 +41,30 @@ </ItemGroup> <ItemGroup> <Compile Include="5-cache\0-helper\RedisKeyHelper.cs" /> <Compile Include="6-service\0-helper\CacheHelper.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_pump\cache\DispatchPumpCacheHelper.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_pump\DispatchPump.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_pump\DispatchPump_Instance.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_request\cache\DispatchRequestCacheHelper.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_request\DispatchRequest.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_request\DispatchRequest_Instance.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_rule\cache\DispatchRuleCacheHelper.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_rule\DispatchRule.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_rule\DispatchRule_Instance.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_scada\cache\DispatchScadaCacheHelper.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_scada\DispatchScada.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_scada\DispatchScada_Instance.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_solution\cache\DispatchSolutionCacheHelper.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_solution\DispatchSolution.cs" /> <Compile Include="6-service\2-dispatch_solution\dispatch_solution\DispatchSolution_Instance.cs" /> </ItemGroup> <ItemGroup> <PackageReference Include="MathNet.Numerics" Version="5.0.0" /> <PackageReference Include="Yw.DynamicExpresso.Core" Version="1.0.0" /> <PackageReference Include="Yw.RabbitMq.Core" Version="1.0.0" /> <PackageReference Include="Yw.Redis.Core" Version="1.0.2" /> <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.0.2" /> <PackageReference Include="Yw.DALFactory.Core" Version="3.0.0" /> <PackageReference Include="Yw.Service.Core" Version="3.0.2" /> <PackageReference Include="Yw.Yitter.Core" Version="1.0.0" /> </ItemGroup> <ItemGroup> @@ -77,4 +94,10 @@ </Content> </ItemGroup> <ItemGroup> <Folder Include="1-entity\1-dispatch_analysis\" /> <Folder Include="4-dal\1-dispatch_analysis\" /> <Folder Include="6-service\1-dispatch_analysis\" /> </ItemGroup> </Project> WebApi/IStation.Service.Core/paras_settings.json
@@ -2,25 +2,28 @@ "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json", "Docking": { "ScadaWebSocketUrl": "ws://192.168.201.17:40001" "ZyScadaHttpUrl": "http://192.168.201.235:8009/dataController/getCurrentJsonDataOfRedis/ä¹ç»´æ¨¡å", "ZyDispatchRulesHttpUrl": "", "Enable": false }, "File": { "DataFolder": "Data", "WorkFolder": "WorkData", "MonitorDataFolder": "MonitorData", "MonitorMonthDataFolder": "MonitorMonthData", "HydraulicModelFolder": "HydraulicModel", "HydraulicModelFile": "chenhang2024.inp", "FileExtension": ".txt", "SignalRecordFileExtension": ".csv", "FileNameSpacer": "-" "StationInfoFile": "StationInfo.json", "ScadaInfoFile": "ScadaInfo.json", "DispatchInfoFile": "DispatchInfo.json" }, "DataBase": { "Db4DispatchAnalysis": "Db4DispatchAnalysis.db", "Db4DispatchSolution": "Db4DispatchSolution.db" }, "MemoryCache": { "KeepTime": 30, "RandomTime": 300 }, "RedisCache": { "Prefix": "IStation" } WebApi/IStation.TopShelf/Program.cs
@@ -12,5 +12,4 @@ x.EnableServiceRecovery(r => r.RestartService(TimeSpan.FromSeconds(120))); x.StartAutomatically(); });