luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change all Ids to string

Browse Source
This commit is contained in:
罗圣
2016-08-23 15:17:10 +08:00
parent 5d3fe794f9
commit cbb70d3376
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modbus.Net/Modbus.Net/BaseMachine.cs
View File

@@ -43,7 +43,7 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// 设备的Id /// 设备的Id
/// </summary> /// </summary>
public int Id { get; set; } public string Id { get; set; }
/// <summary> /// <summary>
/// 设备所在工程的名称 /// 设备所在工程的名称
@@ -494,7 +494,7 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// 数据单元Id /// 数据单元Id
/// </summary> /// </summary>
public int Id { get; set; } public string Id { get; set; }
/// <summary> /// <summary>
/// 数据所属的区域 /// 数据所属的区域
/// </summary> /// </summary>
@@ -558,7 +558,7 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// Id /// Id
/// </summary> /// </summary>
int Id { get; set; } string Id { get; set; }
/// <summary> /// <summary>
/// 工程名 /// 工程名
/// </summary> /// </summary>

8
Modbus.Net/Modbus.Net/TaskManager.cs
View File

@@ -9,7 +9,7 @@ namespace Modbus.Net
{ {
public class TaskReturnDef public class TaskReturnDef
{ {
public int MachineId { get; set; } public string MachineId { get; set; }
public Dictionary<string, ReturnUnit> ReturnValues { get; set; } public Dictionary<string, ReturnUnit> ReturnValues { get; set; }
} }
@@ -355,7 +355,7 @@ namespace Modbus.Net
/// 根据设备的id移除设备 /// 根据设备的id移除设备
/// </summary> /// </summary>
/// <param name="id">设备的id</param> /// <param name="id">设备的id</param>
public void RemoveMachineWithId(int id) public void RemoveMachineWithId(string id)
{ {
lock (_machines) lock (_machines)
{ {
@@ -371,7 +371,7 @@ namespace Modbus.Net
/// 将设备指定为未连接 /// 将设备指定为未连接
/// </summary> /// </summary>
/// <param name="id">设备的id</param> /// <param name="id">设备的id</param>
public void MoveMachineToUnlinked(int id) public void MoveMachineToUnlinked(string id)
{ {
IEnumerable<BaseMachine> machines; IEnumerable<BaseMachine> machines;
lock(_machines) lock(_machines)
@@ -393,7 +393,7 @@ namespace Modbus.Net
/// 将设备指定为已连接 /// 将设备指定为已连接
/// </summary> /// </summary>
/// <param name="id">设备的id</param> /// <param name="id">设备的id</param>
public void MoveMachineToLinked(int id) public void MoveMachineToLinked(string id)
{ {
IEnumerable<BaseMachine> machines; IEnumerable<BaseMachine> machines;
lock (_unlinkedMachines) lock (_unlinkedMachines)