Compare commits
No commits in common. "6f51214891e519362de823869c9898f6e25c7c1b" and "38ac4477e99b0be3de89d3435bd2350874380ec1" have entirely different histories.
6f51214891
...
38ac4477e9
@ -1 +1 @@
|
||||
Subproject commit bebd41984adbf6ce1e722ce804b0a6922083e059
|
||||
Subproject commit 87668ccc6f5fea1111470327fa7da683b9756430
|
||||
@ -4,19 +4,25 @@
|
||||
"CorsOrigins": "https://*.IoT.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://10.10.90.3:4200"
|
||||
},
|
||||
"ConnectionStrings": {
|
||||
"Default": "Data Source=192.168.111.174;Port=13306;Database=JiSheIoTProDB;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;"
|
||||
"Default": "Data Source=47.110.53.196;Port=13306;Database=JiSheIoTProDB;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;",
|
||||
//"PrepayDB": "server=118.190.144.92;database=jishe.sysdb;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False",
|
||||
//"EnergyDB": "server=118.190.144.92;database=db_energy;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False"
|
||||
|
||||
// 正式
|
||||
"PrepayDB": "server=rm-m5el3d1u1k0wzk70n2o.sqlserver.rds.aliyuncs.com,3433;database=jishe.sysdb;uid=v3sa;pwd=JiShe123;Encrypt=False;Trust Server Certificate=False",
|
||||
"EnergyDB": "server=rm-wz9hw529i3j1e3b5fbo.sqlserver.rds.aliyuncs.com,3433;database=db_energy;uid=yjdb;pwd=Kdjdhf+9*7ad222LL;Encrypt=False;Trust Server Certificate=False"
|
||||
},
|
||||
"Hangfire": {
|
||||
"Redis": {
|
||||
"Host": "192.168.111.174:30712,password=1q3J@BGf!yhTaD46nS#",
|
||||
"Host": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#",
|
||||
"DB": "2"
|
||||
}
|
||||
},
|
||||
"Redis": {
|
||||
"Configuration": "192.168.111.174:30712,password=1q3J@BGf!yhTaD46nS#,defaultdatabase=5"
|
||||
"Configuration": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#,defaultdatabase=5"
|
||||
},
|
||||
"Kafka": {
|
||||
"BootstrapServers": "47.110.62.104:9094,192.168.111.174:9094,47.110.60.222:9094",
|
||||
"BootstrapServers": "47.110.62.104:9094,47.110.53.196:9094,47.110.60.222:9094",
|
||||
"EnableFilter": true,
|
||||
"EnableAuthorization": false,
|
||||
"SaslUserName": "lixiao",
|
||||
@ -26,8 +32,8 @@
|
||||
"TaskThreadCount": -1
|
||||
},
|
||||
"Pulsar": {
|
||||
"ServiceUrl": "pulsar://192.168.111.174:9093",
|
||||
"WebUrl": "http://192.168.111.174:9094",
|
||||
"ServiceUrl": "pulsar://47.110.53.196:9093",
|
||||
"WebUrl": "http://47.110.53.196:9094",
|
||||
"UserName": "admin",
|
||||
"TenantName": "1YMVZZkAkRArjxSD8457",
|
||||
"Namespace": "OneNET",
|
||||
@ -56,10 +62,10 @@
|
||||
"IoTDBOptions": {
|
||||
"UserName": "root",
|
||||
"Password": "Lixiao@1980",
|
||||
//"TreeModelClusterList": [ "192.168.111.174:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
|
||||
//"TableModelClusterList": [ "192.168.111.174:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
|
||||
"TreeModelClusterList": [ "192.168.111.174:30710" ],
|
||||
"TableModelClusterList": [ "192.168.111.174:30710" ],
|
||||
//"TreeModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
|
||||
//"TableModelClusterList": [ "47.110.53.196:6667", "47.110.60.222:6667", "47.110.62.104:6667" ],
|
||||
"TreeModelClusterList": [ "47.110.53.196:30710" ],
|
||||
"TableModelClusterList": [ "47.110.53.196:30710" ],
|
||||
"PoolSize": 32,
|
||||
"DataBaseName": "jisheiotdata",
|
||||
"OpenDebugMode": false,
|
||||
@ -95,14 +101,14 @@
|
||||
}
|
||||
},
|
||||
"FreeRedisOptions": {
|
||||
"ConnectionString": "192.168.111.174:30712,password=1q3J@BGf!yhTaD46nS#,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=500,defaultdatabase=14",
|
||||
"ConnectionString": "47.110.53.196:30712,password=1q3J@BGf!yhTaD46nS#,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=500,defaultdatabase=14",
|
||||
"UseDistributedCache": true
|
||||
},
|
||||
"FreeSqlProviderOptions": {
|
||||
"UsePrepayDB": false,
|
||||
"UseEnergyDB": false,
|
||||
"PrintLog": false,
|
||||
"DataType": 1
|
||||
"DataType": true
|
||||
},
|
||||
"OneNETSecureReceiveOptions": {
|
||||
"OneNETVerifySignatureToken": "SIcPQnpMgaFDmNlIjNmzq5smshz7cKrh",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"ConnectionStrings": {
|
||||
"Default": "Data Source=localhost;Port=3306;Database=JiSheIoTProDB;uid=root;pwd=admin123;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;"
|
||||
"Default": "Data Source=192.168.111.42;Port=13306;Database=JiSheIoTProDB;uid=root;pwd=JiShe!aqG#5kGgh&0;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;"
|
||||
},
|
||||
"IoTDBOptions": {
|
||||
"UserName": "root",
|
||||
|
||||
@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
|
||||
namespace JiShe.IoT.Migrations
|
||||
{
|
||||
[DbContext(typeof(IoTDbContext))]
|
||||
[Migration("20251020061451_InitialCreate")]
|
||||
[Migration("20250804031635_InitialCreate")]
|
||||
partial class InitialCreate
|
||||
{
|
||||
/// <inheritdoc />
|
||||
@ -506,9 +506,7 @@ namespace JiShe.IoT.Migrations
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("Code")
|
||||
.IsRequired()
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("varchar(64)");
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<DateTime>("CreationTime")
|
||||
.HasColumnType("datetime(6)")
|
||||
@ -522,16 +520,10 @@ namespace JiShe.IoT.Migrations
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("Description")
|
||||
.HasMaxLength(1024)
|
||||
.HasColumnType("varchar(1024)");
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<string>("DisplayText")
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("varchar(64)");
|
||||
|
||||
b.Property<string>("ExtendedAttribute")
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("varchar(64)");
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<bool>("IsEnabled")
|
||||
.HasColumnType("tinyint(1)");
|
||||
@ -607,7 +599,7 @@ namespace JiShe.IoT.Migrations
|
||||
.HasColumnType("int")
|
||||
.HasComment("设备在线状态");
|
||||
|
||||
b.Property<int>("DeviceSourceTypeEnum")
|
||||
b.Property<int?>("DeviceSourceTypeEnum")
|
||||
.HasColumnType("int")
|
||||
.HasComment("设备来源类型");
|
||||
|
||||
@ -716,121 +708,6 @@ namespace JiShe.IoT.Migrations
|
||||
});
|
||||
});
|
||||
|
||||
modelBuilder.Entity("JiShe.ServicePro.DeviceManagement.ThingModelInfos.DeviceThingModelInfo", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("ConcurrencyStamp")
|
||||
.IsConcurrencyToken()
|
||||
.IsRequired()
|
||||
.HasMaxLength(40)
|
||||
.HasColumnType("varchar(40)")
|
||||
.HasColumnName("ConcurrencyStamp");
|
||||
|
||||
b.Property<DateTime>("CreationTime")
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasColumnName("CreationTime");
|
||||
|
||||
b.Property<Guid?>("CreatorId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasColumnName("CreatorId");
|
||||
|
||||
b.Property<Guid?>("DeleterId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasColumnName("DeleterId");
|
||||
|
||||
b.Property<DateTime?>("DeletionTime")
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasColumnName("DeletionTime");
|
||||
|
||||
b.Property<string>("ExtraProperties")
|
||||
.HasColumnType("longtext")
|
||||
.HasColumnName("ExtraProperties")
|
||||
.HasComment("扩展属性,用于存储自定义字段,JSON格式");
|
||||
|
||||
b.Property<string>("FiledType")
|
||||
.IsRequired()
|
||||
.HasMaxLength(128)
|
||||
.HasColumnType("varchar(128)")
|
||||
.HasComment("物联网平台中对应产品物模型属性或者事件类型");
|
||||
|
||||
b.Property<int>("IoTPlatform")
|
||||
.HasColumnType("int")
|
||||
.HasComment("物联网平台类型,默认没有指定");
|
||||
|
||||
b.Property<string>("IoTPlatformProductId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("varchar(50)")
|
||||
.HasComment("物联网平台中对应的产品Id");
|
||||
|
||||
b.Property<bool>("IsDeleted")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("tinyint(1)")
|
||||
.HasDefaultValue(false)
|
||||
.HasColumnName("IsDeleted");
|
||||
|
||||
b.Property<bool>("IsValueNeedConvert")
|
||||
.HasColumnType("tinyint(1)")
|
||||
.HasComment("是否需要值类型转换");
|
||||
|
||||
b.Property<DateTime?>("LastModificationTime")
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasColumnName("LastModificationTime");
|
||||
|
||||
b.Property<Guid?>("LastModifierId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasColumnName("LastModifierId");
|
||||
|
||||
b.Property<int?>("OSACreatorId")
|
||||
.HasColumnType("int")
|
||||
.HasComment("旧系统授权创建者Id");
|
||||
|
||||
b.Property<int?>("OSADeleterId")
|
||||
.HasColumnType("int")
|
||||
.HasComment("旧系统授权最后删除者Id");
|
||||
|
||||
b.Property<int?>("OSALastModifierId")
|
||||
.HasColumnType("int")
|
||||
.HasComment("旧系统授权最后修改者Id");
|
||||
|
||||
b.Property<string>("RawFieldName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("varchar(50)")
|
||||
.HasComment("物联网平台中对应的产品物模型属性或者事件名称");
|
||||
|
||||
b.Property<string>("Remark")
|
||||
.HasColumnType("longtext")
|
||||
.HasComment("备注");
|
||||
|
||||
b.Property<string>("StandardFieldName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("varchar(50)")
|
||||
.HasComment("管理后台产品标准的物模型属性或者事件名称");
|
||||
|
||||
b.Property<Guid?>("TenantId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasColumnName("TenantId")
|
||||
.HasComment("租户ID");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("CreationTime");
|
||||
|
||||
b.HasIndex("IoTPlatformProductId");
|
||||
|
||||
b.HasIndex(new[] { "Id", "IoTPlatformProductId", "RawFieldName", "StandardFieldName", "CreationTime" }, "IX_ServiceProDeviceThingModelInfo_IsNotUniqueKey")
|
||||
.IsDescending();
|
||||
|
||||
b.ToTable("ServiceProDeviceThingModelInfo", null, t =>
|
||||
{
|
||||
t.HasComment("设备物模型信息");
|
||||
});
|
||||
});
|
||||
|
||||
modelBuilder.Entity("JiShe.ServicePro.DynamicMenuManagement.Menus.Menu", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@ -951,13 +828,6 @@ namespace JiShe.IoT.Migrations
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("CreationTime");
|
||||
|
||||
b.HasIndex("Name");
|
||||
|
||||
b.HasIndex(new[] { "Id", "Name", "Path", "MenuType", "CreationTime" }, "IX_Menus_IsNotUniqueKey")
|
||||
.IsDescending();
|
||||
|
||||
b.ToTable("ServiceProMenus", null, t =>
|
||||
{
|
||||
t.HasComment("动态菜单管理");
|
||||
@ -886,7 +886,7 @@ namespace JiShe.IoT.Migrations
|
||||
DeviceOnlineStatus = table.Column<int>(type: "int", nullable: true, comment: "设备在线状态"),
|
||||
LastOnlineTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "最后在线时间"),
|
||||
LastOfflineTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "最后离线时间"),
|
||||
DeviceSourceTypeEnum = table.Column<int>(type: "int", nullable: false, comment: "设备来源类型"),
|
||||
DeviceSourceTypeEnum = table.Column<int>(type: "int", nullable: true, comment: "设备来源类型"),
|
||||
ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||
@ -912,46 +912,6 @@ namespace JiShe.IoT.Migrations
|
||||
comment: "设备信息")
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ServiceProDeviceThingModelInfo",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
IoTPlatform = table.Column<int>(type: "int", nullable: false, comment: "物联网平台类型,默认没有指定"),
|
||||
IoTPlatformProductId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "物联网平台中对应的产品Id")
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
FiledType = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false, comment: "物联网平台中对应产品物模型属性或者事件类型")
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
RawFieldName = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "物联网平台中对应的产品物模型属性或者事件名称")
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
StandardFieldName = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "管理后台产品标准的物模型属性或者事件名称")
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
IsValueNeedConvert = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "是否需要值类型转换"),
|
||||
ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||
CreatorId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
|
||||
LastModifierId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
IsDeleted = table.Column<bool>(type: "tinyint(1)", nullable: false, defaultValue: false),
|
||||
DeleterId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
DeletionTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
|
||||
TenantId = table.Column<Guid>(type: "char(36)", nullable: true, comment: "租户ID", collation: "ascii_general_ci"),
|
||||
Remark = table.Column<string>(type: "longtext", nullable: true, comment: "备注")
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
OSACreatorId = table.Column<int>(type: "int", nullable: true, comment: "旧系统授权创建者Id"),
|
||||
OSALastModifierId = table.Column<int>(type: "int", nullable: true, comment: "旧系统授权最后修改者Id"),
|
||||
OSADeleterId = table.Column<int>(type: "int", nullable: true, comment: "旧系统授权最后删除者Id"),
|
||||
ExtraProperties = table.Column<string>(type: "longtext", nullable: true, comment: "扩展属性,用于存储自定义字段,JSON格式")
|
||||
.Annotation("MySql:CharSet", "utf8mb4")
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_ServiceProDeviceThingModelInfo", x => x.Id);
|
||||
},
|
||||
comment: "设备物模型信息")
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "ServiceProMenus",
|
||||
columns: table => new
|
||||
@ -1236,16 +1196,14 @@ namespace JiShe.IoT.Migrations
|
||||
{
|
||||
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
DataDictionaryId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
|
||||
Code = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false)
|
||||
Code = table.Column<string>(type: "longtext", nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
Order = table.Column<int>(type: "int", nullable: false),
|
||||
DisplayText = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true)
|
||||
DisplayText = table.Column<string>(type: "longtext", nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
Description = table.Column<string>(type: "varchar(1024)", maxLength: 1024, nullable: true)
|
||||
Description = table.Column<string>(type: "longtext", nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
IsEnabled = table.Column<bool>(type: "tinyint(1)", nullable: false),
|
||||
ExtendedAttribute = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
|
||||
CreatorId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
|
||||
LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
|
||||
@ -1776,38 +1734,6 @@ namespace JiShe.IoT.Migrations
|
||||
columns: new[] { "Id", "DeviceName", "DeviceAddress", "IoTPlatformProductId", "CreationTime" },
|
||||
descending: new bool[0]);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ServiceProDeviceThingModelInfo_CreationTime",
|
||||
table: "ServiceProDeviceThingModelInfo",
|
||||
column: "CreationTime");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ServiceProDeviceThingModelInfo_IoTPlatformProductId",
|
||||
table: "ServiceProDeviceThingModelInfo",
|
||||
column: "IoTPlatformProductId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ServiceProDeviceThingModelInfo_IsNotUniqueKey",
|
||||
table: "ServiceProDeviceThingModelInfo",
|
||||
columns: new[] { "Id", "IoTPlatformProductId", "RawFieldName", "StandardFieldName", "CreationTime" },
|
||||
descending: new bool[0]);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_Menus_IsNotUniqueKey",
|
||||
table: "ServiceProMenus",
|
||||
columns: new[] { "Id", "Name", "Path", "MenuType", "CreationTime" },
|
||||
descending: new bool[0]);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ServiceProMenus_CreationTime",
|
||||
table: "ServiceProMenus",
|
||||
column: "CreationTime");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ServiceProMenus_Name",
|
||||
table: "ServiceProMenus",
|
||||
column: "Name");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_ServiceProOneNETAccountInfo_CreationTime",
|
||||
table: "ServiceProOneNETAccountInfo",
|
||||
@ -1949,9 +1875,6 @@ namespace JiShe.IoT.Migrations
|
||||
migrationBuilder.DropTable(
|
||||
name: "ServiceProDeviceInfo");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "ServiceProDeviceThingModelInfo");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "ServiceProMenus");
|
||||
|
||||
@ -503,9 +503,7 @@ namespace JiShe.IoT.Migrations
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("Code")
|
||||
.IsRequired()
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("varchar(64)");
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<DateTime>("CreationTime")
|
||||
.HasColumnType("datetime(6)")
|
||||
@ -519,16 +517,10 @@ namespace JiShe.IoT.Migrations
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("Description")
|
||||
.HasMaxLength(1024)
|
||||
.HasColumnType("varchar(1024)");
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<string>("DisplayText")
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("varchar(64)");
|
||||
|
||||
b.Property<string>("ExtendedAttribute")
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("varchar(64)");
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<bool>("IsEnabled")
|
||||
.HasColumnType("tinyint(1)");
|
||||
@ -604,7 +596,7 @@ namespace JiShe.IoT.Migrations
|
||||
.HasColumnType("int")
|
||||
.HasComment("设备在线状态");
|
||||
|
||||
b.Property<int>("DeviceSourceTypeEnum")
|
||||
b.Property<int?>("DeviceSourceTypeEnum")
|
||||
.HasColumnType("int")
|
||||
.HasComment("设备来源类型");
|
||||
|
||||
@ -713,121 +705,6 @@ namespace JiShe.IoT.Migrations
|
||||
});
|
||||
});
|
||||
|
||||
modelBuilder.Entity("JiShe.ServicePro.DeviceManagement.ThingModelInfos.DeviceThingModelInfo", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("ConcurrencyStamp")
|
||||
.IsConcurrencyToken()
|
||||
.IsRequired()
|
||||
.HasMaxLength(40)
|
||||
.HasColumnType("varchar(40)")
|
||||
.HasColumnName("ConcurrencyStamp");
|
||||
|
||||
b.Property<DateTime>("CreationTime")
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasColumnName("CreationTime");
|
||||
|
||||
b.Property<Guid?>("CreatorId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasColumnName("CreatorId");
|
||||
|
||||
b.Property<Guid?>("DeleterId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasColumnName("DeleterId");
|
||||
|
||||
b.Property<DateTime?>("DeletionTime")
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasColumnName("DeletionTime");
|
||||
|
||||
b.Property<string>("ExtraProperties")
|
||||
.HasColumnType("longtext")
|
||||
.HasColumnName("ExtraProperties")
|
||||
.HasComment("扩展属性,用于存储自定义字段,JSON格式");
|
||||
|
||||
b.Property<string>("FiledType")
|
||||
.IsRequired()
|
||||
.HasMaxLength(128)
|
||||
.HasColumnType("varchar(128)")
|
||||
.HasComment("物联网平台中对应产品物模型属性或者事件类型");
|
||||
|
||||
b.Property<int>("IoTPlatform")
|
||||
.HasColumnType("int")
|
||||
.HasComment("物联网平台类型,默认没有指定");
|
||||
|
||||
b.Property<string>("IoTPlatformProductId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("varchar(50)")
|
||||
.HasComment("物联网平台中对应的产品Id");
|
||||
|
||||
b.Property<bool>("IsDeleted")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("tinyint(1)")
|
||||
.HasDefaultValue(false)
|
||||
.HasColumnName("IsDeleted");
|
||||
|
||||
b.Property<bool>("IsValueNeedConvert")
|
||||
.HasColumnType("tinyint(1)")
|
||||
.HasComment("是否需要值类型转换");
|
||||
|
||||
b.Property<DateTime?>("LastModificationTime")
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasColumnName("LastModificationTime");
|
||||
|
||||
b.Property<Guid?>("LastModifierId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasColumnName("LastModifierId");
|
||||
|
||||
b.Property<int?>("OSACreatorId")
|
||||
.HasColumnType("int")
|
||||
.HasComment("旧系统授权创建者Id");
|
||||
|
||||
b.Property<int?>("OSADeleterId")
|
||||
.HasColumnType("int")
|
||||
.HasComment("旧系统授权最后删除者Id");
|
||||
|
||||
b.Property<int?>("OSALastModifierId")
|
||||
.HasColumnType("int")
|
||||
.HasComment("旧系统授权最后修改者Id");
|
||||
|
||||
b.Property<string>("RawFieldName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("varchar(50)")
|
||||
.HasComment("物联网平台中对应的产品物模型属性或者事件名称");
|
||||
|
||||
b.Property<string>("Remark")
|
||||
.HasColumnType("longtext")
|
||||
.HasComment("备注");
|
||||
|
||||
b.Property<string>("StandardFieldName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
.HasColumnType("varchar(50)")
|
||||
.HasComment("管理后台产品标准的物模型属性或者事件名称");
|
||||
|
||||
b.Property<Guid?>("TenantId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasColumnName("TenantId")
|
||||
.HasComment("租户ID");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("CreationTime");
|
||||
|
||||
b.HasIndex("IoTPlatformProductId");
|
||||
|
||||
b.HasIndex(new[] { "Id", "IoTPlatformProductId", "RawFieldName", "StandardFieldName", "CreationTime" }, "IX_ServiceProDeviceThingModelInfo_IsNotUniqueKey")
|
||||
.IsDescending();
|
||||
|
||||
b.ToTable("ServiceProDeviceThingModelInfo", null, t =>
|
||||
{
|
||||
t.HasComment("设备物模型信息");
|
||||
});
|
||||
});
|
||||
|
||||
modelBuilder.Entity("JiShe.ServicePro.DynamicMenuManagement.Menus.Menu", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
@ -948,13 +825,6 @@ namespace JiShe.IoT.Migrations
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("CreationTime");
|
||||
|
||||
b.HasIndex("Name");
|
||||
|
||||
b.HasIndex(new[] { "Id", "Name", "Path", "MenuType", "CreationTime" }, "IX_Menus_IsNotUniqueKey")
|
||||
.IsDescending();
|
||||
|
||||
b.ToTable("ServiceProMenus", null, t =>
|
||||
{
|
||||
t.HasComment("动态菜单管理");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user