luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
luosheng
2023-03-29 12:34:33 +08:00
parent 7ba7904282
commit f06088134f
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modbus.Net/Modbus.Net.Modbus/ModbusMachine.cs
View File

@@ -48,5 +48,5 @@ namespace Modbus.Net.Modbus
{ {
} }
} }
} }

15
Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs
View File

@@ -3,7 +3,6 @@ using Quartz.Impl;
using Quartz.Impl.Matchers; using Quartz.Impl.Matchers;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Modbus.Net namespace Modbus.Net
@@ -101,7 +100,7 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// 获取数据任务 /// 获取数据任务
/// </summary> /// </summary>
public sealed class MachineGetJobScheduler<TMachineMethod, TMachineKey, TReturnUnit> where TMachineKey: IEquatable<TMachineKey> where TReturnUnit : struct where TMachineMethod : IMachineMethod public sealed class MachineGetJobScheduler<TMachineMethod, TMachineKey, TReturnUnit> where TMachineKey : IEquatable<TMachineKey> where TReturnUnit : struct where TMachineMethod : IMachineMethod
{ {
private IScheduler _scheduler; private IScheduler _scheduler;
@@ -151,13 +150,13 @@ namespace Modbus.Net
.Build(); .Build();
string methodName = typeof(TMachineMethod).Name; 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"); throw new FormatException("IMachineMethod Name not match format exception");
} }
job.JobDataMap.Put("DataType", machineDataType); job.JobDataMap.Put("DataType", machineDataType);
job.JobDataMap.Put("Machine", machine); job.JobDataMap.Put("Machine", machine);
job.JobDataMap.Put("Function", methodName.Remove(0,14)); job.JobDataMap.Put("Function", methodName.Remove(0, 14));
if (_parentJobKey != null) if (_parentJobKey != null)
{ {
@@ -230,7 +229,7 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// 处理数据任务 /// 处理数据任务
/// </summary> /// </summary>
public sealed class MachineQueryJobScheduler<TMachineMethod, TMachineKey, TReturnUnit> where TMachineKey: IEquatable<TMachineKey> where TReturnUnit : struct where TMachineMethod : IMachineMethod public sealed class MachineQueryJobScheduler<TMachineMethod, TMachineKey, TReturnUnit> where TMachineKey : IEquatable<TMachineKey> where TReturnUnit : struct where TMachineMethod : IMachineMethod
{ {
private IScheduler _scheduler; private IScheduler _scheduler;
@@ -285,7 +284,7 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// 写入数据任务 /// 写入数据任务
/// </summary> /// </summary>
public sealed class MachineSetJobScheduler<TMachineMethod, TMachineKey, TReturnUnit> where TMachineKey: IEquatable<TMachineKey> where TReturnUnit : struct where TMachineMethod : IMachineMethod public sealed class MachineSetJobScheduler<TMachineMethod, TMachineKey, TReturnUnit> where TMachineKey : IEquatable<TMachineKey> where TReturnUnit : struct where TMachineMethod : IMachineMethod
{ {
private IScheduler _scheduler; private IScheduler _scheduler;
@@ -330,7 +329,7 @@ namespace Modbus.Net
throw new FormatException("IMachineMethod Name not match format exception"); throw new FormatException("IMachineMethod Name not match format exception");
} }
job.JobDataMap.Put("Machine", machine); 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; 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"); if (listener == null) throw new NullReferenceException("Listener " + "Modbus.Net.DataQuery.Chain." + _trigger.Key.Name + " is null");
@@ -398,7 +397,7 @@ namespace Modbus.Net
/// <returns></returns> /// <returns></returns>
/// <exception cref="NullReferenceException"></exception> /// <exception cref="NullReferenceException"></exception>
public async Task<MachineSetJobScheduler<TMachineMethod, TMachineKey, TReturnUnit>> Deal(string queryId = null, Func<string, Task> onSuccess = null, Func<string, int, string, Task> onFailure = null) public async Task<MachineSetJobScheduler<TMachineMethod, TMachineKey, TReturnUnit>> Deal(string queryId = null, Func<string, Task> onSuccess = null, Func<string, int, string, Task> onFailure = null)
{ {
if (queryId == null) return new MachineSetJobScheduler<TMachineMethod, TMachineKey, TReturnUnit>(_scheduler, _trigger, _parentJobKey); if (queryId == null) return new MachineSetJobScheduler<TMachineMethod, TMachineKey, TReturnUnit>(_scheduler, _trigger, _parentJobKey);
JobKey jobKey = JobKey.Create("Modbus.Net.DataQuery.Job." + queryId, "Modbus.Net.DataQuery.Group." + _trigger.Key.Name); JobKey jobKey = JobKey.Create("Modbus.Net.DataQuery.Job." + queryId, "Modbus.Net.DataQuery.Group." + _trigger.Key.Name);

2
Modbus.Net/Modbus.Net/Job/MultipleMachinesJobSchedulerCreator.cs
View File

@@ -9,7 +9,7 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// 多设备任务调度器 /// 多设备任务调度器
/// </summary> /// </summary>
public sealed class MultipleMachinesJobScheduler<TMachineMethod, TMachineKey, TReturnUnit> where TMachineKey: IEquatable<TMachineKey> where TReturnUnit : struct where TMachineMethod : IMachineMethod public sealed class MultipleMachinesJobScheduler<TMachineMethod, TMachineKey, TReturnUnit> where TMachineKey : IEquatable<TMachineKey> where TReturnUnit : struct where TMachineMethod : IMachineMethod
{ {
private static int _machineCount = 0; private static int _machineCount = 0;

4
Samples/MachineJob/Worker.cs
View File

@@ -1,6 +1,10 @@
using Modbus.Net; using Modbus.Net;
using Modbus.Net.Modbus; using Modbus.Net.Modbus;
using Modbus.Net.Siemens; using Modbus.Net.Siemens;
using ModbusMachine = Modbus.Net.Modbus.ModbusMachine<string, string>;
using SiemensMachine = Modbus.Net.Siemens.SiemensMachine<string, string>;
using MultipleMachinesJobScheduler = Modbus.Net.MultipleMachinesJobScheduler<Modbus.Net.IMachineMethodDatas, string, double>;
using DataReturnDef = Modbus.Net.DataReturnDef<string, double>;
namespace MachineJob.Service namespace MachineJob.Service
{ {