完善下发数据的处理。

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
@@ -118,7 +119,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                             List<string> itemCodeList = new List<string>();
                             foreach (var dataType in itemArr)
                             {
-                                var excludeItemCode = "10_98,10_94";//排除透明转发:尖峰平谷时段、跳合闸
+                                var excludeItemCode = "10_98,10_94";//TODO 排除透明转发:尖峰平谷时段、跳合闸,特殊电表
                                 var gatherItem = gatherItemInfos.FirstOrDefault(f => f.DataType.Equals(dataType));
                                 if (gatherItem != null)
                                 {
@@ -127,17 +128,21 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                                         itemCodeList.Add(gatherItem.ItemCode);
                                     }
                                 }
-                            }
-                            #endregion
 
                                 #region 特殊电表采集项编号处理
                                 if (itemArr.Exists(e => e.Equals("95"))) //德力西DTS
                                 {
                                     itemCodeList.Add("10_95");
                                 }
-                            //if (itemArr.Exists(e => e.Equals("109")))//WAVE_109
+                                if (itemArr.Exists(e => e.Equals("109")))//WAVE_109
-                            //    ammeter.ItemCodes += "10_109,";
+                                {
+                                    itemCodeList.Add("10_109");
+                                }
                                 #endregion
+                            }
+                            #endregion
+
+
 
                             ammeter.ItemCodes = itemCodeList.Serialize();//转换成JSON字符串
 
@@ -207,7 +212,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                 _logger.LogError($"{nameof(AmmeterScheduledMeterFiveMinuteReading)} 5分钟采集电表数据处理时没有获取到缓存信息,-102");
                 return;
             }
-            await AmmerterScheduledMeterReadingIssued(ProtocolConst.AmmeterSubscriberWorkerOneMinuteIssuedEventName, meterInfos);
+            await AmmerterScheduledMeterReadingIssued(ProtocolConst.AmmeterSubscriberWorkerFiveMinuteIssuedEventName, meterInfos);
 
             _logger.LogInformation($"{nameof(AmmeterScheduledMeterFiveMinuteReading)} 5分钟采集电表数据处理完成");
         }
@@ -235,8 +240,14 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                 return;
             }
 
-            await AmmerterScheduledMeterReadingIssued(ProtocolConst.AmmeterSubscriberWorkerOneMinuteIssuedEventName, meterInfos);
+            Stopwatch stopwatch = new Stopwatch();
-            _logger.LogInformation($"{nameof(AmmeterScheduledMeterFifteenMinuteReading)} 15分钟采集电表数据处理完成");
+            stopwatch.Start();
+
+            await AmmerterScheduledMeterReadingIssued(ProtocolConst.AmmeterSubscriberWorkerFifteenMinuteIssuedEventName, meterInfos);
+
+            stopwatch.Stop();
+
+            _logger.LogInformation($"{nameof(AmmeterScheduledMeterFifteenMinuteReading)} 15分钟采集电表数据处理完成，共消耗{stopwatch.ElapsedMilliseconds}毫秒。");
         }
         #endregion
 
@@ -494,6 +505,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                 foreach (var group in focusHashGroups)
                 {
                     _ = Task.Run(async () => { await CreatePublishTask(eventName, group.Value); });
+                    //await CreatePublishTask(eventName, group.Value);
                 }
 
                 await Task.CompletedTask;
@@ -538,12 +550,12 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                         continue;
                     }
 
-                    //排除1天未在线的集中器生成指令 或 排除集中器配置为自动上报的集中器
+                    ////排除1天未在线的集中器生成指令 或 排除集中器配置为自动上报的集中器
-                    if (!IsGennerateCmd(ammeter.LastTime, -1))
+                    //if (!IsGennerateCmd(ammeter.LastTime, -1))
-                    {
+                    //{
-                        _logger.LogInformation($"{nameof(CreatePublishTask)} 集中器{ammeter.FocusAddress}的电表{ammeter.Name}，采集时间：{ammeter.LastTime}，已超过1天未在线，不生成指令");
+                    //    _logger.LogInformation($"{nameof(CreatePublishTask)} 集中器{ammeter.FocusAddress}的电表{ammeter.Name}，采集时间：{ammeter.LastTime}，已超过1天未在线，不生成指令");
-                        continue;
+                    //    continue;
-                    }
+                    //}
 
                     if (string.IsNullOrWhiteSpace(ammeter.AreaCode))
                     {
@@ -622,13 +634,15 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                         }
                         else
                         {
+                            //特殊表暂不处理
                             if (TelemetryPacketBuilder.AFNHandlers.TryGetValue(tempItem, out var handler))
                             {
                                 dataInfos = handler(ammeter.FocusAddress, fn, ammeter.MeteringCode);
                             }
                             else
                             {
-                                throw new InvalidOperationException($"无效编码: {tempItem}");
+                                _logger.LogWarning($"{nameof(CreatePublishTask)} 集中器{ammeter.FocusAddress}的电表{ammeter.Name}采集项{tempItem}无效编码。");
+                                continue;
                             }
                         }
                         //TODO:特殊表 

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

@@ -59,11 +59,12 @@ namespace JiShe.CollectBus.ScheduledMeterReading
               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 ";
+              WHERE 1=1 and C.Special = 0 ";
+            //TODO 记得移除特殊表过滤
 
             if (!string.IsNullOrWhiteSpace(gatherCode))
             {
-                sql = $@"{sql} A.GatherCode = '{gatherCode}'";
+                sql = $@"{sql} AND A.GatherCode = '{gatherCode}'";
             }
             return await SqlProvider.Instance.Change(DbEnum.EnergyDB)
                 .Ado

src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs

@@ -81,7 +81,7 @@ namespace JiShe.CollectBus.Subscribers
         /// <returns></returns>
         [HttpPost]
         [Route("ammeter/fiveminute/issued-event")]
-        [CapSubscribe(ProtocolConst.AmmeterSubscriberWorkerOneMinuteIssuedEventName)]
+        [CapSubscribe(ProtocolConst.AmmeterSubscriberWorkerFiveMinuteIssuedEventName)]
         public async Task AmmeterScheduledMeterFiveMinuteReadingIssuedEvent(ScheduledMeterReadingIssuedEventMessage receivedMessage)
         {
             _logger.LogInformation("5分钟采集电表数据下行消息消费队列开始处理");
@@ -108,7 +108,7 @@ namespace JiShe.CollectBus.Subscribers
         /// <returns></returns>
         [HttpPost]
         [Route("ammeter/fifteenminute/issued-event")]
-        [CapSubscribe(ProtocolConst.AmmeterSubscriberWorkerOneMinuteIssuedEventName)]
+        [CapSubscribe(ProtocolConst.AmmeterSubscriberWorkerFifteenMinuteIssuedEventName)]
         public async Task AmmeterScheduledMeterFifteenMinuteReadingIssuedEvent(ScheduledMeterReadingIssuedEventMessage receivedMessage)
         {
             _logger.LogInformation("15分钟采集电表数据下行消息消费队列开始处理");
@@ -164,7 +164,7 @@ namespace JiShe.CollectBus.Subscribers
         /// <returns></returns>
         [HttpPost]
         [Route("watermeter/fiveminute/issued-event")]
-        [CapSubscribe(ProtocolConst.WatermeterSubscriberWorkerOneMinuteIssuedEventName)]
+        [CapSubscribe(ProtocolConst.AmmeterSubscriberWorkerFiveMinuteIssuedEventName)]
         public async Task WatermeterScheduledMeterFiveMinuteReadingIssuedEvent(ScheduledMeterReadingIssuedEventMessage receivedMessage)
         {
             _logger.LogInformation("5分钟采集电表数据下行消息消费队列开始处理");
@@ -191,7 +191,7 @@ namespace JiShe.CollectBus.Subscribers
         /// <returns></returns>
         [HttpPost]
         [Route("watermeter/fifteenminute/issued-event")]
-        [CapSubscribe(ProtocolConst.WatermeterSubscriberWorkerOneMinuteIssuedEventName)]
+        [CapSubscribe(ProtocolConst.AmmeterSubscriberWorkerFifteenMinuteIssuedEventName)]
         public async Task WatermeterScheduledMeterFifteenMinuteReadingIssuedEvent(ScheduledMeterReadingIssuedEventMessage receivedMessage)
         {
             _logger.LogInformation("15分钟采集电表数据下行消息消费队列开始处理");

src/JiShe.CollectBus.Common/BuildSendDatas/Build3761SendData.cs

@@ -1401,7 +1401,7 @@ namespace JiShe.CollectBus.Common.BuildSendDatas
             cmdStrList.AddRange(userDatas);
             cmdStrList.Add(cs);
             cmdStrList.Add(endStr);
-            Console.WriteLine(string.Join(" ", cmdStrList));
+            //Console.WriteLine(string.Join(" ", cmdStrList));
             var bytes = cmdStrList.Select(x => Convert.ToByte(x, 16)).ToArray();
             return bytes;
         }

src/JiShe.CollectBus.Domain/Ammeters/AmmeterInfo.cs

@@ -119,7 +119,7 @@ namespace JiShe.CollectBus.Ammeters
         public string GatherCode { get; set; }
 
         /// <summary>
-        /// 是否特殊表
+        /// 是否特殊表，1是特殊电表
         /// </summary>
         public int Special { get; set; }
 

src/JiShe.CollectBus.Host/appsettings.Development.json

@@ -1,7 +1,7 @@
 {
   "Logging": {
     "LogLevel": {
-      "Default": "Information",
+      "Default": "Warning",
       "Microsoft.AspNetCore": "Warning"
     }
   }

src/JiShe.CollectBus.Host/appsettings.json

@@ -5,7 +5,7 @@
       "Serilog.Sinks.File"
     ],
     "MinimumLevel": {
-      "Default": "Information",
+      "Default": "Warning",
       "Override": {
         "Microsoft": "Information",
         "Volo.Abp": "Warning",