From f3a0c82d24a5bacc803fe4bd135476f9fc3d2e34 Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Tue, 15 Apr 2025 16:05:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A1=B9=E7=9B=AE=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectBusAppService.cs | 10 ++-------- .../BasicScheduledMeterReadingService.cs | 7 +------ .../Subscribers/SubscriberAppService.cs | 2 +- .../DeviceGroupBalanceControl.cs | 3 +-- .../Helpers}/BusJsonSerializer.cs | 2 +- .../JiShe.CollectBus.Common.csproj | 4 ---- .../Models}/BusGlobalPagedResult.cs | 2 +- .../Models}/BusPagedResult.cs | 2 +- .../Models}/DeviceCacheBasicModel.cs | 2 +- .../FreeRedisProvider.cs | 14 +++----------- .../JiShe.CollectBus.FreeRedisProvider.csproj | 3 +++ .../Interface/IIoTDBProvider.cs | 7 +------ .../Provider/IoTDBProvider.cs | 2 +- .../JiShe.CollectBus.Kafka.csproj | 4 ++++ 14 files changed, 21 insertions(+), 43 deletions(-) rename src/{JiShe.CollectBus.FreeRedisProvider/Extensions => JiShe.CollectBus.Common/Helpers}/BusJsonSerializer.cs (99%) rename src/{JiShe.CollectBus.FreeRedisProvider/Extensions => JiShe.CollectBus.Common/Models}/BusGlobalPagedResult.cs (94%) rename src/{JiShe.CollectBus.FreeRedisProvider/Extensions => JiShe.CollectBus.Common/Models}/BusPagedResult.cs (94%) rename src/{JiShe.CollectBus.FreeRedisProvider/Extensions => JiShe.CollectBus.Common/Models}/DeviceCacheBasicModel.cs (91%) diff --git a/src/JiShe.CollectBus.Application/CollectBusAppService.cs b/src/JiShe.CollectBus.Application/CollectBusAppService.cs index e1f913e..6ecc509 100644 --- a/src/JiShe.CollectBus.Application/CollectBusAppService.cs +++ b/src/JiShe.CollectBus.Application/CollectBusAppService.cs @@ -1,20 +1,14 @@ -using Confluent.Kafka; -using FreeRedis; -using FreeSql; -using JiShe.CollectBus.Common.Consts; +using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; -using JiShe.CollectBus.Common.Models; +using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.FreeRedisProvider; using JiShe.CollectBus.FreeSql; -using JiShe.CollectBus.Kafka.Producer; using JiShe.CollectBus.Localization; -using JiShe.CollectBus.Serializer; using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Threading.Tasks; using Volo.Abp.Application.Services; diff --git a/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs b/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs index 248bb92..287158f 100644 --- a/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs +++ b/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs @@ -1,6 +1,4 @@ -using Confluent.Kafka; -using DeviceDetectorNET.Class.Client; -using DotNetCore.CAP; +using DotNetCore.CAP; using JiShe.CollectBus.Ammeters; using JiShe.CollectBus.Common.BuildSendDatas; using JiShe.CollectBus.Common.Consts; @@ -8,7 +6,6 @@ using JiShe.CollectBus.Common.DeviceBalanceControl; using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Helpers; -using JiShe.CollectBus.EnergySystems.Entities; using JiShe.CollectBus.GatherItem; using JiShe.CollectBus.IoTDBProvider; using JiShe.CollectBus.IotSystems.MessageIssueds; @@ -17,13 +14,11 @@ using JiShe.CollectBus.IotSystems.Watermeter; using JiShe.CollectBus.Kafka.Producer; using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Repository.MeterReadingRecord; -using JiShe.CollectBus.Serializer; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using System.Threading; using System.Threading.Tasks; namespace JiShe.CollectBus.ScheduledMeterReading diff --git a/src/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs b/src/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs index 63559de..d5e9caf 100644 --- a/src/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs +++ b/src/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs @@ -1,5 +1,6 @@ using DotNetCore.CAP; using JiShe.CollectBus.Common.Enums; +using JiShe.CollectBus.Common.Helpers; using JiShe.CollectBus.Common.Models; using JiShe.CollectBus.IoTDBProvider; using JiShe.CollectBus.IotSystems.Devices; @@ -9,7 +10,6 @@ using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Contracts.Interfaces; using JiShe.CollectBus.Protocol.Contracts.Models; using JiShe.CollectBus.Repository.MeterReadingRecord; -using JiShe.CollectBus.Serializer; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using System; diff --git a/src/JiShe.CollectBus.Common/DeviceBalanceControl/DeviceGroupBalanceControl.cs b/src/JiShe.CollectBus.Common/DeviceBalanceControl/DeviceGroupBalanceControl.cs index 2575675..4be0f4f 100644 --- a/src/JiShe.CollectBus.Common/DeviceBalanceControl/DeviceGroupBalanceControl.cs +++ b/src/JiShe.CollectBus.Common/DeviceBalanceControl/DeviceGroupBalanceControl.cs @@ -1,5 +1,4 @@ -using JiShe.CollectBus.FreeRedisProvider; -using System; +using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; diff --git a/src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusJsonSerializer.cs b/src/JiShe.CollectBus.Common/Helpers/BusJsonSerializer.cs similarity index 99% rename from src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusJsonSerializer.cs rename to src/JiShe.CollectBus.Common/Helpers/BusJsonSerializer.cs index db1227b..f938fd8 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusJsonSerializer.cs +++ b/src/JiShe.CollectBus.Common/Helpers/BusJsonSerializer.cs @@ -7,7 +7,7 @@ using System.Text.Json.Serialization; using System.Text.Json; using System.Threading.Tasks; -namespace JiShe.CollectBus.Serializer +namespace JiShe.CollectBus.Common.Helpers { /// /// json帮助类 diff --git a/src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj b/src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj index 448bf62..b22e8ca 100644 --- a/src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj +++ b/src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj @@ -28,8 +28,4 @@ - - - - diff --git a/src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusGlobalPagedResult.cs b/src/JiShe.CollectBus.Common/Models/BusGlobalPagedResult.cs similarity index 94% rename from src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusGlobalPagedResult.cs rename to src/JiShe.CollectBus.Common/Models/BusGlobalPagedResult.cs index 18cd089..6ae8b91 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusGlobalPagedResult.cs +++ b/src/JiShe.CollectBus.Common/Models/BusGlobalPagedResult.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace JiShe.CollectBus.PagedResult +namespace JiShe.CollectBus.Common.Models { public class GlobalPagedResult { diff --git a/src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusPagedResult.cs b/src/JiShe.CollectBus.Common/Models/BusPagedResult.cs similarity index 94% rename from src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusPagedResult.cs rename to src/JiShe.CollectBus.Common/Models/BusPagedResult.cs index 3ee9950..2e68b14 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusPagedResult.cs +++ b/src/JiShe.CollectBus.Common/Models/BusPagedResult.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace JiShe.CollectBus.PagedResult +namespace JiShe.CollectBus.Common.Models { /// /// 查询结果 diff --git a/src/JiShe.CollectBus.FreeRedisProvider/Extensions/DeviceCacheBasicModel.cs b/src/JiShe.CollectBus.Common/Models/DeviceCacheBasicModel.cs similarity index 91% rename from src/JiShe.CollectBus.FreeRedisProvider/Extensions/DeviceCacheBasicModel.cs rename to src/JiShe.CollectBus.Common/Models/DeviceCacheBasicModel.cs index c561df2..05b654d 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/Extensions/DeviceCacheBasicModel.cs +++ b/src/JiShe.CollectBus.Common/Models/DeviceCacheBasicModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace JiShe.CollectBus.FreeRedisProvider +namespace JiShe.CollectBus.Common.Models { /// /// 设备缓存基础模型 diff --git a/src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider.cs b/src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider.cs index 4bdbd6d..c76f9e6 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider.cs +++ b/src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider.cs @@ -1,18 +1,10 @@ using FreeRedis; -using JetBrains.Annotations; -using JiShe.CollectBus.FreeRedisProvider.Options; -using JiShe.CollectBus.PagedResult; -using JiShe.CollectBus.Serializer; +using JiShe.CollectBus.Common.Helpers; +using JiShe.CollectBus.Common.Models; +using JiShe.CollectBus.FreeRedisProvider.Options; using Microsoft.Extensions.Options; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Text.Encodings.Web; using System.Text.Json; -using System.Text.Json.Serialization; -using System.Threading.Tasks; using Volo.Abp.DependencyInjection; namespace JiShe.CollectBus.FreeRedisProvider diff --git a/src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj b/src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj index e4f3447..7db0478 100644 --- a/src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj +++ b/src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj @@ -9,4 +9,7 @@ + + + diff --git a/src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBProvider.cs b/src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBProvider.cs index 292549a..8fe46a9 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBProvider.cs +++ b/src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBProvider.cs @@ -1,9 +1,4 @@ -using JiShe.CollectBus.PagedResult; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using JiShe.CollectBus.Common.Models; namespace JiShe.CollectBus.IoTDBProvider { diff --git a/src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBProvider.cs b/src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBProvider.cs index 6ae0ef1..3dd1341 100644 --- a/src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBProvider.cs +++ b/src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBProvider.cs @@ -1,13 +1,13 @@ using Apache.IoTDB; using Apache.IoTDB.DataStructure; using JiShe.CollectBus.Common.Extensions; +using JiShe.CollectBus.Common.Models; using JiShe.CollectBus.IoTDBProvider.Context; using JiShe.CollectBus.IoTDBProvider.Interface; using Microsoft.Extensions.Logging; using System.Collections.Concurrent; using System.Reflection; using System.Text; -using JiShe.CollectBus.PagedResult; namespace JiShe.CollectBus.IoTDBProvider diff --git a/src/JiShe.CollectBus.KafkaProducer/JiShe.CollectBus.Kafka.csproj b/src/JiShe.CollectBus.KafkaProducer/JiShe.CollectBus.Kafka.csproj index cef24d5..9518b0b 100644 --- a/src/JiShe.CollectBus.KafkaProducer/JiShe.CollectBus.Kafka.csproj +++ b/src/JiShe.CollectBus.KafkaProducer/JiShe.CollectBus.Kafka.csproj @@ -12,4 +12,8 @@ + + + +