Shun 2 years ago
parent
commit
2a0dc7771c
41 changed files with 214 additions and 40 deletions
  1. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.dll
  2. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.pdb
  3. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Core.dll
  4. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.Core.dll
  5. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.DB.dll
  6. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.DB.pdb
  7. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Core.dll
  8. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Kafka.dll
  9. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Kafka.pdb
  10. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Core.dll
  11. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Modbus.dll
  12. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Modbus.pdb
  13. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Core.dll
  14. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Mqtt.dll
  15. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Mqtt.pdb
  16. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Core.dll
  17. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.dll
  18. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.pdb
  19. 82 20
      src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.xml
  20. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.Core.dll
  21. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.RabbitMQ.dll
  22. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.RabbitMQ.pdb
  23. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.Core.dll
  24. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.S7.dll
  25. BIN
      src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.S7.pdb
  26. 4 2
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.Can.Param.json
  27. 15 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.Can.ParamDetails.json
  28. 4 2
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.DB.Param.json
  29. 15 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.DB.ParamDetails.json
  30. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.Kafka.Param.json
  31. 4 2
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.Modbus.Param.json
  32. 15 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.Modbus.ParamDetails.json
  33. 3 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDa.Param.json
  34. 14 0
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDa.ParamDetails.json
  35. 4 2
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDaHttp.Param.json
  36. 15 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDaHttp.ParamDetails.json
  37. 3 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcUa.Param.json
  38. 15 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcUa.ParamDetails.json
  39. 1 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.RabbitMQ.Param.json
  40. 4 2
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.S7.Param.json
  41. 15 1
      src/YSAI.DAQ/YSAI.Manage/param/YSAI.S7.ParamDetails.json

BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Can.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Can.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.DB.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.DB.Pack/YSAI.DB.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Kafka.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Kafka.Pack/YSAI.Kafka.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Modbus.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Modbus.Pack/YSAI.Modbus.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Mqtt.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Mqtt.Pack/YSAI.Mqtt.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.pdb


+ 82 - 20
src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.xml

@@ -34,6 +34,16 @@
             更新频率
             </summary>
         </member>
+        <member name="P:YSAI.Opc.da.client.OpcDaClientData.Basics.TaskHandleCount">
+            <summary>
+            任务处理数量
+            </summary>
+        </member>
+        <member name="P:YSAI.Opc.da.client.OpcDaClientData.Basics.TaskHandleAccomplishSleepTime">
+            <summary>
+            任务处理完成休眠时间(毫秒)
+            </summary>
+        </member>
         <member name="M:YSAI.Opc.da.client.OpcDaClientData.Basics.Equals(System.Object)">
             <summary>
             重写Equals
@@ -222,6 +232,37 @@
             <param name="GroupName">此节点在哪个组下,不输入则删除所有节点名相同的数据</param>
             <returns>统一出参</returns>
         </member>
+        <member name="T:YSAI.Opc.da.client.OpcDaClientOperate.QueueData">
+            <summary>
+            队列数据
+            </summary>
+        </member>
+        <member name="P:YSAI.Opc.da.client.OpcDaClientOperate.QueueData.values">
+            <summary>
+            地址详情
+            </summary>
+        </member>
+        <member name="P:YSAI.Opc.da.client.OpcDaClientOperate.QueueData.GroupName">
+            <summary>
+            组名
+            </summary>
+        </member>
+        <member name="F:YSAI.Opc.da.client.OpcDaClientOperate.TaskArray">
+            <summary>
+            任务集合
+            </summary>
+        </member>
+        <member name="F:YSAI.Opc.da.client.OpcDaClientOperate.DataQueue">
+            <summary>
+            数据队列
+            </summary>
+        </member>
+        <member name="M:YSAI.Opc.da.client.OpcDaClientOperate.TaskHandle">
+            <summary>
+            任务处理
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:YSAI.Opc.da.http.OpcDaHttpData">
             <summary>
             opcua http客户端操作
@@ -1186,6 +1227,16 @@
             发布时间间隔
             </summary>
         </member>
+        <member name="P:YSAI.Opc.ua.client.OpcUaClientData.Basics.TaskHandleCount">
+            <summary>
+            任务处理数量
+            </summary>
+        </member>
+        <member name="P:YSAI.Opc.ua.client.OpcUaClientData.Basics.TaskHandleAccomplishSleepTime">
+            <summary>
+            任务处理完成休眠时间(毫秒)
+            </summary>
+        </member>
         <member name="M:YSAI.Opc.ua.client.OpcUaClientData.Basics.Equals(System.Object)">
             <summary>
             重写基类中的Equals方法
@@ -1291,26 +1342,6 @@
             处理从重新连接处理程序完成的重新连接事件
             </summary>
         </member>
-        <member name="T:YSAI.Opc.ua.client.OpcUaClientOperate.QueueData">
-            <summary>
-            队列数据
-            </summary>
-        </member>
-        <member name="P:YSAI.Opc.ua.client.OpcUaClientOperate.QueueData.addressDetails">
-            <summary>
-            地址详情
-            </summary>
-        </member>
-        <member name="P:YSAI.Opc.ua.client.OpcUaClientOperate.QueueData.Value">
-            <summary>
-            这个点的值
-            </summary>
-        </member>
-        <member name="F:YSAI.Opc.ua.client.OpcUaClientOperate.DataQueue">
-            <summary>
-            数据队列
-            </summary>
-        </member>
         <member name="M:YSAI.Opc.ua.client.OpcUaClientOperate.OnMonitoredItemNotification(Opc.Ua.Client.MonitoredItem,Opc.Ua.Client.MonitoredItemNotificationEventArgs,YSAI.Core.data.AddressDetails)">
             <summary>
             当数据变化更新
@@ -1415,6 +1446,37 @@
             <param name="Key">关键字</param>
             <returns>统一出参</returns>
         </member>
+        <member name="T:YSAI.Opc.ua.client.OpcUaClientOperate.QueueData">
+            <summary>
+            队列数据
+            </summary>
+        </member>
+        <member name="P:YSAI.Opc.ua.client.OpcUaClientOperate.QueueData.addressDetails">
+            <summary>
+            地址详情
+            </summary>
+        </member>
+        <member name="P:YSAI.Opc.ua.client.OpcUaClientOperate.QueueData.NotificationValue">
+            <summary>
+            通知的数据
+            </summary>
+        </member>
+        <member name="F:YSAI.Opc.ua.client.OpcUaClientOperate.TaskArray">
+            <summary>
+            任务集合
+            </summary>
+        </member>
+        <member name="F:YSAI.Opc.ua.client.OpcUaClientOperate.DataQueue">
+            <summary>
+            数据队列
+            </summary>
+        </member>
+        <member name="M:YSAI.Opc.ua.client.OpcUaClientOperate.TaskHandle">
+            <summary>
+            任务处理
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:YSAI.Opc.ua.client.OpcUaClientReadController">
             <summary>
             同一个UPCUA服务器的  opcua客户端读取控制器(此函数让OPCUA客户端读取速度提升)

BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.RabbitMQ.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.RabbitMQ.Pack/YSAI.RabbitMQ.pdb


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.Core.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.S7.dll


BIN
src/YSAI.DAQ/YSAI.Lib/YSAI.S7.Pack/YSAI.S7.pdb


+ 4 - 2
src/YSAI.DAQ/YSAI.Manage/param/YSAI.Can.Param.json

@@ -2,7 +2,9 @@
     "SN": null,
     "BaudRate": 0,
     "CanChannel": 0,
-    "SleepTime": 500,
+    "SleepTime": 1000,
     "DataChangeOut": true,
-    "SameDataOut": false
+    "SameDataOut": false,
+    "TaskHandleCount": 10,
+    "TaskHandleAccomplishSleepTime": 1000
 }

+ 15 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.Can.ParamDetails.json

@@ -103,7 +103,7 @@
     },
     {
         "Name": "SleepTime",
-        "Describe": "休眠时间",
+        "Describe": "休眠时间(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
@@ -121,5 +121,19 @@
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleCount",
+        "Describe": "任务处理数量",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleAccomplishSleepTime",
+        "Describe": "任务处理完成休眠时间(毫秒)",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
     }
 ]

+ 4 - 2
src/YSAI.DAQ/YSAI.Manage/param/YSAI.DB.Param.json

@@ -2,7 +2,9 @@
     "SN": null,
     "ConnectStr": null,
     "DBType": "SqlServer",
-    "SleepTime": 500,
+    "SleepTime": 1000,
     "DataChangeOut": true,
-    "SameDataOut": false
+    "SameDataOut": false,
+    "TaskHandleCount": 10,
+    "TaskHandleAccomplishSleepTime": 1000
 }

+ 15 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.DB.ParamDetails.json

@@ -43,7 +43,7 @@
     },
     {
         "Name": "SleepTime",
-        "Describe": "休眠时间",
+        "Describe": "休眠时间(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
@@ -61,5 +61,19 @@
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleCount",
+        "Describe": "任务处理数量",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleAccomplishSleepTime",
+        "Describe": "任务处理完成休眠时间(毫秒)",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
     }
 ]

+ 1 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.Kafka.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "7f565423-b2a0-475f-a972-e735776e17ed",
+    "SN": "6229071b-9352-4f7b-b5a7-58f2966b55e3",
     "BootstrapServers": null,
     "WaitTime": 1000,
     "SecurityProtocol": "Plaintext",

+ 4 - 2
src/YSAI.DAQ/YSAI.Manage/param/YSAI.Modbus.Param.json

@@ -14,7 +14,9 @@
     "ParityBit": "Even",
     "DataBit": 8,
     "StopBit": "One",
-    "SleepTime": 500,
+    "SleepTime": 1000,
     "DataChangeOut": true,
-    "SameDataOut": false
+    "SameDataOut": false,
+    "TaskHandleCount": 10,
+    "TaskHandleAccomplishSleepTime": 1000
 }

+ 15 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.Modbus.ParamDetails.json

@@ -291,7 +291,7 @@
     },
     {
         "Name": "SleepTime",
-        "Describe": "休眠时间",
+        "Describe": "休眠时间(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
@@ -309,5 +309,19 @@
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleCount",
+        "Describe": "任务处理数量",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleAccomplishSleepTime",
+        "Describe": "任务处理完成休眠时间(毫秒)",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
     }
 ]

+ 3 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDa.Param.json

@@ -2,5 +2,7 @@
     "SN": null,
     "SName": null,
     "ApiVerType": "COM_DA_10",
-    "UpdateRate": 100
+    "UpdateRate": 100,
+    "TaskHandleCount": 10,
+    "TaskHandleAccomplishSleepTime": 1000
 }

+ 14 - 0
src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDa.ParamDetails.json

@@ -42,5 +42,19 @@
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleCount",
+        "Describe": "任务处理数量",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleAccomplishSleepTime",
+        "Describe": "任务处理完成休眠时间(毫秒)",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
     }
 ]

+ 4 - 2
src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDaHttp.Param.json

@@ -4,7 +4,9 @@
     "Port": null,
     "Key": null,
     "RequestType": "http",
-    "SleepTime": 500,
+    "SleepTime": 1000,
     "DataChangeOut": true,
-    "SameDataOut": false
+    "SameDataOut": false,
+    "TaskHandleCount": 10,
+    "TaskHandleAccomplishSleepTime": 1000
 }

+ 15 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDaHttp.ParamDetails.json

@@ -47,7 +47,7 @@
     },
     {
         "Name": "SleepTime",
-        "Describe": "休眠时间",
+        "Describe": "休眠时间(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
@@ -65,5 +65,19 @@
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleCount",
+        "Describe": "任务处理数量",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleAccomplishSleepTime",
+        "Describe": "任务处理完成休眠时间(毫秒)",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
     }
 ]

+ 3 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcUa.Param.json

@@ -7,5 +7,7 @@
     "ServerUrl": null,
     "Name": null,
     "SamplingInterval": 1000,
-    "PublishingInterval": 20
+    "PublishingInterval": 1000,
+    "TaskHandleCount": 10,
+    "TaskHandleAccomplishSleepTime": 1000
 }

+ 15 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcUa.ParamDetails.json

@@ -58,7 +58,21 @@
     {
         "Name": "PublishingInterval",
         "Describe": "发布时间间隔",
-        "ParamType": "Byte",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleCount",
+        "Describe": "任务处理数量",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleAccomplishSleepTime",
+        "Describe": "任务处理完成休眠时间(毫秒)",
+        "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     }

+ 1 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.RabbitMQ.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "86f57b7a-4926-4f77-b27d-af35b32c4ae1",
+    "SN": "0e3aecf5-0a25-470a-8c05-7379e17f6dc8",
     "ExChangeName": null,
     "HostName": null,
     "Port": 0,

+ 4 - 2
src/YSAI.DAQ/YSAI.Manage/param/YSAI.S7.Param.json

@@ -5,7 +5,9 @@
     "S7CpuType": "S7200",
     "Rack": 0,
     "Slot": 0,
-    "SleepTime": 500,
+    "SleepTime": 1000,
     "DataChangeOut": true,
-    "SameDataOut": false
+    "SameDataOut": false,
+    "TaskHandleCount": 10,
+    "TaskHandleAccomplishSleepTime": 1000
 }

+ 15 - 1
src/YSAI.DAQ/YSAI.Manage/param/YSAI.S7.ParamDetails.json

@@ -79,7 +79,7 @@
     },
     {
         "Name": "SleepTime",
-        "Describe": "休眠时间",
+        "Describe": "休眠时间(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
@@ -97,5 +97,19 @@
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleCount",
+        "Describe": "任务处理数量",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
+    {
+        "Name": "TaskHandleAccomplishSleepTime",
+        "Describe": "任务处理完成休眠时间(毫秒)",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
     }
 ]