JiShe.CollectBus.sln

@@ -3,43 +3,49 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34728.123
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Domain.Shared", "src\JiShe.CollectBus.Domain.Shared\JiShe.CollectBus.Domain.Shared.csproj", "{D64C1577-4929-4B60-939E-96DE1534891A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Domain.Shared", "shared\JiShe.CollectBus.Domain.Shared\JiShe.CollectBus.Domain.Shared.csproj", "{D64C1577-4929-4B60-939E-96DE1534891A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Domain", "src\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj", "{F2840BC7-0188-4606-9126-DADD0F5ABF7A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Domain", "services\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj", "{F2840BC7-0188-4606-9126-DADD0F5ABF7A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Application.Contracts", "src\JiShe.CollectBus.Application.Contracts\JiShe.CollectBus.Application.Contracts.csproj", "{BD65D04F-08D5-40C1-8C24-77CA0BACB877}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Application.Contracts", "services\JiShe.CollectBus.Application.Contracts\JiShe.CollectBus.Application.Contracts.csproj", "{BD65D04F-08D5-40C1-8C24-77CA0BACB877}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Application", "src\JiShe.CollectBus.Application\JiShe.CollectBus.Application.csproj", "{78040F9E-3501-4A40-82DF-00A597710F35}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Application", "services\JiShe.CollectBus.Application\JiShe.CollectBus.Application.csproj", "{78040F9E-3501-4A40-82DF-00A597710F35}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{649A3FFA-182F-4E56-9717-E6A9A2BEC545}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.MongoDB", "modules\JiShe.CollectBus.MongoDB\JiShe.CollectBus.MongoDB.csproj", "{F1C58097-4C08-4D88-8976-6B3389391481}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.MongoDB", "src\JiShe.CollectBus.MongoDB\JiShe.CollectBus.MongoDB.csproj", "{F1C58097-4C08-4D88-8976-6B3389391481}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.HttpApi", "web\JiShe.CollectBus.HttpApi\JiShe.CollectBus.HttpApi.csproj", "{077AA5F8-8B61-420C-A6B5-0150A66FDB34}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.HttpApi", "src\JiShe.CollectBus.HttpApi\JiShe.CollectBus.HttpApi.csproj", "{077AA5F8-8B61-420C-A6B5-0150A66FDB34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Host", "web\JiShe.CollectBus.Host\JiShe.CollectBus.Host.csproj", "{35829A15-4127-4F69-8BDE-9405DEAACA9A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Host", "src\JiShe.CollectBus.Host\JiShe.CollectBus.Host.csproj", "{35829A15-4127-4F69-8BDE-9405DEAACA9A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Common", "shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj", "{AD2F1928-4411-4511-B564-5FB996EC08B9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Common", "src\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj", "{AD2F1928-4411-4511-B564-5FB996EC08B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Protocol", "protocols\JiShe.CollectBus.Protocol\JiShe.CollectBus.Protocol.csproj", "{C62EFF95-5C32-435F-BD78-6977E828F894}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Protocol", "src\JiShe.CollectBus.Protocol\JiShe.CollectBus.Protocol.csproj", "{C62EFF95-5C32-435F-BD78-6977E828F894}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Protocol.Contracts", "protocols\JiShe.CollectBus.Protocol.Contracts\JiShe.CollectBus.Protocol.Contracts.csproj", "{38C1808B-009A-418B-B17B-AB3626341B5D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Protocol.Contracts", "src\JiShe.CollectBus.Protocol.Contracts\JiShe.CollectBus.Protocol.Contracts.csproj", "{38C1808B-009A-418B-B17B-AB3626341B5D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.DbMigrator", "services\JiShe.CollectBus.DbMigrator\JiShe.CollectBus.DbMigrator.csproj", "{8BA01C3D-297D-42DF-BD63-EF07202A0A67}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.DbMigrator", "src\JiShe.CollectBus.DbMigrator\JiShe.CollectBus.DbMigrator.csproj", "{8BA01C3D-297D-42DF-BD63-EF07202A0A67}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.FreeSql", "modules\JiShe.CollectBus.FreeSql\JiShe.CollectBus.FreeSql.csproj", "{FE0457D9-4038-4A17-8808-DCAD06CFC0A0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.FreeSql", "src\JiShe.CollectBus.FreeSql\JiShe.CollectBus.FreeSql.csproj", "{FE0457D9-4038-4A17-8808-DCAD06CFC0A0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.FreeRedis", "modules\JiShe.CollectBus.FreeRedis\JiShe.CollectBus.FreeRedis.csproj", "{C06C4082-638F-2996-5FED-7784475766C1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.FreeRedisProvider", "src\JiShe.CollectBus.FreeRedisProvider\JiShe.CollectBus.FreeRedisProvider.csproj", "{C06C4082-638F-2996-5FED-7784475766C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Kafka", "modules\JiShe.CollectBus.Kafka\JiShe.CollectBus.Kafka.csproj", "{F0288175-F0EC-48BD-945F-CF1512850943}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Kafka", "src\JiShe.CollectBus.KafkaProducer\JiShe.CollectBus.Kafka.csproj", "{F0288175-F0EC-48BD-945F-CF1512850943}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.IoTDB", "modules\JiShe.CollectBus.IoTDB\JiShe.CollectBus.IoTDB.csproj", "{A3F3C092-0A25-450B-BF6A-5983163CBEF5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.IoTDBProvider", "src\JiShe.CollectBus.IoTDBProvider\JiShe.CollectBus.IoTDBProvider.csproj", "{A3F3C092-0A25-450B-BF6A-5983163CBEF5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Protocol.Test", "protocols\JiShe.CollectBus.Protocol.Test\JiShe.CollectBus.Protocol.Test.csproj", "{A377955E-7EA1-6F29-8CF7-774569E93925}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Protocol.Test", "src\JiShe.CollectBus.Protocol.Test\JiShe.CollectBus.Protocol.Test.csproj", "{A377955E-7EA1-6F29-8CF7-774569E93925}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JiShe.CollectBus.Cassandra", "modules\JiShe.CollectBus.Cassandra\JiShe.CollectBus.Cassandra.csproj", "{443B4549-0AC0-4493-8F3E-49C83225DD76}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Cassandra", "src\JiShe.CollectBus.Cassandra\JiShe.CollectBus.Cassandra.csproj", "{443B4549-0AC0-4493-8F3E-49C83225DD76}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.Web", "1.Web", "{A02F7D8A-04DC-44D6-94D4-3F65712D6B94}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Kafka.Test", "src\JiShe.CollectBus.Kafka.Test\JiShe.CollectBus.Kafka.Test.csproj", "{FA762E8F-659A-DECF-83D6-5F364144450E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4.Modules", "4.Modules", "{2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.Protocols", "3.Protocols", "{3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2.Services", "2.Services", "{BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.Shared", "5.Shared", "{EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -115,32 +121,28 @@ Global
 		{443B4549-0AC0-4493-8F3E-49C83225DD76}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{443B4549-0AC0-4493-8F3E-49C83225DD76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{443B4549-0AC0-4493-8F3E-49C83225DD76}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA762E8F-659A-DECF-83D6-5F364144450E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA762E8F-659A-DECF-83D6-5F364144450E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA762E8F-659A-DECF-83D6-5F364144450E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA762E8F-659A-DECF-83D6-5F364144450E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D64C1577-4929-4B60-939E-96DE1534891A} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{D64C1577-4929-4B60-939E-96DE1534891A} = {EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}
-		{F2840BC7-0188-4606-9126-DADD0F5ABF7A} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{F2840BC7-0188-4606-9126-DADD0F5ABF7A} = {BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23}
-		{BD65D04F-08D5-40C1-8C24-77CA0BACB877} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{BD65D04F-08D5-40C1-8C24-77CA0BACB877} = {BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23}
-		{78040F9E-3501-4A40-82DF-00A597710F35} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{78040F9E-3501-4A40-82DF-00A597710F35} = {BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23}
-		{F1C58097-4C08-4D88-8976-6B3389391481} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{F1C58097-4C08-4D88-8976-6B3389391481} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}
-		{077AA5F8-8B61-420C-A6B5-0150A66FDB34} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{077AA5F8-8B61-420C-A6B5-0150A66FDB34} = {A02F7D8A-04DC-44D6-94D4-3F65712D6B94}
-		{35829A15-4127-4F69-8BDE-9405DEAACA9A} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{35829A15-4127-4F69-8BDE-9405DEAACA9A} = {A02F7D8A-04DC-44D6-94D4-3F65712D6B94}
-		{AD2F1928-4411-4511-B564-5FB996EC08B9} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{AD2F1928-4411-4511-B564-5FB996EC08B9} = {EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}
-		{C62EFF95-5C32-435F-BD78-6977E828F894} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{C62EFF95-5C32-435F-BD78-6977E828F894} = {3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}
-		{38C1808B-009A-418B-B17B-AB3626341B5D} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{38C1808B-009A-418B-B17B-AB3626341B5D} = {3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}
-		{8BA01C3D-297D-42DF-BD63-EF07202A0A67} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{8BA01C3D-297D-42DF-BD63-EF07202A0A67} = {BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23}
-		{FE0457D9-4038-4A17-8808-DCAD06CFC0A0} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{FE0457D9-4038-4A17-8808-DCAD06CFC0A0} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}
-		{C06C4082-638F-2996-5FED-7784475766C1} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{C06C4082-638F-2996-5FED-7784475766C1} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}
-		{F0288175-F0EC-48BD-945F-CF1512850943} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{F0288175-F0EC-48BD-945F-CF1512850943} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}
-		{A3F3C092-0A25-450B-BF6A-5983163CBEF5} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{A3F3C092-0A25-450B-BF6A-5983163CBEF5} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}
-		{A377955E-7EA1-6F29-8CF7-774569E93925} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{A377955E-7EA1-6F29-8CF7-774569E93925} = {3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}
-		{443B4549-0AC0-4493-8F3E-49C83225DD76} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
+		{443B4549-0AC0-4493-8F3E-49C83225DD76} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD}

modules/JiShe.CollectBus.Cassandra/CassandraRepository.cs

@@ -3,7 +3,6 @@ using Cassandra.Data.Linq;
 using Cassandra.Mapping;
 using JiShe.CollectBus.Cassandra.Extensions;
 using JiShe.CollectBus.Common.Attributes;
-using JiShe.CollectBus.IoTDBProvider;
 using Microsoft.AspNetCore.Http;
 using System.Reflection;
 using Thrift.Protocol.Entities;

modules/JiShe.CollectBus.Cassandra/JiShe.CollectBus.Cassandra.csproj

@@ -15,8 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
+    <ProjectReference Include="..\..\services\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
-    <ProjectReference Include="..\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
+    <ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
   </ItemGroup>
 
 </Project>

modules/JiShe.CollectBus.FreeRedis/CollectBusFreeRedisModule.cs

@@ -1,9 +1,9 @@
-using JiShe.CollectBus.FreeRedisProvider.Options;
+using JiShe.CollectBus.FreeRedis.Options;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Modularity;
 
-namespace JiShe.CollectBus.FreeRedisProvider
+namespace JiShe.CollectBus.FreeRedis
 {
     public class CollectBusFreeRedisModule : AbpModule
     {

modules/JiShe.CollectBus.FreeRedis/FreeRedisProvider.cs

@@ -1,16 +1,11 @@
-using FreeRedis;
+using System.Diagnostics;
+using FreeRedis;
 using JiShe.CollectBus.Common.Helpers;
-using JiShe.CollectBus.Common.Models;
+using JiShe.CollectBus.FreeRedis.Options;
-using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.FreeRedisProvider.Options;
 using Microsoft.Extensions.Options;
-using System.Diagnostics;
-using System.Text.Json;
 using Volo.Abp.DependencyInjection;
-using static System.Runtime.InteropServices.JavaScript.JSType;
-using System.Collections.Concurrent;
 
-namespace JiShe.CollectBus.FreeRedisProvider
+namespace JiShe.CollectBus.FreeRedis
 {
 
     public class FreeRedisProvider : IFreeRedisProvider, ISingletonDependency

modules/JiShe.CollectBus.FreeRedis/IFreeRedisProvider.cs

@@ -1,7 +1,6 @@
 using FreeRedis;
-using JiShe.CollectBus.Common.Models;
 
-namespace JiShe.CollectBus.FreeRedisProvider
+namespace JiShe.CollectBus.FreeRedis
 {
     public interface IFreeRedisProvider
     {

modules/JiShe.CollectBus.FreeRedis/JiShe.CollectBus.FreeRedis.csproj

@@ -10,6 +10,6 @@
 		<PackageReference Include="Volo.Abp" Version="8.3.3" />
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
+	  <ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
 	</ItemGroup>
 </Project>

modules/JiShe.CollectBus.FreeRedis/Options/FreeRedisOptions.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JiShe.CollectBus.FreeRedis.Options
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiShe.CollectBus.FreeRedisProvider.Options
 {
     public class FreeRedisOptions
     {

modules/JiShe.CollectBus.IoTDB/Attribute/ATTRIBUTEColumnAttribute.cs

@@ -0,0 +1,10 @@
+namespace JiShe.CollectBus.IoTDB.Attribute
+{ 
+    /// <summary>
+    /// Column分类标记特性（ATTRIBUTE字段）,也就是属性字段
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property)]
+    public class ATTRIBUTEColumnAttribute : System.Attribute
+    {
+    }
+}

modules/JiShe.CollectBus.IoTDB/Attribute/FIELDColumnAttribute.cs

@@ -0,0 +1,10 @@
+namespace JiShe.CollectBus.IoTDB.Attribute
+{
+    /// <summary>
+    /// Column分类标记特性（FIELD字段），数据列字段
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property)]
+    public class FIELDColumnAttribute : System.Attribute
+    {
+    }
+}

modules/JiShe.CollectBus.IoTDB/Attribute/SingleMeasuringAttribute.cs

@@ -1,16 +1,10 @@
-using System;
+namespace JiShe.CollectBus.IoTDB.Attribute
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiShe.CollectBus.IoTDBProvider
 {
     /// <summary>
     /// 用于标识当前实体为单侧点模式，单侧点模式只有一个Filed标识字段,类型是Tuple<string,object>,Item1=>测点名称，Item2=>测点值,泛型
     /// </summary>
     [AttributeUsage(AttributeTargets.Property)]
-    public class SingleMeasuringAttribute : Attribute
+    public class SingleMeasuringAttribute : System.Attribute
     {
         public string FieldName { get; set;}
 

modules/JiShe.CollectBus.IoTDB/Attribute/TAGColumnAttribute.cs

@@ -0,0 +1,10 @@
+namespace JiShe.CollectBus.IoTDB.Attribute
+{
+    /// <summary>
+    /// Column分类标记特性（TAG字段），标签字段
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property)]
+    public class TAGColumnAttribute : System.Attribute
+    {
+    }
+}

modules/JiShe.CollectBus.IoTDB/CollectBusIoTDBModule.cs

@@ -1,17 +1,12 @@
-using JiShe.CollectBus.IoTDBProvider.Context;
+using JiShe.CollectBus.IoTDB.Context;
-using JiShe.CollectBus.IoTDBProvider.Interface;
+using JiShe.CollectBus.IoTDB.Interface;
-using JiShe.CollectBus.IoTDBProvider.Provider;
+using JiShe.CollectBus.IoTDB.Options;
+using JiShe.CollectBus.IoTDB.Provider;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Volo.Abp.Modularity;
-using static Thrift.Server.TThreadPoolAsyncServer;
 
-namespace JiShe.CollectBus.IoTDBProvider
+namespace JiShe.CollectBus.IoTDB
 {
     public class CollectBusIoTDBModule : AbpModule
     {

modules/JiShe.CollectBus.IoTDB/Context/IoTDBRuntimeContext.cs

@@ -1,11 +1,7 @@
-using Microsoft.Extensions.Options;
+using JiShe.CollectBus.IoTDB.Options;
-using System;
+using Microsoft.Extensions.Options;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace JiShe.CollectBus.IoTDBProvider.Context
+namespace JiShe.CollectBus.IoTDB.Context
 {
     /// <summary>
     /// IoTDB SessionPool 运行时上下文

modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBProvider.cs

@@ -1,6 +1,8 @@
 using JiShe.CollectBus.Common.Models;
+using JiShe.CollectBus.IoTDB.Options;
+using JiShe.CollectBus.IoTDB.Provider;
 
-namespace JiShe.CollectBus.IoTDBProvider
+namespace JiShe.CollectBus.IoTDB.Interface
 {
     /// <summary>
     /// IoTDB数据源,数据库能同时存多个时序模型，但数据是完全隔离的，不能跨时序模型查询，通过连接字符串配置

modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBSessionFactory.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JiShe.CollectBus.IoTDB.Interface
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiShe.CollectBus.IoTDBProvider.Interface
 {
     /// <summary>
     /// Session 工厂接口

modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBSessionPool.cs

@@ -1,11 +1,6 @@
 using Apache.IoTDB.DataStructure;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace JiShe.CollectBus.IoTDBProvider.Interface
+namespace JiShe.CollectBus.IoTDB.Interface
 {
     /// <summary>
     /// Session 连接池

modules/JiShe.CollectBus.IoTDB/JiShe.CollectBus.IoTDB.csproj

@@ -11,6 +11,6 @@
 		<PackageReference Include="Volo.Abp" Version="8.3.3" />
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
+	  <ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
 	</ItemGroup>
 </Project>

modules/JiShe.CollectBus.IoTDB/Options/IoTDBOptions.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JiShe.CollectBus.IoTDB.Options
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiShe.CollectBus.IoTDBProvider
 {
     /// <summary>
     /// IOTDB配置

modules/JiShe.CollectBus.IoTDB/Options/QueryCondition.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JiShe.CollectBus.IoTDB.Options
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiShe.CollectBus.IoTDBProvider
 {
     /// <summary>
     /// 查询条件

modules/JiShe.CollectBus.IoTDB/Options/QueryOptions.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JiShe.CollectBus.IoTDB.Options
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiShe.CollectBus.IoTDBProvider
 {
     /// <summary>
     /// 查询条件

modules/JiShe.CollectBus.IoTDB/Provider/DeviceMetadata.cs

@@ -1,11 +1,6 @@
 using Apache.IoTDB;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace JiShe.CollectBus.IoTDBProvider
+namespace JiShe.CollectBus.IoTDB.Provider
 {
     /// <summary>
     /// 设备元数据

modules/JiShe.CollectBus.IoTDB/Provider/DevicePathBuilder.cs

@@ -1,10 +1,4 @@
-using System;
+namespace JiShe.CollectBus.IoTDB.Provider
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiShe.CollectBus.IoTDBProvider
 {
     /// <summary>
     /// 设备路径构建器

modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs

@@ -1,16 +1,16 @@
-using Apache.IoTDB;
+using System.Collections.Concurrent;
-using Apache.IoTDB.DataStructure;
-using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Common.Models;
-using JiShe.CollectBus.IoTDBProvider.Context;
-using JiShe.CollectBus.IoTDBProvider.Interface;
-using Microsoft.Extensions.Logging;
-using System.Collections.Concurrent;
 using System.Reflection;
 using System.Text;
+using Apache.IoTDB;
+using Apache.IoTDB.DataStructure;
+using JiShe.CollectBus.Common.Models;
+using JiShe.CollectBus.IoTDB.Attribute;
+using JiShe.CollectBus.IoTDB.Context;
+using JiShe.CollectBus.IoTDB.Interface;
+using JiShe.CollectBus.IoTDB.Options;
+using Microsoft.Extensions.Logging;
 
-
+namespace JiShe.CollectBus.IoTDB.Provider
-namespace JiShe.CollectBus.IoTDBProvider
 {
     /// <summary>
     /// IoTDB数据源

modules/JiShe.CollectBus.IoTDB/Provider/IoTDBSessionFactory.cs

@@ -1,13 +1,9 @@
-using JiShe.CollectBus.IoTDBProvider.Interface;
+using System.Collections.Concurrent;
+using JiShe.CollectBus.IoTDB.Interface;
+using JiShe.CollectBus.IoTDB.Options;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace JiShe.CollectBus.IoTDBProvider.Provider
+namespace JiShe.CollectBus.IoTDB.Provider
 {
 
     /// <summary>

modules/JiShe.CollectBus.IoTDB/Provider/IoTEntity.cs

@@ -1,4 +1,6 @@
-namespace JiShe.CollectBus.IoTDBProvider
+using JiShe.CollectBus.IoTDB.Attribute;
+
+namespace JiShe.CollectBus.IoTDB.Provider
 {
     /// <summary>
     /// IoT实体基类

modules/JiShe.CollectBus.IoTDB/Provider/SessionPoolAdapter.cs

@@ -1,14 +1,10 @@
-using Apache.IoTDB.DataStructure;
+using Apache.IoTDB;
-using Apache.IoTDB;
+using Apache.IoTDB.DataStructure;
-using System;
+using JiShe.CollectBus.IoTDB.Interface;
-using System.Collections.Generic;
+using JiShe.CollectBus.IoTDB.Options;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using JiShe.CollectBus.IoTDBProvider.Interface;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.IoTDBProvider.Provider
+namespace JiShe.CollectBus.IoTDB.Provider
 {
     /// <summary>
     /// 树模型连接池

modules/JiShe.CollectBus.IoTDB/Provider/TableSessionPoolAdapter.cs

@@ -1,14 +1,10 @@
-using Apache.IoTDB.DataStructure;
+using Apache.IoTDB;
-using Apache.IoTDB;
+using Apache.IoTDB.DataStructure;
-using JiShe.CollectBus.IoTDBProvider.Interface;
+using JiShe.CollectBus.IoTDB.Interface;
-using System;
+using JiShe.CollectBus.IoTDB.Options;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.IoTDBProvider.Provider
+namespace JiShe.CollectBus.IoTDB.Provider
 {
     /// <summary>
     /// 表模型Session连接池

modules/JiShe.CollectBus.Kafka/JiShe.CollectBus.Kafka.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
+    <ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
   </ItemGroup>
 
 </Project>

modules/JiShe.CollectBus.MongoDB/JiShe.CollectBus.MongoDB.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="Volo.Abp.MongoDB" Version="8.3.3" />
     <PackageReference Include="Volo.Abp.BackgroundJobs.MongoDB" Version="8.3.3" />
     <PackageReference Include="Volo.Abp.AuditLogging.MongoDB" Version="8.3.3" />
-    <ProjectReference Include="..\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
+    <ProjectReference Include="..\..\services\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
   </ItemGroup>
 
 </Project>

protocols/JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj

@@ -6,6 +6,12 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <Compile Remove="Extensions\**" />
+	  <EmbeddedResource Remove="Extensions\**" />
+	  <None Remove="Extensions\**" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="DotNetCore.CAP" Version="8.3.1" />
 		<PackageReference Include="MassTransit.Abstractions" Version="8.3.0" />
@@ -15,13 +21,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
+		<ProjectReference Include="..\..\modules\JiShe.CollectBus.Kafka\JiShe.CollectBus.Kafka.csproj" />
-		<ProjectReference Include="..\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
+		<ProjectReference Include="..\..\services\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
-		<ProjectReference Include="..\JiShe.CollectBus.KafkaProducer\JiShe.CollectBus.Kafka.csproj" />
+		<ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <Folder Include="Extensions\" />
 	</ItemGroup>
 
 </Project>

protocols/JiShe.CollectBus.Protocol.Test/JiShe.CollectBus.Protocol.Test.csproj

@@ -16,13 +16,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
+		<ProjectReference Include="..\..\services\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
-		<ProjectReference Include="..\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
+		<ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
 		<ProjectReference Include="..\JiShe.CollectBus.Protocol.Contracts\JiShe.CollectBus.Protocol.Contracts.csproj" />
 	</ItemGroup>
 
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Exec Command="copy $(TargetDir)JiShe.CollectBus.Protocol.Test.dll $(ProjectDir)..\JiShe.CollectBus.Host\Plugins\" />
+		<Exec Command="copy $(TargetDir)JiShe.CollectBus.Protocol.Test.dll $(ProjectDir)..\..\web\JiShe.CollectBus.Host\Plugins\" />
 	</Target>
 
 </Project>

protocols/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj

@@ -16,13 +16,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
+		<ProjectReference Include="..\..\services\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
-		<ProjectReference Include="..\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
+		<ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
-		<ProjectReference Include="..\JiShe.CollectBus.Protocol.Contracts\JiShe.CollectBus.Protocol.Contracts.csproj" />
+		<ProjectReference Include="..\..\protocols\JiShe.CollectBus.Protocol.Contracts\JiShe.CollectBus.Protocol.Contracts.csproj" />
 	</ItemGroup>
 
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Exec Command="copy $(TargetDir)JiShe.CollectBus.Protocol.dll $(ProjectDir)..\JiShe.CollectBus.Host\Plugins\" />
+		<Exec Command="copy $(TargetDir)JiShe.CollectBus.Protocol.dll $(ProjectDir)..\..\web\JiShe.CollectBus.Host\Plugins\" />
 	</Target>
 
 </Project>