diff --git a/Modbus.Net/Modbus.Net.Modbus/ModbusMachine.cs b/Modbus.Net/Modbus.Net.Modbus/ModbusMachine.cs index 6d6b737..51b0d01 100644 --- a/Modbus.Net/Modbus.Net.Modbus/ModbusMachine.cs +++ b/Modbus.Net/Modbus.Net.Modbus/ModbusMachine.cs @@ -48,5 +48,5 @@ namespace Modbus.Net.Modbus { } } - + } \ No newline at end of file diff --git a/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs b/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs index 28a9c2f..4800977 100644 --- a/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs +++ b/Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs @@ -3,7 +3,6 @@ using Quartz.Impl; using Quartz.Impl.Matchers; using System; using System.Collections.Generic; -using System.Reflection; using System.Threading.Tasks; namespace Modbus.Net @@ -101,7 +100,7 @@ namespace Modbus.Net /// /// 获取数据任务 /// - public sealed class MachineGetJobScheduler where TMachineKey: IEquatable where TReturnUnit : struct where TMachineMethod : IMachineMethod + public sealed class MachineGetJobScheduler where TMachineKey : IEquatable where TReturnUnit : struct where TMachineMethod : IMachineMethod { private IScheduler _scheduler; @@ -151,13 +150,13 @@ namespace Modbus.Net .Build(); string methodName = typeof(TMachineMethod).Name; - if (methodName.Substring(0,14) != "IMachineMethod") + if (methodName.Substring(0, 14) != "IMachineMethod") { throw new FormatException("IMachineMethod Name not match format exception"); } job.JobDataMap.Put("DataType", machineDataType); job.JobDataMap.Put("Machine", machine); - job.JobDataMap.Put("Function", methodName.Remove(0,14)); + job.JobDataMap.Put("Function", methodName.Remove(0, 14)); if (_parentJobKey != null) { @@ -230,7 +229,7 @@ namespace Modbus.Net /// /// 处理数据任务 /// - public sealed class MachineQueryJobScheduler where TMachineKey: IEquatable where TReturnUnit : struct where TMachineMethod : IMachineMethod + public sealed class MachineQueryJobScheduler where TMachineKey : IEquatable where TReturnUnit : struct where TMachineMethod : IMachineMethod { private IScheduler _scheduler; @@ -285,7 +284,7 @@ namespace Modbus.Net /// /// 写入数据任务 /// - public sealed class MachineSetJobScheduler where TMachineKey: IEquatable where TReturnUnit : struct where TMachineMethod : IMachineMethod + public sealed class MachineSetJobScheduler where TMachineKey : IEquatable where TReturnUnit : struct where TMachineMethod : IMachineMethod { private IScheduler _scheduler; @@ -330,7 +329,7 @@ namespace Modbus.Net throw new FormatException("IMachineMethod Name not match format exception"); } job.JobDataMap.Put("Machine", machine); - job.JobDataMap.Put("Function", methodName.Remove(0,14)); + job.JobDataMap.Put("Function", methodName.Remove(0, 14)); var listener = _scheduler.ListenerManager.GetJobListener("Modbus.Net.DataQuery.Chain." + _trigger.Key.Name) as JobChainingJobListenerWithDataMap; if (listener == null) throw new NullReferenceException("Listener " + "Modbus.Net.DataQuery.Chain." + _trigger.Key.Name + " is null"); @@ -398,7 +397,7 @@ namespace Modbus.Net /// /// public async Task> Deal(string queryId = null, Func onSuccess = null, Func onFailure = null) - { + { if (queryId == null) return new MachineSetJobScheduler(_scheduler, _trigger, _parentJobKey); JobKey jobKey = JobKey.Create("Modbus.Net.DataQuery.Job." + queryId, "Modbus.Net.DataQuery.Group." + _trigger.Key.Name); diff --git a/Modbus.Net/Modbus.Net/Job/MultipleMachinesJobSchedulerCreator.cs b/Modbus.Net/Modbus.Net/Job/MultipleMachinesJobSchedulerCreator.cs index 2826fb1..02054a9 100644 --- a/Modbus.Net/Modbus.Net/Job/MultipleMachinesJobSchedulerCreator.cs +++ b/Modbus.Net/Modbus.Net/Job/MultipleMachinesJobSchedulerCreator.cs @@ -9,7 +9,7 @@ namespace Modbus.Net /// /// 豸 /// - public sealed class MultipleMachinesJobScheduler where TMachineKey: IEquatable where TReturnUnit : struct where TMachineMethod : IMachineMethod + public sealed class MultipleMachinesJobScheduler where TMachineKey : IEquatable where TReturnUnit : struct where TMachineMethod : IMachineMethod { private static int _machineCount = 0; diff --git a/Samples/MachineJob/Worker.cs b/Samples/MachineJob/Worker.cs index 6881700..478f693 100644 --- a/Samples/MachineJob/Worker.cs +++ b/Samples/MachineJob/Worker.cs @@ -1,6 +1,10 @@ using Modbus.Net; using Modbus.Net.Modbus; using Modbus.Net.Siemens; +using ModbusMachine = Modbus.Net.Modbus.ModbusMachine; +using SiemensMachine = Modbus.Net.Siemens.SiemensMachine; +using MultipleMachinesJobScheduler = Modbus.Net.MultipleMachinesJobScheduler; +using DataReturnDef = Modbus.Net.DataReturnDef; namespace MachineJob.Service {