完善项目依赖

src/JiShe.CollectBus.Application/CollectBusAppService.cs

@@ -1,20 +1,14 @@
-using Confluent.Kafka;
+using JiShe.CollectBus.Common.Consts;
-using FreeRedis;
-using FreeSql;
-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;
 

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

@@ -1,6 +1,4 @@
-using Confluent.Kafka;
+using DotNetCore.CAP;
-using DeviceDetectorNET.Class.Client;
-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

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;

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;

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
 {
     /// <summary>
     /// json帮助类

src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj

@@ -28,8 +28,4 @@
 
 	</ItemGroup>
 
-	<ItemGroup>
-	  <ProjectReference Include="..\JiShe.CollectBus.FreeRedisProvider\JiShe.CollectBus.FreeRedisProvider.csproj" />
-	</ItemGroup>
-
 </Project>

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<T>
     {

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
 {
     /// <summary>
     /// 查询结果

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
 {
     /// <summary>
     /// 设备缓存基础模型

src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider.cs

@@ -1,18 +1,10 @@
 using FreeRedis;
-using JetBrains.Annotations;
+using JiShe.CollectBus.Common.Helpers;
-using JiShe.CollectBus.FreeRedisProvider.Options;
+using JiShe.CollectBus.Common.Models;
-using JiShe.CollectBus.PagedResult;
+using JiShe.CollectBus.FreeRedisProvider.Options; 
-using JiShe.CollectBus.Serializer;
 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

src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj

@@ -9,4 +9,7 @@
 		<PackageReference Include="FreeRedis" Version="1.3.6" />
 		<PackageReference Include="Volo.Abp" Version="8.3.3" />
 	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
+	</ItemGroup>
 </Project>

src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBProvider.cs

@@ -1,9 +1,4 @@
-using JiShe.CollectBus.PagedResult;
+using JiShe.CollectBus.Common.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace JiShe.CollectBus.IoTDBProvider
 {

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

src/JiShe.CollectBus.KafkaProducer/JiShe.CollectBus.Kafka.csproj

@@ -12,4 +12,8 @@
     <PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
+  </ItemGroup>
+
 </Project>