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

Compare commits

base: admin:a4b3331e956e7416844a079655a654b5faa77dfa
Branches Tags
admin:master
admin:master_net9_Pomelo
..
compare: admin:d535aa285ebc88c09adfb945b835aa65f1539e28
Branches Tags
admin:master
admin:master_net9_Pomelo

No commits in common. "a4b3331e956e7416844a079655a654b5faa77dfa" and "d535aa285ebc88c09adfb945b835aa65f1539e28" have entirely different histories.
a4b3331e95 ... d535aa285e

7 changed files with 15 additions and 47 deletions
Show Stats Expand all files Collapse all files

2
JiShe.ServicePro

@ -1 +1 @@
Subproject commit a3b01428087b3c2a18bd99df4c4032959b17ba31
Subproject commit fa776f0281564ebc3f7c3173420b86026f71eedd

3
host/JiShe.IoT.HttpApi.Host/Program.cs
View File

@ -25,9 +25,6 @@ public class Program
context.Configuration);
});
await builder.AddApplicationAsync<JiShe.IoT.IoTHttpApiHostModule>();
#if DEBUG
builder.WebHost.UseUrls($"http://+:10500");
#endif
var app = builder.Build();
await app.InitializeApplicationAsync();
await app.RunAsync();

2
host/JiShe.IoT.HttpApi.Host/Properties/launchSettings.json
View File

@ -3,7 +3,7 @@
"JiShe.IoT.HttpApi.Host": {
"commandName": "Project",
"launchBrowser": true,
"applicationUrl": "http://localhost:10500",
"applicationUrl": "http://localhost:44315",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}

4
src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj
View File

@ -43,4 +43,8 @@
<PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Migrations\" />
</ItemGroup>
</Project>

22
src/JiShe.IoT.EntityFrameworkCore/Migrations/20250708065507_InitialCreate.Designer.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.Designer.cs generated
View File

@ -13,8 +13,8 @@ using Volo.Abp.EntityFrameworkCore;
namespace JiShe.IoT.Migrations
{
[DbContext(typeof(IoTDbContext))]
[Migration("20250708065507_InitialCreate")]
partial class InitialCreate
[Migration("20250620054425_initCreat")]
partial class initCreat
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -306,15 +306,6 @@ namespace JiShe.IoT.Migrations
.HasColumnType("int")
.HasComment("心跳间隔");
b.Property<int>("IoTPlatform")
.HasColumnType("int")
.HasComment("物联网平台类型，默认没有指定");
b.Property<string>("IoTPlatformDeviceOpenId")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasComment("集中器在物联网平台中的设备ID");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
@ -361,11 +352,6 @@ namespace JiShe.IoT.Migrations
.HasColumnType("int")
.HasComment("旧系统授权最后修改者Id");
b.Property<string>("PlatformPassword")
.HasMaxLength(80)
.HasColumnType("varchar(80)")
.HasComment("物联网平台设备密码");
b.Property<int>("ProjectID")
.HasColumnType("int")
.HasComment("项目ID");
@ -619,11 +605,11 @@ namespace JiShe.IoT.Migrations
.HasComment("租户ID");
b.Property<decimal>("TimesA")
.HasColumnType("decimal(18,4)")
.HasColumnType("decimal(12, 4)")
.HasComment("倍率A");
b.Property<decimal>("Timev")
.HasColumnType("decimal(18,4)")
.HasColumnType("decimal(12, 4)")
.HasComment("倍率V");
b.Property<bool>("TripState")

11
src/JiShe.IoT.EntityFrameworkCore/Migrations/20250708065507_InitialCreate.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20250620054425_initCreat.cs
View File

@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace JiShe.IoT.Migrations
{
/// <inheritdoc />
public partial class InitialCreate : Migration
public partial class initCreat : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
@ -773,11 +773,6 @@ namespace JiShe.IoT.Migrations
.Annotation("MySql:CharSet", "utf8mb4"),
HardwareReleaseDate = table.Column<string>(type: "varchar(80)", maxLength: 80, nullable: true, comment: "硬件软件发布日期：日月年")
.Annotation("MySql:CharSet", "utf8mb4"),
IoTPlatformDeviceOpenId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "集中器在物联网平台中的设备ID")
.Annotation("MySql:CharSet", "utf8mb4"),
IoTPlatform = table.Column<int>(type: "int", nullable: false, comment: "物联网平台类型，默认没有指定"),
PlatformPassword = table.Column<string>(type: "varchar(80)", maxLength: 80, nullable: true, comment: "物联网平台设备密码")
.Annotation("MySql:CharSet", "utf8mb4"),
ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
@ -874,8 +869,8 @@ namespace JiShe.IoT.Migrations
.Annotation("MySql:CharSet", "utf8mb4"),
ArchiveStatus = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "归档状态"),
TripState = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "是否跳闸"),
TimesA = table.Column<decimal>(type: "decimal(18,4)", nullable: false, comment: "倍率A"),
Timev = table.Column<decimal>(type: "decimal(18,4)", nullable: false, comment: "倍率V"),
TimesA = table.Column<decimal>(type: "decimal(12,4)", nullable: false, comment: "倍率A"),
Timev = table.Column<decimal>(type: "decimal(12,4)", nullable: false, comment: "倍率V"),
HaveValve = table.Column<bool>(type: "tinyint(1)", nullable: true, comment: "是否带阀控"),
FocusId = table.Column<int>(type: "int", nullable: false, comment: "集中器ID"),
MeterId = table.Column<int>(type: "int", nullable: false, comment: "表计ID"),

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

@ -303,15 +303,6 @@ namespace JiShe.IoT.Migrations
.HasColumnType("int")
.HasComment("心跳间隔");
b.Property<int>("IoTPlatform")
.HasColumnType("int")
.HasComment("物联网平台类型，默认没有指定");
b.Property<string>("IoTPlatformDeviceOpenId")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasComment("集中器在物联网平台中的设备ID");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
@ -358,11 +349,6 @@ namespace JiShe.IoT.Migrations
.HasColumnType("int")
.HasComment("旧系统授权最后修改者Id");
b.Property<string>("PlatformPassword")
.HasMaxLength(80)
.HasColumnType("varchar(80)")
.HasComment("物联网平台设备密码");
b.Property<int>("ProjectID")
.HasColumnType("int")
.HasComment("项目ID");
@ -616,11 +602,11 @@ namespace JiShe.IoT.Migrations
.HasComment("租户ID");
b.Property<decimal>("TimesA")
.HasColumnType("decimal(18,4)")
.HasColumnType("decimal(12, 4)")
.HasComment("倍率A");
b.Property<decimal>("Timev")
.HasColumnType("decimal(18,4)")
.HasColumnType("decimal(12, 4)")
.HasComment("倍率V");
b.Property<bool>("TripState")