From c640420188003df54b610a0e530666f4c0ae7ff0 Mon Sep 17 00:00:00 2001 From: yanghongwei Date: Wed, 2 Apr 2025 14:48:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Device/DeviceManager.cs | 3 ++- Service/DeviceService.cs | 13 ++++++++++--- Service/LogService.cs | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Device/DeviceManager.cs b/Device/DeviceManager.cs index 6a82c93..b13307a 100644 --- a/Device/DeviceManager.cs +++ b/Device/DeviceManager.cs @@ -54,7 +54,7 @@ namespace LY.App.Device private readonly RedisService _redis = ServiceLocator.Instance.GetService(); private static readonly object _lock = new object(); private readonly CancellationTokenSource _monitorCancellationTokenSource = new(); - private readonly LogService _log = ServiceLocator.Instance.GetService(); + private DeviceManager() { @@ -338,6 +338,7 @@ namespace LY.App.Device { int retryDelay = 1000; // 初始重连间隔(1秒) int maxDelay = 30000; // 最大重连间隔(30秒) + var _log = ServiceLocator.Instance.GetService(); await _log?.AddLog(new AddLog { Message = $"设备 {device.Id} 掉线,重新连接中...", Parameters = "", StackTrace = "", url = "" }); while (!device.IsConnected) { diff --git a/Service/DeviceService.cs b/Service/DeviceService.cs index 3f6a8a3..dc5a014 100644 --- a/Service/DeviceService.cs +++ b/Service/DeviceService.cs @@ -9,18 +9,25 @@ using SqlSugar; namespace LY.App.Service { + /// + /// 设备服务 + /// [ServiceInjection(InjectionType.Transient)] public class DeviceService { private readonly SqlSugarClient _db; - private readonly IConfiguration _config; private readonly RedisService _redisService; private readonly AlarmService _alarmService; private readonly DeviceManager deviceManager = DeviceManager.Instance; - public DeviceService(SqlSugarClient db, IConfiguration config, RedisService redisService, AlarmService alarmService) + /// + /// 构造函数 + /// + /// + /// + /// + public DeviceService(SqlSugarClient db, RedisService redisService, AlarmService alarmService) { _db = db; - _config = config; _redisService = redisService; _alarmService = alarmService; } diff --git a/Service/LogService.cs b/Service/LogService.cs index 43b2281..04a2281 100644 --- a/Service/LogService.cs +++ b/Service/LogService.cs @@ -9,7 +9,7 @@ using System.Text; namespace LY.App.Service { - [ServiceInjection(InjectionType.Singleton)] + [ServiceInjection(InjectionType.Transient)] public class LogService { private readonly SqlSugarClient _db;