mirror of
https://gitee.com/ThingsGateway/ThingsGateway.git
synced 2025-10-23 20:13:22 +08:00
表达式整理
This commit is contained in:
@@ -1,28 +0,0 @@
|
||||
using CodingSeb.ExpressionEvaluator;
|
||||
|
||||
namespace ThingsGateway.Foundation
|
||||
{
|
||||
[System.Security.SecuritySafeCritical]
|
||||
public static class ExpressionsHelper
|
||||
{
|
||||
/// <summary>
|
||||
/// 计算表达式:raw*100
|
||||
/// </summary>
|
||||
/// <param name="expressions"></param>
|
||||
/// <returns></returns>
|
||||
public static object GetExpressionsResult(this ExpressionEvaluator evaluator, string expressions, object rawvalue)
|
||||
{
|
||||
if (expressions.IsNullOrEmpty())
|
||||
{
|
||||
return rawvalue;
|
||||
}
|
||||
evaluator.Variables = new Dictionary<string, object>()
|
||||
{
|
||||
{ "Raw", rawvalue},
|
||||
{ "raw", rawvalue},
|
||||
};
|
||||
var value = evaluator.Evaluate(expressions);
|
||||
return value;
|
||||
}
|
||||
}
|
||||
}
|
@@ -9,6 +9,7 @@ namespace ThingsGateway.Web.Foundation
|
||||
/// <summary>
|
||||
/// 表达式扩展
|
||||
/// </summary>
|
||||
[System.Security.SecuritySafeCritical]
|
||||
public static class ExpressionEvaluatorExtension
|
||||
{
|
||||
static ExpressionEvaluator ExpressionEvaluator;
|
||||
@@ -35,6 +36,25 @@ namespace ThingsGateway.Web.Foundation
|
||||
var value = ExpressionEvaluator.Evaluate(expressions);
|
||||
return value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 计算表达式:raw*100
|
||||
/// </summary>
|
||||
public static object GetExpressionsResult(this ExpressionEvaluator evaluator, string expressions, object rawvalue)
|
||||
{
|
||||
if (expressions.IsNullOrEmpty())
|
||||
{
|
||||
return rawvalue;
|
||||
}
|
||||
evaluator.Variables = new Dictionary<string, object>()
|
||||
{
|
||||
{ "Raw", rawvalue},
|
||||
{ "raw", rawvalue},
|
||||
};
|
||||
var value = evaluator.Evaluate(expressions);
|
||||
return value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 表达式的扩展变量来源
|
||||
/// </summary>
|
||||
|
@@ -59,7 +59,7 @@ public class CollectVariableRunTime : CollectDeviceVariable
|
||||
public object LastSetValue;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// 设置变量值
|
||||
/// </summary>
|
||||
/// <param name="value"></param>
|
||||
/// <param name="dateTime"></param>
|
||||
|
Reference in New Issue
Block a user