参数类型修改，参数文件修改

src/YSAI.DAQ/YSAI.Core/interface/ICommunication.cs

@@ -3,5 +3,5 @@
     /// <summary>
     /// 底层通信接口
     /// </summary>
-    public interface ICommunication : IOn, IOff, ISend, ISendWait, IGetObject, IGetStatus, IEvent,IDisposable { }
+    public interface ICommunication : IOn, IOff, ISend, ISendWait, IGetObject, IGetStatus, IEvent, IDisposable { }
 }

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

@@ -1,5 +1,5 @@
 {
-    "SN": "05bc689e-e9f4-4906-9daa-542928ca2660",
+    "SN": "0e65bed3-bfd7-4d53-a74a-90e783a41f1e",
     "BaudRate": 0,
     "CanChannel": 0,
     "HandleInterval": 1000,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "973f7d2c-05f5-44fc-b252-dd33625eb9aa",
+    "SN": "a066d944-b192-44d2-a3d4-9b9c776102c5",
     "ConnectStr": null,
     "DBType": "SqlServer",
     "HandleInterval": 1000,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "72a9c0b5-67cd-4a88-890f-142439208c02",
+    "SN": "b41447b7-c9c5-410e-bbb0-32651924347e",
     "BootstrapServers": null,
     "WaitTime": 1000,
     "SecurityProtocol": "Plaintext",

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

@@ -1,5 +1,5 @@
 {
-    "SN": "d01596a4-c219-4b90-acee-e9e52f17af29",
+    "SN": "0279052e-dc23-45a0-825a-a70fbaa5f442",
     "SlaveAddress": 1,
     "ProtocolType": "Tcp",
     "ReadTimeOut": 2000,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "c29eabf0-fddf-4a32-945a-b8390aea5092",
+    "SN": "aac3ad3a-fe0d-474b-babe-a5e187d9a5c2",
     "Ip": null,
     "Port": 0,
     "UserName": null,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "71e043fa-090f-4a38-9eff-356c2fa62da1",
+    "SN": "0571e5e0-4a0e-464c-97d4-c10e3fd42477",
     "SName": "Knight.OPC.Server.Demo",
     "ApiVerType": "COM_DA_30",
     "UpdateRate": 100,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "f9ce62b1-b9e3-443b-9dda-118ecc27da2a",
+    "SN": "d9f0b403-67e7-4d5d-8399-47c3c32541b3",
     "Ip": "127.0.0.1",
     "Port": 6688,
     "Key": null,

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

@@ -1,11 +1,11 @@
 {
-    "SN": "40534d90-3086-4b60-aa68-3054f6e3aad1",
+    "SN": "2eede438-09ea-4cc5-ad6a-5a3d6b36adb7",
     "UserName": null,
     "Password": null,
     "Cer": null,
     "SecreKey": null,
     "ServerUrl": null,
-    "CustomName": "057ADC0A1D374CF4A148D617D7AEAF8E",
+    "CustomName": "8772D551E5464D76B1A3B1A77D3CB362",
     "Timeout": 5000,
     "SamplingInterval": 1000,
     "PublishingInterval": 1000,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "0b60f879-ea83-4935-a918-04bab081dd03",
+    "SN": "468d8fde-31bd-4a9c-8fd3-0463c2f9905e",
     "ExChangeName": null,
     "HostName": null,
     "Port": 0,

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

@@ -1,5 +1,5 @@
 {
-    "SN": "c6753007-47f4-4318-bd57-18d8b2e9adc2",
+    "SN": "a9394b43-17d0-466a-b9da-6b12a41c8eea",
     "Ip": null,
     "Port": 0,
     "S7CpuType": "S7200",

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

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	  <Version>1.0.0.16</Version>
+	  <Version>1.0.0.17</Version>
 	  <Authors>Shun</Authors>
 	  <Company>YSAI</Company>
 	  <Product>SCADA</Product>

src/YSAI.DAQ/YSAI.Mqtt/service/MqttServiceData.cs

@@ -16,7 +16,7 @@ namespace YSAI.Mqtt.service
             /// 端口
             /// </summary>
             [Description("端口")]
-            public string? Port { get; set; }
+            public int Port { get; set; }
             /// <summary>
             /// 用户
             /// </summary>

src/YSAI.DAQ/YSAI.Tool.Core/mqtt/service/MqttServiceToolController.cs

@@ -51,13 +51,12 @@ namespace YSAI.Tool.Core.mqtt.service
         /// <summary>
         /// 端口
         /// </summary>
-        public string Port
+        public int Port
         {
             get => GetProperty(() => Port);
             set
             {
                 SetProperty(() => Port, value);
-                SetConfig(Port: value);
             }
         }
         /// <summary>
@@ -271,13 +270,13 @@ namespace YSAI.Tool.Core.mqtt.service
         /// 设置配置
         /// </summary>
         /// <returns></returns>
-        public bool SetConfig(string IPAddress = null, string Port = null, string LoginID = null, string LoginPassword = null, string MaxNumber = null)
+        public bool SetConfig(string IPAddress = null, string LoginID = null, string LoginPassword = null, string MaxNumber = null)
         {
             try
             {
                 return SetConfig(new MqttServiceData.Basics()
                 {
-                    Port = Port.IsEmpty() ? this.Port : Port,
+                    Port = this.Port,
                     UserName = LoginID.IsEmpty() ? this.LoginID : LoginID,
                     Password = LoginPassword.IsEmpty() ? this.LoginPassword : LoginPassword,
                     MaxNumber = MaxNumber.IsEmpty() ? this.MaxNumber.IsEmpty() ? 0 : int.Parse(this.MaxNumber) : int.Parse(MaxNumber)

src/YSAI.DAQ/YSAI.Unility/ExtensionTool.cs

@@ -154,7 +154,7 @@ namespace YSAI.Unility
             return guid.ToNString().TrimStart('0').ToLong();
         }
 
-        
+
 
         /// <summary>
         /// 格式化为长日期格式(yyyy年M月d日)
@@ -394,7 +394,7 @@ namespace YSAI.Unility
         {
             return decimal.TryParse(str, out decimal d) ? d : defaultValue;
         }
-        
+
         /// <summary>
         /// 判断字符串是否为日期时间
         /// </summary>
@@ -513,7 +513,7 @@ namespace YSAI.Unility
             return stringBuilder.ToString().TrimEnd(',');
         }
 
-       
+
 
         /// <summary>
         /// URL编码