From d14030746fcd0310d3c9b028fe2c0a5b78984eb6 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 19:44:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotClientManager.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotClientManager.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotClientManager.cs
index 5c95316..c021204 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotClientManager.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotClientManager.cs
@@ -1,6 +1,8 @@
+using Serilog;
using System.Collections.Concurrent;
using System.Net.Sockets;
using WIDESEAWCS_Core.LogHelper;
+using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_Tasks.SocketServer;
@@ -27,6 +29,11 @@
/// 鏈烘鎵嬬姸鎬佺鐞嗗櫒锛岀敤浜庤鍐欒澶囩姸鎬�
/// </summary>
private readonly RobotStateManager _stateManager;
+
+ /// <summary>
+ /// 鏃ュ織璁板綍鍣�
+ /// </summary>
+ private readonly ILogger _logger;
/// <summary>
/// 璺熻釜宸插惎鍔ㄦ秷鎭鐞嗙殑瀹㈡埛绔紝閬垮厤閲嶅鍚姩
@@ -59,10 +66,12 @@
/// </summary>
/// <param name="tcpSocket">TCP Socket 鏈嶅姟鍣ㄥ疄渚�</param>
/// <param name="stateManager">鐘舵�佺鐞嗗櫒瀹炰緥</param>
- public RobotClientManager(TcpSocketServer tcpSocket, RobotStateManager stateManager)
+ /// <param name="logger">鏃ュ織璁板綍鍣�</param>
+ public RobotClientManager(TcpSocketServer tcpSocket, RobotStateManager stateManager, ILogger logger)
{
_tcpSocket = tcpSocket;
_stateManager = stateManager;
+ _logger = logger;
}
/// <summary>
@@ -92,6 +101,7 @@
// 娓呯悊璇ュ鎴风鐨� HandleClientAsync 鍚姩鏍囧織
// 浠ヤ究涓嬫閲嶈繛鏃跺彲浠ラ噸鏂板惎鍔ㄥ鐞�
_handleClientStarted.TryRemove(ipAddress, out _);
+ QuartzLogHelper.LogDebug(_logger, $"瀹㈡埛绔湭杩炴帴锛孖P: {ipAddress}", robotCrane.DeviceName);
return false;
}
@@ -101,8 +111,8 @@
{
// 缁戝畾瀹㈡埛绔柇寮�杩炴帴鐨勪簨浠跺鐞�
_tcpSocket.RobotReceived += OnRobotReceived;
- // 璁板綍鏃ュ織锛堟敞鎰忥細鏃ュ織鍐呭涓�"瀹㈡埛绔凡鏂紑杩炴帴"锛屽彲鑳芥槸閬楃暀鐨勫崰浣嶆枃鏈級
- QuartzLogger.Warn($"瀹㈡埛绔凡鏂紑杩炴帴", robotCrane.DeviceName);
+ // 璁板綍鏃ュ織锛氫簨浠惰闃呮垚鍔�
+ QuartzLogHelper.LogInfo(_logger, $"鏈烘鎵婽CP娑堟伅浜嬩欢宸茶闃�", robotCrane.DeviceName);
}
// 浠� TCP 鏈嶅姟鍣ㄧ殑瀹㈡埛绔瓧鍏镐腑鑾峰彇 TcpClient 瀵硅薄
@@ -114,6 +124,7 @@
{
// 绉婚櫎鍚姩鏍囧織锛岃繑鍥� false 琛ㄧず瀹㈡埛绔笉鍙敤
_handleClientStarted.TryRemove(ipAddress, out _);
+ QuartzLogHelper.LogWarn(_logger, $"鑾峰彇TcpClient澶辫触锛孖P: {ipAddress}", robotCrane.DeviceName);
return false;
}
@@ -123,8 +134,8 @@
// 濡傛灉灏氭湭鍚姩锛屽垯鍚姩娑堟伅澶勭悊寰幆
if (!alreadyStarted)
{
- // 璁板綍鏃ュ織
- QuartzLogger.Info($"鍚姩瀹㈡埛绔秷鎭鐞�", robotCrane.DeviceName);
+ // 璁板綍鏃ュ織锛氬惎鍔ㄦ秷鎭鐞�
+ QuartzLogHelper.LogInfo(_logger, $"鍚姩瀹㈡埛绔秷鎭鐞嗭紝IP: {ipAddress}", robotCrane.DeviceName);
// 鑾峰彇鏈�鏂扮殑鐘舵�佸璞�
var latestStateForSubscribe = _stateManager.GetState(ipAddress);
@@ -142,8 +153,7 @@
if (t.IsFaulted)
{
// 璁板綍閿欒鏃ュ織
- QuartzLogger.Info($"鐩戝惉瀹㈡埛绔秷鎭簨浠跺紓甯�", robotCrane.DeviceName);
- Console.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] HandleClientAsync error: {t.Exception?.GetBaseException().Message}");
+ QuartzLogHelper.LogError(_logger, t.Exception, $"鐩戝惉瀹㈡埛绔秷鎭簨浠跺紓甯革紝IP: {ipAddress}", $"鐩戝惉瀹㈡埛绔秷鎭簨浠跺紓甯革紝IP: {ipAddress}", robotCrane.DeviceName);
// 鍙戠敓閿欒鏃讹紝绉婚櫎鍚姩鏍囧織锛屽厑璁镐笅娆￠噸璇�
_handleClientStarted.TryRemove(ipAddress, out _);
}
@@ -179,6 +189,9 @@
// 绉婚櫎璇ュ鎴风鐨� HandleClientAsync 鍚姩鏍囧織
_handleClientStarted.TryRemove(clientId, out _);
+ // 璁板綍鏃ュ織锛氬鎴风鏂紑杩炴帴
+ QuartzLogHelper.LogInfo(_logger, $"瀹㈡埛绔柇寮�杩炴帴锛孖P: {clientId}", clientId);
+
// 閲嶇疆璇ュ鎴风鐨勭姸鎬佷俊鎭�
_stateManager.TryUpdateStateSafely(clientId, state =>
{
--
Gitblit v1.9.3