From 62f63c142a09a8f62cfd60cfd163740621b5df6d Mon Sep 17 00:00:00 2001 From: luosheng Date: Wed, 15 Feb 2023 17:40:22 +0800 Subject: [PATCH] ApplyTo change --- .../Modbus.Net/Job/MachineJobScheduler.cs | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs b/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs index 14f0e1f..0877983 100644 --- a/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs +++ b/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs @@ -160,29 +160,8 @@ namespace Modbus.Net public async Task ApplyTo(string queryId, Dictionary values, MachineDataType machineDataType) where TMachineKey : IEquatable { - JobKey jobKey = JobKey.Create("Modbus.Net.DataQuery.Job." + queryId, "Modbus.Net.DataQuery.Group." + _trigger.Key.Name); - - IJobDetail job = JobBuilder.Create>() - .WithIdentity(jobKey) - .StoreDurably(true) - .Build(); - - job.JobDataMap.Put("DataType", machineDataType); - job.JobDataMap.Put("Value", values); - - if (_parentJobKey != null) - { - var listener = _scheduler.ListenerManager.GetJobListener("Modbus.Net.DataQuery.Chain." + _trigger.Key.Name) as JobChainingJobListenerWithDataMap; - listener.AddJobChainLink(_parentJobKey, jobKey); - - await _scheduler.AddJob(job, true); - } - else - { - await _scheduler.ScheduleJob(job, _trigger); - } - - return new MachineSetJobScheduler(_scheduler, _trigger, jobKey); + var applyJobScheduler = await Apply(queryId, values, machineDataType); + return await applyJobScheduler.Query(); } }