From 171a39eabb6082a469d881956b792cb1d9fd2047 Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Wed, 12 Mar 2025 16:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84Device=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs   | 6 +++---
 .../Workers/BasicScheduledMeterReadingService.cs         | 2 ++
 .../Workers/EnergySystemScheduledMeterReadingService.cs  | 9 ++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs b/src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs
index 1c5a6b6..b4b6079 100644
--- a/src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs
+++ b/src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs
@@ -129,7 +129,7 @@ namespace JiShe.CollectBus.Plugins
         {
             var messageReceivedLoginEvent = new MessageReceivedLogin
             {
-                ClientId = client.Id,
+                ClientId = oldClinetId,
                 ClientIp = client.IP,
                 ClientPort = client.Port,
                 MessageHexString = messageHexString,
@@ -140,11 +140,11 @@ namespace JiShe.CollectBus.Plugins
             var entity = await _deviceRepository.FindAsync(a => a.Number == deviceNo);
             if (entity == null)
             {
-                await _deviceRepository.InsertAsync(new Device(deviceNo, client.Id, DateTime.Now, DateTime.Now, DeviceStatus.Online));
+                await _deviceRepository.InsertAsync(new Device(deviceNo, oldClinetId, DateTime.Now, DateTime.Now, DeviceStatus.Online));
             }
             else
             {
-                entity.UpdateByLoginAndHeartbeat(client.Id);
+                entity.UpdateByLoginAndHeartbeat(oldClinetId);
                 await _deviceRepository.UpdateAsync(entity);
             }
         }
diff --git a/src/JiShe.CollectBus.Application/Workers/BasicScheduledMeterReadingService.cs b/src/JiShe.CollectBus.Application/Workers/BasicScheduledMeterReadingService.cs
index 46dc901..51b6652 100644
--- a/src/JiShe.CollectBus.Application/Workers/BasicScheduledMeterReadingService.cs
+++ b/src/JiShe.CollectBus.Application/Workers/BasicScheduledMeterReadingService.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
+using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Workers
 {
@@ -113,6 +114,7 @@ namespace JiShe.CollectBus.Workers
         /// <returns></returns>
         public virtual Task ScheduledMeterOneMinuteReading()
         {
+            
             throw new NotImplementedException($"{nameof(ScheduledMeterOneMinuteReading)}请根据不同系统类型进行实现");
         }
 
diff --git a/src/JiShe.CollectBus.Application/Workers/EnergySystemScheduledMeterReadingService.cs b/src/JiShe.CollectBus.Application/Workers/EnergySystemScheduledMeterReadingService.cs
index 92a9861..1db9e4a 100644
--- a/src/JiShe.CollectBus.Application/Workers/EnergySystemScheduledMeterReadingService.cs
+++ b/src/JiShe.CollectBus.Application/Workers/EnergySystemScheduledMeterReadingService.cs
@@ -1,6 +1,7 @@
 using FreeRedis;
 using JiShe.CollectBus.Ammeters;
 using JiShe.CollectBus.Common.Consts;
+using JiShe.CollectBus.Devices;
 using JiShe.CollectBus.FreeRedisProvider;
 using JiShe.CollectBus.FreeSql;
 using JiShe.CollectBus.Watermeter;
@@ -12,6 +13,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
 
 namespace JiShe.CollectBus.Workers
 {
@@ -22,6 +24,12 @@ namespace JiShe.CollectBus.Workers
     //[Route($"/energy/app/scheduled")]
     public class EnergySystemScheduledMeterReadingService : BasicScheduledMeterReadingService
     {
+        private readonly IRepository<Device, Guid> _deviceRepository;
+        public EnergySystemScheduledMeterReadingService(IRepository<Device, Guid> deviceRepository)
+        {
+            this._deviceRepository = deviceRepository;
+        }
+
         public sealed override string SystemType => SystemTypeConst.Energy;
 
         /// <summary>
@@ -98,6 +106,5 @@ namespace JiShe.CollectBus.Workers
             .Ado
             .QueryAsync<WatermeterInfo>(sql);
         }
-
     }
 }
\ No newline at end of file