From e35172d69f4c5f620ced3f13f664be44abee0654 Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Mon, 12 May 2025 10:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs | 2 +-
.../JiShe.CollectBus.Protocol.csproj | 2 +-
.../DataChannels/DataChannelManageService.cs | 4 ++--
.../JiShe.CollectBus.Application.csproj | 4 ++--
.../JiShe.CollectBus.Application/Samples/SampleAppService.cs | 4 ++--
.../BasicScheduledMeterReadingService.cs | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs b/modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs
index dfe442d..6d77ce3 100644
--- a/modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs
+++ b/modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs
@@ -134,7 +134,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
try
{
- var batchSize = 1000;
+ var batchSize = 2000;
var batches = entities.Chunk(batchSize);
foreach (var batch in batches)
diff --git a/protocols/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj b/protocols/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj
index 6495b24..7fead27 100644
--- a/protocols/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj
+++ b/protocols/JiShe.CollectBus.Protocol/JiShe.CollectBus.Protocol.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/services/JiShe.CollectBus.Application/DataChannels/DataChannelManageService.cs b/services/JiShe.CollectBus.Application/DataChannels/DataChannelManageService.cs
index c24ad18..21cec8a 100644
--- a/services/JiShe.CollectBus.Application/DataChannels/DataChannelManageService.cs
+++ b/services/JiShe.CollectBus.Application/DataChannels/DataChannelManageService.cs
@@ -63,8 +63,8 @@ namespace JiShe.CollectBus.DataChannels
public async Task ScheduledMeterTaskReadingAsync(
ChannelReader>> telemetryPacketInfoReader)
{
- const int BatchSize = 20000;
- const int EmptyWaitMilliseconds = 1000;
+ const int BatchSize = 100000;
+ const int EmptyWaitMilliseconds = 200;
var timeout = TimeSpan.FromSeconds(5);
var timer = Stopwatch.StartNew();
long timeoutMilliseconds = 0;
diff --git a/services/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj b/services/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj
index b9d899c..01878c2 100644
--- a/services/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj
+++ b/services/JiShe.CollectBus.Application/JiShe.CollectBus.Application.csproj
@@ -19,8 +19,8 @@
-
-
+
+
diff --git a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
index 0009e20..ffbfadb 100644
--- a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
+++ b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
@@ -250,14 +250,14 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
{
time = DateTime.Now;
- var meter = new TableModelSingleMeasuringEntity()
+ var meter = new TableModelSingleMeasuringEntity()
{
SystemName = "energy",
DeviceId = "402440506",
DeviceType = "Ammeter",
ProjectId = "10059",
Timestamps = time.GetDateTimeOffset().ToUnixTimeMilliseconds(),
- SingleColumn = (measuring, value)
+ SingleColumn = (measuring, true)
};
_dbContext.UseTableSessionPool = true;
await _iotDBProvider.InsertAsync(meter);
diff --git a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
index 270bb67..7b407b4 100644
--- a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
@@ -231,7 +231,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
//检查任务时间节点，由于定时任务10秒钟运行一次，需要判定当前时间是否在任务时间节点内，不在则跳过
var currentTaskTime = tasksToBeIssueModel.LastTaskTime.CalculateNextCollectionTime(timeDensity);//程序启动缓存电表的时候，NextTaskTime需要格式化到下一个采集点时间。
- if (!IsTaskTime(currentTaskTime, timeDensity))
+ if (!IsTaskTime(currentTaskTime, timeDensity))//todo 如果时间超过两个采集频率周期，就一直处理，直到追加到下一个采集频率周期。
{
_logger.LogInformation($"{nameof(CreateToBeIssueTasks)} 构建待处理的下发指令任务处理时Key=>{item}时间节点不在当前时间范围内,103");
continue;
@@ -498,7 +498,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
timer.Stop();
- _logger.LogInformation($"{nameof(InitAmmeterCacheData)} 初始化电表缓存数据完成，耗时{timer.ElapsedMilliseconds}毫秒");
+ _logger.LogWarning($"{nameof(InitAmmeterCacheData)} 初始化电表缓存数据完成，耗时{timer.ElapsedMilliseconds}毫秒");
}
///