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:
ChenYi 2025-04-15 16:05:07 +08:00
parent c456a22bb8
commit f3a0c82d24
14 changed files with 21 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/JiShe.CollectBus.Application/CollectBusAppService.cs
View File

@ -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;

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

@ -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

2
src/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs
View File

@ -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;

3
src/JiShe.CollectBus.Common/DeviceBalanceControl/DeviceGroupBalanceControl.cs
View File

@ -1,5 +1,4 @@
using JiShe.CollectBus.FreeRedisProvider;
using System;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;

2
src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusJsonSerializer.cs → src/JiShe.CollectBus.Common/Helpers/BusJsonSerializer.cs
View File

@ -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帮助类

4
src/JiShe.CollectBus.Common/JiShe.CollectBus.Common.csproj
View File

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

2
src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusGlobalPagedResult.cs → src/JiShe.CollectBus.Common/Models/BusGlobalPagedResult.cs
View File

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

2
src/JiShe.CollectBus.FreeRedisProvider/Extensions/BusPagedResult.cs → src/JiShe.CollectBus.Common/Models/BusPagedResult.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JiShe.CollectBus.PagedResult
namespace JiShe.CollectBus.Common.Models
{
/// <summary>
/// 查询结果

2
src/JiShe.CollectBus.FreeRedisProvider/Extensions/DeviceCacheBasicModel.cs → src/JiShe.CollectBus.Common/Models/DeviceCacheBasicModel.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JiShe.CollectBus.FreeRedisProvider
namespace JiShe.CollectBus.Common.Models
{
/// <summary>
/// 设备缓存基础模型

14
src/JiShe.CollectBus.FreeRedisProvider/FreeRedisProvider.cs
View File

@ -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

3
src/JiShe.CollectBus.FreeRedisProvider/JiShe.CollectBus.FreeRedisProvider.csproj
View File

@ -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>

7
src/JiShe.CollectBus.IoTDBProvider/Interface/IIoTDBProvider.cs
View File

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

2
src/JiShe.CollectBus.IoTDBProvider/Provider/IoTDBProvider.cs
View File

@ -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

4
src/JiShe.CollectBus.KafkaProducer/JiShe.CollectBus.Kafka.csproj
View File

@ -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>