wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 98ed4c7c4705f92e93e4b2425ab2188c55f14bbb
Former-commit-id: 01d5de11d0f6dfa469c3449f9c8693f466396d71
1.0
wanggang 5 years ago
parent a0c5da3f1f
commit 95e319512e
11 changed files with 13 additions and 67 deletions
Show Stats Download Patch File Download Diff File

6
projects/Infrastructure/Areas/Admin/Views/Shared/_Menu.cshtml
Unescape View File

@ -1,6 +0,0 @@
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="nav-icon false">
@if (HasPermission("Read-Setting"))
{
<li class="nav-item"><a class="@GetLinkClass(area:"Settings")" href="@Url.Action("Index","Setting")"><i class="far fa-circle nav-icon"></i><p>配置管理</p></a></li>
}
</ul>

5
projects/IoTNode/Areas/Admin/Views/Setting/Index.cshtml
Unescape View File

@ -49,10 +49,7 @@
<th>属性名称</th>
<th>属性值</th>
<th>类型</th>
@if (User.IsInRole($"Edit-{scope}-{entityName}"))
{
<th>编辑</th>
}
<th>编辑</th>
</tr>
@foreach (var item in Model.List)
{

3
projects/IoTNode/Areas/Admin/Views/Shared/_Menu.cshtml
Unescape View File

@ -1,3 +0,0 @@
<ul class="nav nav-pills nav-sidebar flex-column nav-flat" data-widget="treeview" role="menu" data-accordion="nav-icon false">
<li class="nav-item"><a class="@GetLinkClass("Setting")" href="@Url.Action("Index","Setting")"><i class="far fa-circle nav-icon"></i><p>系统设置</p></a></li>
</ul>

8
projects/IoTNode/Areas/IoTCenter/Views/Shared/_Menu.cshtml
Unescape View File

@ -1,8 +0,0 @@
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="nav-icon false">
<li class="nav-item"><a class="@GetLinkClass("IoTProduct")" href="@Url.Action("Index","IoTProduct")"><i class="far fa-circle nav-icon"></i><span>产品管理</span></a></li>
<li class="nav-item"><a class="@GetLinkClass("IoTApi")" href="@Url.Action("Index","IoTApi")"><i class="far fa-circle nav-icon"></i><span>接口管理</span></a></li>
<li class="nav-item"><a class="@GetLinkClass("IoTParameter")" href="@Url.Action("Index","IoTParameter")"><i class="far fa-circle nav-icon"></i><span>参数管理</span></a></li>
<li class="nav-item"><a class="@GetLinkClass("IoTGateway")" href="@Url.Action("Index","IoTGateway")"><i class="far fa-circle nav-icon"></i><span>网关管理</span></a></li>
<li class="nav-item"><a class="@GetLinkClass("IoTDevice")" href="@Url.Action("Index","IoTDevice")"><i class="far fa-circle nav-icon"></i><span>设备管理</span></a></li>
<li class="nav-item"><a class="@GetLinkClass("IoTData")" href="@Url.Action("Index","IoTData")"><i class="far fa-circle nav-icon"></i><span>数据管理</span></a></li>
</ul>

12
projects/IoTNode/Areas/IoTCenter/Views/_ViewImports.cshtml
Unescape View File

@ -1,12 +0,0 @@
@inherits Infrastructure.Web.Mvc.Razor.MyRazorPage<TModel>
@using Microsoft.Extensions.Hosting
@using Microsoft.Extensions.Configuration
@using System.ComponentModel.DataAnnotations
@using Infrastructure.Application
@using Infrastructure.Web
@using Infrastructure.Web.DataAnnotations
@using Infrastructure.Extensions
@using Infrastructure.Data
@using Application.Domain.Entities
@using IoT.Shared.Application.Models
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

3
projects/IoTNode/Areas/IoTCenter/Views/_ViewStart.cshtml
Unescape View File

@ -1,3 +0,0 @@
@{
Layout = "_Layout";
}

2
projects/IoTNode/Data/IoTNodeDbContext.cs
Unescape View File

@ -46,6 +46,8 @@ namespace IoTNode.Data
modelBuilder.Ignore<OrganUserRole>();
modelBuilder.Ignore<PermissionCategory>();
modelBuilder.Ignore<IoTProductCategory>();
modelBuilder.Ignore<IoTApi>();
modelBuilder.Ignore<IoTParameter>();
modelBuilder.Ignore<IoTCommand>();
modelBuilder.Ignore<IoTSceneIoTCommand>();
modelBuilder.Ignore<IoTScene>();

6
projects/IoTNode/Startup.cs
Unescape View File

@ -46,9 +46,9 @@ namespace IoTNode
if (Env.IsDevelopment())
{
services.AddHostedService(o => o.GetService<SerialPortService>());
//services.AddHostedService(o => o.GetService<OnvifService>());
//services.AddHostedService(o => o.GetService<FBeeService>());
//services.AddHostedService(o => o.GetService<LCDAUE800DService>());
services.AddHostedService(o => o.GetService<OnvifService>());
services.AddHostedService(o => o.GetService<FBeeService>());
services.AddHostedService(o => o.GetService<LCDAUE800DService>());
}
else
{

7
projects/IoTNode/Views/Shared/_Menu.cshtml
Unescape View File

@ -1,3 +1,8 @@
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="nav-icon false">
<li class="nav-item"><a class="@GetLinkClass("Home",null,"")" href="@Url.Action("Index","Home")"><i class="far fa-circle nav-icon"></i><p>首页</p></a></li>
<li class="nav-item"><a class="@GetLinkClass("Home","Index","")" href="@Url.Action("Index","Home")"><i class="far fa-circle nav-icon"></i><p>首页</p></a></li>
<li class="nav-item"><a class="@GetLinkClass("Setting","Index","Admin")" href="@Url.Action("Index","Setting",new { area="Admin"})"><i class="far fa-circle nav-icon"></i><p>系统设置</p></a></li>
<li class="nav-item"><a class="@GetLinkClass("IoTProduct","Index","IoTCenter")" href="@Url.Action("Index","IoTProduct",new { area="IoTCenter"})"><i class="far fa-circle nav-icon"></i><span>产品管理</span></a></li>
<li class="nav-item"><a class="@GetLinkClass("IoTGateway","Index","IoTCenter")" href="@Url.Action("Index","IoTGateway",new { area="IoTCenter"})"><i class="far fa-circle nav-icon"></i><span>网关管理</span></a></li>
<li class="nav-item"><a class="@GetLinkClass("IoTDevice","Index","IoTCenter")" href="@Url.Action("Index","IoTDevice",new { area="IoTCenter"})"><i class="far fa-circle nav-icon"></i><span>设备管理</span></a></li>
<li class="nav-item"><a class="@GetLinkClass("IoTData","Index","IoTCenter")" href="@Url.Action("Index","IoTData",new { area="IoTCenter"})"><i class="far fa-circle nav-icon"></i><span>数据管理</span></a></li>
</ul>

9
projects/IoTNode/Views/Shared/_TopMenu.cshtml
Unescape View File

@ -2,13 +2,4 @@
<li class="nav-item">
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fas fa-bars"></i></a>
</li>
<li class="nav-item d-none d-sm-inline-block">
<a href="@Url.Action("Index","Home",new { area=""})" class="@GetLinkClass(area:"")">首页</a>
</li>
<li class="nav-item d-none d-sm-inline-block">
<a href="@Url.Action("Index","Setting",new { area="Admin"})" class="@GetLinkClass(area:"Admin")">系统设置</a>
</li>
<li class="nav-item d-none d-sm-inline-block">
<a href="@Url.Action("Index","IoTProduct",new { area="IoTCenter"})" class="@GetLinkClass(area:"IoTCenter")">设备管理</a>
</li>
</ul>

19
projects/IoTNode/db.sql
Unescape View File

@ -69,20 +69,6 @@ CREATE TABLE "iot_IoTDevice" (
);
CREATE TABLE "iot_IoTParameter" (
"Id" TEXT NOT NULL CONSTRAINT "PK_iot_IoTParameter" PRIMARY KEY,
"Type" TEXT NULL,
"Name" TEXT NULL,
"Description" TEXT NULL,
"Required" INTEGER NOT NULL,
"Maxinum" TEXT NULL,
"Minimum" TEXT NULL,
"IoTApiId" TEXT NOT NULL,
"IsDeleted" TEXT NULL,
CONSTRAINT "FK_iot_IoTParameter_iot_IoTApi_IoTApiId" FOREIGN KEY ("IoTApiId") REFERENCES "iot_IoTApi" ("Id") ON DELETE CASCADE
);
CREATE TABLE "iot_IoTData" (
"Id" TEXT NOT NULL CONSTRAINT "PK_iot_IoTData" PRIMARY KEY,
"Key" TEXT NOT NULL,
@ -101,7 +87,7 @@ CREATE TABLE "iot_IoTData" (
);
CREATE UNIQUE INDEX "IX_iot_IoTApi_IoTProductId_Name" ON "iot_IoTApi" ("IoTProductId", "Name");
CREATE INDEX "IX_iot_IoTApi_IoTProductId" ON "iot_IoTApi" ("IoTProductId");
CREATE INDEX "IX_iot_IoTData_IoTDeviceId" ON "iot_IoTData" ("IoTDeviceId");
@ -119,9 +105,6 @@ CREATE UNIQUE INDEX "IX_iot_IoTDevice_Number" ON "iot_IoTDevice" ("Number");
CREATE UNIQUE INDEX "IX_iot_IoTGateway_Number" ON "iot_IoTGateway" ("Number");
CREATE INDEX "IX_iot_IoTParameter_IoTApiId" ON "iot_IoTParameter" ("IoTApiId");
CREATE UNIQUE INDEX "IX_iot_IoTProduct_Number" ON "iot_IoTProduct" ("Number");

Write Preview
Loading…
Cancel
Save