From a49912ec4833a8ee86184a90f369497a392a5ce4 Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Fri, 27 Mar 2026 10:24:55 +0800 Subject: [PATCH] =?UTF-8?q?JToken=20=E6=97=A0=E9=BB=98=E8=AE=A4=E6=9E=84?= =?UTF-8?q?=E9=80=A0=E5=87=BD=E6=95=B0=EF=BC=8C=E6=98=BE=E5=BC=8F=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E6=98=A0=E5=B0=84=E7=AD=96=E7=95=A5=E9=81=BF=E5=85=8D?= =?UTF-8?q?=20Mapster?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/JiShe.IoT.DbMigrator/appsettings.json | 2 +- ...esigner.cs => 20260326023314_InitialCreate.Designer.cs} | 7 +++---- ...15_InitialCreate.cs => 20260326023314_InitialCreate.cs} | 4 ++-- .../Migrations/IoTDbContextModelSnapshot.cs | 5 ++--- 4 files changed, 8 insertions(+), 10 deletions(-) rename src/JiShe.IoT.EntityFrameworkCore/Migrations/{20260325090415_InitialCreate.Designer.cs => 20260326023314_InitialCreate.Designer.cs} (99%) rename src/JiShe.IoT.EntityFrameworkCore/Migrations/{20260325090415_InitialCreate.cs => 20260326023314_InitialCreate.cs} (99%) diff --git a/src/JiShe.IoT.DbMigrator/appsettings.json b/src/JiShe.IoT.DbMigrator/appsettings.json index bfa311c..138b06f 100644 --- a/src/JiShe.IoT.DbMigrator/appsettings.json +++ b/src/JiShe.IoT.DbMigrator/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "Default": "Host=192.168.111.174;Port=5432;Database=jisheiotprodb68;Username=postgres;Password=JiShe!aqG#5kGgh&0;Encoding=UTF8;Pooling=true;Pooling=true;Minimum Pool Size=5;Maximum Pool Size=100;" + "Default": "Host=192.168.111.174;Port=5432;Database=jisheiotprodb58;Username=postgres;Password=JiShe!aqG#5kGgh&0;Encoding=UTF8;Pooling=true;Pooling=true;Minimum Pool Size=5;Maximum Pool Size=100;" }, "IoTDBOptions": { "UserName": "root", diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20260325090415_InitialCreate.Designer.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20260326023314_InitialCreate.Designer.cs similarity index 99% rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20260325090415_InitialCreate.Designer.cs rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20260326023314_InitialCreate.Designer.cs index 18ca9d6..0b04d3a 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20260325090415_InitialCreate.Designer.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20260326023314_InitialCreate.Designer.cs @@ -14,7 +14,7 @@ using Volo.Abp.EntityFrameworkCore; namespace JiShe.IoT.Migrations { [DbContext(typeof(IoTDbContext))] - [Migration("20260325090415_InitialCreate")] + [Migration("20260326023314_InitialCreate")] partial class InitialCreate { /// @@ -838,8 +838,8 @@ namespace JiShe.IoT.Migrations .HasColumnType("timestamp with time zone") .HasComment("最后在线时间"); - b.Property("NeedEquipmentProductionPlan") - .HasColumnType("integer") + b.Property("NeedEquipmentProductionPlan") + .HasColumnType("boolean") .HasComment("是否需要设备生产计划"); b.Property("OSACreatorId") @@ -871,7 +871,6 @@ namespace JiShe.IoT.Migrations .HasComment("备注"); b.Property("SimCardInfo") - .IsRequired() .HasColumnType("jsonb") .HasComment("SIM卡信息"); diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20260325090415_InitialCreate.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20260326023314_InitialCreate.cs similarity index 99% rename from src/JiShe.IoT.EntityFrameworkCore/Migrations/20260325090415_InitialCreate.cs rename to src/JiShe.IoT.EntityFrameworkCore/Migrations/20260326023314_InitialCreate.cs index 3b5e0a3..8c82d9e 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/20260325090415_InitialCreate.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/20260326023314_InitialCreate.cs @@ -762,10 +762,10 @@ namespace JiShe.IoT.Migrations UpgradeDate = table.Column(type: "timestamp with time zone", nullable: true, comment: "升级日期"), SubDeviceCapacity = table.Column(type: "integer", nullable: false, defaultValue: 64, comment: "子设备容量"), ReadingMode = table.Column(type: "integer", nullable: false, defaultValue: 1, comment: "抄读模式"), - SimCardInfo = table.Column(type: "jsonb", nullable: false, comment: "SIM卡信息"), + SimCardInfo = table.Column(type: "jsonb", nullable: true, comment: "SIM卡信息"), EncryptionType = table.Column(type: "integer", nullable: false, defaultValue: 1, comment: "设备加密类型，类型不同给，鉴权路径资源不同，默认为一型一密"), EncryptionMethod = table.Column(type: "integer", nullable: false, defaultValue: 1, comment: "设备鉴权加密方式"), - NeedEquipmentProductionPlan = table.Column(type: "integer", nullable: true, comment: "是否需要设备生产计划"), + NeedEquipmentProductionPlan = table.Column(type: "boolean", nullable: true, comment: "是否需要设备生产计划"), ConcurrencyStamp = table.Column(type: "character varying(40)", maxLength: 40, nullable: false), CreationTime = table.Column(type: "timestamp with time zone", nullable: false), CreatorId = table.Column(type: "uuid", nullable: true), diff --git a/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs b/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs index 6cd3363..ee77657 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs @@ -835,8 +835,8 @@ namespace JiShe.IoT.Migrations .HasColumnType("timestamp with time zone") .HasComment("最后在线时间"); - b.Property("NeedEquipmentProductionPlan") - .HasColumnType("integer") + b.Property("NeedEquipmentProductionPlan") + .HasColumnType("boolean") .HasComment("是否需要设备生产计划"); b.Property("OSACreatorId") @@ -868,7 +868,6 @@ namespace JiShe.IoT.Migrations .HasComment("备注"); b.Property("SimCardInfo") - .IsRequired() .HasColumnType("jsonb") .HasComment("SIM卡信息");