test/iotgateway
1
0
Fork 0
mirror of https://gitee.com/iioter/iotgateway.git synced 2024-11-29 18:28:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.解决了表达式可能不生效的问题 2.缓存最近3次值，可以用raw、$pv、$ppv获取 3.bool类型的值可以表达式可以直接使用

Browse Source
This commit is contained in:
iioter 2023-10-18 10:26:40 +08:00
parent 22d11eee84
commit da79a78da7
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IoTGateway.Model/DeviceVariable.cs
View File

@ -63,5 +63,13 @@ namespace IoTGateway.Model
[Display(Name = "状态")]
[JsonConverter(typeof(StringEnumConverter))]
public VaribaleStatusTypeEnum StatusType { get; set; } = VaribaleStatusTypeEnum.UnKnow;
[NotMapped][Display(Name = "最近几次的值")] public object[] Values { get; set; } = new object[3];
public void EnqueueVariable(object value)
{
Values[2] = Values[1];
Values[1] = Values[0];
Values[0] = value;
}
}
}

27
Plugins/Plugin/DeviceThread.cs
View File

@ -88,6 +88,10 @@ namespace Plugin
{
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();
@ -105,13 +109,27 @@ namespace Plugin
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(DealMysqlStr(item.Expressions)
.Replace("raw", ret.Value?.ToString()));
ret.CookedValue = _interpreter.Eval(expressionText);
}
catch (Exception)
{
@ -128,9 +146,8 @@ namespace Plugin
ret.VarId = item.ID;
//变化了才推送到mqttserver，用于前端展示
if (item.StatusType != ret.StatusType ||
item.Value?.ToString() != ret.Value?.ToString() ||
item.CookedValue?.ToString() != ret.CookedValue?.ToString())
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(