diff --git a/Plugins/Plugin/DeviceThread.cs b/Plugins/Plugin/DeviceThread.cs index f5be4e5..fbc214d 100644 --- a/Plugins/Plugin/DeviceThread.cs +++ b/Plugins/Plugin/DeviceThread.cs @@ -23,7 +23,7 @@ namespace Plugin private Task? _task; private readonly DateTime _tsStartDt = new(1970, 1, 1); private readonly CancellationTokenSource _tokenSource = new CancellationTokenSource(); - private readonly object _lock = new(); + private ManualResetEvent resetEvent = new(true); public DeviceThread(Device device, IDriver driver, string projectId, MyMqttClient myMqttClient, MqttServer mqttServer, ILogger logger) @@ -68,135 +68,145 @@ namespace Plugin return; } - lock (_lock) + resetEvent.WaitOne(); + try { - try + if (driver.IsConnected) { - if (driver.IsConnected) + foreach (var deviceVariables in Device.DeviceVariables.Where(x => x.ProtectType != ProtectTypeEnum.WriteOnly).GroupBy(x => x.Alias)) { - foreach (var deviceVariables in Device.DeviceVariables.Where(x=>x.ProtectType!= ProtectTypeEnum.WriteOnly).GroupBy(x => x.Alias)) - { - string deviceName = string.IsNullOrWhiteSpace(deviceVariables.Key) - ? Device.DeviceName - : deviceVariables.Key; + string deviceName = string.IsNullOrWhiteSpace(deviceVariables.Key) + ? Device.DeviceName + : deviceVariables.Key; - Dictionary> sendModel = new() + Dictionary> sendModel = new() { { deviceName, new() } }; - var payLoad = new PayLoad() { Values = new() }; + var payLoad = new PayLoad() { Values = new() }; - if (deviceVariables.Any()) + if (deviceVariables.Any()) + { + foreach (var item in deviceVariables.OrderBy(x => x.Index)) { - foreach (var item in deviceVariables.OrderBy(x => x.Index)) + item.Value = null; + item.CookedValue = null; + item.StatusType = VaribaleStatusTypeEnum.Bad; + + Thread.Sleep((int)Device.CmdPeriod); + + var ret = new DriverReturnValueModel(); + var ioarg = new DriverAddressIoArgModel { - item.Value = null; - item.CookedValue = null; - item.StatusType = VaribaleStatusTypeEnum.Bad; + ID = item.ID, + Address = item.DeviceAddress, + ValueType = item.DataType, + EndianType = item.EndianType + }; + var method = Methods.FirstOrDefault(x => x.Name == item.Method); + if (method == null) + ret.StatusType = VaribaleStatusTypeEnum.MethodError; + else + ret = (DriverReturnValueModel)method.Invoke(Driver, + new object[] { ioarg })!; - Thread.Sleep((int)Device.CmdPeriod); + item.EnqueueVariable(ret.Value); + if (ret.StatusType == VaribaleStatusTypeEnum.Good && + !string.IsNullOrWhiteSpace(item.Expressions?.Trim())) + { + var expressionText = DealMysqlStr(item.Expressions) + .Replace("raw", + item.Values[0] is bool + ? $"Convert.ToBoolean(\"{item.Values[0]}\")" + : item.Values[0]?.ToString()) + .Replace("$ppv", + item.Values[2] is bool + ? $"Convert.ToBoolean(\"{item.Values[2]}\")" + : item.Values[2]?.ToString()) + .Replace("$pv", + item.Values[1] is bool + ? $"Convert.ToBoolean(\"{item.Values[1]}\")" + : item.Values[1]?.ToString()); - var ret = new DriverReturnValueModel(); - var ioarg = new DriverAddressIoArgModel + try { - ID = item.ID, - Address = item.DeviceAddress, - ValueType = item.DataType, - EndianType = item.EndianType - }; - var method = Methods.FirstOrDefault(x => x.Name == item.Method); - if (method == null) - ret.StatusType = VaribaleStatusTypeEnum.MethodError; - else - ret = (DriverReturnValueModel)method.Invoke(Driver, - new object[] { ioarg })!; - - item.EnqueueVariable(ret.Value); - if (ret.StatusType == VaribaleStatusTypeEnum.Good && - !string.IsNullOrWhiteSpace(item.Expressions?.Trim())) - { - var expressionText = DealMysqlStr(item.Expressions) - .Replace("raw", - item.Values[0] is bool - ? $"Convert.ToBoolean(\"{item.Values[0]}\")" - : item.Values[0]?.ToString()) - .Replace("$ppv", - item.Values[2] is bool - ? $"Convert.ToBoolean(\"{item.Values[2]}\")" - : item.Values[2]?.ToString()) - .Replace("$pv", - item.Values[1] is bool - ? $"Convert.ToBoolean(\"{item.Values[1]}\")" - : item.Values[1]?.ToString()); - - try - { - ret.CookedValue = _interpreter.Eval(expressionText); - } - catch (Exception) - { - ret.StatusType = VaribaleStatusTypeEnum.ExpressionError; - } + ret.CookedValue = _interpreter.Eval(expressionText); } - else - ret.CookedValue = ret.Value; - - - if(item.IsUpload) - payLoad.Values[item.Name] = ret.CookedValue; - - ret.VarId = item.ID; - - //变化了才推送到mqttserver，用于前端展示 - if ((item.Values[1] == null && item.Values[0] != null) || - (item.Values[1] != null && item.Values[0] != null && item.Values[1].ToString() != item.Values[0].ToString())) + catch (Exception) { - //这是设备变量列表要用的 - var msgInternal = new InjectedMqttApplicationMessage( - new MqttApplicationMessage() - { - Topic = $"internal/v1/gateway/telemetry/{deviceName}/{item.Name}", - Payload = Encoding.UTF8.GetBytes(JsonUtility.SerializeToJson(ret)) - }); - mqttServer.InjectApplicationMessage(msgInternal); - //这是在线组态要用的 - var msgConfigure = new InjectedMqttApplicationMessage( - new MqttApplicationMessage() - { - Topic = $"v1/gateway/telemetry/{deviceName}/{item.Name}", - Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(ret.CookedValue)) - }); - mqttServer.InjectApplicationMessage(msgConfigure); + ret.StatusType = VaribaleStatusTypeEnum.ExpressionError; } + } + else + ret.CookedValue = ret.Value; - item.Value = ret.Value; - item.CookedValue = ret.CookedValue; - item.Timestamp = ret.Timestamp; - item.StatusType = ret.StatusType; + + if (item.IsUpload) + payLoad.Values[item.Name] = ret.CookedValue; + + ret.VarId = item.ID; + + //变化了才推送到mqttserver，用于前端展示 + if ((item.Values[1] == null && item.Values[0] != null) || + (item.Values[1] != null && item.Values[0] != null && item.Values[1].ToString() != item.Values[0].ToString())) + { + //这是设备变量列表要用的 + var msgInternal = new InjectedMqttApplicationMessage( + new MqttApplicationMessage() + { + Topic = $"internal/v1/gateway/telemetry/{deviceName}/{item.Name}", + Payload = Encoding.UTF8.GetBytes(JsonUtility.SerializeToJson(ret)) + }); + mqttServer.InjectApplicationMessage(msgInternal); + //这是在线组态要用的 + var msgConfigure = new InjectedMqttApplicationMessage( + new MqttApplicationMessage() + { + Topic = $"v1/gateway/telemetry/{deviceName}/{item.Name}", + Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(ret.CookedValue)) + }); + mqttServer.InjectApplicationMessage(msgConfigure); } - payLoad.TS = (long)(DateTime.UtcNow - _tsStartDt).TotalMilliseconds; - - if (deviceVariables.Where(x=>x.IsUpload&&x.ProtectType!=ProtectTypeEnum.WriteOnly).All(x => x.StatusType == VaribaleStatusTypeEnum.Good)) - { - payLoad.DeviceStatus = DeviceStatusTypeEnum.Good; - sendModel[deviceName] = new List { payLoad }; - myMqttClient - .PublishTelemetryAsync(deviceName, - Device, sendModel).Wait(); - } - else if (deviceVariables.Any(x => x.StatusType == VaribaleStatusTypeEnum.Bad)) - _myMqttClient?.DeviceDisconnected(deviceName, Device); + item.Value = ret.Value; + item.CookedValue = ret.CookedValue; + item.Timestamp = ret.Timestamp; + item.StatusType = ret.StatusType; } + payLoad.TS = (long)(DateTime.UtcNow - _tsStartDt).TotalMilliseconds; + + if (deviceVariables.Where(x => x.IsUpload && x.ProtectType != ProtectTypeEnum.WriteOnly).All(x => x.StatusType == VaribaleStatusTypeEnum.Good)) + { + payLoad.DeviceStatus = DeviceStatusTypeEnum.Good; + sendModel[deviceName] = new List { payLoad }; + myMqttClient + .PublishTelemetryAsync(deviceName, + Device, sendModel).Wait(); + } + else if (deviceVariables.Any(x => x.StatusType == VaribaleStatusTypeEnum.Bad)) + _myMqttClient?.DeviceDisconnected(deviceName, Device); } - //只要有读取异常且连接正常就断开 - if (Device.DeviceVariables.Where(x => x.IsUpload && x.ProtectType != ProtectTypeEnum.WriteOnly).Any(x => x.StatusType != VaribaleStatusTypeEnum.Good) && driver.IsConnected) - { - driver.Close(); - driver.Dispose(); - } } - else + + //只要有读取异常且连接正常就断开 + if (Device.DeviceVariables.Where(x => x.IsUpload && x.ProtectType != ProtectTypeEnum.WriteOnly).Any(x => x.StatusType != VaribaleStatusTypeEnum.Good) && driver.IsConnected) + { + driver.Close(); + driver.Dispose(); + } + } + else + { + foreach (var deviceVariables in Device.DeviceVariables!.GroupBy(x => x.Alias)) + { + string deviceName = string.IsNullOrWhiteSpace(deviceVariables.Key) + ? Device.DeviceName + : deviceVariables.Key; + + _myMqttClient?.DeviceDisconnected(deviceName, Device); + } + + if (driver.Connect()) { foreach (var deviceVariables in Device.DeviceVariables!.GroupBy(x => x.Alias)) { @@ -204,26 +214,14 @@ namespace Plugin ? Device.DeviceName : deviceVariables.Key; - _myMqttClient?.DeviceDisconnected(deviceName, Device); - } - - if (driver.Connect()) - { - foreach (var deviceVariables in Device.DeviceVariables!.GroupBy(x => x.Alias)) - { - string deviceName = string.IsNullOrWhiteSpace(deviceVariables.Key) - ? Device.DeviceName - : deviceVariables.Key; - - _myMqttClient?.DeviceConnected(deviceName, Device); - } + _myMqttClient?.DeviceConnected(deviceName, Device); } } } - catch (Exception ex) - { - _logger.LogError(ex, $"线程循环异常,{Device.DeviceName}"); - } + } + catch (Exception ex) + { + _logger.LogError(ex, $"线程循环异常,{Device.DeviceName}"); } @@ -255,61 +253,61 @@ namespace Plugin //执行写入变量RPC if (e.Method.ToLower() == "write") { - lock (_lock) + resetEvent.Reset(); + + bool rpcConnected = false; + //没连接就连接 + if (!Driver.IsConnected) + if (Driver.Connect()) + rpcConnected = true; + + //连接成功就尝试一个一个的写入，注意:目前写入地址和读取地址是相同的，对于PLC来说没问题，其他的要自己改........ + if (Driver.IsConnected) { - bool rpcConnected = false; - //没连接就连接 - if (!Driver.IsConnected) - if (Driver.Connect()) - rpcConnected = true; - - //连接成功就尝试一个一个的写入，注意:目前写入地址和读取地址是相同的，对于PLC来说没问题，其他的要自己改........ - if (Driver.IsConnected) + foreach (var para in e.Params) { - foreach (var para in e.Params) - { - //先查配置项，要用到配置的地址、数据类型、方法(方法最主要是用于区分写入数据的辅助判断，比如modbus不同的功能码) - //先找别名中的变量名，找不到就用设备名 - DeviceVariable? deviceVariable; - if (e.DeviceName == Device.DeviceName) - deviceVariable = Device.DeviceVariables.FirstOrDefault(x => - x.Name == para.Key && string.IsNullOrWhiteSpace(x.Alias)); - else - deviceVariable = Device.DeviceVariables.FirstOrDefault(x => - x.Name == para.Key && x.Alias == e.DeviceName); + //先查配置项，要用到配置的地址、数据类型、方法(方法最主要是用于区分写入数据的辅助判断，比如modbus不同的功能码) + //先找别名中的变量名，找不到就用设备名 + DeviceVariable? deviceVariable; + if (e.DeviceName == Device.DeviceName) + deviceVariable = Device.DeviceVariables.FirstOrDefault(x => + x.Name == para.Key && string.IsNullOrWhiteSpace(x.Alias)); + else + deviceVariable = Device.DeviceVariables.FirstOrDefault(x => + x.Name == para.Key && x.Alias == e.DeviceName); - if (deviceVariable != null&& deviceVariable.ProtectType!= ProtectTypeEnum.ReadOnly) + if (deviceVariable != null && deviceVariable.ProtectType != ProtectTypeEnum.ReadOnly) + { + DriverAddressIoArgModel ioArgModel = new() { - DriverAddressIoArgModel ioArgModel = new() - { - Address = deviceVariable.DeviceAddress, - Value = para.Value, - ValueType = deviceVariable.DataType - }; - var writeResponse = Driver - .WriteAsync(e.RequestId, deviceVariable.Method, ioArgModel).Result; - rpcResponse.IsSuccess = writeResponse.IsSuccess; - if (!writeResponse.IsSuccess) - { - rpcResponse.Description += writeResponse.Description; - } - } - else + Address = deviceVariable.DeviceAddress, + Value = para.Value, + ValueType = deviceVariable.DataType + }; + var writeResponse = Driver + .WriteAsync(e.RequestId, deviceVariable.Method, ioArgModel).Result; + rpcResponse.IsSuccess = writeResponse.IsSuccess; + if (!writeResponse.IsSuccess) { - rpcResponse.IsSuccess = false; - rpcResponse.Description += $"未能找到支持写入的变量:{para.Key},"; + rpcResponse.Description += writeResponse.Description; } } + else + { + rpcResponse.IsSuccess = false; + rpcResponse.Description += $"未能找到支持写入的变量:{para.Key},"; + } + } - if (rpcConnected) - Driver.Close(); - } - else //连接失败 - { - rpcResponse.IsSuccess = false; - rpcResponse.Description = $"{e.DeviceName} 连接失败"; - } + if (rpcConnected) + Driver.Close(); } + else //连接失败 + { + rpcResponse.IsSuccess = false; + rpcResponse.Description = $"{e.DeviceName} 连接失败"; + } + resetEvent.Set(); } //其他RPC TODO else