From 627371d0ffdf50239313f2c86d022a0c5c69550d Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 19:43:46 +0800
Subject: [PATCH] refactor(logging): 重构日志记录模块，统一使用Serilog和QuartzLogHelper
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotClientManager.cs | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotClientManager.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotClientManager.cs
index 1d952e3..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,6 @@
+using Serilog;
using System.Collections.Concurrent;
using System.Net.Sockets;
-using Microsoft.Extensions.Logging;
using WIDESEAWCS_Core.LogHelper;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
@@ -101,8 +101,7 @@
// 娓呯悊璇ュ鎴风鐨� HandleClientAsync 鍚姩鏍囧織
// 浠ヤ究涓嬫閲嶈繛鏃跺彲浠ラ噸鏂板惎鍔ㄥ鐞�
_handleClientStarted.TryRemove(ipAddress, out _);
- _logger.LogDebug("瀹㈡埛绔湭杩炴帴锛孖P: {IpAddress}", ipAddress);
- QuartzLogger.Debug($"瀹㈡埛绔湭杩炴帴锛孖P: {ipAddress}", robotCrane.DeviceName);
+ QuartzLogHelper.LogDebug(_logger, $"瀹㈡埛绔湭杩炴帴锛孖P: {ipAddress}", robotCrane.DeviceName);
return false;
}
@@ -113,8 +112,7 @@
// 缁戝畾瀹㈡埛绔柇寮�杩炴帴鐨勪簨浠跺鐞�
_tcpSocket.RobotReceived += OnRobotReceived;
// 璁板綍鏃ュ織锛氫簨浠惰闃呮垚鍔�
- _logger.LogInformation("鏈烘鎵婽CP娑堟伅浜嬩欢宸茶闃咃紝璁惧: {DeviceName}", robotCrane.DeviceName);
- QuartzLogger.Info($"鏈烘鎵婽CP娑堟伅浜嬩欢宸茶闃�", robotCrane.DeviceName);
+ QuartzLogHelper.LogInfo(_logger, $"鏈烘鎵婽CP娑堟伅浜嬩欢宸茶闃�", robotCrane.DeviceName);
}
// 浠� TCP 鏈嶅姟鍣ㄧ殑瀹㈡埛绔瓧鍏镐腑鑾峰彇 TcpClient 瀵硅薄
@@ -126,8 +124,7 @@
{
// 绉婚櫎鍚姩鏍囧織锛岃繑鍥� false 琛ㄧず瀹㈡埛绔笉鍙敤
_handleClientStarted.TryRemove(ipAddress, out _);
- _logger.LogWarning("鑾峰彇TcpClient澶辫触锛孖P: {IpAddress}", ipAddress);
- QuartzLogger.Warn($"鑾峰彇TcpClient澶辫触锛孖P: {ipAddress}", robotCrane.DeviceName);
+ QuartzLogHelper.LogWarn(_logger, $"鑾峰彇TcpClient澶辫触锛孖P: {ipAddress}", robotCrane.DeviceName);
return false;
}
@@ -138,8 +135,7 @@
if (!alreadyStarted)
{
// 璁板綍鏃ュ織锛氬惎鍔ㄦ秷鎭鐞�
- _logger.LogInformation("鍚姩瀹㈡埛绔秷鎭鐞嗭紝IP: {IpAddress}", ipAddress);
- QuartzLogger.Info($"鍚姩瀹㈡埛绔秷鎭鐞�", robotCrane.DeviceName);
+ QuartzLogHelper.LogInfo(_logger, $"鍚姩瀹㈡埛绔秷鎭鐞嗭紝IP: {ipAddress}", robotCrane.DeviceName);
// 鑾峰彇鏈�鏂扮殑鐘舵�佸璞�
var latestStateForSubscribe = _stateManager.GetState(ipAddress);
@@ -157,8 +153,7 @@
if (t.IsFaulted)
{
// 璁板綍閿欒鏃ュ織
- _logger.LogError(t.Exception, "鐩戝惉瀹㈡埛绔秷鎭簨浠跺紓甯革紝IP: {IpAddress}", ipAddress);
- QuartzLogger.Error($"鐩戝惉瀹㈡埛绔秷鎭簨浠跺紓甯�", robotCrane.DeviceName, t.Exception);
+ QuartzLogHelper.LogError(_logger, t.Exception, $"鐩戝惉瀹㈡埛绔秷鎭簨浠跺紓甯革紝IP: {ipAddress}", $"鐩戝惉瀹㈡埛绔秷鎭簨浠跺紓甯革紝IP: {ipAddress}", robotCrane.DeviceName);
// 鍙戠敓閿欒鏃讹紝绉婚櫎鍚姩鏍囧織锛屽厑璁镐笅娆￠噸璇�
_handleClientStarted.TryRemove(ipAddress, out _);
}
@@ -195,8 +190,7 @@
_handleClientStarted.TryRemove(clientId, out _);
// 璁板綍鏃ュ織锛氬鎴风鏂紑杩炴帴
- _logger.LogInformation("瀹㈡埛绔柇寮�杩炴帴锛孖P: {ClientId}", clientId);
- QuartzLogger.Info($"瀹㈡埛绔柇寮�杩炴帴", clientId);
+ QuartzLogHelper.LogInfo(_logger, $"瀹㈡埛绔柇寮�杩炴帴锛孖P: {clientId}", clientId);
// 閲嶇疆璇ュ鎴风鐨勭姸鎬佷俊鎭�
_stateManager.TryUpdateStateSafely(clientId, state =>
--
Gitblit v1.9.3