From f562618e7b291f9a9b550f5990a6cdf7fb230f8c Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 28 Apr 2020 17:10:24 +0800 Subject: [PATCH] 1.0.0.428.3 Former-commit-id: 42ecef67e603ec00f76f3918bf49c4830820098c --- .../Application/Domain/Entities/Node.cs | 10 ------ projects/IoT.Shared/IoTSharedDbConfig.cs | 14 +++----- projects/IoTCenter/Api/SrsController.cs | 1 + .../Application/Domain}/LiveRecord.cs | 2 +- .../Application/Domain}/NodeCategory.cs | 2 +- .../Application/Domain}/NodeCategoryNode.cs | 5 +-- .../IoTCenter/Application/Domain/Organ.cs | 12 +++++++ .../IoTCenter/Application/Domain/OrganNode.cs | 14 ++++++++ .../Controllers}/LiveRecordController.cs | 10 +++--- .../Controllers/NodeCategoryController.cs | 2 +- .../IoTCenter/Controllers/AppController.cs | 18 +---------- .../IoTCenter/Controllers/HomeController.cs | 2 +- projects/IoTCenter/DbConfig.cs | 14 ++++++++ projects/IoTCenter/db.sql | 22 +++++++++++++ projects/IoTNode/DbConfig.cs | 4 +-- projects/IoTNode/db.sql | 32 ------------------- projects/JobServer/Pages/Error.cshtml | 2 +- projects/JobServer/Pages/Error.cshtml.cs | 8 ++--- projects/JobServer/Pages/Index.cshtml | 2 +- projects/JobServer/Pages/Index.cshtml.cs | 10 ++---- projects/JobServer/Pages/Privacy.cshtml | 2 +- projects/JobServer/Pages/Privacy.cshtml.cs | 9 ++---- .../Shared/_ValidationScriptsPartial.cshtml | 2 +- projects/JobServer/Pages/_ViewImports.cshtml | 2 +- projects/JobServer/Pages/_ViewStart.cshtml | 2 +- .../JobServer/appsettings.Development.json | 2 +- projects/Version.cs | 2 +- 27 files changed, 96 insertions(+), 111 deletions(-) rename projects/{IoT.Shared/Application/Domain/Entities => IoTCenter/Application/Domain}/LiveRecord.cs (89%) rename projects/{IoT.Shared/Application/Domain/Entities => IoTCenter/Application/Domain}/NodeCategory.cs (93%) rename projects/{IoT.Shared/Application/Domain/Entities => IoTCenter/Application/Domain}/NodeCategoryNode.cs (75%) create mode 100644 projects/IoTCenter/Application/Domain/Organ.cs create mode 100644 projects/IoTCenter/Application/Domain/OrganNode.cs rename projects/{IoT.Shared/Areas/Admin/Controlls => IoTCenter/Areas/Admin/Controllers}/LiveRecordController.cs (86%) diff --git a/projects/IoT.Shared/Application/Domain/Entities/Node.cs b/projects/IoT.Shared/Application/Domain/Entities/Node.cs index e9cce167..ba22a554 100644 --- a/projects/IoT.Shared/Application/Domain/Entities/Node.cs +++ b/projects/IoT.Shared/Application/Domain/Entities/Node.cs @@ -29,15 +29,6 @@ namespace Application.Domain.Entities [Display(Name = "海拔")] public decimal Altitude { get; set; } - //[Display(Name = "类型")] - //public string Type { get; set; } - - //[Display(Name = "模板")] - //public string Template { get; set; } - - //[Display(Name = "标记")] - //public string MobileTemplate { get; set; } - [Display(Name = "序号")] public int DisplayOrder { get; set; } @@ -46,6 +37,5 @@ namespace Application.Domain.Entities public List Devices { get; set; } = new List(); public List Scenes { get; set; } = new List(); - public List CategoryNodes { get; set; } = new List(); } } \ No newline at end of file diff --git a/projects/IoT.Shared/IoTSharedDbConfig.cs b/projects/IoT.Shared/IoTSharedDbConfig.cs index 06a90b5c..446c0137 100644 --- a/projects/IoT.Shared/IoTSharedDbConfig.cs +++ b/projects/IoT.Shared/IoTSharedDbConfig.cs @@ -23,19 +23,21 @@ namespace IoT.Shared modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); modelBuilder.Entity().HasIndex(o => new { o.UserId, o.RoleId }).IsUnique(); modelBuilder.Entity().HasIndex(o => new { o.RoleId, o.PermissionId }).IsUnique(); + ////// + modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); // modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); modelBuilder.Entity().HasOne(o => o.Category).WithMany(o => o.Products).HasForeignKey(o => o.CategoryId); modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); modelBuilder.Entity().HasOne(o => o.Product).WithMany(o => o.Apis).HasForeignKey(o => o.ProductId); modelBuilder.Entity().HasIndex(o => new { o.ProductId, o.Name }).IsUnique(); - modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); + modelBuilder.Entity().HasOne(o => o.Api).WithMany(o => o.Parameters).HasForeignKey(o => o.ApiId); + // modelBuilder.Entity().HasOne(o => o.Product).WithMany(o => o.Devices).HasForeignKey(o => o.ProductId); modelBuilder.Entity().HasOne(o => o.Node).WithMany(o => o.Devices).HasForeignKey(o => o.NodeId); modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); modelBuilder.Entity().HasOne(o => o.Device).WithMany(o => o.Data).HasForeignKey(o => o.DeviceId); - modelBuilder.Entity().HasOne(o => o.Api).WithMany(o => o.Parameters).HasForeignKey(o => o.ApiId); - modelBuilder.Entity().Property(o => o.DeviceNumber).IsRequired(); + // modelBuilder.Entity().HasOne(o => o.Api).WithMany(o => o.Commands).HasForeignKey(o => o.ApiId); modelBuilder.Entity().HasOne(o => o.Node).WithMany(o => o.Scenes).HasForeignKey(o => o.NodeId); modelBuilder.Entity().HasOne(o => o.Scene).WithMany(o => o.SceneCommands).HasForeignKey(o => o.SceneId); @@ -43,10 +45,6 @@ namespace IoT.Shared modelBuilder.Entity().HasOne(o => o.Scene).WithMany(o => o.SceneTimers).HasForeignKey(o => o.SceneId); modelBuilder.Entity().HasOne(o => o.Scene).WithMany(o => o.SceneTiggers).HasForeignKey(o => o.SceneId); modelBuilder.Entity().HasOne(o => o.Data).WithMany(o => o.Tiggers).HasForeignKey(o => o.DataId); - modelBuilder.Entity().HasIndex(o => o.Name).IsUnique(); - modelBuilder.Entity().HasOne(o => o.Node).WithMany(o => o.CategoryNodes).HasForeignKey(o => o.NodeId); - modelBuilder.Entity().HasOne(o => o.Category).WithMany(o => o.CategoryNodes).HasForeignKey(o => o.CategoryId); - modelBuilder.Entity().HasIndex(o => new { o.CategoryId, o.NodeId }).IsUnique(); } public static void Seed(DbContext db) @@ -76,8 +74,6 @@ namespace IoT.Shared db.Set().Add(new Category { Id = "productcatgoryid-40".ToGuid(), Number = "40", Name = "监测", Image = "/images/monitor.png" }); db.SaveChanges(); - db.Set().Add(new NodeCategory { Name = "智慧教室", Template = "node" }); - db.SaveChanges(); } } } \ No newline at end of file diff --git a/projects/IoTCenter/Api/SrsController.cs b/projects/IoTCenter/Api/SrsController.cs index 4423f5b0..77c66214 100644 --- a/projects/IoTCenter/Api/SrsController.cs +++ b/projects/IoTCenter/Api/SrsController.cs @@ -1,5 +1,6 @@ using Application.Domain.Entities; using Infrastructure.Data; +using IoTCenter.Application.Domain; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; diff --git a/projects/IoT.Shared/Application/Domain/Entities/LiveRecord.cs b/projects/IoTCenter/Application/Domain/LiveRecord.cs similarity index 89% rename from projects/IoT.Shared/Application/Domain/Entities/LiveRecord.cs rename to projects/IoTCenter/Application/Domain/LiveRecord.cs index 6cb21815..704b2a49 100644 --- a/projects/IoT.Shared/Application/Domain/Entities/LiveRecord.cs +++ b/projects/IoTCenter/Application/Domain/LiveRecord.cs @@ -1,7 +1,7 @@ using Infrastructure.Domain; using System.ComponentModel.DataAnnotations; -namespace Application.Domain.Entities +namespace IoTCenter.Application.Domain { [Display(Name = "回放")] public class LiveRecord : BaseEntity diff --git a/projects/IoT.Shared/Application/Domain/Entities/NodeCategory.cs b/projects/IoTCenter/Application/Domain/NodeCategory.cs similarity index 93% rename from projects/IoT.Shared/Application/Domain/Entities/NodeCategory.cs rename to projects/IoTCenter/Application/Domain/NodeCategory.cs index 83b0ccb0..4a64bafa 100644 --- a/projects/IoT.Shared/Application/Domain/Entities/NodeCategory.cs +++ b/projects/IoTCenter/Application/Domain/NodeCategory.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Application.Domain.Entities +namespace IoTCenter.Application.Domain { [Display(Name = "节点类型")] public class NodeCategory : BaseEntity diff --git a/projects/IoT.Shared/Application/Domain/Entities/NodeCategoryNode.cs b/projects/IoTCenter/Application/Domain/NodeCategoryNode.cs similarity index 75% rename from projects/IoT.Shared/Application/Domain/Entities/NodeCategoryNode.cs rename to projects/IoTCenter/Application/Domain/NodeCategoryNode.cs index 9b6f899e..09881190 100644 --- a/projects/IoT.Shared/Application/Domain/Entities/NodeCategoryNode.cs +++ b/projects/IoTCenter/Application/Domain/NodeCategoryNode.cs @@ -1,8 +1,9 @@ -using Infrastructure.Domain; +using Application.Domain.Entities; +using Infrastructure.Domain; using System; using System.ComponentModel.DataAnnotations; -namespace Application.Domain.Entities +namespace IoTCenter.Application.Domain { [Display(Name = "节点分类")] public class NodeCategoryNode : BaseEntity diff --git a/projects/IoTCenter/Application/Domain/Organ.cs b/projects/IoTCenter/Application/Domain/Organ.cs new file mode 100644 index 00000000..371f980e --- /dev/null +++ b/projects/IoTCenter/Application/Domain/Organ.cs @@ -0,0 +1,12 @@ +using Infrastructure.Domain; +using System.Collections.Generic; + +namespace IoTCenter.Application.Domain +{ + public class Organ : BaseEntity + { + public string Name { get; set; } + public string Number { get; set; } + public List OrganNodes { get; set; } = new List(); + } +} \ No newline at end of file diff --git a/projects/IoTCenter/Application/Domain/OrganNode.cs b/projects/IoTCenter/Application/Domain/OrganNode.cs new file mode 100644 index 00000000..084ec249 --- /dev/null +++ b/projects/IoTCenter/Application/Domain/OrganNode.cs @@ -0,0 +1,14 @@ +using Application.Domain.Entities; +using Infrastructure.Domain; +using System; + +namespace IoTCenter.Application.Domain +{ + public class OrganNode : BaseEntity + { + public Guid OrganId { get; set; } + public Guid NodeId { get; set; } + public Organ Organ { get; set; } + public Node Node { get; set; } + } +} \ No newline at end of file diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/LiveRecordController.cs b/projects/IoTCenter/Areas/Admin/Controllers/LiveRecordController.cs similarity index 86% rename from projects/IoT.Shared/Areas/Admin/Controlls/LiveRecordController.cs rename to projects/IoTCenter/Areas/Admin/Controllers/LiveRecordController.cs index 8e4b6cd2..d1618a0d 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/LiveRecordController.cs +++ b/projects/IoTCenter/Areas/Admin/Controllers/LiveRecordController.cs @@ -1,14 +1,14 @@ -using System.Linq; -using Application.Domain.Entities; -using Application.Models; -using Infrastructure.Application; +using Application.Models; using Infrastructure.Data; using Infrastructure.Extensions; using Infrastructure.Web.Mvc; +using IoT.Shared.Areas.Admin.Controlls; +using IoTCenter.Application.Domain; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using System.Linq; -namespace IoT.Shared.Areas.Admin.Controlls +namespace IoTCenter.Areas.Admin.Controllers { [Authorize] [Area(nameof(Admin))] diff --git a/projects/IoTCenter/Areas/Admin/Controllers/NodeCategoryController.cs b/projects/IoTCenter/Areas/Admin/Controllers/NodeCategoryController.cs index 1b835e56..763ee0fa 100644 --- a/projects/IoTCenter/Areas/Admin/Controllers/NodeCategoryController.cs +++ b/projects/IoTCenter/Areas/Admin/Controllers/NodeCategoryController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using IoTCenter.Application.Domain; using Infrastructure.Application; using Infrastructure.Data; using Infrastructure.Extensions; diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs index 16172870..b8415149 100644 --- a/projects/IoTCenter/Controllers/AppController.cs +++ b/projects/IoTCenter/Controllers/AppController.cs @@ -2,6 +2,7 @@ using Application.Models; using Infrastructure.Data; using Infrastructure.Extensions; +using IoTCenter.Application.Domain; using IoTCenter.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -136,23 +137,6 @@ namespace IoTCenter.Controllers return Json(model); } - public IActionResult GetTemplate(string number) - { - var node = _nodeRepo.ReadOnlyTable() - .Include(o => o.CategoryNodes) - .ThenInclude(o => o.Category) - .FirstOrDefault(o => o.Number == number); - var template = node.CategoryNodes.FirstOrDefault()?.Category.Template; - if (!string.IsNullOrEmpty(template)) - { - return Content(System.IO.File.ReadAllText(Path.Combine(this._env.ContentRootPath, "wwwroot", template))); - } - else - { - return Content(""); - } - } - public IActionResult ExecApi(string connectionId, string number, string method) { try diff --git a/projects/IoTCenter/Controllers/HomeController.cs b/projects/IoTCenter/Controllers/HomeController.cs index f867b9b9..46d4b8c7 100644 --- a/projects/IoTCenter/Controllers/HomeController.cs +++ b/projects/IoTCenter/Controllers/HomeController.cs @@ -1,10 +1,10 @@ using Application.Domain.Entities; using Infrastructure.Data; using Infrastructure.Extensions; +using IoTCenter.Application.Domain; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Configuration; using System; using System.Collections.Generic; diff --git a/projects/IoTCenter/DbConfig.cs b/projects/IoTCenter/DbConfig.cs index 21da9fba..66f5b150 100644 --- a/projects/IoTCenter/DbConfig.cs +++ b/projects/IoTCenter/DbConfig.cs @@ -4,6 +4,7 @@ using Infrastructure.Data; using Infrastructure.Extensions; using Infrastructure.Security; using IoT.Shared; +using IoTCenter.Application.Domain; using Microsoft.EntityFrameworkCore; using System.Collections.Generic; @@ -25,6 +26,16 @@ namespace IoTCenter public void OnModelCreating(ModelBuilder modelBuilder) { IoTSharedDbConfig.OnModelCreating(modelBuilder); + modelBuilder.Entity().Property(o => o.DeviceNumber).IsRequired(); + modelBuilder.Entity().HasIndex(o => o.Name).IsUnique(); + modelBuilder.Entity().HasOne(o => o.Node).WithMany().HasForeignKey(o => o.NodeId); + modelBuilder.Entity().HasOne(o => o.Category).WithMany(o => o.CategoryNodes).HasForeignKey(o => o.CategoryId); + modelBuilder.Entity().HasIndex(o => new { o.CategoryId, o.NodeId }).IsUnique(); + modelBuilder.Entity().Property(o => o.Number).IsRequired(); + modelBuilder.Entity().HasIndex(o => o.Number).IsUnique(); + modelBuilder.Entity().HasOne(o => o.Organ).WithMany(o => o.OrganNodes).HasForeignKey(o => o.OrganId); + modelBuilder.Entity().HasOne(o => o.Node).WithMany().HasForeignKey(o => o.NodeId); + modelBuilder.Entity().HasIndex(o => new { o.OrganId, o.NodeId }).IsUnique(); } public void Seed(DbContext db) @@ -74,6 +85,9 @@ namespace IoTCenter set.Add(new Setting { Name = "id", Value = macAddress.Md5(), Type = SettingType.Text }); set.Add(new Setting { Name = "code", Value = "根据id生成的授权码", Type = SettingType.Text }); db.SaveChanges(); + // + db.Set().Add(new NodeCategory { Name = "智慧教室", Template = "node" }); + db.SaveChanges(); } } } \ No newline at end of file diff --git a/projects/IoTCenter/db.sql b/projects/IoTCenter/db.sql index 222fc12e..f2051503 100644 --- a/projects/IoTCenter/db.sql +++ b/projects/IoTCenter/db.sql @@ -37,6 +37,13 @@ CREATE TABLE "iot_NodeCategory" ( "DisplayOrder" INTEGER NOT NULL ); +CREATE TABLE "iot_Organ" ( + "Id" TEXT NOT NULL CONSTRAINT "PK_iot_Organ" PRIMARY KEY, + "IsDeleted" TEXT NULL, + "Name" TEXT NULL, + "Number" TEXT NOT NULL +); + CREATE TABLE "iot_PermissionCategory" ( "Id" TEXT NOT NULL CONSTRAINT "PK_iot_PermissionCategory" PRIMARY KEY, "IsDeleted" TEXT NULL, @@ -106,6 +113,15 @@ CREATE TABLE "iot_NodeCategoryNode" ( CONSTRAINT "FK_iot_NodeCategoryNode_iot_Node_NodeId" FOREIGN KEY ("NodeId") REFERENCES "iot_Node" ("Id") ON DELETE CASCADE ); +CREATE TABLE "iot_OrganNode" ( + "Id" TEXT NOT NULL CONSTRAINT "PK_iot_OrganNode" PRIMARY KEY, + "IsDeleted" TEXT NULL, + "OrganId" TEXT NOT NULL, + "NodeId" TEXT NOT NULL, + CONSTRAINT "FK_iot_OrganNode_iot_Node_NodeId" FOREIGN KEY ("NodeId") REFERENCES "iot_Node" ("Id") ON DELETE CASCADE, + CONSTRAINT "FK_iot_OrganNode_iot_Organ_OrganId" FOREIGN KEY ("OrganId") REFERENCES "iot_Organ" ("Id") ON DELETE CASCADE +); + CREATE TABLE "iot_Permission" ( "Id" TEXT NOT NULL CONSTRAINT "PK_iot_Permission" PRIMARY KEY, "IsDeleted" TEXT NULL, @@ -263,6 +279,12 @@ CREATE INDEX "IX_iot_NodeCategoryNode_NodeId" ON "iot_NodeCategoryNode" ("NodeId CREATE UNIQUE INDEX "IX_iot_NodeCategoryNode_CategoryId_NodeId" ON "iot_NodeCategoryNode" ("CategoryId", "NodeId"); +CREATE UNIQUE INDEX "IX_iot_Organ_Number" ON "iot_Organ" ("Number"); + +CREATE INDEX "IX_iot_OrganNode_NodeId" ON "iot_OrganNode" ("NodeId"); + +CREATE UNIQUE INDEX "IX_iot_OrganNode_OrganId_NodeId" ON "iot_OrganNode" ("OrganId", "NodeId"); + CREATE INDEX "IX_iot_Parameter_ApiId" ON "iot_Parameter" ("ApiId"); CREATE INDEX "IX_iot_Permission_CategoryId" ON "iot_Permission" ("CategoryId"); diff --git a/projects/IoTNode/DbConfig.cs b/projects/IoTNode/DbConfig.cs index 34da5de5..ad0420a8 100644 --- a/projects/IoTNode/DbConfig.cs +++ b/projects/IoTNode/DbConfig.cs @@ -78,14 +78,12 @@ namespace IoTNode set.Add(new Setting { Name = "debug", Value = "false" }); set.Add(new Setting { Name = "notify:enabled", Value = "true" }); set.Add(new Setting { Name = "notify:host", Value = $"http://{host}:8011" }); - set.Add(new Setting { Name = "timer.seconds", Value = "300" }); + set.Add(new Setting { Name = "timer.seconds", Value = "180" }); set.Add(new Setting { Name = "onvif.timer", Value = "1" }); set.Add(new Setting { Name = "onvif.speed", Value = "0.2" }); set.Add(new Setting { Name = "camera.usr", Value = "admin" }); set.Add(new Setting { Name = "camera.pwd", Value = "dsideal123" }); set.Add(new Setting { Name = "stream.rtmp", Value = stream }); - //set.Add(new Setting { Name = "stream.flv", Value = $"{stream}" }); - //set.Add(new Setting { Name = "stream.hls", Value = $"{stream}" }); set.Add(new Setting { Name = "ffmpeg.args", Value = " -y -threads {0} -rtsp_transport tcp -use_wallclock_as_timestamps 1 -stimeout 3000000 -i \"{1}\" -fflags +genpts -c copy -f flv \"{2}\"" }); set.Add(new Setting { Name = "fbee.writelist", Value = "" }); set.Add(new Setting { Name = "camera.writelist", Value = "" }); diff --git a/projects/IoTNode/db.sql b/projects/IoTNode/db.sql index 222fc12e..5cbac7ef 100644 --- a/projects/IoTNode/db.sql +++ b/projects/IoTNode/db.sql @@ -6,15 +6,6 @@ CREATE TABLE "iot_Category" ( "Image" TEXT NULL ); -CREATE TABLE "iot_LiveRecord" ( - "Id" TEXT NOT NULL CONSTRAINT "PK_iot_LiveRecord" PRIMARY KEY, - "IsDeleted" TEXT NULL, - "DeviceNumber" TEXT NOT NULL, - "DeviceName" TEXT NULL, - "Name" TEXT NULL, - "Value" TEXT NULL -); - CREATE TABLE "iot_Node" ( "Id" TEXT NOT NULL CONSTRAINT "PK_iot_Node" PRIMARY KEY, "IsDeleted" TEXT NULL, @@ -29,14 +20,6 @@ CREATE TABLE "iot_Node" ( "Disabled" INTEGER NOT NULL ); -CREATE TABLE "iot_NodeCategory" ( - "Id" TEXT NOT NULL CONSTRAINT "PK_iot_NodeCategory" PRIMARY KEY, - "IsDeleted" TEXT NULL, - "Name" TEXT NULL, - "Template" TEXT NULL, - "DisplayOrder" INTEGER NOT NULL -); - CREATE TABLE "iot_PermissionCategory" ( "Id" TEXT NOT NULL CONSTRAINT "PK_iot_PermissionCategory" PRIMARY KEY, "IsDeleted" TEXT NULL, @@ -97,15 +80,6 @@ CREATE TABLE "iot_Scene" ( CONSTRAINT "FK_iot_Scene_iot_Node_NodeId" FOREIGN KEY ("NodeId") REFERENCES "iot_Node" ("Id") ON DELETE RESTRICT ); -CREATE TABLE "iot_NodeCategoryNode" ( - "Id" TEXT NOT NULL CONSTRAINT "PK_iot_NodeCategoryNode" PRIMARY KEY, - "IsDeleted" TEXT NULL, - "CategoryId" TEXT NOT NULL, - "NodeId" TEXT NOT NULL, - CONSTRAINT "FK_iot_NodeCategoryNode_iot_NodeCategory_CategoryId" FOREIGN KEY ("CategoryId") REFERENCES "iot_NodeCategory" ("Id") ON DELETE CASCADE, - CONSTRAINT "FK_iot_NodeCategoryNode_iot_Node_NodeId" FOREIGN KEY ("NodeId") REFERENCES "iot_Node" ("Id") ON DELETE CASCADE -); - CREATE TABLE "iot_Permission" ( "Id" TEXT NOT NULL CONSTRAINT "PK_iot_Permission" PRIMARY KEY, "IsDeleted" TEXT NULL, @@ -257,12 +231,6 @@ CREATE INDEX "IX_iot_Device_ProductId" ON "iot_Device" ("ProductId"); CREATE UNIQUE INDEX "IX_iot_Node_Number" ON "iot_Node" ("Number"); -CREATE UNIQUE INDEX "IX_iot_NodeCategory_Name" ON "iot_NodeCategory" ("Name"); - -CREATE INDEX "IX_iot_NodeCategoryNode_NodeId" ON "iot_NodeCategoryNode" ("NodeId"); - -CREATE UNIQUE INDEX "IX_iot_NodeCategoryNode_CategoryId_NodeId" ON "iot_NodeCategoryNode" ("CategoryId", "NodeId"); - CREATE INDEX "IX_iot_Parameter_ApiId" ON "iot_Parameter" ("ApiId"); CREATE INDEX "IX_iot_Permission_CategoryId" ON "iot_Permission" ("CategoryId"); diff --git a/projects/JobServer/Pages/Error.cshtml b/projects/JobServer/Pages/Error.cshtml index 6f92b956..b5105b6d 100644 --- a/projects/JobServer/Pages/Error.cshtml +++ b/projects/JobServer/Pages/Error.cshtml @@ -23,4 +23,4 @@ It can result in displaying sensitive information from exceptions to end users. For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development and restarting the app. -

+

\ No newline at end of file diff --git a/projects/JobServer/Pages/Error.cshtml.cs b/projects/JobServer/Pages/Error.cshtml.cs index a560056a..003334f5 100644 --- a/projects/JobServer/Pages/Error.cshtml.cs +++ b/projects/JobServer/Pages/Error.cshtml.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; +using System.Diagnostics; namespace JobServer.Pages { @@ -28,4 +24,4 @@ namespace JobServer.Pages RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; } } -} +} \ No newline at end of file diff --git a/projects/JobServer/Pages/Index.cshtml b/projects/JobServer/Pages/Index.cshtml index b5f0c15f..fd28464c 100644 --- a/projects/JobServer/Pages/Index.cshtml +++ b/projects/JobServer/Pages/Index.cshtml @@ -7,4 +7,4 @@

Welcome

Learn about building Web apps with ASP.NET Core.

-
+ \ No newline at end of file diff --git a/projects/JobServer/Pages/Index.cshtml.cs b/projects/JobServer/Pages/Index.cshtml.cs index 0f17de86..b2ff37e6 100644 --- a/projects/JobServer/Pages/Index.cshtml.cs +++ b/projects/JobServer/Pages/Index.cshtml.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; namespace JobServer.Pages @@ -19,7 +14,6 @@ namespace JobServer.Pages public void OnGet() { - } } -} +} \ No newline at end of file diff --git a/projects/JobServer/Pages/Privacy.cshtml b/projects/JobServer/Pages/Privacy.cshtml index 46ba9661..a92998a6 100644 --- a/projects/JobServer/Pages/Privacy.cshtml +++ b/projects/JobServer/Pages/Privacy.cshtml @@ -5,4 +5,4 @@ }

@ViewData["Title"]

-

Use this page to detail your site's privacy policy.

+

Use this page to detail your site's privacy policy.

\ No newline at end of file diff --git a/projects/JobServer/Pages/Privacy.cshtml.cs b/projects/JobServer/Pages/Privacy.cshtml.cs index 7886fa9f..e8419757 100644 --- a/projects/JobServer/Pages/Privacy.cshtml.cs +++ b/projects/JobServer/Pages/Privacy.cshtml.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; namespace JobServer.Pages @@ -21,4 +16,4 @@ namespace JobServer.Pages { } } -} +} \ No newline at end of file diff --git a/projects/JobServer/Pages/Shared/_ValidationScriptsPartial.cshtml b/projects/JobServer/Pages/Shared/_ValidationScriptsPartial.cshtml index 5a16d80a..660f00c3 100644 --- a/projects/JobServer/Pages/Shared/_ValidationScriptsPartial.cshtml +++ b/projects/JobServer/Pages/Shared/_ValidationScriptsPartial.cshtml @@ -1,2 +1,2 @@  - + \ No newline at end of file diff --git a/projects/JobServer/Pages/_ViewImports.cshtml b/projects/JobServer/Pages/_ViewImports.cshtml index 4083ffad..add3f52b 100644 --- a/projects/JobServer/Pages/_ViewImports.cshtml +++ b/projects/JobServer/Pages/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using JobServer @namespace JobServer.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/projects/JobServer/Pages/_ViewStart.cshtml b/projects/JobServer/Pages/_ViewStart.cshtml index a5f10045..1af6e494 100644 --- a/projects/JobServer/Pages/_ViewStart.cshtml +++ b/projects/JobServer/Pages/_ViewStart.cshtml @@ -1,3 +1,3 @@ @{ Layout = "_Layout"; -} +} \ No newline at end of file diff --git a/projects/JobServer/appsettings.Development.json b/projects/JobServer/appsettings.Development.json index 8983e0fc..45fe774a 100644 --- a/projects/JobServer/appsettings.Development.json +++ b/projects/JobServer/appsettings.Development.json @@ -6,4 +6,4 @@ "Microsoft.Hosting.Lifetime": "Information" } } -} +} \ No newline at end of file diff --git a/projects/Version.cs b/projects/Version.cs index 9e0e5329..1e14b877 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.*")] -[assembly: AssemblyInformationalVersion("1.0.0.428.1")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.428.3")] \ No newline at end of file