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

Compare commits

base: admin:c6e7389c3b0c68661536e316ac15ecefa8c001d4
Branches Tags
admin:master
admin:master_net9_Pomelo
..
compare: admin:cd2090d4a1eb82496d0f2f21c3118b1deee4317b
Branches Tags
admin:master
admin:master_net9_Pomelo

No commits in common. "c6e7389c3b0c68661536e316ac15ecefa8c001d4" and "cd2090d4a1eb82496d0f2f21c3118b1deee4317b" have entirely different histories.
c6e7389c3b ... cd2090d4a1

25 changed files with 19334 additions and 5757 deletions
Show Stats Expand all files Collapse all files

3
.gitignore vendored
View File

@ -60,4 +60,5 @@
/gateways/JiShe.IoT.WebGateway/bin/Debug/net10.0
/host/JiShe.IoT.HttpApi.Host/bin/Debug/net10.0
/src/JiShe.IoT.Application/bin/Debug/net10.0
/host/JiShe.IoT.HttpApi.Host/UploadFile
/host/JiShe.IoT.HttpApi.Host/UploadFile/20251210/host/abp-file-management
/host/JiShe.IoT.HttpApi.Host/UploadFile/20260108/host/abp-file-management

2
DockerComposeShells/.env
View File

@ -29,6 +29,6 @@ SQLSERVER_PORT=11433
# 认证信息
PULSAR_ADMIN_USER=admin
PULSAR_ADMIN_PASSWORD=0fd7afb8b0d04e6abc4fdfdac2190a79
IOTDB_ROOT_PASSWORD=Li#xiao@198!0
IOTDB_ROOT_PASSWORD=Lixiao@1980
MYSQL_ROOT_PASSWORD='JiShe!aqG#5kGgh&0'
SQLSERVER_SA_PASSWORD=JiShe!aqG@5kGgh&0

2
DockerComposeShells/docker-compose-init.yml
View File

@ -183,7 +183,7 @@ services:
- pulsar-net
iotdb-standalone-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.5-standalone
hostname: iotdb-standalone
container_name: iotdb-standalone
restart: always

2
DockerComposeShells/docker-compose-iotdb-standalone.yml
View File

@ -1,6 +1,6 @@
services:
iotdb-standalone:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.5-standalone
hostname: iotdb-standalone
container_name: iotdb-standalone
restart: "no"

2
DockerComposeShells/docker-compose.yml
View File

@ -152,7 +152,7 @@ services:
max-file: "3"
iotdb-standalone-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.5-standalone
hostname: iotdb-standalone
container_name: iotdb-standalone
restart: always

2
DockerComposeShells/docker-compose_service_sub.yml
View File

@ -1,6 +1,6 @@
services:
iotdb-standalone-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.5-standalone
hostname: iotdb-standalone
container_name: iotdb-standalone
restart: always

2
DockerComposeShells/docker-compose_service_sub_init.yml
View File

@ -1,6 +1,6 @@
services:
iotdb-standalone-service:
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.6-standalone
image: registry.cn-qingdao.aliyuncs.com/jisheyun/iotdb:2.0.5-standalone
hostname: iotdb-standalone
container_name: iotdb-standalone
restart: always

3
DockerComposeShells/env.example
View File

@ -17,9 +17,6 @@ REDIS_PORT=30712
POSTGRES_PORT=5432
POSTGRES_PASSWORD=JiShe!aqG#5kGgh&0
POSTGRES_DB=jisheiotprodb
POSTGRES_USER=postgres
POSTGRES_CONTAINER=postgres
POSTGRES_BACKUP_DIR=/mnt/dockerdata/appservice/postgresql/backup
# Admin API配置
ADMIN_API_PORT=28080

0
DockerComposeShells/postgresql/init/02-create-user.sql → DockerComposeShells/postgresql/init/01-create-user.sql
View File

5723
DockerComposeShells/postgresql/init/01-jisheiotprodb.sql
View File

File diff suppressed because one or more lines are too long

0
DockerComposeShells/postgresql/init/03-grant-schema-permissions.sql → DockerComposeShells/postgresql/init/02-grant-schema-permissions.sql
View File

1
JiShe.IoT.Admin.sln
View File

@ -275,7 +275,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DockerComposeShells", "DockerComposeShells", "{8FE7CFC6-BA2A-4717-941C-0C227EB151B9}"
ProjectSection(SolutionItems) = preProject
DockerComposeShells\.env = DockerComposeShells\.env
DockerComposeShells\postgresql\init\01-jisheiotprodb.sql = DockerComposeShells\postgresql\init\01-jisheiotprodb.sql
DockerComposeShells\adminapi\conf\appsettings.Development.json = DockerComposeShells\adminapi\conf\appsettings.Development.json
DockerComposeShells\adminapi\conf\appsettings.Development_服务订阅模式.json = DockerComposeShells\adminapi\conf\appsettings.Development_服务订阅模式.json
DockerComposeShells\adminapi\conf\appsettings.json = DockerComposeShells\adminapi\conf\appsettings.json

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

@ -1169,7 +1169,6 @@ namespace JiShe.IoT.DeviceAggregation
var upgradeRecordInput = new CreateDeviceUpgradeRecordInput()
{
DeviceDataId = deviceInfo.Id,
DeviceName = deviceInfo.DeviceName,
DeviceAddress = deviceInfo.DeviceAddress,
OldFirmwareVersion = deviceInfo.FirmwareVersion,

2
src/JiShe.IoT.Application/Subscribers/ServiceCommunicationChannelSubscriberService.cs
View File

@ -195,7 +195,7 @@ namespace JiShe.ServicePro.OneNETManagement.Subscribers
.Set(d => d.UpgradeDate, currentTime)
.Set(d => d.LastModificationTime, currentTime)
.Set(d => d.LastModifierId, CurrentUser.Id)
.Where(d=>d.Id == deviceUpgradeRecordEntity.DeviceDataId)
.Where(d=>d.DeviceAddress == deviceUpgradeRecordEntity.DeviceAddress)
.ExecuteAffrowsAsync();
}
else

4279
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260120070701_InitialCreate.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

2062
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260120070701_InitialCreate.cs Normal file
View File

File diff suppressed because it is too large Load Diff

4283
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260121014333_updateIoTThingModels.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

52
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260121014333_updateIoTThingModels.cs Normal file
View File

@ -0,0 +1,52 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace JiShe.IoT.Migrations
{
/// <inheritdoc />
public partial class updateIoTThingModels : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "IoTPlatformRawFieldExtension",
table: "ServiceProIoTPlatformThingModelInfo",
type: "text",
nullable: true,
comment: "物联网平台中对应产品物模型标识符扩展，结构体或者数组的时候，是参数的名称与长度的键值对,其他类型就是长度或者值范围",
oldClrType: typeof(string),
oldType: "text",
oldNullable: true,
oldComment: "物联网平台中对应产品物模型标识符扩展，用于扩展结构体类型");
migrationBuilder.AddColumn<bool>(
name: "IsOperableIdentifier",
table: "ServiceProIoTPlatformThingModelInfo",
type: "boolean",
nullable: false,
defaultValue: false,
comment: "是否可操作物模型标识符");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsOperableIdentifier",
table: "ServiceProIoTPlatformThingModelInfo");
migrationBuilder.AlterColumn<string>(
name: "IoTPlatformRawFieldExtension",
table: "ServiceProIoTPlatformThingModelInfo",
type: "text",
nullable: true,
comment: "物联网平台中对应产品物模型标识符扩展，用于扩展结构体类型",
oldClrType: typeof(string),
oldType: "text",
oldNullable: true,
oldComment: "物联网平台中对应产品物模型标识符扩展，结构体或者数组的时候，是参数的名称与长度的键值对,其他类型就是长度或者值范围");
}
}
}

4283
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260121015002_InitialCreate.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

3
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260126022433_InitialCreate.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20260121015002_InitialCreate.cs
View File

@ -872,7 +872,6 @@ namespace JiShe.IoT.Migrations
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
DeviceDataId = table.Column<Guid>(type: "uuid", nullable: false, comment: "设备数据Id"),
DeviceName = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false, comment: "设备名称"),
DeviceAddress = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false, comment: "设备地址"),
OldFirmwareVersion = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false, comment: "旧的固件版本"),
@ -923,8 +922,6 @@ namespace JiShe.IoT.Migrations
IsSpecialIdentifier = table.Column<bool>(type: "boolean", nullable: false, comment: "是否是特殊物模型标识符"),
IoTPlatformRawFieldExtension = table.Column<string>(type: "text", nullable: true, comment: "物联网平台中对应产品物模型标识符扩展，结构体或者数组的时候，是参数的名称与长度的键值对,其他类型就是长度或者值范围"),
IsOperableIdentifier = table.Column<bool>(type: "boolean", nullable: false, comment: "是否可操作物模型标识符"),
AccessMode = table.Column<string>(type: "character varying(10)", maxLength: 10, nullable: false, defaultValue: "r", comment: "物模型标识符访问模式"),
IdentifierType = table.Column<int>(type: "integer", nullable: false, comment: "物模型标识符类型"),
ConcurrencyStamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: false),
CreationTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
CreatorId = table.Column<Guid>(type: "uuid", nullable: true),

4290
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260121062322_updatethingmodel.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

30
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260121062322_updatethingmodel.cs Normal file
View File

@ -0,0 +1,30 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace JiShe.IoT.Migrations
{
/// <inheritdoc />
public partial class updatethingmodel : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "AccessMode",
table: "ServiceProIoTPlatformThingModelInfo",
type: "text",
nullable: false,
defaultValue: "r",
comment: "物模型标识符访问模式");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "AccessMode",
table: "ServiceProIoTPlatformThingModelInfo");
}
}
}

12
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260126022433_InitialCreate.Designer.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20260121062614_updatethingmodel2.Designer.cs generated
View File

@ -13,8 +13,8 @@ using Volo.Abp.EntityFrameworkCore;
namespace JiShe.IoT.Migrations
{
[DbContext(typeof(IoTDbContext))]
[Migration("20260126022433_InitialCreate")]
partial class InitialCreate
[Migration("20260121062614_updatethingmodel2")]
partial class updatethingmodel2
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -907,10 +907,6 @@ namespace JiShe.IoT.Migrations
.HasColumnType("character varying(50)")
.HasComment("设备地址");
b.Property<Guid>("DeviceDataId")
.HasColumnType("uuid")
.HasComment("设备数据Id");
b.Property<string>("DeviceName")
.IsRequired()
.HasMaxLength(50)
@ -1585,10 +1581,6 @@ namespace JiShe.IoT.Migrations
.HasColumnType("character varying(50)")
.HasComment("物联网平台中对应产品物模型属性或者事件类型");
b.Property<int>("IdentifierType")
.HasColumnType("integer")
.HasComment("物模型标识符类型");
b.Property<int>("IoTPlatform")
.HasColumnType("integer")
.HasComment("物联网平台类型,默认没有指定");

44
src/JiShe.IoT.EntityFrameworkCore/Migrations/20260121062614_updatethingmodel2.cs Normal file
View File

@ -0,0 +1,44 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace JiShe.IoT.Migrations
{
/// <inheritdoc />
public partial class updatethingmodel2 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "AccessMode",
table: "ServiceProIoTPlatformThingModelInfo",
type: "character varying(10)",
maxLength: 10,
nullable: false,
defaultValue: "r",
comment: "物模型标识符访问模式",
oldClrType: typeof(string),
oldType: "text",
oldDefaultValue: "r",
oldComment: "物模型标识符访问模式");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "AccessMode",
table: "ServiceProIoTPlatformThingModelInfo",
type: "text",
nullable: false,
defaultValue: "r",
comment: "物模型标识符访问模式",
oldClrType: typeof(string),
oldType: "character varying(10)",
oldMaxLength: 10,
oldDefaultValue: "r",
oldComment: "物模型标识符访问模式");
}
}
}

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

@ -904,10 +904,6 @@ namespace JiShe.IoT.Migrations
.HasColumnType("character varying(50)")
.HasComment("设备地址");
b.Property<Guid>("DeviceDataId")
.HasColumnType("uuid")
.HasComment("设备数据Id");
b.Property<string>("DeviceName")
.IsRequired()
.HasMaxLength(50)
@ -1582,10 +1578,6 @@ namespace JiShe.IoT.Migrations
.HasColumnType("character varying(50)")
.HasComment("物联网平台中对应产品物模型属性或者事件类型");
b.Property<int>("IdentifierType")
.HasColumnType("integer")
.HasComment("物模型标识符类型");
b.Property<int>("IoTPlatform")
.HasColumnType("integer")
.HasComment("物联网平台类型,默认没有指定");