From 5915f5961b4b0a1a1cd4514c9e229c751dc26d9f Mon Sep 17 00:00:00 2001
From: cli <377476583@qq.com>
Date: Fri, 14 Mar 2025 14:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...he.CollectBus.Application.Contracts.csproj | 10 ++--
 .../IScheduledMeterReadingService.cs          | 54 +++++++++++++------
 .../IWorkerSubscriberAppService.cs            |  1 -
 .../Consumers/WorkerConsumer.cs               |  2 -
 .../BasicScheduledMeterReadingService.cs      | 25 ++++-----
 ...nergySystemScheduledMeterReadingService.cs | 19 ++-----
 .../Subscribers/WorkerSubscriberAppService.cs |  1 -
 7 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/src/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj b/src/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj
index 0b1f26d..de972d1 100644
--- a/src/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj
+++ b/src/JiShe.CollectBus.Application.Contracts/JiShe.CollectBus.Application.Contracts.csproj
@@ -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>
diff --git a/src/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs b/src/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs
index df8f4f1..a89d071 100644
--- a/src/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs
+++ b/src/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs
@@ -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>
     /// 定时任务基础约束
@@ -31,7 +26,7 @@ namespace JiShe.CollectBus.Workers
         /// <param name="gatherCode">采集端Code</param>
         /// <returns></returns>
         Task<List<AmmeterInfo>> GetAmmeterInfoList(string gatherCode = "");
-         
+
         /// <summary>
         /// 初始化电表缓存数据
         /// </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
+
+
     }
 }
diff --git a/src/JiShe.CollectBus.Application.Contracts/Subscribers/IWorkerSubscriberAppService.cs b/src/JiShe.CollectBus.Application.Contracts/Subscribers/IWorkerSubscriberAppService.cs
index dede8c4..12a8e19 100644
--- a/src/JiShe.CollectBus.Application.Contracts/Subscribers/IWorkerSubscriberAppService.cs
+++ b/src/JiShe.CollectBus.Application.Contracts/Subscribers/IWorkerSubscriberAppService.cs
@@ -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
diff --git a/src/JiShe.CollectBus.Application/Consumers/WorkerConsumer.cs b/src/JiShe.CollectBus.Application/Consumers/WorkerConsumer.cs
index 5a5652d..53ad836 100644
--- a/src/JiShe.CollectBus.Application/Consumers/WorkerConsumer.cs
+++ b/src/JiShe.CollectBus.Application/Consumers/WorkerConsumer.cs
@@ -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;
diff --git a/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs b/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
index c573ab5..82a11ab 100644
--- a/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
+++ b/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
@@ -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>
     /// 定时采集服务
diff --git a/src/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs b/src/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
index 3aa355e..16359f2 100644
--- a/src/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
+++ b/src/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
@@ -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>
     /// 能耗系统定时采集服务
diff --git a/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs b/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
index 275886e..d5c20b0 100644
--- a/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
+++ b/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
@@ -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;