From e15d326bf99045464912aad08d18faa0c667cdb5 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期三, 22 五月 2024 09:27:34 +0800
Subject: [PATCH] 调度算法 修改 调度逻辑 修改 调度接口 web新增

---
 WebApi/IStation.Service.Core/IStation.Service.Core.csproj |   43 +++++++++++++++++++++++++++++++++----------
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/WebApi/IStation.Service.Core/IStation.Service.Core.csproj b/WebApi/IStation.Service.Core/IStation.Service.Core.csproj
index bdbc9bc..415f53b 100644
--- a/WebApi/IStation.Service.Core/IStation.Service.Core.csproj
+++ b/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>

--
Gitblit v1.9.3