优化代码

src/JiShe.CollectBus.Application/Consumers/ScheduledMeterReadingConsumer.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Models;
+using JiShe.CollectBus.IotSystems.MessageIssueds;
 using MassTransit;
 using Microsoft.Extensions.Logging;
 using TouchSocket.Sockets;
@@ -12,9 +13,9 @@ namespace JiShe.CollectBus.Consumers
     /// <summary>
     /// 定时抄读任务消费者
     /// </summary>
-    public class WorkerConsumer : IConsumer<IssuedEventMessage>
+    public class ScheduledMeterReadingConsumer : IConsumer<ScheduledMeterReadingIssuedEventMessage>
     {
-        private readonly ILogger<WorkerConsumer> _logger;
+        private readonly ILogger<ScheduledMeterReadingConsumer> _logger;
         private readonly ITcpService _tcpService;
 
         /// <summary>
@@ -22,7 +23,7 @@ namespace JiShe.CollectBus.Consumers
         /// </summary>
         /// <param name="logger"></param>
         /// <param name="tcpService"></param>
-        public WorkerConsumer(ILogger<WorkerConsumer> logger, 
+        public ScheduledMeterReadingConsumer(ILogger<ScheduledMeterReadingConsumer> logger, 
             ITcpService tcpService)
         {
             _logger = logger;
@@ -30,9 +31,10 @@ namespace JiShe.CollectBus.Consumers
         }
 
 
-        public async Task Consume(ConsumeContext<IssuedEventMessage> context)
+        public async Task Consume(ConsumeContext<ScheduledMeterReadingIssuedEventMessage> context)
         {
-            await _tcpService.SendAsync(context.Message.ClientId, context.Message.Message);
+            _logger.LogError($"{nameof(ScheduledMeterReadingConsumer)} 集中器的消息消费{context.Message.FocusAddress}");
+            await _tcpService.SendAsync(context.Message.FocusAddress, context.Message.MessageHexString);
         }
     }
 }

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

@@ -15,7 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-
+		<PackageReference Include="MassTransit.Kafka" Version="8.3.2" />
+		
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.3.3" />
     <PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.3" />
     <PackageReference Include="Volo.Abp.BackgroundWorkers.Hangfire" Version="8.3.3" />

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

@@ -26,6 +26,7 @@ using JiShe.CollectBus.Repository.MeterReadingRecord;
 using JiShe.CollectBus.Workers;
 using MassTransit;
 using MassTransit.Internals.GraphValidation;
+using MassTransit.Transports;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.Domain.Repositories;
 using static FreeSql.Internal.GlobalFilter;
@@ -41,10 +42,9 @@ namespace JiShe.CollectBus.ScheduledMeterReading
         private readonly ICapPublisher _capBus;
         private readonly IMeterReadingRecordRepository _meterReadingRecordsRepository;
 
-
         public BasicScheduledMeterReadingService(
             ILogger<BasicScheduledMeterReadingService> logger,
-            ICapPublisher capBus,
+            ICapPublisher capBus, 
             IMeterReadingRecordRepository meterReadingRecordsRepository)
         {
             _capBus = capBus;
@@ -432,8 +432,11 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                         FocusAddress = ammerterItem.Value.FocusAddress,
                         TimeDensity = timeDensity.ToString(),
                     };
+
                     _ = _capBus.PublishDelayAsync(TimeSpan.FromMicroseconds(500) ,ProtocolConst.AmmeterSubscriberWorkerFifteenMinuteIssuedEventName, tempMsg);
 
+                    //await _massTransitBus.Publish(tempMsg);
+
                     meterTaskInfosList.Add(ammerterItem.Value);
                 }
             }

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

@@ -12,6 +12,7 @@ using JiShe.CollectBus.IotSystems.MeterReadingRecords;
 using JiShe.CollectBus.IotSystems.Watermeter;
 using JiShe.CollectBus.Repository;
 using JiShe.CollectBus.Repository.MeterReadingRecord;
+using MassTransit;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.Domain.Repositories;
@@ -27,10 +28,10 @@ namespace JiShe.CollectBus.ScheduledMeterReading
     public class EnergySystemScheduledMeterReadingService : BasicScheduledMeterReadingService
     {
 
-        public EnergySystemScheduledMeterReadingService(ILogger<EnergySystemScheduledMeterReadingService> logger, 
+        public EnergySystemScheduledMeterReadingService(ILogger<EnergySystemScheduledMeterReadingService> logger,
-            ICapPublisher capBus, IMeterReadingRecordRepository _meterReadingRecordsRepository) :base(logger, capBus, _meterReadingRecordsRepository)
+            ICapPublisher capBus, IMeterReadingRecordRepository meterReadingRecordsRepository) : base(logger, capBus, meterReadingRecordsRepository)
         {
-            
+
         }
 
         public sealed override string SystemType => SystemTypeConst.Energy;
@@ -63,21 +64,50 @@ namespace JiShe.CollectBus.ScheduledMeterReading
         //[Route($"ammeter/list")]
         public override async Task<List<AmmeterInfo>> GetAmmeterInfoList(string gatherCode = "V4-Gather-8890")
         {
-            string sql = $@"SELECT C.ID,C.Name,C.FocusID,C.SingleRate,C.MeteringCode,C.Code AS BrandType,C.Baudrate,C.Password,C.MeteringPort,C.[Address] AS AmmerterAddress,C.TypeName,C.Protocol,C.TripState,C.[State],B.[Address],B.AreaCode,B.AutomaticReport,D.DataTypes,B.TimeDensity,A.GatherCode,C.Special,C.[ProjectID],B.AbnormalState,B.LastTime,CONCAT(B.AreaCode, B.[Address]) AS FocusAddress,(select top 1 DatabaseBusiID from TB_Project where ID = B.ProjectID) AS DatabaseBusiID
-              FROM TB_GatherInfo(NOLOCK) AS A
-              INNER JOIN TB_FocusInfo(NOLOCK) AS B ON A.ID = B.GatherInfoID AND B.RemoveState >= 0 AND B.State>=0
-              INNER JOIN TB_AmmeterInfo(NOLOCK) AS C ON B.ID = C.FocusID AND C.State>= 0 AND C.State<100
-              INNER JOIN TB_AmmeterGatherItem(NOLOCK) AS D ON C.ID = D.AmmeterID AND D.State>=0
-              WHERE 1=1 and C.Special = 0 ";
-            //TODO 记得移除特殊表过滤
 
-            if (!string.IsNullOrWhiteSpace(gatherCode))
+            List<AmmeterInfo> ammeterInfos = new List<AmmeterInfo>();
+            ammeterInfos.Add(new AmmeterInfo()
             {
-                sql = $@"{sql} AND A.GatherCode = '{gatherCode}'";
+                Baudrate = 2400,
-            }
+                FocusAddress = "402440506",
-            return await SqlProvider.Instance.Change(DbEnum.EnergyDB)
+                Name = "三相电表",
-                .Ado
+                FocusID = 1,
-                .QueryAsync<AmmeterInfo>(sql);
+                DatabaseBusiID = 1,
+                MeteringCode = 2,
+                AmmerterAddress = "402410040506",
+                ID = 9980,
+                TypeName = 3,
+            });
+            ammeterInfos.Add(new AmmeterInfo()
+            {
+                Baudrate = 2400,
+                FocusAddress = "542400504",
+                Name = "单相电表",
+                FocusID = 1,
+                DatabaseBusiID = 1,
+                MeteringCode = 2,
+                AmmerterAddress = "542410000504",
+                ID = 9981,
+                TypeName = 1,
+            });
+
+            return ammeterInfos;
+
+            //string sql = $@"SELECT C.ID,C.Name,C.FocusID,C.SingleRate,C.MeteringCode,C.Code AS BrandType,C.Baudrate,C.Password,C.MeteringPort,C.[Address] AS AmmerterAddress,C.TypeName,C.Protocol,C.TripState,C.[State],B.[Address],B.AreaCode,B.AutomaticReport,D.DataTypes,B.TimeDensity,A.GatherCode,C.Special,C.[ProjectID],B.AbnormalState,B.LastTime,CONCAT(B.AreaCode, B.[Address]) AS FocusAddress,(select top 1 DatabaseBusiID from TB_Project where ID = B.ProjectID) AS DatabaseBusiID
+            //  FROM TB_GatherInfo(NOLOCK) AS A
+            //  INNER JOIN TB_FocusInfo(NOLOCK) AS B ON A.ID = B.GatherInfoID AND B.RemoveState >= 0 AND B.State>=0
+            //  INNER JOIN TB_AmmeterInfo(NOLOCK) AS C ON B.ID = C.FocusID AND C.State>= 0 AND C.State<100
+            //  INNER JOIN TB_AmmeterGatherItem(NOLOCK) AS D ON C.ID = D.AmmeterID AND D.State>=0
+            //  WHERE 1=1 and C.Special = 0 ";
+            ////TODO 记得移除特殊表过滤
+
+            //if (!string.IsNullOrWhiteSpace(gatherCode))
+            //{
+            //    sql = $@"{sql} AND A.GatherCode = '{gatherCode}'";
+            //}
+            //return await SqlProvider.Instance.Change(DbEnum.EnergyDB)
+            //    .Ado
+            //    .QueryAsync<AmmeterInfo>(sql);
         }
 
         /// <summary>

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

@@ -20,6 +20,7 @@ using JiShe.CollectBus.Plugins;
 using JiShe.CollectBus.Consumers;
 using JiShe.CollectBus.Protocol.Contracts;
 using JiShe.CollectBus.IotSystems.MessageReceiveds;
+using JiShe.CollectBus.IotSystems.MessageIssueds;
 
 
 namespace JiShe.CollectBus.Host
@@ -302,6 +303,9 @@ namespace JiShe.CollectBus.Host
                             .SetTimeLimitStart(BatchTimeLimitStart.FromLast)
                             .SetConcurrencyLimit(10));
                     });
+
+                    rider.AddConsumer<ScheduledMeterReadingConsumer>();
+                     
                     rider.UsingKafka((c, cfg) =>
                     {
                         cfg.Host(configuration.GetConnectionString("Kafka"));
@@ -329,6 +333,12 @@ namespace JiShe.CollectBus.Host
                             configurator.ConfigureConsumer<IssuedConsumer>(c);
                             configurator.ConfigureConsumeTopology = false;
                         });
+
+                        //cfg.TopicEndpoint<ScheduledMeterReadingIssuedEventMessage>(ProtocolConst.AmmeterSubscriberWorkerFifteenMinuteIssuedEventName, ProtocolConst.SubscriberGroup, configurator =>
+                        //{
+                        //    configurator.ConfigureConsumer<ScheduledMeterReadingConsumer>(c);
+                        //    configurator.ConfigureConsumeTopology = false;
+                        //});
                     });
                 });
             });

src/JiShe.CollectBus.Host/CollectBusHostModule.cs

@@ -25,7 +25,7 @@ namespace JiShe.CollectBus.Host
         typeof(AbpAspNetCoreSerilogModule),
         typeof(AbpSwashbuckleModule),
         typeof(CollectBusApplicationModule),
-        typeof(CollectBusMongoDbModule),
+        typeof(CollectBusMongoDbModule), 
         typeof(AbpCachingStackExchangeRedisModule),
         typeof(AbpBackgroundWorkersHangfireModule)
         )]