diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs index c3bdde3..200850c 100644 --- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs +++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs @@ -20,7 +20,7 @@ namespace JiShe.IoT typeof(AbpCachingStackExchangeRedisModule), typeof(AbpBlobStoringFileSystemModule), typeof(AbpDistributedLockingModule) - //typeof(AbpBackgroundJobsHangfireModule) + //typeof(AbpBackgroundJobsHangfireModule) )] public partial class IoTHttpApiHostModule : AbpModule { @@ -80,7 +80,8 @@ namespace JiShe.IoT { var groupNames = EnumExtensions.GetEnumTypeValueNameList(); var excludeSwaggerGroups = configuration.GetSection("ExcludeSwaggerGroup").Get>() ?? new List(); - groupNames.ForEach(attr => { + groupNames.ForEach(attr => + { if (!excludeSwaggerGroups.Where(e => e == attr.Key).Any()) { @@ -99,8 +100,8 @@ namespace JiShe.IoT app.UseUnitOfWork(); app.UseConfiguredEndpoints(endpoints => { - endpoints.MapHealthChecks("/health"); - + endpoints.MapHealthChecks("/health"); + // endpoints.MapHangfireDashboard("/hangfire", new DashboardOptions() // { // Authorization = new[] { new CustomHangfireAuthorizeFilter() }, diff --git a/src/JiShe.IoT.Application.Contracts/DeviceAggregation/Dto/CreateDeviceAggregationInput.cs b/src/JiShe.IoT.Application.Contracts/DeviceAggregation/Dto/CreateDeviceAggregationInput.cs index 5f53812..afb7b47 100644 --- a/src/JiShe.IoT.Application.Contracts/DeviceAggregation/Dto/CreateDeviceAggregationInput.cs +++ b/src/JiShe.IoT.Application.Contracts/DeviceAggregation/Dto/CreateDeviceAggregationInput.cs @@ -29,6 +29,7 @@ namespace JiShe.IoT.DeviceAggregation.Dto /// /// 集中器在物联网平台中对应的产品Id /// + [Required(ErrorMessage = "产品Id不能为空")] public string IoTPlatformProductId { get; set; } /// diff --git a/src/JiShe.IoT.Application.Contracts/DeviceAggregation/IDeviceAggregationService.cs b/src/JiShe.IoT.Application.Contracts/DeviceAggregation/IDeviceAggregationService.cs index c9723d1..60654e2 100644 --- a/src/JiShe.IoT.Application.Contracts/DeviceAggregation/IDeviceAggregationService.cs +++ b/src/JiShe.IoT.Application.Contracts/DeviceAggregation/IDeviceAggregationService.cs @@ -1,12 +1,6 @@ using JiShe.IoT.DeviceAggregation.Dto; using JiShe.ServicePro.Core; -using JiShe.ServicePro.DeviceManagement.DeivceInfos.Dto; -using JiShe.ServicePro.DeviceManagement.Meters.Dto; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using JiShe.ServicePro.DeviceManagement.DeviceInfos; using Volo.Abp; namespace JiShe.IoT.DeviceAggregation diff --git a/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs b/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs index 5fcc51f..b386b28 100644 --- a/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs +++ b/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs @@ -1,9 +1,8 @@ using JiShe.IoT.DeviceAggregation.Dto; using JiShe.IoT.OneNETAggregation.Dto; using JiShe.ServicePro.Core; -using JiShe.ServicePro.DeviceManagement.DeivceInfos; -using JiShe.ServicePro.DeviceManagement.DeivceInfos.Dto; -using JiShe.ServicePro.DeviceManagement.Meters.Dto; +using JiShe.ServicePro.DeviceManagement.DeviceInfos; +using JiShe.ServicePro.DeviceManagement.DeviceInfos.Dto; using JiShe.ServicePro.DeviceManagement.Permissions; using JiShe.ServicePro.OneNETManagement.OneNETDevices; using Mapster; diff --git a/src/JiShe.IoT.Application/OneNETAggregation/OneNETAggregationService.cs b/src/JiShe.IoT.Application/OneNETAggregation/OneNETAggregationService.cs index 0b3bc6a..4cdc027 100644 --- a/src/JiShe.IoT.Application/OneNETAggregation/OneNETAggregationService.cs +++ b/src/JiShe.IoT.Application/OneNETAggregation/OneNETAggregationService.cs @@ -1,8 +1,8 @@ using JiShe.IoT.OneNETAggregation.Dto; using JiShe.ServicePro; using JiShe.ServicePro.Core; -using JiShe.ServicePro.DeviceManagement.DeivceInfos; -using JiShe.ServicePro.DeviceManagement.DeivceInfos.Dto; +using JiShe.ServicePro.DeviceManagement.DeviceInfos; +using JiShe.ServicePro.DeviceManagement.DeviceInfos.Dto; using JiShe.ServicePro.Encrypt; using JiShe.ServicePro.Enums; using JiShe.ServicePro.Kafka.Consts; diff --git a/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs b/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs index 9e83a1c..912ba5f 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs @@ -2,7 +2,7 @@ using JiShe.ServicePro.BasicManagement.UserRefreshTokens; using JiShe.ServicePro.CTWingManagement.CTWingAccount; using JiShe.ServicePro.CTWingManagement.CTWingProduct; using JiShe.ServicePro.CTWingManagement.EntityFrameworkCore; -using JiShe.ServicePro.DeviceManagement.DeivceInfos; +using JiShe.ServicePro.DeviceManagement.DeviceInfos; using JiShe.ServicePro.DeviceManagement.EntityFrameworkCore; using JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore; using JiShe.ServicePro.DynamicMenuManagement.Menus; diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.Designer.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725092548_InitialCreate.Designer.cs similarity index 99% rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.Designer.cs rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725092548_InitialCreate.Designer.cs index d445ea8..be658c1 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.Designer.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725092548_InitialCreate.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace JiShe.IoT.Migrations { [DbContext(typeof(IoTDbContext))] - [Migration("20250725034846_InitialCreate")] + [Migration("20250725092548_InitialCreate")] partial class InitialCreate { /// @@ -515,7 +515,7 @@ namespace JiShe.IoT.Migrations }); }); - modelBuilder.Entity("JiShe.ServicePro.DeviceManagement.DeivceInfos.DeviceManagementInfo", b => + modelBuilder.Entity("JiShe.ServicePro.DeviceManagement.DeviceInfos.DeviceManagementInfo", b => { b.Property("Id") .HasColumnType("char(36)"); @@ -1202,7 +1202,7 @@ namespace JiShe.IoT.Migrations b.Property("Id") .HasColumnType("char(36)"); - b.Property("Accesskey") + b.Property("AccountAccesskey") .IsRequired() .HasMaxLength(50) .HasColumnType("varchar(50)") diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725092548_InitialCreate.cs similarity index 99% rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.cs rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725092548_InitialCreate.cs index 5df6d3b..2a0628a 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725034846_InitialCreate.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250725092548_InitialCreate.cs @@ -949,7 +949,7 @@ namespace JiShe.IoT.Migrations .Annotation("MySql:CharSet", "utf8mb4"), PhoneNumber = table.Column(type: "varchar(50)", maxLength: 50, nullable: false, comment: "手机号码") .Annotation("MySql:CharSet", "utf8mb4"), - Accesskey = table.Column(type: "varchar(50)", maxLength: 50, nullable: false, comment: "账户通信密钥,平台可以重置密钥") + AccountAccesskey = table.Column(type: "varchar(50)", maxLength: 50, nullable: false, comment: "账户通信密钥,平台可以重置密钥") .Annotation("MySql:CharSet", "utf8mb4"), ProductCount = table.Column(type: "int", nullable: false), ConcurrencyStamp = table.Column(type: "varchar(40)", maxLength: 40, nullable: false) diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs index a3871c6..43830d9 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs @@ -512,7 +512,7 @@ namespace JiShe.IoT.Migrations }); }); - modelBuilder.Entity("JiShe.ServicePro.DeviceManagement.DeivceInfos.DeviceManagementInfo", b => + modelBuilder.Entity("JiShe.ServicePro.DeviceManagement.DeviceInfos.DeviceManagementInfo", b => { b.Property("Id") .HasColumnType("char(36)"); @@ -1199,7 +1199,7 @@ namespace JiShe.IoT.Migrations b.Property("Id") .HasColumnType("char(36)"); - b.Property("Accesskey") + b.Property("AccountAccesskey") .IsRequired() .HasMaxLength(50) .HasColumnType("varchar(50)") diff --git a/src/JiShe.IoT.HttpApi/Controllers/BusinessSystemAggregationController.cs b/src/JiShe.IoT.HttpApi/Controllers/BusinessSystemAggregationController.cs index 4f2e288..62889cb 100644 --- a/src/JiShe.IoT.HttpApi/Controllers/BusinessSystemAggregationController.cs +++ b/src/JiShe.IoT.HttpApi/Controllers/BusinessSystemAggregationController.cs @@ -1,26 +1,10 @@ using JiShe.IoT.BusinessSystemAggregation; -using JiShe.IoT.CommonServices; -using JiShe.IoT.CommonServices.Dto; -using JiShe.IoT.DeviceAggregation; -using JiShe.IoT.DeviceAggregation.Dto; -using JiShe.IoT.OneNETAggregation; -using JiShe.IoT.OneNETAggregation.Dto; using JiShe.ServicePro; -using JiShe.ServicePro.Commons; -using JiShe.ServicePro.Core; -using JiShe.ServicePro.DeviceManagement.DeivceInfos.Dto; -using JiShe.ServicePro.DeviceManagement.Meters.Dto; -using JiShe.ServicePro.OneNETManagement.OneNETProducts; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace JiShe.IoT.Controllers { /// - /// 设备聚合服务 + /// 业务系统服务 /// [Route("/Aggregation/Business")] public class BusinessSystemAggregationController : IoTController diff --git a/src/JiShe.IoT.HttpApi/Controllers/CommonController.cs b/src/JiShe.IoT.HttpApi/Controllers/CommonController.cs index c3ec9b6..d36a103 100644 --- a/src/JiShe.IoT.HttpApi/Controllers/CommonController.cs +++ b/src/JiShe.IoT.HttpApi/Controllers/CommonController.cs @@ -11,6 +11,9 @@ using System.Threading.Tasks; namespace JiShe.IoT.Controllers { + /// + /// 通用服务 + /// [Route("Common")] public class CommonController:IoTController { diff --git a/src/JiShe.IoT.HttpApi/Controllers/DeviceAggregationController.cs b/src/JiShe.IoT.HttpApi/Controllers/DeviceAggregationController.cs index 9c991f6..26d0fd1 100644 --- a/src/JiShe.IoT.HttpApi/Controllers/DeviceAggregationController.cs +++ b/src/JiShe.IoT.HttpApi/Controllers/DeviceAggregationController.cs @@ -1,20 +1,7 @@ -using JiShe.IoT.CommonServices; -using JiShe.IoT.CommonServices.Dto; -using JiShe.IoT.DeviceAggregation; +using JiShe.IoT.DeviceAggregation; using JiShe.IoT.DeviceAggregation.Dto; -using JiShe.IoT.OneNETAggregation; -using JiShe.IoT.OneNETAggregation.Dto; -using JiShe.ServicePro; -using JiShe.ServicePro.Commons; using JiShe.ServicePro.Core; -using JiShe.ServicePro.DeviceManagement.DeivceInfos.Dto; -using JiShe.ServicePro.DeviceManagement.Meters.Dto; -using JiShe.ServicePro.OneNETManagement.OneNETProducts; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using JiShe.ServicePro.DeviceManagement.DeviceInfos; namespace JiShe.IoT.Controllers {