xf vor 10 Monaten
Ursprung
Commit
f7d668bc7e

+ 25 - 4
DataSharing.sln

@@ -17,13 +17,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03_Application", "03_Applic
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "04_Presentation", "04_Presentation", "{C243D2BB-93F3-4327-9E0C-D59BBA5A258A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSharing.Host", "src\DataSharing.Host\DataSharing.Host.csproj", "{C813C9AA-0FD3-4331-AE7E-534D39B4E766}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataSharing.Host", "src\DataSharing.Host\DataSharing.Host.csproj", "{C813C9AA-0FD3-4331-AE7E-534D39B4E766}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSharing.Application", "src\DataSharing.Application\DataSharing.Application.csproj", "{E0077D7B-C21C-4864-8A39-155E6C3A5B90}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataSharing.Application", "src\DataSharing.Application\DataSharing.Application.csproj", "{E0077D7B-C21C-4864-8A39-155E6C3A5B90}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSharing.Repository", "src\DataSharing.Repository\DataSharing.Repository.csproj", "{DB54E979-4AF6-4C63-BE97-49466A1CDDEF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataSharing.Repository", "src\DataSharing.Repository\DataSharing.Repository.csproj", "{DB54E979-4AF6-4C63-BE97-49466A1CDDEF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSharing.Share", "src\DataSharing.Share\DataSharing.Share.csproj", "{022AA8CA-42ED-4310-A567-F540D7B2AFA3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataSharing.Share", "src\DataSharing.Share\DataSharing.Share.csproj", "{022AA8CA-42ED-4310-A567-F540D7B2AFA3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataSharing.Police110", "src\DataSharing.Police110\DataSharing.Police110.csproj", "{02570E85-5D41-4AB8-8046-A58757A06A93}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSharing.YiBin", "src\DataSharing.YiBin\DataSharing.YiBin.csproj", "{0661AFE0-1569-464F-A56C-D7D20FCEACBA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSharing.ZiGong", "src\DataSharing.ZiGong\DataSharing.ZiGong.csproj", "{ECCEFB84-E87A-4114-BAED-8B968A843EDD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,6 +57,18 @@ Global
 		{022AA8CA-42ED-4310-A567-F540D7B2AFA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{022AA8CA-42ED-4310-A567-F540D7B2AFA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{022AA8CA-42ED-4310-A567-F540D7B2AFA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02570E85-5D41-4AB8-8046-A58757A06A93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02570E85-5D41-4AB8-8046-A58757A06A93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02570E85-5D41-4AB8-8046-A58757A06A93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02570E85-5D41-4AB8-8046-A58757A06A93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0661AFE0-1569-464F-A56C-D7D20FCEACBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0661AFE0-1569-464F-A56C-D7D20FCEACBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0661AFE0-1569-464F-A56C-D7D20FCEACBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0661AFE0-1569-464F-A56C-D7D20FCEACBA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECCEFB84-E87A-4114-BAED-8B968A843EDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECCEFB84-E87A-4114-BAED-8B968A843EDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECCEFB84-E87A-4114-BAED-8B968A843EDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECCEFB84-E87A-4114-BAED-8B968A843EDD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -65,6 +83,9 @@ Global
 		{E0077D7B-C21C-4864-8A39-155E6C3A5B90} = {809EA935-FD2A-48FB-9F53-37543F88BED4}
 		{DB54E979-4AF6-4C63-BE97-49466A1CDDEF} = {487B598E-9C72-45F0-8708-A532A4289EB6}
 		{022AA8CA-42ED-4310-A567-F540D7B2AFA3} = {E4B0553C-3284-481B-9E90-F5025D98C4AA}
+		{02570E85-5D41-4AB8-8046-A58757A06A93} = {E4B0553C-3284-481B-9E90-F5025D98C4AA}
+		{0661AFE0-1569-464F-A56C-D7D20FCEACBA} = {E4B0553C-3284-481B-9E90-F5025D98C4AA}
+		{ECCEFB84-E87A-4114-BAED-8B968A843EDD} = {E4B0553C-3284-481B-9E90-F5025D98C4AA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1866F49D-D504-4570-867E-2EF1A18B57FE}

+ 2 - 2
src/DataSharing.Application/DataSharing.Application.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -14,8 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\DataSharing.Police110\DataSharing.Police110.csproj" />
     <ProjectReference Include="..\DataSharing.Repository\DataSharing.Repository.csproj" />
-    <ProjectReference Include="..\DataSharing\DataSharing.csproj" />
   </ItemGroup>
 
 </Project>

+ 1 - 1
src/DataSharing.Application/Receivers/ProvinceReceiver.cs

@@ -1,6 +1,5 @@
 using DataSharing.Application.Validators.HuiJu;
 using DataSharing.Application.Validators.XieTong;
-using DataSharing.DaoShu110;
 using DataSharing.DataExchange;
 using DataSharing.Province;
 using DataSharing.RawData;
@@ -31,6 +30,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using System.Security.Cryptography;
 using System.Text;
+using DataSharing.Police110.DaoShu110;
 using XF.Domain.Cache;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;

+ 2 - 2
src/DataSharing.Host/Controllers/PoliceDSController.cs

@@ -1,5 +1,4 @@
-using DataSharing.DaoShu110;
-using DataSharing.Extensions;
+using DataSharing.Extensions;
 using DataSharing.FwDataExchange;
 using DataSharing.RawData;
 using DataSharing.Share.Dtos;
@@ -16,6 +15,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System.Net;
 using System.Text;
+using DataSharing.Police110.DaoShu110;
 using XF.Domain.Filters;
 using XF.Domain.Repository;
 

+ 3 - 1
src/DataSharing.Host/DataSharing.Host.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -22,6 +22,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\DataSharing.Application\DataSharing.Application.csproj" />
+    <ProjectReference Include="..\DataSharing.YiBin\DataSharing.YiBin.csproj" />
+    <ProjectReference Include="..\DataSharing.ZiGong\DataSharing.ZiGong.csproj" />
   </ItemGroup>
 
 </Project>

+ 3 - 3
src/DataSharing/DaoShu110/DsPoliceSendChainAlarmDs.cs → src/DataSharing.Police110/DaoShu110/DsPoliceSendChainAlarmDs.cs

@@ -1,8 +1,8 @@
-using SqlSugar;
-using System.ComponentModel;
+using System.ComponentModel;
+using SqlSugar;
 using XF.Domain.Repository;
 
-namespace DataSharing.DaoShu110
+namespace DataSharing.Police110.DaoShu110
 {
     /// <summary>
     /// 道枢受理工单表

+ 3 - 3
src/DataSharing/DaoShu110/DsPoliceSendChainDealDs.cs → src/DataSharing.Police110/DaoShu110/DsPoliceSendChainDealDs.cs

@@ -1,8 +1,8 @@
-using SqlSugar;
-using System.ComponentModel;
+using System.ComponentModel;
+using SqlSugar;
 using XF.Domain.Repository;
 
-namespace DataSharing.DaoShu110
+namespace DataSharing.Police110.DaoShu110
 {
     /// <summary>
     /// 道枢办理结果表

+ 3 - 3
src/DataSharing/DaoShu110/DsReceivePoliceData.cs → src/DataSharing.Police110/DaoShu110/DsReceivePoliceData.cs

@@ -1,8 +1,8 @@
-using SqlSugar;
-using System.ComponentModel;
+using System.ComponentModel;
+using SqlSugar;
 using XF.Domain.Repository;
 
-namespace DataSharing.DaoShu110
+namespace DataSharing.Police110.DaoShu110
 {
     /// <summary>
     /// 110交换调用接口数据

+ 13 - 0
src/DataSharing.Police110/DataSharing.Police110.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DataSharing\DataSharing.csproj" />
+  </ItemGroup>
+
+</Project>

+ 1 - 1
src/DataSharing.Repository/DataSharing.Repository.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

+ 1 - 1
src/DataSharing.Share/DataSharing.Share.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

+ 0 - 0
src/DataSharing/ConvergenceMedia/DsReceiveMediaData.cs → src/DataSharing.YiBin/ConvergenceMedia/DsReceiveMediaData.cs


+ 13 - 0
src/DataSharing.YiBin/DataSharing.YiBin.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DataSharing\DataSharing.csproj" />
+  </ItemGroup>
+
+</Project>

+ 9 - 0
src/DataSharing.ZiGong/DataSharing.ZiGong.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

+ 1 - 1
src/DataSharing/DataSharing.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>