huangsucan/IOT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加配置连接窗口已经相关S7与ModbusTCP连接功能

Browse Source
This commit is contained in:
20492
2026-06-12 08:38:43 +08:00
parent 5d14afcb66
commit 1ff51cbc45
13 changed files with 1785 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
DeviceCommand/Base/ModbusTcp.cs
View File

@@ -1,4 +1,4 @@
using NModbus;
using NModbus;
using System;
using System.Net;
using System.Net.Sockets;
@@ -38,20 +38,48 @@ namespace DeviceCommand.Base
await _commLock.WaitAsync(ct);
try
{
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 开始连接 - IP: {IPAddress}, 端口: {Port}");
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 超时设置 - 发送: {SendTimeout}ms, 接收: {ReceiveTimeout}ms");
if (_tcpClient.Connected)
{
var remoteEndPoint = (IPEndPoint)_tcpClient.Client.RemoteEndPoint!;
if (remoteEndPoint.Address.MapToIPv4().ToString() == IPAddress && remoteEndPoint.Port == Port)
string currentIp = remoteEndPoint.Address.MapToIPv4().ToString();
int currentPort = remoteEndPoint.Port;
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 已有连接: {currentIp}:{currentPort}");
if (currentIp == IPAddress && currentPort == Port)
{
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 参数匹配，复用现有连接");
return true;
}
else
{
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 参数不匹配，需要重新连接");
}
}
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 关闭并释放旧连接");
_tcpClient.Close();
_tcpClient.Dispose();
_tcpClient = new TcpClient();
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 调用 ConnectAsync({IPAddress}, {Port})");
await _tcpClient.ConnectAsync(IPAddress, Port, ct);
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 创建ModbusMaster");
Modbus = new ModbusFactory().CreateMaster(_tcpClient);
return true;
bool isConnected = _tcpClient.Connected;
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 连接结果: {(isConnected ? "成功" : "失败")}");
return isConnected;
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 连接异常: {ex.Message}");
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 异常类型: {ex.GetType().Name}");
System.Diagnostics.Debug.WriteLine($"[ModbusTcp] 异常堆栈: {ex.StackTrace}");
return false;
}
finally
{

36
DeviceCommand/Base/S7Device.cs
View File

@@ -1,4 +1,4 @@
using S7.Net;
using S7.Net;
using System;
using System.IO;
using System.Net;
@@ -9,7 +9,6 @@ namespace DeviceCommand.Base
{
public class S7Device : IS7Device
{
// 保持和你一致的连接参数命名属性
public string IPAddress { get; private set; } = "127.0.0.1";
public CpuType CpuType { get; private set; } = CpuType.S71200;
public short Rack { get; private set; } = 0;
@@ -20,21 +19,15 @@ namespace DeviceCommand.Base
private Plc _plc;
public Plc PlcContext => _plc;
// S7.Net 的 Plc.IsConnected 属性内部会通过 Socket 状态进行判断
public bool IsConnected => _plc?.IsConnected ?? false;
// 统一线程锁
protected readonly SemaphoreSlim _commLock = new(1, 1);
public S7Device()
{
// 初始化默认配置
_plc = new Plc(CpuType, IPAddress, Rack, Slot);
}
/// <summary>
/// 设备参数配置（符合你的命名风格）
/// </summary>
public void ConfigureDevice(string ipAddress, CpuType cpuType, short rack = 0, short slot = 1, int sendTimeout = 3000, int receiveTimeout = 3000)
{
IPAddress = ipAddress;
@@ -50,32 +43,30 @@ namespace DeviceCommand.Base
await _commLock.WaitAsync(ct);
try
{
// 如果已经连接，检查当前的 IP 和 CPU 类型是否一致，一致则直接复用
if (_plc != null && _plc.IsConnected)
{
if (_plc.IP == IPAddress && _plc.CPU == CpuType && _plc.Rack == Rack && _plc.Slot == Slot)
return true;
}
// 修复：释放并彻底清空旧连接实例
if (_plc != null)
{
_plc.Close();
}
// 重新实例化 Plc 对象并配置超时
_plc = new Plc(CpuType, IPAddress, Rack, Slot)
{
ReadTimeout = ReceiveTimeout,
WriteTimeout = SendTimeout
};
// 部分版本 S7.Net 的 OpenAsync 本身不接受 CancellationToken，我们通过 WaitAsync 实现超时
await _plc.OpenAsync().WaitAsync(TimeSpan.FromMilliseconds(SendTimeout), ct);
await _plc.OpenAsync();
return _plc.IsConnected;
}
catch
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine($"[S7Device] 连接异常: IP={IPAddress}, CPU={CpuType}, Error={ex.Message}");
System.Diagnostics.Debug.WriteLine($"[S7Device] 异常堆栈: {ex.StackTrace}");
return false;
}
finally
@@ -125,7 +116,22 @@ namespace DeviceCommand.Base
public async Task<T> ReadAsync<T>(string address, CancellationToken ct = default)
{
var result = await ReadAsync(address, ct);
return (T)result;
System.Diagnostics.Debug.WriteLine($"[S7Device.ReadAsync<T>] 地址={address}, 返回类型={result?.GetType().Name ?? "null"}, 值={result}");
try
{
if (result is IConvertible convertible)
{
return (T)Convert.ChangeType(convertible, typeof(T));
}
return (T)result;
}
catch (InvalidCastException ex)
{
System.Diagnostics.Debug.WriteLine($"[S7Device.ReadAsync<T>] 类型转换失败: 目标类型={typeof(T).Name}, 实际类型={result.GetType().Name}, 值={result}, 异常={ex.Message}");
throw;
}
}
public async Task<byte[]> ReadBytesAsync(DataType dataType, int db, int startByteAdr, int count, CancellationToken ct = default)