修改代码

src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs

@@ -64,6 +64,11 @@ namespace JiShe.CollectBus.ScheduledMeterReading
         /// </summary>
         public abstract string SystemType { get; }
 
+        /// <summary>
+        /// 应用服务器部署标记
+        /// </summary>
+        public abstract string ServerTagName { get; }
+
         /// <summary>
         ///电表日冻结采集项
         /// </summary>

src/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs

@@ -15,6 +15,7 @@ using JiShe.CollectBus.Repository;
 using JiShe.CollectBus.Repository.MeterReadingRecord;
 using MassTransit;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Uow;
@@ -28,15 +29,17 @@ namespace JiShe.CollectBus.ScheduledMeterReading
     //[Route($"/energy/app/scheduled")]
     public class EnergySystemScheduledMeterReadingService : BasicScheduledMeterReadingService
     {
-
+        string serverTagName = string.Empty;
         public EnergySystemScheduledMeterReadingService(ILogger<EnergySystemScheduledMeterReadingService> logger,
-            ICapPublisher producerBus, IIoTDBProvider dbProvider, IMeterReadingRecordRepository meterReadingRecordRepository) : base(logger, producerBus, meterReadingRecordRepository, dbProvider)
+            ICapPublisher producerBus, IIoTDBProvider dbProvider, IMeterReadingRecordRepository meterReadingRecordRepository,IConfiguration configuration) : base(logger, producerBus, meterReadingRecordRepository, dbProvider)
         {
-
+            serverTagName = configuration.GetValue<string>(CommonConst.ServerTagName)!;
         }
 
         public sealed override string SystemType => SystemTypeConst.Energy;
 
+        public sealed override string ServerTagName => serverTagName;
+
         /// <summary>
         /// 获取采集项列表
         /// </summary>

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

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.Common.Consts
+{
+    /// <summary>
+    /// 常用常量管理
+    /// </summary>
+    public class CommonConst
+    {
+        /// <summary>
+        /// 服务器标识
+        /// </summary>
+        public const string ServerTagName = "ServerTagName";
+
+        /// <summary>
+        /// Kafka
+        /// </summary>
+        public const string Kafka = "Kafka";
+    }
+}

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

@@ -29,19 +29,19 @@ namespace JiShe.CollectBus.Common.Consts
         public const string FifteenMinuteAcquisitionTimeInterval = "Fifteen";
 
         /// <summary>
-        /// 缓存表计信息,{0}=>系统类型，{1}=>表计类别
+        /// 缓存表计信息,{0}=>系统类型，{1}=>应用服务部署标记，{2}=>表计类别，{3}=>采集频率
         /// </summary>
-        public const string CacheMeterInfoKey = $"{CacheBasicDirectoryKey}{"{0}"}:MeterInfo:{"{1}"}:{"{2}"}:";
+        public const string CacheMeterInfoKey = $"{CacheBasicDirectoryKey}{"{0}:{1}"}:MeterInfo:{"{2}"}:{"{3}"}:";
 
         /// <summary>
-        /// 缓存待下发的指令生产任务数据,{0}=>系统类型，{1}=>表计类别，{2}=>采集频率
+        /// 缓存待下发的指令生产任务数据,{0}=>系统类型，{1}=>应用服务部署标记，{2}=>表计类别，{3}=>采集频率
         /// </summary>
-        public const string CacheTasksToBeIssuedKey = $"{CacheBasicDirectoryKey}{"{0}"}:TaskInfo:{"{1}"}:{"{2}"}";
+        public const string CacheTasksToBeIssuedKey = $"{CacheBasicDirectoryKey}{"{0}:{1}"}:TaskInfo:{"{2}"}:{"{3}"}";
 
         /// <summary>
-        /// 缓存表计下发指令数据集,{0}=>系统类型，{1}=>表计类别，{2}=>采集频率
+        /// 缓存表计下发指令数据集,{0}=>系统类型，{1}=>应用服务部署标记，{2}=>表计类别，{3}=>采集频率
         /// </summary>
-        public const string CacheTelemetryPacketInfoKey = $"{CacheBasicDirectoryKey}{"{0}"}:TelemetryPacket:{"{1}"}:{"{2}"}:";
+        public const string CacheTelemetryPacketInfoKey = $"{CacheBasicDirectoryKey}{"{0}:{1}"}:TelemetryPacket:{"{2}"}:{"{3}"}:";
 
         public const string CacheAmmeterFocusKey = "CacheAmmeterFocusKey";
     }

src/JiShe.CollectBus.Common/Helpers/CommonHelper.cs

@@ -762,37 +762,49 @@ namespace JiShe.CollectBus.Common.Helpers
         }
 
         /// <summary>
-        /// 获取设备Id哈希值
+        /// 固定Kafka主题分组数为50，避免动态计算
         /// </summary>
-        /// <param name="deviceId"></param>
+        private const int FixedGroupCount = 50;
-        /// <param name="TotalShards"></param>
+
-        /// <returns></returns>
+        /// <summary>
-        public static int GetDeviceHashCode(string deviceId, int TotalShards = 100)
+        /// 根据 deviceId 获取其所属分组ID（0~49）
+        /// </summary>
+        public static int GetGroupId(string deviceId)
         {
-            // 计算哈希分组ID
+            int hashCode = deviceId.GetHashCode();
-            return Math.Abs(deviceId.GetHashCode() % TotalShards);
+            // 更安全的非负取模方式，兼容负数哈希码
+            return (hashCode % FixedGroupCount + FixedGroupCount) % FixedGroupCount;
         }
 
         /// <summary>
-        /// 获取设备Id哈希分组
+        /// 分组优化：使用数组替代字典，预初始化分组容器
         /// </summary>
-        /// <param name="deviceList"></param>
+        public static List<string>[] GroupDevices(List<string> deviceList)
-        /// <returns></returns>
-        public static Dictionary<string, List<string>> GetDeviceHashGroup(List<string> deviceList)
         {
-            Dictionary<string, List<string>> keyValuePairs = new Dictionary<string, List<string>>();
+            //直接初始化分组，避免动态扩容
+            List<string>[] groups = new List<string>[FixedGroupCount];
+            for (int i = 0; i < FixedGroupCount; i++)
+            {
+                groups[i] = new List<string>(capacity: deviceList.Count / FixedGroupCount + 1);
+            }
+
+            // 单次遍历直接分配
             foreach (var deviceId in deviceList)
             {
-                var hashCode = GetDeviceHashCode(deviceId);
+                int groupId = GetGroupId(deviceId);
-
+                groups[groupId].Add(deviceId);
-                if (!keyValuePairs.ContainsKey(hashCode.ToString()))
-                {
-                    keyValuePairs.Add(hashCode.ToString(), new List<string>());
-                }
-
-                keyValuePairs[hashCode.ToString()].Add(deviceId);
             }
-            return keyValuePairs;
+
+            return groups;
+        }
+
+        /// <summary>
+        /// 通过 deviceId 直接定位分组
+        /// </summary>
+        public static List<string> FindDeviceGroup(List<string>[] groups, string deviceId)
+        {
+            int groupId = GetGroupId(deviceId);
+            return groups[groupId];
         }
     }
 }

src/JiShe.CollectBus.Host/CollectBusHostModule.Configure.cs

@@ -24,6 +24,7 @@ using JiShe.CollectBus.IotSystems.MessageIssueds;
 using Confluent.Kafka;
 using MassTransit.SqlTransport.Topology;
 using Confluent.Kafka.Admin;
+using JiShe.CollectBus.Common.Consts;
 
 
 namespace JiShe.CollectBus.Host
@@ -370,12 +371,12 @@ namespace JiShe.CollectBus.Host
         {
             var adminClient = new AdminClientBuilder(new AdminClientConfig
             {
-                BootstrapServers = configuration.GetConnectionString("Kafka")
+                BootstrapServers = configuration.GetConnectionString(CommonConst.Kafka)
             }).Build();
 
             try
             {
-                string serverTagName = configuration.GetSection("ServerTagName").Value!;
+                string serverTagName = configuration.GetSection(CommonConst.ServerTagName).Value!;
 
                 List<string> topics = ProtocolConstExtensions.GetAllTopicNamesByIssued(serverTagName);
                 topics.AddRange(ProtocolConstExtensions.GetAllTopicNamesByReceived(serverTagName));