From ff006f77f6267fc0d2c4ee810d897a85165f5b8f Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 30 四月 2026 22:08:29 +0800
Subject: [PATCH] Merge branch 'xiaoyang' into dev
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs
index f49e018..2c7f8f4 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SocketServer/TcpSocketServer.Messaging.cs
@@ -3,6 +3,7 @@
using System.Text.Json;
using System.IO;
using WIDESEAWCS_Model.Models;
+using Serilog.Core;
namespace WIDESEAWCS_Tasks.SocketServer
{
@@ -23,8 +24,7 @@
/// <param name="client">TCP 瀹㈡埛绔繛鎺�</param>
/// <param name="clientId">瀹㈡埛绔敮涓�鏍囪瘑</param>
/// <param name="cancellationToken">鍙栨秷浠ょ墝</param>
- /// <param name="robotCrane">鏈哄櫒浜虹姸鎬�</param>
- public async Task HandleClientAsync(TcpClient client, string clientId, CancellationToken cancellationToken, RobotSocketState robotCrane)
+ public async Task HandleClientAsync(TcpClient client, string clientId, CancellationToken cancellationToken)
{
using (client)
using (NetworkStream networkStream = client.GetStream())
@@ -61,14 +61,15 @@
}
// 鎸夊鎴风鍘婚噸锛氭鏌ユ槸鍚︿笌璇ュ鎴风涓婃娑堟伅鐩稿悓
- lock (_syncRoot)
- {
- if (_clientLastMessage.TryGetValue(clientId, out var prev) && message == prev)
- {
- continue;
- }
- _clientLastMessage[clientId] = message;
- }
+ //lock (_syncRoot)
+ //{
+ // if (_clientLastMessage.TryGetValue(clientId, out var prev) && message == prev)
+ // {
+ // QuartzLogHelper.LogInfo(Logger.None, $"鏉ヨ嚜瀹㈡埛绔� {clientId} 鐨勯噸澶嶆秷鎭紝鍐呭: {message}", clientId);
+ // continue;
+ // }
+ // _clientLastMessage[clientId] = message;
+ //}
// 鏇存柊瀹㈡埛绔姸鎬�
UpdateClientStatus(clientId, message);
--
Gitblit v1.9.3