admin/JiShe.IOT.Admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善设备管理设计，展示对应的所属账号手机号

Browse Source
This commit is contained in:
ChenYi 2025-07-31 10:43:36 +08:00
parent b4fafb72cc
commit 8d325a57d8
5 changed files with 84 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -56,3 +56,4 @@
/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/bin/Release/net9.0
/test/JiShe.IoT.TestBase/bin/Release/net9.0
/host/JiShe.IoT.HttpApi.Host/UploadFile/20250729/host/abp-file-management
/host/JiShe.IoT.HttpApi.Host/UploadFile/20250731/host/abp-file-management/3a1b7059-f930-8a33-5a5b-a67f48f2feec

2
src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs
View File

@ -88,6 +88,8 @@ namespace JiShe.IoT.DeviceAggregation
createDeviceInput.IoTPlatformAccountId = productInfo.OneNETAccountId;
createDeviceInput.IoTPlatformDeviceOpenInfo = $"{input.IoTPlatformProductId}{input.DeviceAddress}";
createDeviceInput.PlatformPassword = productInfo.ProductAccesskey;
createDeviceInput.IoTPlatformProductName = productInfo.ProductName;
createDeviceInput.AccountPhoneNumber = productInfo.AccountPhoneNumber;
var insertResult = await deviceAppService.CreateAsync(createDeviceInput);
if (insertResult == null)

37
src/JiShe.IoT.EntityFrameworkCore/Migrations/20250730091642_InitialCreate.Designer.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20250731021938_InitialCreate.Designer.cs generated
View File

@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace JiShe.IoT.Migrations
{
[DbContext(typeof(IoTDbContext))]
[Migration("20250730091642_InitialCreate")]
[Migration("20250731021938_InitialCreate")]
partial class InitialCreate
{
/// <inheritdoc />
@ -250,6 +250,9 @@ namespace JiShe.IoT.Migrations
b.Property<int>("AccessType")
.HasColumnType("int");
b.Property<string>("AccountPhoneNumber")
.HasColumnType("longtext");
b.Property<int>("AuthType")
.HasColumnType("int");
@ -551,6 +554,12 @@ namespace JiShe.IoT.Migrations
b.Property<Guid>("Id")
.HasColumnType("char(36)");
b.Property<string>("AccountPhoneNumber")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasComment("账户手机号");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
@ -586,6 +595,10 @@ namespace JiShe.IoT.Migrations
.HasColumnType("varchar(128)")
.HasComment("设备名称");
b.Property<int?>("DeviceOnlineStatus")
.HasColumnType("int")
.HasComment("设备在线状态");
b.Property<string>("ExtraProperties")
.HasColumnType("longtext")
.HasColumnName("ExtraProperties")
@ -613,6 +626,12 @@ namespace JiShe.IoT.Migrations
.HasColumnType("varchar(50)")
.HasComment("物联网平台中对应的产品Id");
b.Property<string>("IoTPlatformProductName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)")
.HasComment("物联网平台中对应的产品Name");
b.Property<string>("IoTPlatformResponse")
.HasColumnType("text")
.HasComment("物联网平台返回的响应信息");
@ -624,7 +643,8 @@ namespace JiShe.IoT.Migrations
.HasColumnName("IsDeleted");
b.Property<bool>("IsPlatformPushSuccess")
.HasColumnType("tinyint(1)");
.HasColumnType("tinyint(1)")
.HasComment("物联网平台推送是否成功");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
@ -634,6 +654,14 @@ namespace JiShe.IoT.Migrations
.HasColumnType("char(36)")
.HasColumnName("LastModifierId");
b.Property<DateTime?>("LastOfflineTime")
.HasColumnType("datetime(6)")
.HasComment("最后离线时间");
b.Property<DateTime?>("LastOnlineTime")
.HasColumnType("datetime(6)")
.HasComment("最后在线时间");
b.Property<int?>("OSACreatorId")
.HasColumnType("int")
.HasComment("旧系统授权创建者Id");
@ -1347,6 +1375,11 @@ namespace JiShe.IoT.Migrations
.HasColumnType("int")
.HasComment("接入协议");
b.Property<string>("AccountPhoneNumber")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasComment("账户手机号");
b.Property<string>("Brand")
.HasColumnType("longtext")
.HasComment("产品品牌");

13
src/JiShe.IoT.EntityFrameworkCore/Migrations/20250730091642_InitialCreate.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20250731021938_InitialCreate.cs
View File

@ -796,6 +796,8 @@ namespace JiShe.IoT.Migrations
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
CTWingAccountId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "账号ID")
.Annotation("MySql:CharSet", "utf8mb4"),
AccountPhoneNumber = table.Column<string>(type: "longtext", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
CommunicationAddress = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false, comment: "通讯服务地址")
.Annotation("MySql:CharSet", "utf8mb4"),
MasterKey = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "OpenAPI 通信主密钥")
@ -872,11 +874,18 @@ namespace JiShe.IoT.Migrations
.Annotation("MySql:CharSet", "utf8mb4"),
IoTPlatformProductId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "物联网平台中对应的产品Id")
.Annotation("MySql:CharSet", "utf8mb4"),
IoTPlatformProductName = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false, comment: "物联网平台中对应的产品Name")
.Annotation("MySql:CharSet", "utf8mb4"),
IoTPlatformAccountId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "物联网平台中对应的账号Id")
.Annotation("MySql:CharSet", "utf8mb4"),
AccountPhoneNumber = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "账户手机号")
.Annotation("MySql:CharSet", "utf8mb4"),
IoTPlatformResponse = table.Column<string>(type: "text", nullable: true, comment: "物联网平台返回的响应信息")
.Annotation("MySql:CharSet", "utf8mb4"),
IsPlatformPushSuccess = table.Column<bool>(type: "tinyint(1)", nullable: false),
IsPlatformPushSuccess = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "物联网平台推送是否成功"),
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: "最后离线时间"),
ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
@ -996,6 +1005,8 @@ namespace JiShe.IoT.Migrations
Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
OneNETAccountId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "账户Id")
.Annotation("MySql:CharSet", "utf8mb4"),
AccountPhoneNumber = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "账户手机号")
.Annotation("MySql:CharSet", "utf8mb4"),
IoTPlatformProductId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "物联网平台对应的产品Id")
.Annotation("MySql:CharSet", "utf8mb4"),
ProductName = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: true, comment: "产品名称")

35
src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs
View File

@ -247,6 +247,9 @@ namespace JiShe.IoT.Migrations
b.Property<int>("AccessType")
.HasColumnType("int");
b.Property<string>("AccountPhoneNumber")
.HasColumnType("longtext");
b.Property<int>("AuthType")
.HasColumnType("int");
@ -548,6 +551,12 @@ namespace JiShe.IoT.Migrations
b.Property<Guid>("Id")
.HasColumnType("char(36)");
b.Property<string>("AccountPhoneNumber")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasComment("账户手机号");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
@ -583,6 +592,10 @@ namespace JiShe.IoT.Migrations
.HasColumnType("varchar(128)")
.HasComment("设备名称");
b.Property<int?>("DeviceOnlineStatus")
.HasColumnType("int")
.HasComment("设备在线状态");
b.Property<string>("ExtraProperties")
.HasColumnType("longtext")
.HasColumnName("ExtraProperties")
@ -610,6 +623,12 @@ namespace JiShe.IoT.Migrations
.HasColumnType("varchar(50)")
.HasComment("物联网平台中对应的产品Id");
b.Property<string>("IoTPlatformProductName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)")
.HasComment("物联网平台中对应的产品Name");
b.Property<string>("IoTPlatformResponse")
.HasColumnType("text")
.HasComment("物联网平台返回的响应信息");
@ -621,7 +640,8 @@ namespace JiShe.IoT.Migrations
.HasColumnName("IsDeleted");
b.Property<bool>("IsPlatformPushSuccess")
.HasColumnType("tinyint(1)");
.HasColumnType("tinyint(1)")
.HasComment("物联网平台推送是否成功");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
@ -631,6 +651,14 @@ namespace JiShe.IoT.Migrations
.HasColumnType("char(36)")
.HasColumnName("LastModifierId");
b.Property<DateTime?>("LastOfflineTime")
.HasColumnType("datetime(6)")
.HasComment("最后离线时间");
b.Property<DateTime?>("LastOnlineTime")
.HasColumnType("datetime(6)")
.HasComment("最后在线时间");
b.Property<int?>("OSACreatorId")
.HasColumnType("int")
.HasComment("旧系统授权创建者Id");
@ -1344,6 +1372,11 @@ namespace JiShe.IoT.Migrations
.HasColumnType("int")
.HasComment("接入协议");
b.Property<string>("AccountPhoneNumber")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasComment("账户手机号");
b.Property<string>("Brand")
.HasColumnType("longtext")
.HasComment("产品品牌");