admin/JiShe.CollectBus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'feature_定时抄读_CY' into dev

Browse Source
This commit is contained in:
ChenYi 2025-03-12 16:30:10 +08:00
commit 665c4fc383
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/JiShe.CollectBus.Application/Plugins/TcpMonitor.cs
View File

@ -129,7 +129,7 @@ namespace JiShe.CollectBus.Plugins
{ {
var messageReceivedLoginEvent = new MessageReceivedLogin var messageReceivedLoginEvent = new MessageReceivedLogin
{ {
ClientId = client.Id, ClientId = oldClinetId,
ClientIp = client.IP, ClientIp = client.IP,
ClientPort = client.Port, ClientPort = client.Port,
MessageHexString = messageHexString, MessageHexString = messageHexString,
@ -140,11 +140,11 @@ namespace JiShe.CollectBus.Plugins
var entity = await _deviceRepository.FindAsync(a => a.Number == deviceNo); var entity = await _deviceRepository.FindAsync(a => a.Number == deviceNo);
if (entity == null) 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 else
{ {
entity.UpdateByLoginAndHeartbeat(client.Id); entity.UpdateByLoginAndHeartbeat(oldClinetId);
await _deviceRepository.UpdateAsync(entity); await _deviceRepository.UpdateAsync(entity);
} }
} }

2
src/JiShe.CollectBus.Application/Workers/BasicScheduledMeterReadingService.cs
View File

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

9
src/JiShe.CollectBus.Application/Workers/EnergySystemScheduledMeterReadingService.cs
View File

@ -1,6 +1,7 @@
using FreeRedis; using FreeRedis;
using JiShe.CollectBus.Ammeters; using JiShe.CollectBus.Ammeters;
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.Devices;
using JiShe.CollectBus.FreeRedisProvider; using JiShe.CollectBus.FreeRedisProvider;
using JiShe.CollectBus.FreeSql; using JiShe.CollectBus.FreeSql;
using JiShe.CollectBus.Watermeter; using JiShe.CollectBus.Watermeter;
@ -12,6 +13,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Repositories;
namespace JiShe.CollectBus.Workers namespace JiShe.CollectBus.Workers
{ {
@ -22,6 +24,12 @@ namespace JiShe.CollectBus.Workers
//[Route($"/energy/app/scheduled")] //[Route($"/energy/app/scheduled")]
public class EnergySystemScheduledMeterReadingService : BasicScheduledMeterReadingService 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; public sealed override string SystemType => SystemTypeConst.Energy;
/// <summary> /// <summary>
@ -98,6 +106,5 @@ namespace JiShe.CollectBus.Workers
.Ado .Ado
.QueryAsync<WatermeterInfo>(sql); .QueryAsync<WatermeterInfo>(sql);
} }
} }
} }