新增C#脚本，未完成

src/YSAI.DAQ/YSAI.Can/YSAI.Can.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.57" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -10,9 +10,11 @@
     <Company>YSAI</Company>
     <Product>SCADA</Product>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+	<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
   </PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.7.0" />
 		<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
 		<PackageReference Include="Microsoft.ClearScript" Version="7.4.4" />
 		<PackageReference Include="System.IO.Ports" Version="7.0.0" />

src/YSAI.DAQ/YSAI.Core/data/AddressParse.cs

@@ -27,15 +27,5 @@ namespace YSAI.Core.data
         /// 通过脚本来执行解析
         /// </summary>
         public ScriptData.Basics Script { get; set; }
-
-        /// <summary>
-        /// 重写Equals
-        /// </summary>
-        /// <param name="o"></param>
-        /// <returns></returns>
-        public override bool Equals(object o)
-        {
-            return this.Comparer(o as AddressParse).result;
-        }
     }
 }

src/YSAI.DAQ/YSAI.Core/handler/RuleHandler.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace YSAI.Core.handler
+{
+    /// <summary>
+    /// 规则处理
+    /// </summary>
+    public class RuleHandler
+    {
+    }
+}

src/YSAI.DAQ/YSAI.Core/script/ScriptData.cs

@@ -34,7 +34,8 @@ namespace YSAI.Core.script
         /// </summary>
         public enum ScriptType
         {
-            JavaScript
+            JavaScript,
+            CSharp
         }
 
     }

src/YSAI.DAQ/YSAI.Core/script/ScriptOperate.cs

@@ -113,6 +113,9 @@ namespace YSAI.Core.script
                             engine.Execute(ScriptCode);  //执行脚本
                             RetParam = engine.Invoke(ScriptFunction, ScriptParam).ToString();
                         }
+                        break;
+                    case ScriptData.ScriptType.CSharp:
+
                         break;
                 }
                 return Break("Execute", true, RData: RetParam, RType: @enum.ResultType.String);

src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj

@@ -18,7 +18,7 @@
 		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 		<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.57" />
 	</ItemGroup>
 	<!--<ItemGroup>
 		<ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />

src/YSAI.DAQ/YSAI.DaqManage/YSAI.DaqManage.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.57" />
 	</ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Kafka/YSAI.Kafka.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="2.2.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.57" />
   </ItemGroup>
 	
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Modbus/YSAI.Modbus.csproj

@@ -15,7 +15,7 @@
 	<ItemGroup>
     <PackageReference Include="NModbus" Version="3.0.80" />
     <PackageReference Include="NModbus.Serial" Version="3.0.80" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.57" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Mqtt/YSAI.Mqtt.csproj

@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="MQTTnet" Version="4.3.1.873" />
     <PackageReference Include="MQTTnet.AspNetCore" Version="4.3.1.873" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.57" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Opc/YSAI.Opc.csproj

@@ -13,7 +13,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.372.56" />
-	<PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.57" />
   </ItemGroup>
 
 

src/YSAI.DAQ/YSAI.Opc/ua/client/OpcUaClientOperate.cs

@@ -867,13 +867,8 @@ namespace YSAI.Opc.ua.client
                             //添加监控项
                             allSubscriptions[Tag].AddItems(monitoredItems);
 
-                            //修改订阅的参数
-                            allSubscriptions[Tag].KeepAliveCount = 10;  //保活计数
-                            allSubscriptions[Tag].LifetimeCount = 30;  //寿命计数
-                            allSubscriptions[Tag].PublishingEnabled = true;//是否启用发布
-
                             //添加订阅
-                            if (!clientSession?.AddSubscription(allSubscriptions[Tag]) == true)
+                            if (clientSession?.AddSubscription(allSubscriptions[Tag]) == false)
                             {
                                 return Break("AddSubscribe", false, "会话添加订阅失败");
                             }
@@ -887,17 +882,15 @@ namespace YSAI.Opc.ua.client
                         //此标签不存在，直接创建
                         //订阅
                         Subscription subscription = new Subscription(clientSession?.DefaultSubscription);
+                        subscription.PublishingEnabled = true;//是否启用发布
                         subscription.PublishingInterval = basics.PublishingInterval; //出版间隔
                         subscription.KeepAliveCount = uint.MaxValue;  //保活计数
                         subscription.LifetimeCount = uint.MaxValue;  //寿命计数
                         subscription.MaxNotificationsPerPublish = uint.MaxValue;  //每个发布请求的最大通知数
-                        subscription.MaxMessageCount = Nodes.Count;     //最大的消息数据量
-                        subscription.Priority = 1;  //分配给订阅的优先级
+                        subscription.Priority = 100;  //分配给订阅的优先级
                         subscription.DisplayName = Tag;  //订阅的显示名称
-                        subscription.TimestampsToReturn = TimestampsToReturn.Both;  //与通知消息一起返回的时间戳
                         subscription.StateChanged += delegate (Subscription subscription, SubscriptionStateChangedEventArgs e) { Subscription_StateChanged(subscription, e, Tag); };  //订阅状态
-                        subscription.PublishingEnabled = true;//是否启用发布
-
+                       
                         //监控项集合                                                                                                                                                    
                         List<MonitoredItem> monitoredItems = new List<MonitoredItem>();
 
@@ -917,7 +910,7 @@ namespace YSAI.Opc.ua.client
                         subscription.AddItems(monitoredItems);
 
                         //添加订阅
-                        if (!clientSession?.AddSubscription(subscription) == true)
+                        if (clientSession?.AddSubscription(subscription) == false)
                         {
                             return Break("AddSubscribe", false, "会话添加订阅失败");
                         }
@@ -927,9 +920,7 @@ namespace YSAI.Opc.ua.client
 
                         //把此订阅添加到集合，方便后续移除订阅(当存在此键则更新值，不存在则添加)
                         allSubscriptions?.AddOrUpdate(Tag, subscription, (k, v) => subscription);
-
                     }
-                    return Break("AddSubscribe", true);
                 }
                 catch (Exception ex)
                 {

src/YSAI.DAQ/YSAI.RabbitMQ/YSAI.RabbitMQ.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.57" />
   </ItemGroup>
 
   <ItemGroup>

src/YSAI.DAQ/YSAI.RelayManage/YSAI.RelayManage.csproj

@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
 		<PackageReference Include="Confluent.Kafka" Version="2.2.0" />
-		<PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+		<PackageReference Include="YSAI.Core" Version="1.0.0.57" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 

src/YSAI.DAQ/YSAI.S7/YSAI.S7.csproj

@@ -14,7 +14,7 @@
 
 	<ItemGroup>
     <PackageReference Include="S7netplus" Version="0.20.0" />
-    <PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+    <PackageReference Include="YSAI.Core" Version="1.0.0.57" />
   </ItemGroup>
 
 	<!--<ItemGroup>

src/YSAI.DAQ/YSAI.Test/YSAI.Test.csproj

@@ -17,7 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-	<PackageReference Include="YSAI.Core" Version="1.0.0.56" />
+	<PackageReference Include="YSAI.Core" Version="1.0.0.57" />
   </ItemGroup>
 
   <ItemGroup>