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/ConveyorLineNewJob/CommonConveyorLineNewJob.cs | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs
index c88e03c..07fb90d 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineNewJob/CommonConveyorLineNewJob.cs
@@ -1,15 +1,14 @@
using MapsterMapper;
using Masuit.Tools;
using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Quartz;
+using Serilog;
using SqlSugar;
using WIDESEA_Core;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Helper;
-using WIDESEAWCS_Core.LogHelper;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
@@ -41,7 +40,6 @@
/// 浠诲姟鏈嶅姟
/// </summary>
private readonly ITaskService _taskService;
-
/// <summary>
/// 鏈哄櫒浜轰换鍔℃湇鍔�
@@ -82,7 +80,7 @@
/// <summary>
/// 鏃ュ織璁板綍鍣�
/// </summary>
- private readonly ILogger<CommonConveyorLineNewJob> _logger;
+ private readonly ILogger _logger;
/// <summary>
/// 鐩爣鍦板潃鍒拌澶囩被鍨嬬殑鏄犲皠
@@ -90,6 +88,11 @@
/// <remarks>
/// </remarks>
private static List<string> AddressToDeviceType = new List<string> { "11020", "11028" };
+
+ /// <summary>
+ /// 鎵樼洏妫�鏌ヤ綅缃殑鏈�杩戞墽琛屾椂闂达紙鐢ㄤ簬30绉掗棿闅旈檺鍒讹級
+ /// </summary>
+ private static readonly Dictionary<string, DateTime> _lastPalletCheckTime = new();
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -100,7 +103,7 @@
/// <param name="mapper">瀵硅薄鏄犲皠鍣�</param>
/// <param name="httpClientHelper">HTTP 瀹㈡埛绔府鍔╃被</param>
/// <param name="logger">鏃ュ織璁板綍鍣�</param>
- public CommonConveyorLineNewJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, HttpClientHelper httpClientHelper, ILogger<CommonConveyorLineNewJob> logger, IRobotTaskService robotTaskService)
+ public CommonConveyorLineNewJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, HttpClientHelper httpClientHelper, ILogger logger, IRobotTaskService robotTaskService)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -179,6 +182,13 @@
// 濡傛灉褰撳墠璁惧鍦ㄦ鏌ュ垪琛ㄤ腑
if (checkPalletPositions.Any(x => x.Code == childDeviceCode))
{
+ // 30绉掗棿闅旈檺鍒�
+ if (_lastPalletCheckTime.TryGetValue(childDeviceCode, out var lastTime) &&
+ (DateTime.Now - lastTime).TotalSeconds < 30)
+ {
+ continue;
+ }
+
// 妫�鏌ヨ緭閫佺嚎鐘舵�侊紙鏄惁鏈夋墭鐩橈級
if (command.CV_State == 2)
{
@@ -188,27 +198,37 @@
{
// 娌℃湁浠诲姟锛屽悜 WMS 璇锋眰鍑哄簱鎵樼洏浠诲姟
var position = checkPalletPositions.FirstOrDefault(x => x.Code == childDeviceCode);
- //QuartzLogHelper.LogInfo(_logger, "Execute锛氭鏌ユ墭鐩樹綅缃� {ChildDeviceCode}锛岃姹俉MS鍑哄簱鎵樼洏浠诲姟", $"妫�鏌ユ墭鐩樹綅缃� {childDeviceCode}锛岃姹俉MS鍑哄簱鎵樼洏浠诲姟", conveyorLine.DeviceCode, childDeviceCode);
- var responseResult = _httpClientHelper.Post<WebResponseContent>("GetOutBoundTrayTaskAsync", new CreateTaskDto()
+ string configKey = "GetOutBoundTrayTaskAsync";
+ string requestParam = new CreateTaskDto()
{
WarehouseId = position.WarehouseId,
TargetAddress = childDeviceCode
- }.Serialize());
+ }.Serialize();
+ DateTime startTime = DateTime.Now;
+
+ var responseResult = _httpClientHelper.Post<WebResponseContent>(configKey, requestParam);
+
+ _lastPalletCheckTime[childDeviceCode] = DateTime.Now;
// 濡傛灉璇锋眰鎴愬姛锛屾帴鏀� WMS 杩斿洖鐨勪换鍔�
if (responseResult.IsSuccess && responseResult.Data.Status)
{
+ QuartzLogHelper.LogInfo(_logger, $"璋冪敤WMS鎺ュ彛鎴愬姛,鎺ュ彛:銆恵configKey}銆�,璇锋眰鍙傛暟:銆恵requestParam}銆�,鍝嶅簲鏁版嵁:銆恵responseResult.Data?.Data}銆�,鑰楁椂:{(DateTime.Now - startTime).TotalMilliseconds}ms", conveyorLine.DeviceCode);
var wmsTask = JsonConvert.DeserializeObject<WMSTaskDTO>(responseResult.Data.Data.ToString());
List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO> { wmsTask };
if (wmsTask != null)
_taskService.ReceiveWMSTask(taskDTOs);
}
+ else
+ {
+ QuartzLogHelper.LogError(_logger, $"璋冪敤WMS鎺ュ彛澶辫触,鎺ュ彛:銆恵configKey}銆�,璇锋眰鍙傛暟:銆恵requestParam}銆�,閿欒淇℃伅:銆恵responseResult.Data?.Message}銆�", conveyorLine.DeviceCode);
+ }
}
}
}
- #endregion
+ #endregion 妫�娴嬫槸鍚﹂渶瑕佺┖鎵樼洏
// ========== 妫�鏌� PLC_STB 鏍囧織 ==========
// 鍙湁褰� PLC_STB 涓� 1 鏃舵墠澶勭悊浠诲姟
@@ -224,7 +244,7 @@
var task = _taskService.QueryManualInboundTask(childDeviceCode);
if (task != null)
{
- var handler = new ManualInboundTaskHandler(_taskService);
+ var handler = new ManualInboundTaskHandler(_taskService, _logger);
handler.WriteTaskToPlc(conveyorLine, childDeviceCode, task);
}
}
@@ -278,7 +298,6 @@
RobotTargetAddressLineCode = childDeviceCode,
RobotTaskNum = num, // 鐢熸垚浠诲姟鍙�
RobotDispatchertime = DateTime.Now,
-
};
if (_robotTaskService.AddData(robotTask).Status)
{
--
Gitblit v1.9.3