diff --git a/src/ThingsGateway.Foundation/Foundation/Expressions/ExpressionsHelper.cs b/src/ThingsGateway.Foundation/Foundation/Expressions/ExpressionsHelper.cs
deleted file mode 100644
index a542195f4..000000000
--- a/src/ThingsGateway.Foundation/Foundation/Expressions/ExpressionsHelper.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using CodingSeb.ExpressionEvaluator;
-
-namespace ThingsGateway.Foundation
-{
- [System.Security.SecuritySafeCritical]
- public static class ExpressionsHelper
- {
- ///
- /// 计算表达式:raw*100
- ///
- ///
- ///
- public static object GetExpressionsResult(this ExpressionEvaluator evaluator, string expressions, object rawvalue)
- {
- if (expressions.IsNullOrEmpty())
- {
- return rawvalue;
- }
- evaluator.Variables = new Dictionary()
- {
- { "Raw", rawvalue},
- { "raw", rawvalue},
- };
- var value = evaluator.Evaluate(expressions);
- return value;
- }
- }
-}
\ No newline at end of file
diff --git a/src/ThingsGateway.Web.Foundation/HostServices/Core/Helps/ExpressionEvaluatorExtension.cs b/src/ThingsGateway.Web.Foundation/HostServices/Core/Helps/ExpressionEvaluatorExtension.cs
index 796cca59c..3cf9ec19b 100644
--- a/src/ThingsGateway.Web.Foundation/HostServices/Core/Helps/ExpressionEvaluatorExtension.cs
+++ b/src/ThingsGateway.Web.Foundation/HostServices/Core/Helps/ExpressionEvaluatorExtension.cs
@@ -9,6 +9,7 @@ namespace ThingsGateway.Web.Foundation
///
/// 表达式扩展
///
+ [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;
}
+
+ ///
+ /// 计算表达式:raw*100
+ ///
+ public static object GetExpressionsResult(this ExpressionEvaluator evaluator, string expressions, object rawvalue)
+ {
+ if (expressions.IsNullOrEmpty())
+ {
+ return rawvalue;
+ }
+ evaluator.Variables = new Dictionary()
+ {
+ { "Raw", rawvalue},
+ { "raw", rawvalue},
+ };
+ var value = evaluator.Evaluate(expressions);
+ return value;
+ }
+
///
/// 表达式的扩展变量来源
///
diff --git a/src/ThingsGateway.Web.Foundation/Model/CollectVariableRunTime.cs b/src/ThingsGateway.Web.Foundation/Model/CollectVariableRunTime.cs
index be7ff620c..248764d6c 100644
--- a/src/ThingsGateway.Web.Foundation/Model/CollectVariableRunTime.cs
+++ b/src/ThingsGateway.Web.Foundation/Model/CollectVariableRunTime.cs
@@ -59,7 +59,7 @@ public class CollectVariableRunTime : CollectDeviceVariable
public object LastSetValue;
///
- ///
+ /// 设置变量值
///
///
///