diff --git a/Modbus.Net/Modbus.Net/BaseMachine.cs b/Modbus.Net/Modbus.Net/BaseMachine.cs index e972ddc..930433e 100644 --- a/Modbus.Net/Modbus.Net/BaseMachine.cs +++ b/Modbus.Net/Modbus.Net/BaseMachine.cs @@ -43,7 +43,7 @@ namespace Modbus.Net /// /// 设备的Id /// - public int Id { get; set; } + public string Id { get; set; } /// /// 设备所在工程的名称 @@ -494,7 +494,7 @@ namespace Modbus.Net /// /// 数据单元Id /// - public int Id { get; set; } + public string Id { get; set; } /// /// 数据所属的区域 /// @@ -558,7 +558,7 @@ namespace Modbus.Net /// /// Id /// - int Id { get; set; } + string Id { get; set; } /// /// 工程名 /// diff --git a/Modbus.Net/Modbus.Net/TaskManager.cs b/Modbus.Net/Modbus.Net/TaskManager.cs index 5bccfc3..53ac2a1 100644 --- a/Modbus.Net/Modbus.Net/TaskManager.cs +++ b/Modbus.Net/Modbus.Net/TaskManager.cs @@ -9,7 +9,7 @@ namespace Modbus.Net { public class TaskReturnDef { - public int MachineId { get; set; } + public string MachineId { get; set; } public Dictionary ReturnValues { get; set; } } @@ -355,7 +355,7 @@ namespace Modbus.Net /// 根据设备的id移除设备 /// /// 设备的id - public void RemoveMachineWithId(int id) + public void RemoveMachineWithId(string id) { lock (_machines) { @@ -371,7 +371,7 @@ namespace Modbus.Net /// 将设备指定为未连接 /// /// 设备的id - public void MoveMachineToUnlinked(int id) + public void MoveMachineToUnlinked(string id) { IEnumerable machines; lock(_machines) @@ -393,7 +393,7 @@ namespace Modbus.Net /// 将设备指定为已连接 /// /// 设备的id - public void MoveMachineToLinked(int id) + public void MoveMachineToLinked(string id) { IEnumerable machines; lock (_unlinkedMachines)