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

修改地址

Browse Source
This commit is contained in:
cli 2025-03-14 14:38:08 +08:00
parent d82e646359
commit 5915f5961b
7 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj
View File

@ -9,6 +9,12 @@
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Workers\**" />
<EmbeddedResource Remove="Workers\**" />
<None Remove="Workers\**" />
</ItemGroup>
<ItemGroup>
<None Remove="FodyWeavers.xml" />
<None Remove="JiShe.CollectBus.Application.Contracts.abppkg" />
@ -22,8 +28,4 @@
<ProjectReference Include="..\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Workers\" />
</ItemGroup>
</Project>

52
src/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs
View File

@ -1,16 +1,11 @@
using JiShe.CollectBus.Ammeters;
using JiShe.CollectBus.IotSystems.Watermeter;
using JiShe.CollectBus.GatherItem;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Collections.Generic;
using System.Threading.Tasks;
using JiShe.CollectBus.Ammeters;
using JiShe.CollectBus.GatherItem;
using JiShe.CollectBus.IotSystems.Watermeter;
using Volo.Abp.Application.Services;
using Volo.Abp.DependencyInjection;
namespace JiShe.CollectBus.Workers
namespace JiShe.CollectBus.ScheduledMeterReading
{
/// <summary>
/// 定时任务基础约束
@ -39,6 +34,28 @@ namespace JiShe.CollectBus.Workers
/// <returns></returns>
Task InitAmmeterCacheData(string gatherCode = "");
/// <summary>
/// 1分钟采集电表数据
/// </summary>
/// <returns></returns>
Task AmmeterScheduledMeterOneMinuteReading();
/// <summary>
/// 5分钟采集电表数据
/// </summary>
/// <returns></returns>
Task AmmeterScheduledMeterFiveMinuteReading();
/// <summary>
/// 15分钟采集电表数据
/// </summary>
/// <returns></returns>
Task AmmeterScheduledMeterFifteenMinuteReading();
#endregion
#region 水表采集处理
/// <summary>
/// 获取水表信息
/// </summary>
@ -54,21 +71,24 @@ namespace JiShe.CollectBus.Workers
Task InitWatermeterCacheData(string gatherCode = "");
/// <summary>
/// 1分钟采集电表数据
/// 1分钟采集水表数据
/// </summary>
/// <returns></returns>
Task ScheduledMeterOneMinuteReading();
Task WatermeterScheduledMeterOneMinuteReading();
/// <summary>
/// 5分钟采集电表数据
/// 5分钟采集水表数据
/// </summary>
/// <returns></returns>
Task ScheduledMeterFiveMinuteReading();
Task WatermeterScheduledMeterFiveMinuteReading();
/// <summary>
/// 15分钟采集电表数据
/// 15分钟采集水表数据
/// </summary>
/// <returns></returns>
Task ScheduledMeterFifteenMinuteReading();
Task WatermeterScheduledMeterFifteenMinuteReading();
#endregion
}
}

1
src/JiShe.CollectBus.Application.Contracts/Subscribers/IWorkerSubscriberAppService.cs
View File

@ -1,6 +1,5 @@
using System.Threading.Tasks;
using JiShe.CollectBus.Common.Models;
using JiShe.CollectBus.MessageReceiveds;
using Volo.Abp.Application.Services;
namespace JiShe.CollectBus.Subscribers

2
src/JiShe.CollectBus.Application/Consumers/WorkerConsumer.cs
View File

@ -2,8 +2,6 @@
using System.Threading.Tasks;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Models;
using JiShe.CollectBus.MessageIssueds;
using JiShe.CollectBus.MessageReceiveds;
using MassTransit;
using Microsoft.Extensions.Logging;
using TouchSocket.Sockets;

25
src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
View File

@ -1,28 +1,21 @@
using DotNetCore.CAP;
using FreeRedis;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using DotNetCore.CAP;
using JiShe.CollectBus.Ammeters;
using JiShe.CollectBus.Common.BuildSendDatas;
using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.GatherItem;
using JiShe.CollectBus.MessageReceiveds;
using JiShe.CollectBus.IotSystems.MessageReceiveds;
using JiShe.CollectBus.IotSystems.Watermeter;
using JiShe.CollectBus.Protocol.Contracts;
using JiShe.CollectBus.Watermeter;
using JiShe.CollectBus.Workers;
using MassTransit;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Diagnostics.Metrics;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using TouchSocket.Sockets;
using Volo.Abp.Application.Services;
using static FreeSql.Internal.GlobalFilter;
namespace JiShe.CollectBus.Workers
namespace JiShe.CollectBus.ScheduledMeterReading
{
/// <summary>
/// 定时采集服务

19
src/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
View File

@ -1,24 +1,15 @@
using DotNetCore.CAP;
using FreeRedis;
using FreeSql;
using System.Collections.Generic;
using System.Threading.Tasks;
using DotNetCore.CAP;
using JiShe.CollectBus.Ammeters;
using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.FreeRedisProvider;
using JiShe.CollectBus.FreeSql;
using JiShe.CollectBus.IotSystems.Watermeter;
using JiShe.CollectBus.GatherItem;
using JiShe.CollectBus.IotSystems.Watermeter;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Repositories;
namespace JiShe.CollectBus.Workers
namespace JiShe.CollectBus.ScheduledMeterReading
{
/// <summary>
/// 能耗系统定时采集服务

1
src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
View File

@ -5,7 +5,6 @@ using DotNetCore.CAP;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Models;
using JiShe.CollectBus.IotSystems.Devices;
using JiShe.CollectBus.MessageReceiveds;
using JiShe.CollectBus.Protocol.Contracts;
using JiShe.CollectBus.Protocol.Contracts.Interfaces;
using Microsoft.AspNetCore.Mvc;