From f8d23dcf8d6501482db1a5180325194232afe96c Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 18 七月 2025 17:30:09 +0800
Subject: [PATCH] 封装部分业务代码，继续优化日志打印流程
---
device/ModbusHelper.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/device/ModbusHelper.cs b/device/ModbusHelper.cs
index ff631e8..5c8dc79 100644
--- a/device/ModbusHelper.cs
+++ b/device/ModbusHelper.cs
@@ -10,7 +10,7 @@
/// modbus tcp 鐢ㄧ涓夋柟鐨勫寘
/// </summary>
public class ModbusHelper {
- // 鍐呭瓨锛岃繛鎺ヤ笂鐨�Modbus 閫氳瀵硅薄
+ // 鍐呭瓨,杩炴帴涓婄殑 Modbus 閫氳瀵硅薄
private static Dictionary<string, ModbusClient> _ipPort_ModbusClient = new Dictionary<string, ModbusClient>();
public ModbusHelper(string ip, int port = 502, byte slaveId = 1) {
@@ -25,7 +25,7 @@
try {
if (ip == null || ip.Trim() == "") {
// 璇诲彇閰嶇疆淇℃伅澶辫触
- LogHelper.Info("Modbus锛氳鍙栭厤缃俊鎭け璐�);
+ LogHelper.Info("Modbus:璇诲彇閰嶇疆淇℃伅澶辫触");
return;
}
@@ -59,7 +59,7 @@
}
/// <summary>
- /// 杩炴帴 Modbus 涓嬩綅鏈猴紙绉佹湁锛屽唴閮ㄨ皟鐢級
+ /// 杩炴帴 Modbus 涓嬩綅鏈�(绉佹湁,鍐呴儴璋冪敤)
/// </summary>
/// <param name="modbusClient"></param>
private static void Link(ModbusClient modbusClient) {
@@ -79,7 +79,7 @@
}
/// <summary>
- /// 璇讳竴涓垨澶氫釜绾垮湀锛岃繑鍥炰竴涓猙it鐪熷亣鏁扮粍
+ /// 璇讳竴涓垨澶氫釜绾垮湀,杩斿洖涓�釜bit鐪熷亣鏁扮粍
/// </summary>
/// <param name="address"></param>
/// <param name="qty"></param>
@@ -131,7 +131,7 @@
}
}
catch (Exception ex) {
-
+ LogHelper.InfoEx(ex);
}
}
else {
@@ -162,7 +162,7 @@
}
}
catch (Exception ex) {
-
+ LogHelper.InfoEx(ex);
}
}
else {
@@ -173,7 +173,7 @@
}
/// <summary>
- /// 鎵归噺璇诲彇鎴栧崟鐙鍙栦繚鎸佸瘎瀛樺櫒锛岃繑鍥炵殑鏄�2浣峣nt鏁扮粍
+ /// 鎵归噺璇诲彇鎴栧崟鐙鍙栦繚鎸佸瘎瀛樺櫒,杩斿洖鐨勬槸32浣峣nt鏁扮粍
/// </summary>
/// <param name="address">璇诲彇璧峰浣�/param>
/// <param name="qty">璇诲彇鐨勬暟閲�/param>
@@ -185,7 +185,7 @@
var client = GetModbusClient(ip, port);
if (client != null && client.Connected) {
try {
- //涓�釜瀵勫瓨鍣ㄦ槸16浣嶏紝杩斿洖2涓猧nt绫诲瀷
+ //涓�釜瀵勫瓨鍣ㄦ槸16浣�杩斿洖2涓猧nt绫诲瀷
res = client.ReadHoldingRegisters(address, qty);
if (res.Length != 0) {
//璇诲彇鎴愬姛
@@ -195,7 +195,7 @@
}
}
catch (Exception ex) {
- //濡傛灉璇锋眰鏁伴噺瓒呭嚭淇濇寔瀵勫瓨鍣ㄧ殑鏈�ぇ鏁版嵁琛屾暟锛屼細鎶ラ敊
+ //濡傛灉璇锋眰鏁伴噺瓒呭嚭淇濇寔瀵勫瓨鍣ㄧ殑鏈�ぇ鏁版嵁琛屾暟,浼氭姤閿� LogHelper.Info($"鍙戠敓浜嗗紓甯�{ex.Message},IP:{ip},Port:{port}", "Error");
}
}
@@ -227,7 +227,7 @@
}
}
catch (Exception ex) {
-
+ LogHelper.InfoEx(ex);
}
}
else {
@@ -270,7 +270,7 @@
}
/// <summary>
- /// 璇讳竴涓垨澶氫釜绂绘暎杈撳叆锛岃繑鍥炰竴涓猙it鐪熷亣鏁扮粍
+ /// 璇讳竴涓垨澶氫釜绂绘暎杈撳叆,杩斿洖涓�釜bit鐪熷亣鏁扮粍
/// </summary>
/// <param name="address"></param>
/// <param name="qty"></param>
@@ -291,7 +291,7 @@
}
}
catch (Exception ex) {
-
+ LogHelper.InfoEx(ex);
}
}
else {
@@ -302,7 +302,7 @@
}
/// <summary>
- /// 璇讳竴涓垨澶氫釜杈撳叆瀵勫瓨鍣紝杩斿洖涓�釜int32浣嶆暟缁�+ /// 璇讳竴涓垨澶氫釜杈撳叆瀵勫瓨鍣�杩斿洖涓�釜int32浣嶆暟缁� /// </summary>
/// <param name="address"></param>
/// <param name="qty"></param>
@@ -323,7 +323,7 @@
}
}
catch (Exception ex) {
-
+ LogHelper.InfoEx(ex);
}
}
else {
@@ -338,7 +338,7 @@
}
#region Modbus 鍗忚璇诲啓瀛楃涓�- // 灏嗗瓧绗︿覆杞崲涓�Modbus 瀵勫瓨鍣ㄦ暟缁勶紙int[] 褰㈠紡锛屾瘡涓猧nt瀛樹竴涓�6浣嶅�锛�+ // 灏嗗瓧绗︿覆杞崲涓�Modbus 瀵勫瓨鍣ㄦ暟缁�(int[] 褰㈠紡,姣忎釜int瀛樹竴涓�6浣嶅�)
private static int[] StringToRegisters(string text) {
// 濉厖涓哄伓鏁伴暱搴� if (text.Length % 2 != 0) {
@@ -349,7 +349,7 @@
int[] registers = new int[bytes.Length / 2];
for (int i = 0; i < registers.Length; i++) {
- // 澶х搴忥細楂樹綅瀛楄妭鍦ㄥ墠
+ // 澶х搴�楂樹綅瀛楄妭鍦ㄥ墠
registers[i] = (bytes[i * 2] << 8) | bytes[i * 2 + 1];
}
@@ -361,7 +361,7 @@
byte[] bytes = new byte[registers.Length * 2];
for (int i = 0; i < registers.Length; i++) {
- // 鎻愬彇浣�6浣嶏紙蹇界暐楂�6浣嶏級
+ // 鎻愬彇浣�6浣�(蹇界暐楂�6浣�
ushort registerValue = (ushort)(registers[i] & 0xFFFF);
// 瑙ｆ瀽澶х搴�@@ -376,7 +376,7 @@
#endregion
/// <summary>
- /// 鑾峰彇 Modbus 閫氳瀵硅薄锛堢鏈夛紝鍐呴儴璋冪敤锛�+ /// 鑾峰彇 Modbus 閫氳瀵硅薄 (绉佹湁,鍐呴儴璋冪敤)
/// </summary>
/// <param name="ip"></param>
/// <param name="port"></param>
--
Gitblit v1.9.1