src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs

@@ -129,7 +129,7 @@ namespace JiShe.CollectBus.Plugins
         {
             var messageReceivedLoginEvent = new MessageReceivedLogin
             {
-                ClientId = oldClinetId,
+                ClientId = client.Id,
                 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, oldClinetId, DateTime.Now, DateTime.Now, DeviceStatus.Online));
+                await _deviceRepository.InsertAsync(new Device(deviceNo, client.Id, DateTime.Now, DateTime.Now, DeviceStatus.Online));
             }
             else
             {
-                entity.UpdateByLoginAndHeartbeat(oldClinetId);
+                entity.UpdateByLoginAndHeartbeat(client.Id);
                 await _deviceRepository.UpdateAsync(entity);
             }
         }

src/JiShe.CollectBus.Application/Workers/BasicScheduledMeterReadingService.cs

@@ -8,7 +8,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
-using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Workers
 {
@@ -114,7 +113,6 @@ namespace JiShe.CollectBus.Workers
         /// <returns></returns>
         public virtual Task ScheduledMeterOneMinuteReading()
         {
-            
             throw new NotImplementedException($"{nameof(ScheduledMeterOneMinuteReading)}请根据不同系统类型进行实现");
         }
 

src/JiShe.CollectBus.Application/Workers/EnergySystemScheduledMeterReadingService.cs

@@ -1,7 +1,6 @@
 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;
@@ -13,7 +12,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Repositories;
 
 namespace JiShe.CollectBus.Workers
 {
@@ -24,12 +22,6 @@ 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>
@@ -106,5 +98,6 @@ namespace JiShe.CollectBus.Workers
             .Ado
             .QueryAsync<WatermeterInfo>(sql);
         }
+
     }
 }