diff --git a/JiShe.ServicePro b/JiShe.ServicePro index fa776f0..2d4bb55 160000 --- a/JiShe.ServicePro +++ b/JiShe.ServicePro @@ -1 +1 @@ -Subproject commit fa776f0281564ebc3f7c3173420b86026f71eedd +Subproject commit 2d4bb55d3bd38890b034dc802c96c29c5220909d diff --git a/host/JiShe.IoT.HttpApi.Host/Program.cs b/host/JiShe.IoT.HttpApi.Host/Program.cs index fe3376c..385c0a1 100644 --- a/host/JiShe.IoT.HttpApi.Host/Program.cs +++ b/host/JiShe.IoT.HttpApi.Host/Program.cs @@ -25,6 +25,9 @@ public class Program context.Configuration); }); await builder.AddApplicationAsync(); +#if DEBUG + builder.WebHost.UseUrls($"http://+:10500"); +#endif var app = builder.Build(); await app.InitializeApplicationAsync(); await app.RunAsync(); diff --git a/host/JiShe.IoT.HttpApi.Host/Properties/launchSettings.json b/host/JiShe.IoT.HttpApi.Host/Properties/launchSettings.json index 029163d..6f59b12 100644 --- a/host/JiShe.IoT.HttpApi.Host/Properties/launchSettings.json +++ b/host/JiShe.IoT.HttpApi.Host/Properties/launchSettings.json @@ -3,7 +3,7 @@ "JiShe.IoT.HttpApi.Host": { "commandName": "Project", "launchBrowser": true, - "applicationUrl": "http://localhost:44315", + "applicationUrl": "http://localhost:10500", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj index eac1b1d..859cbd3 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj +++ b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj @@ -43,8 +43,4 @@ compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native - - - - diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.Designer.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250708065507_InitialCreate.Designer.cs similarity index 99% rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.Designer.cs rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20250708065507_InitialCreate.Designer.cs index 8100c0a..4f7cd75 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.Designer.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250708065507_InitialCreate.Designer.cs @@ -13,8 +13,8 @@ using Volo.Abp.EntityFrameworkCore; namespace JiShe.IoT.Migrations { [DbContext(typeof(IoTDbContext))] - [Migration("20250620054425_initCreat")] - partial class initCreat + [Migration("20250708065507_InitialCreate")] + partial class InitialCreate { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -306,6 +306,15 @@ namespace JiShe.IoT.Migrations .HasColumnType("int") .HasComment("心跳间隔"); + b.Property("IoTPlatform") + .HasColumnType("int") + .HasComment("物联网平台类型，默认没有指定"); + + b.Property("IoTPlatformDeviceOpenId") + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasComment("集中器在物联网平台中的设备ID"); + b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") @@ -352,6 +361,11 @@ namespace JiShe.IoT.Migrations .HasColumnType("int") .HasComment("旧系统授权最后修改者Id"); + b.Property("PlatformPassword") + .HasMaxLength(80) + .HasColumnType("varchar(80)") + .HasComment("物联网平台设备密码"); + b.Property("ProjectID") .HasColumnType("int") .HasComment("项目ID"); @@ -605,11 +619,11 @@ namespace JiShe.IoT.Migrations .HasComment("租户ID"); b.Property("TimesA") - .HasColumnType("decimal(12, 4)") + .HasColumnType("decimal(18,4)") .HasComment("倍率A"); b.Property("Timev") - .HasColumnType("decimal(12, 4)") + .HasColumnType("decimal(18,4)") .HasComment("倍率V"); b.Property("TripState") diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250708065507_InitialCreate.cs similarity index 99% rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20250708065507_InitialCreate.cs index fca9040..647dd99 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20250708065507_InitialCreate.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace JiShe.IoT.Migrations { /// - public partial class initCreat : Migration + public partial class InitialCreate : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -773,6 +773,11 @@ namespace JiShe.IoT.Migrations .Annotation("MySql:CharSet", "utf8mb4"), HardwareReleaseDate = table.Column(type: "varchar(80)", maxLength: 80, nullable: true, comment: "硬件软件发布日期：日月年") .Annotation("MySql:CharSet", "utf8mb4"), + IoTPlatformDeviceOpenId = table.Column(type: "varchar(50)", maxLength: 50, nullable: true, comment: "集中器在物联网平台中的设备ID") + .Annotation("MySql:CharSet", "utf8mb4"), + IoTPlatform = table.Column(type: "int", nullable: false, comment: "物联网平台类型，默认没有指定"), + PlatformPassword = table.Column(type: "varchar(80)", maxLength: 80, nullable: true, comment: "物联网平台设备密码") + .Annotation("MySql:CharSet", "utf8mb4"), ConcurrencyStamp = table.Column(type: "varchar(40)", maxLength: 40, nullable: false) .Annotation("MySql:CharSet", "utf8mb4"), CreationTime = table.Column(type: "datetime(6)", nullable: false), @@ -869,8 +874,8 @@ namespace JiShe.IoT.Migrations .Annotation("MySql:CharSet", "utf8mb4"), ArchiveStatus = table.Column(type: "tinyint(1)", nullable: false, comment: "归档状态"), TripState = table.Column(type: "tinyint(1)", nullable: false, comment: "是否跳闸"), - TimesA = table.Column(type: "decimal(12,4)", nullable: false, comment: "倍率A"), - Timev = table.Column(type: "decimal(12,4)", nullable: false, comment: "倍率V"), + TimesA = table.Column(type: "decimal(18,4)", nullable: false, comment: "倍率A"), + Timev = table.Column(type: "decimal(18,4)", nullable: false, comment: "倍率V"), HaveValve = table.Column(type: "tinyint(1)", nullable: true, comment: "是否带阀控"), FocusId = table.Column(type: "int", nullable: false, comment: "集中器ID"), MeterId = table.Column(type: "int", nullable: false, comment: "表计ID"), diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs index ee9b40f..b8ba664 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs @@ -303,6 +303,15 @@ namespace JiShe.IoT.Migrations .HasColumnType("int") .HasComment("心跳间隔"); + b.Property("IoTPlatform") + .HasColumnType("int") + .HasComment("物联网平台类型，默认没有指定"); + + b.Property("IoTPlatformDeviceOpenId") + .HasMaxLength(50) + .HasColumnType("varchar(50)") + .HasComment("集中器在物联网平台中的设备ID"); + b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("tinyint(1)") @@ -349,6 +358,11 @@ namespace JiShe.IoT.Migrations .HasColumnType("int") .HasComment("旧系统授权最后修改者Id"); + b.Property("PlatformPassword") + .HasMaxLength(80) + .HasColumnType("varchar(80)") + .HasComment("物联网平台设备密码"); + b.Property("ProjectID") .HasColumnType("int") .HasComment("项目ID"); @@ -602,11 +616,11 @@ namespace JiShe.IoT.Migrations .HasComment("租户ID"); b.Property("TimesA") - .HasColumnType("decimal(12, 4)") + .HasColumnType("decimal(18,4)") .HasComment("倍率A"); b.Property("Timev") - .HasColumnType("decimal(12, 4)") + .HasColumnType("decimal(18,4)") .HasComment("倍率V"); b.Property("TripState")