1

src/YSAI.DAQ/YSAI.Lib/YSAI.Opc.Pack/YSAI.Opc.xml

@@ -1215,7 +1215,7 @@
         </member>
         <member name="P:YSAI.Opc.ua.client.OpcUaClientData.Basics.CustomName">
             <summary>
-            自定义的名称空间
+            自定义名称(唯一)
             </summary>
         </member>
         <member name="P:YSAI.Opc.ua.client.OpcUaClientData.Basics.SamplingInterval">

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Can.Param.json

@@ -1,10 +1,10 @@
 {
-    "SN": null,
+    "SN": "26039931-2087-4e56-b14f-f099e99f9fbd",
     "BaudRate": 0,
     "CanChannel": 0,
-    "SleepTime": 1000,
-    "DataChangeOut": true,
-    "SameDataOut": false,
-    "TaskHandleCount": 10,
-    "TaskHandleAccomplishSleepTime": 1000
+    "HandleInterval": 1000,
+    "ChangeOut": true,
+    "AllOut": false,
+    "TaskNumber": 5,
+    "TaskHandleInterval": 1000
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Can.ParamDetails.json

@@ -96,42 +96,42 @@
     },
     {
         "Name": "CanChannel",
-        "Describe": "打开的CAN通道",
+        "Describe": "CAN通道",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "SleepTime",
-        "Describe": "休眠时间（毫秒）",
+        "Name": "HandleInterval",
+        "Describe": "处理间隔（毫秒）",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "DataChangeOut",
-        "Describe": "数据变化抛出",
+        "Name": "ChangeOut",
+        "Describe": "变化抛出",
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "SameDataOut",
+        "Name": "AllOut",
         "Describe": "未变项与变化项一同抛出",
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleCount",
-        "Describe": "任务处理数量",
+        "Name": "TaskNumber",
+        "Describe": "任务数量",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleAccomplishSleepTime",
-        "Describe": "任务处理完成休眠时间(毫秒)",
+        "Name": "TaskHandleInterval",
+        "Describe": "任务处理间隔(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null

src/YSAI.DAQ/YSAI.Manage/param/YSAI.DB.Param.json

@@ -1,10 +1,10 @@
 {
-    "SN": null,
+    "SN": "1c8bb431-b20c-4616-bd81-f35a9d03dcb0",
     "ConnectStr": null,
     "DBType": "SqlServer",
-    "SleepTime": 1000,
-    "DataChangeOut": true,
-    "SameDataOut": false,
-    "TaskHandleCount": 10,
-    "TaskHandleAccomplishSleepTime": 1000
+    "HandleInterval": 1000,
+    "ChangeOut": true,
+    "AllOut": false,
+    "TaskNumber": 5,
+    "TaskHandleInterval": 1000
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.DB.ParamDetails.json

@@ -42,36 +42,36 @@
         "ObjArray": null
     },
     {
-        "Name": "SleepTime",
-        "Describe": "休眠时间（毫秒）",
+        "Name": "HandleInterval",
+        "Describe": "处理间隔（毫秒）",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "DataChangeOut",
-        "Describe": "数据变化抛出",
+        "Name": "ChangeOut",
+        "Describe": "变化抛出",
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "SameDataOut",
+        "Name": "AllOut",
         "Describe": "未变项与变化项一同抛出",
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleCount",
-        "Describe": "任务处理数量",
+        "Name": "TaskNumber",
+        "Describe": "任务数量",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleAccomplishSleepTime",
-        "Describe": "任务处理完成休眠时间(毫秒)",
+        "Name": "TaskHandleInterval",
+        "Describe": "任务处理间隔(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Kafka.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "6229071b-9352-4f7b-b5a7-58f2966b55e3",
+    "SN": "2f16b78b-ccdf-4a35-8939-3600c1ca98c8",
     "BootstrapServers": null,
     "WaitTime": 1000,
     "SecurityProtocol": "Plaintext",

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Modbus.Param.json

@@ -1,11 +1,11 @@
 {
-    "SN": null,
+    "SN": "ca97fa31-7039-43a0-a98f-92730156e962",
     "SlaveAddress": 1,
     "ProtocolType": "Tcp",
     "ReadTimeOut": 2000,
+    "WriteTimeOut": 2000,
     "MRType": "NULL",
     "MWType": "NULL",
-    "WriteTimeOut": 2000,
     "Ip": "127.0.0.1",
     "Port": 502,
     "ConnectTimeOut": 5000,
@@ -14,9 +14,9 @@
     "ParityBit": "Even",
     "DataBit": 8,
     "StopBit": "One",
-    "SleepTime": 1000,
-    "DataChangeOut": true,
-    "SameDataOut": false,
-    "TaskHandleCount": 10,
-    "TaskHandleAccomplishSleepTime": 1000
+    "HandleInterval": 1000,
+    "ChangeOut": true,
+    "AllOut": false,
+    "TaskNumber": 5,
+    "TaskHandleInterval": 1000
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Modbus.ParamDetails.json

@@ -48,6 +48,13 @@
         "EnumArray": null,
         "ObjArray": null
     },
+    {
+        "Name": "WriteTimeOut",
+        "Describe": "写入超时时间",
+        "ParamType": "Int32",
+        "EnumArray": null,
+        "ObjArray": null
+    },
     {
         "Name": "MRType",
         "Describe": "读取类型",
@@ -179,13 +186,6 @@
         ],
         "ObjArray": null
     },
-    {
-        "Name": "WriteTimeOut",
-        "Describe": "写入超时时间",
-        "ParamType": "Int32",
-        "EnumArray": null,
-        "ObjArray": null
-    },
     {
         "Name": "Ip",
         "Describe": "IP",
@@ -290,36 +290,36 @@
         "ObjArray": null
     },
     {
-        "Name": "SleepTime",
-        "Describe": "休眠时间（毫秒）",
+        "Name": "HandleInterval",
+        "Describe": "处理间隔（毫秒）",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "DataChangeOut",
-        "Describe": "数据变化抛出",
+        "Name": "ChangeOut",
+        "Describe": "变化抛出",
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "SameDataOut",
+        "Name": "AllOut",
         "Describe": "未变项与变化项一同抛出",
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleCount",
-        "Describe": "任务处理数量",
+        "Name": "TaskNumber",
+        "Describe": "任务数量",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleAccomplishSleepTime",
-        "Describe": "任务处理完成休眠时间(毫秒)",
+        "Name": "TaskHandleInterval",
+        "Describe": "任务处理间隔(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Mqtt.Param.json

@@ -1,9 +1,9 @@
 {
-    "SN": null,
-    "ServerIPAddress": null,
-    "ServerPort": 0,
-    "ServerLoginID": null,
-    "ServerLoginPassword": null,
+    "SN": "eaa719c0-a432-48e0-9e77-d1d3747c4a1a",
+    "Ip": null,
+    "Port": 0,
+    "UserName": null,
+    "Password": null,
     "ClientID": null,
     "QualityOfServiceLevel": "AtMostOnce"
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.Mqtt.ParamDetails.json

@@ -7,29 +7,29 @@
         "ObjArray": null
     },
     {
-        "Name": "ServerIPAddress",
+        "Name": "Ip",
         "Describe": "IP地址",
         "ParamType": "String",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "ServerPort",
+        "Name": "Port",
         "Describe": "端口",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "ServerLoginID",
-        "Describe": "登陆账号",
+        "Name": "UserName",
+        "Describe": "用户名",
         "ParamType": "String",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "ServerLoginPassword",
-        "Describe": "登陆密码",
+        "Name": "Password",
+        "Describe": "密码",
         "ParamType": "String",
         "EnumArray": null,
         "ObjArray": null

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDa.Param.json

@@ -1,8 +1,8 @@
 {
-    "SN": null,
-    "SName": null,
-    "ApiVerType": "COM_DA_10",
+    "SN": "363679fb-5507-4fb8-a4a2-9e72c362adb2",
+    "SName": "Knight.OPC.Server.Demo",
+    "ApiVerType": "COM_DA_30",
     "UpdateRate": 100,
-    "TaskHandleCount": 10,
-    "TaskHandleAccomplishSleepTime": 1000
+    "TaskNumber": 5,
+    "TaskHandleInterval": 1000
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDa.ParamDetails.json

@@ -44,15 +44,15 @@
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleCount",
-        "Describe": "任务处理数量",
+        "Name": "TaskNumber",
+        "Describe": "任务数量",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleAccomplishSleepTime",
-        "Describe": "任务处理完成休眠时间(毫秒)",
+        "Name": "TaskHandleInterval",
+        "Describe": "任务处理间隔(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDaHttp.Param.json

@@ -1,12 +1,12 @@
 {
-    "SN": null,
-    "ServerIP": null,
-    "Port": null,
+    "SN": "22266c5a-0453-4ff8-ad64-2ff6a1623100",
+    "Ip": "127.0.0.1",
+    "Port": 6688,
     "Key": null,
     "RequestType": "http",
-    "SleepTime": 1000,
-    "DataChangeOut": true,
-    "SameDataOut": false,
-    "TaskHandleCount": 10,
-    "TaskHandleAccomplishSleepTime": 1000
+    "HandleInterval": 1000,
+    "ChangeOut": true,
+    "AllOut": false,
+    "TaskNumber": 5,
+    "TaskHandleInterval": 1000
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcDaHttp.ParamDetails.json

@@ -7,8 +7,8 @@
         "ObjArray": null
     },
     {
-        "Name": "ServerIP",
-        "Describe": "服务IP",
+        "Name": "Ip",
+        "Describe": "服务地址",
         "ParamType": "String",
         "EnumArray": null,
         "ObjArray": null
@@ -16,7 +16,7 @@
     {
         "Name": "Port",
         "Describe": "端口",
-        "ParamType": "String",
+        "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
@@ -46,36 +46,36 @@
         "ObjArray": null
     },
     {
-        "Name": "SleepTime",
-        "Describe": "休眠时间（毫秒）",
+        "Name": "HandleInterval",
+        "Describe": "处理间隔（毫秒）",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "DataChangeOut",
-        "Describe": "数据变化抛出",
+        "Name": "ChangeOut",
+        "Describe": "变化抛出",
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "SameDataOut",
+        "Name": "AllOut",
         "Describe": "未变项与变化项一同抛出",
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleCount",
-        "Describe": "任务处理数量",
+        "Name": "TaskNumber",
+        "Describe": "任务数量",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleAccomplishSleepTime",
-        "Describe": "任务处理完成休眠时间(毫秒)",
+        "Name": "TaskHandleInterval",
+        "Describe": "任务处理间隔(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcUa.Param.json

@@ -1,13 +1,13 @@
 {
-    "SN": null,
+    "SN": "212c9012-cae8-4542-bfa2-94262f638c56",
     "UserName": null,
     "Password": null,
     "Cer": null,
     "SecreKey": null,
     "ServerUrl": null,
-    "Name": null,
+    "CustomName": "A4E1D7EB6F7446BF8A4EC94F50F5E4AE",
     "SamplingInterval": 1000,
     "PublishingInterval": 1000,
-    "TaskHandleCount": 10,
-    "TaskHandleAccomplishSleepTime": 1000
+    "TaskNumber": 5,
+    "TaskHandleInterval": 1000
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.OpcUa.ParamDetails.json

@@ -42,8 +42,8 @@
         "ObjArray": null
     },
     {
-        "Name": "Name",
-        "Describe": "自定义的名称空间",
+        "Name": "CustomName",
+        "Describe": "自定义名称(唯一)",
         "ParamType": "String",
         "EnumArray": null,
         "ObjArray": null
@@ -63,15 +63,15 @@
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleCount",
-        "Describe": "任务处理数量",
+        "Name": "TaskNumber",
+        "Describe": "任务数量",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleAccomplishSleepTime",
-        "Describe": "任务处理完成休眠时间(毫秒)",
+        "Name": "TaskHandleInterval",
+        "Describe": "任务处理间隔(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null

src/YSAI.DAQ/YSAI.Manage/param/YSAI.RabbitMQ.Param.json

@@ -1,5 +1,5 @@
 {
-    "SN": "0e3aecf5-0a25-470a-8c05-7379e17f6dc8",
+    "SN": "618cd4e0-150c-4953-b81c-361d1a5d26f6",
     "ExChangeName": null,
     "HostName": null,
     "Port": 0,

src/YSAI.DAQ/YSAI.Manage/param/YSAI.RabbitMQ.ParamDetails.json

@@ -29,7 +29,7 @@
     },
     {
         "Name": "UserName",
-        "Describe": "账号",
+        "Describe": "用户名",
         "ParamType": "String",
         "EnumArray": null,
         "ObjArray": null

src/YSAI.DAQ/YSAI.Manage/param/YSAI.S7.Param.json

@@ -1,13 +1,13 @@
 {
-    "SN": null,
+    "SN": "0196a648-6bf9-478a-b2a5-dd029c112085",
     "Ip": null,
     "Port": 0,
     "S7CpuType": "S7200",
     "Rack": 0,
     "Slot": 0,
-    "SleepTime": 1000,
-    "DataChangeOut": true,
-    "SameDataOut": false,
-    "TaskHandleCount": 10,
-    "TaskHandleAccomplishSleepTime": 1000
+    "HandleInterval": 1000,
+    "ChangeOut": true,
+    "AllOut": false,
+    "TaskNumber": 5,
+    "TaskHandleInterval": 1000
 }

src/YSAI.DAQ/YSAI.Manage/param/YSAI.S7.ParamDetails.json

@@ -78,36 +78,36 @@
         "ObjArray": null
     },
     {
-        "Name": "SleepTime",
-        "Describe": "休眠时间（毫秒）",
+        "Name": "HandleInterval",
+        "Describe": "处理间隔（毫秒）",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "DataChangeOut",
-        "Describe": "数据变化抛出",
+        "Name": "ChangeOut",
+        "Describe": "变化抛出",
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "SameDataOut",
+        "Name": "AllOut",
         "Describe": "未变项与变化项一同抛出",
         "ParamType": "Boolean",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleCount",
-        "Describe": "任务处理数量",
+        "Name": "TaskNumber",
+        "Describe": "任务数量",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null
     },
     {
-        "Name": "TaskHandleAccomplishSleepTime",
-        "Describe": "任务处理完成休眠时间(毫秒)",
+        "Name": "TaskHandleInterval",
+        "Describe": "任务处理间隔(毫秒)",
         "ParamType": "Int32",
         "EnumArray": null,
         "ObjArray": null