Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev

src/JiShe.CollectBus.Application/CollectBusApplicationModule.cs

@@ -29,6 +29,8 @@ using Volo.Abp.EventBus.Kafka;
 using Volo.Abp.Kafka;
 using Volo.Abp.EventBus;
 using Confluent.Kafka;
+using JiShe.CollectBus.Kafka.AdminClient;
+using JiShe.CollectBus.Common.Consts;
 
 namespace JiShe.CollectBus;
 
@@ -99,11 +101,22 @@ public class CollectBusApplicationModule : AbpModule
             context.AddBackgroundWorkerAsync(type);
         }
 
-        var dbContext = context.ServiceProvider.GetRequiredService<EnergySystemScheduledMeterReadingService>();
-
         //默认初始化表计信息
+        var dbContext = context.ServiceProvider.GetRequiredService<EnergySystemScheduledMeterReadingService>();
         dbContext.InitAmmeterCacheData().ConfigureAwait(false).GetAwaiter().GetResult(); 
-        //dbContext.InitWatermeterCacheData().ConfigureAwait(false).GetAwaiter().GetResult();
+        dbContext.InitWatermeterCacheData().ConfigureAwait(false).GetAwaiter().GetResult();
+
+        //初始化主题信息
+        var kafkaAdminClient = context.ServiceProvider.GetRequiredService<IAdminClientService>();
+        var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
+
+        List<string> topics = ProtocolConstExtensions.GetAllTopicNamesByIssued();
+        topics.AddRange(ProtocolConstExtensions.GetAllTopicNamesByReceived());
+
+        foreach (var item in topics)
+        {
+            kafkaAdminClient.CreateTopicIfNotExistAsync(item, configuration.GetValue<short>(CommonConst.KafkaReplicationFactor), configuration.GetValue<int>(CommonConst.NumPartitions));
+        }
     }
 
 }

src/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj

@@ -28,6 +28,7 @@
 
 		<ProjectReference Include="..\JiShe.CollectBus.Application.Contracts\JiShe.CollectBus.Application.Contracts.csproj" />
     <ProjectReference Include="..\JiShe.CollectBus.FreeRedisProvider\JiShe.CollectBus.FreeRedisProvider.csproj" />
+    <ProjectReference Include="..\JiShe.CollectBus.KafkaProducer\JiShe.CollectBus.Kafka.csproj" />
     <ProjectReference Include="..\JiShe.CollectBus.MongoDB\JiShe.CollectBus.MongoDB.csproj" />
     <ProjectReference Include="..\JiShe.CollectBus.Protocol.Contracts\JiShe.CollectBus.Protocol.Contracts.csproj" />
   </ItemGroup>

src/JiShe.CollectBus.Common/Consts/CommonConst.cs

@@ -20,5 +20,16 @@ namespace JiShe.CollectBus.Common.Consts
         /// Kafka
         /// </summary>
         public const string Kafka = "Kafka";
+
+        /// <summary>
+        ///  Kafka副本数量
+        /// </summary>
+        public const string KafkaReplicationFactor = "KafkaReplicationFactor";
+
+        /// <summary>
+        ///  Kafka主题分区数量
+        /// </summary>
+        public const string NumPartitions = "NumPartitions";
+
     }
 }

src/JiShe.CollectBus.Host/CollectBusHostModule.cs

@@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Host
             ConfigureHangfire(context);
             ConfigureCap(context, configuration);
             //ConfigureMassTransit(context, configuration);
-            ConfigureKafkaTopic(context, configuration);
+            //ConfigureKafkaTopic(context, configuration);
             ConfigureAuditLog(context);
             ConfigureCustom(context, configuration);
         }

src/JiShe.CollectBus.Host/appsettings.json

@@ -128,5 +128,7 @@
     "OpenDebugMode": true,
     "UseTableSessionPoolByDefault": false
   },
-  "ServerTagName": "JiSheCollectBus"
+  "ServerTagName": "JiSheCollectBus",
+  "KafkaReplicationFactor": 3,
+  "NumPartitions": 60
 }