dev #2

Merged
admin merged 176 commits from dev into master 2025-04-18 01:31:49 +00:00
5 changed files with 11 additions and 5 deletions
Showing only changes of commit 3d56d351d3 - Show all commits

View File

@ -115,7 +115,7 @@ public class CollectBusApplicationModule : AbpModule
foreach (var item in topics) foreach (var item in topics)
{ {
kafkaAdminClient.CreateTopicIfNotExistAsync(item, configuration.GetValue<short>(CommonConst.KafkaReplicationFactor), configuration.GetValue<int>(CommonConst.NumPartitions)); kafkaAdminClient.CreateTopicAsync(item, configuration.GetValue<int>(CommonConst.NumPartitions), configuration.GetValue<short>(CommonConst.KafkaReplicationFactor));
} }
} }

View File

@ -95,6 +95,8 @@ namespace JiShe.CollectBus.ScheduledMeterReading
continue; continue;
} }
//检查任务时间节点
//item 为 CacheTasksToBeIssuedKey 对应的缓存待下发的指令生产任务数据Redis Key tempArryay[0]=>CollectBustempArryay[1]=>SystemTypeConsttempArryay[2]=>TaskInfotempArryay[3]=>表计类别tempArryay[4]=>采集频率 //item 为 CacheTasksToBeIssuedKey 对应的缓存待下发的指令生产任务数据Redis Key tempArryay[0]=>CollectBustempArryay[1]=>SystemTypeConsttempArryay[2]=>TaskInfotempArryay[3]=>表计类别tempArryay[4]=>采集频率
var tempArryay = item.Split(":"); var tempArryay = item.Split(":");
string meteryType = tempArryay[3];//表计类别 string meteryType = tempArryay[3];//表计类别

View File

@ -27,14 +27,14 @@ namespace JiShe.CollectBus.Workers
{ {
_logger = logger; _logger = logger;
RecurringJobId = nameof(CreateToBeIssueTaskWorker); RecurringJobId = nameof(CreateToBeIssueTaskWorker);
CronExpression = $"*/{1} * * * *"; ; CronExpression = $"{10}/* * * * *";
this._scheduledMeterReadingService = scheduledMeterReadingService; this._scheduledMeterReadingService = scheduledMeterReadingService;
} }
public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken()) public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
{ {
//await _scheduledMeterReadingService.CreateToBeIssueTasks(); await _scheduledMeterReadingService.CreateToBeIssueTasks();
} }
} }
} }

View File

@ -71,8 +71,12 @@ namespace JiShe.CollectBus.Kafka.AdminClient
public async Task CreateTopicAsync(string topic, int numPartitions, short replicationFactor) public async Task CreateTopicAsync(string topic, int numPartitions, short replicationFactor)
{ {
try try
{ {
if (await CheckTopicAsync(topic)) return;
await Instance.CreateTopicsAsync(new[] await Instance.CreateTopicsAsync(new[]
{ {
new TopicSpecification new TopicSpecification

View File

@ -14,9 +14,9 @@ namespace JiShe.CollectBus.Kafka.Producer
public class ProducerService<TKey, TValue> : IProducerService<TKey, TValue>, IDisposable,ITransientDependency public class ProducerService<TKey, TValue> : IProducerService<TKey, TValue>, IDisposable,ITransientDependency
{ {
private readonly ILogger<ConsumerService<TKey, TValue>> _logger; private readonly ILogger<ProducerService<TKey, TValue>> _logger;
protected ProducerService(IConfiguration configuration, ILogger<ConsumerService<TKey, TValue>> logger) protected ProducerService(IConfiguration configuration, ILogger<ProducerService<TKey, TValue>> logger)
{ {
_logger = logger; _logger = logger;
GetInstance(configuration); GetInstance(configuration);