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

update

Browse Source 
Former-commit-id: 5cbb27542f47121bc49751a2e11f8de693110767
Former-commit-id: 803ae639bcd0c905ad00214a40e72863f6c88bfc
1.0
wanggang 5 years ago
parent 127bf127c0
commit b5b5599b3f
5 changed files with 86 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
projects/Infrastructure/Extensions/TreeEntityExtensions.cs
Unescape View File

@ -10,7 +10,7 @@ namespace Infrastructure.Extensions
{ {
if (list != null) if (list != null)
{ {
foreach (var item in list) foreach (var item in list.OrderBy(o=>o.DisplayOrder))
{ {
if (item.ParentId.HasValue) if (item.ParentId.HasValue)
{ {

4
projects/IoT.Shared/wwwroot/css/site.css
Unescape View File

@ -123,4 +123,8 @@ img.pointer {
line-height: 24px; line-height: 24px;
margin: 0 auto; margin: 0 auto;
overflow: hidden; overflow: hidden;
}
.ant-tree-switcher-line-icon {
line-height:14px;
vertical-align: text-top;
} }

41
projects/Platform/Controllers/HomeController.cs
Unescape View File

@ -52,10 +52,10 @@ namespace Platform.Controllers
public IActionResult GetOrgan() public IActionResult GetOrgan()
{ {
var userOrganId = User.GetOrganId().Value;//当前用户机构Id var organId = User.GetOrganId().Value;//当前用户机构Id
var organ = this._organRepo.ReadOnlyTable() var organ = this._organRepo.ReadOnlyTable()
.Include(o => o.Buildings) .Include(o => o.Buildings)
.FirstOrDefault(o => o.Id == userOrganId); .FirstOrDefault(o => o.Id == organId);
organ.Buildings.ToTree(); organ.Buildings.ToTree();
var rootBuildingId = this._buildingRepo.ReadOnlyTable().Where(o => o.ParentId == null).Select(o => o.Id).FirstOrDefault(); var rootBuildingId = this._buildingRepo.ReadOnlyTable().Where(o => o.ParentId == null).Select(o => o.Id).FirstOrDefault();
organ.Buildings = organ.Buildings organ.Buildings = organ.Buildings
@ -63,28 +63,37 @@ namespace Platform.Controllers
.ToList(); .ToList();
var model = new { var model = new {
Organ= organ, Organ= organ,
MaxLight = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{userOrganId}]MaxLight").FirstOrDefault()?.Value, MaxLight = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}]MaxLight").FirstOrDefault()?.Value,
MinLight = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{userOrganId}]MinLight").FirstOrDefault()?.Value, MinLight = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}]MinLight").FirstOrDefault()?.Value,
MaxTemperature = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{userOrganId}]MaxTemperature").FirstOrDefault()?.Value, MaxTemperature = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}]MaxTemperature").FirstOrDefault()?.Value,
MinTemperature = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{userOrganId}]MinTemperature").FirstOrDefault()?.Value, MinTemperature = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}]MinTemperature").FirstOrDefault()?.Value,
MaxHumidity = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{userOrganId}]MaxHumidity").FirstOrDefault()?.Value, MaxHumidity = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}]MaxHumidity").FirstOrDefault()?.Value,
MinHumidity = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{userOrganId}]MinHumidity").FirstOrDefault()?.Value, MinHumidity = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}]MinHumidity").FirstOrDefault()?.Value,
DeviceOpenCount = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{userOrganId}]DeviceOpenCount").FirstOrDefault()?.Value, DeviceOpenCount = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}]DeviceOpenCount").FirstOrDefault()?.Value,
DeviceCloseCount = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{userOrganId}]DeviceCloseCount").FirstOrDefault()?.Value, DeviceCloseCount = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}]DeviceCloseCount").FirstOrDefault()?.Value,
}; };
return Json(model); return Json(model);
} }
public IActionResult GetBuilding(Guid id) public IActionResult GetBuilding(Guid id)
{ {
var model = new var organId = User.GetOrganId().Value;//当前用户机构Id
{ var building = this._buildingRepo.ReadOnlyTable()
Building = this._buildingRepo.ReadOnlyTable() .Include(o => o.Scenes)
.Include(o=>o.Scenes)
.Include(o => o.IoTGateways) .Include(o => o.IoTGateways)
.ThenInclude(o => o.Devices).ThenInclude(o => o.Data) .ThenInclude(o => o.Devices).ThenInclude(o => o.Data)
.ToList() .FirstOrDefault();
var model = new
{
Building = building,
MaxLight = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}][{id}]MaxLight").FirstOrDefault()?.Value,
MinLight = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}][{id}]MinLight").FirstOrDefault()?.Value,
MaxTemperature = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}][{id}]MaxTemperature").FirstOrDefault()?.Value,
MinTemperature = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}][{id}]MinTemperature").FirstOrDefault()?.Value,
MaxHumidity = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}][{id}]MaxHumidity").FirstOrDefault()?.Value,
MinHumidity = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}][{id}]MinHumidity").FirstOrDefault()?.Value,
DeviceOpenCount = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}][{id}]DeviceOpenCount").FirstOrDefault()?.Value,
DeviceCloseCount = this._statisticRepo.ReadOnlyTable().Where(o => o.Key == $"[{organId}][{id}]DeviceCloseCount").FirstOrDefault()?.Value,
}; };
return Json(model); return Json(model);
} }

23
projects/Platform/Data/PlatformDbContext.cs
Unescape View File

@ -113,16 +113,17 @@ namespace Platform.Data
public void Seed(DbContext db) public void Seed(DbContext db)
{ {
var order = 0;
var root = db.Set<IoTProductCategory>().Add(new IoTProductCategory var root = db.Set<IoTProductCategory>().Add(new IoTProductCategory
{ {
Name = "产品分类", Name = "产品分类",
Number = "root" Number = "root"
}).Entity; }).Entity;
db.Set<IoTProductCategory>().Add(new IoTProductCategory { ParentId = root.Id, Number = "00", Name = "网关", Image = "/images/gateway.svg" }); db.Set<IoTProductCategory>().Add(new IoTProductCategory {DisplayOrder=order++, ParentId = root.Id, Number = "00", Name = "网关", Image = "/images/gateway.svg" });
db.Set<IoTProductCategory>().Add(new IoTProductCategory { ParentId = root.Id, Number = "10", Name = "安防", Image = "/images/safe.svg" }); db.Set<IoTProductCategory>().Add(new IoTProductCategory {DisplayOrder=order++, ParentId = root.Id, Number = "10", Name = "安防", Image = "/images/safe.svg" });
db.Set<IoTProductCategory>().Add(new IoTProductCategory { ParentId = root.Id, Number = "20", Name = "电器", Image = "/images/socket.svg" }); db.Set<IoTProductCategory>().Add(new IoTProductCategory {DisplayOrder=order++, ParentId = root.Id, Number = "20", Name = "电器", Image = "/images/socket.svg" });
db.Set<IoTProductCategory>().Add(new IoTProductCategory { ParentId = root.Id, Number = "30", Name = "照明", Image = "/images/light.svg" }); db.Set<IoTProductCategory>().Add(new IoTProductCategory {DisplayOrder=order++, ParentId = root.Id, Number = "30", Name = "照明", Image = "/images/light.svg" });
db.Set<IoTProductCategory>().Add(new IoTProductCategory { ParentId = root.Id, Number = "40", Name = "监测", Image = "/images/monitor.svg" }); db.Set<IoTProductCategory>().Add(new IoTProductCategory {DisplayOrder=order++, ParentId = root.Id, Number = "40", Name = "监测", Image = "/images/monitor.svg" });
db.SaveChanges(); db.SaveChanges();
db.Set<IoTProductCategory>().FirstOrDefault(o => o.Number == "root").Update(); db.Set<IoTProductCategory>().FirstOrDefault(o => o.Number == "root").Update();
db.SaveChanges(); db.SaveChanges();
@ -157,7 +158,8 @@ namespace Platform.Data
{ {
Parent = categoryGroup, Parent = categoryGroup,
Name = name, Name = name,
Number = number Number = number,
DisplayOrder=order++
}; };
var scopeAttribute = type.GetCustomAttribute<ScopeAttribute>(); var scopeAttribute = type.GetCustomAttribute<ScopeAttribute>();
if (scopeAttribute != null) if (scopeAttribute != null)
@ -297,7 +299,7 @@ namespace Platform.Data
var organId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao").Id; var organId = db.Set<Organ>().FirstOrDefault(o => o.Number == "xuexiao").Id;
var buildingRoot = new Building var buildingRoot = new Building
{ {
Image= image, Image = image,
Name = "建筑", Name = "建筑",
Number = "root", Number = "root",
OrganId = organRoot.Id, OrganId = organRoot.Id,
@ -306,6 +308,7 @@ namespace Platform.Data
new Building new Building
{ {
Image= image, Image= image,
DisplayOrder=order++,
OrganId=organId, OrganId=organId,
Type= BuildingType.Building, Type= BuildingType.Building,
Name="默认建筑", Name="默认建筑",
@ -313,6 +316,7 @@ namespace Platform.Data
Children = new List<Building> { Children = new List<Building> {
new Building { new Building {
Image= image, Image= image,
DisplayOrder=order++,
OrganId=organId, OrganId=organId,
Type= BuildingType.Layer, Type= BuildingType.Layer,
Name="1楼", Name="1楼",
@ -321,6 +325,7 @@ namespace Platform.Data
{ {
new Building{ new Building{
Image= image, Image= image,
DisplayOrder=order++,
OrganId=organId, OrganId=organId,
Type= BuildingType.Room, Type= BuildingType.Room,
Name="101室", Name="101室",
@ -328,6 +333,7 @@ namespace Platform.Data
}, },
new Building{ new Building{
Image= image, Image= image,
DisplayOrder=order++,
OrganId=organId, OrganId=organId,
Type= BuildingType.Room, Type= BuildingType.Room,
Name="102室", Name="102室",
@ -337,6 +343,7 @@ namespace Platform.Data
}, },
new Building { new Building {
Image= image, Image= image,
DisplayOrder=order++,
OrganId=organId, OrganId=organId,
Type= BuildingType.Layer, Type= BuildingType.Layer,
Name="2楼", Name="2楼",
@ -345,6 +352,7 @@ namespace Platform.Data
{ {
new Building{ new Building{
Image= image, Image= image,
DisplayOrder=order++,
OrganId=organId, OrganId=organId,
Type= BuildingType.Room, Type= BuildingType.Room,
Name="201室", Name="201室",
@ -352,6 +360,7 @@ namespace Platform.Data
}, },
new Building{ new Building{
Image= image, Image= image,
DisplayOrder=order++,
OrganId=organId, OrganId=organId,
Type= BuildingType.Room, Type= BuildingType.Room,
Name="202室", Name="202室",

53
projects/Platform/wwwroot/components/views/home/index.html
Unescape View File

@ -1,10 +1,11 @@
<template> <template>
<div class="row" style="padding-top:1rem;"> <div class="row" style="padding-top:1rem;" v-if="model.organ">
<div class="col-sm-2"> <div class="col-sm-2">
<div class="card" v-if="model.organ"> <div class="card">
<div class="card-header">建筑列表</div> <div class="card-header">建筑列表</div>
<div class="card-body"> <div class="card-body">
<a-tree :tree-data="tree" <a-tree :tree-data="tree"
:default-expanded-keys="expanded"
:replace-fields="{title:'name',key:'id'}" :replace-fields="{title:'name',key:'id'}"
block-node block-node
show-line show-line
@ -153,6 +154,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card">
</div>
</div> </div>
</div> </div>
</template> </template>
@ -163,7 +167,8 @@
url: config.baseUrl + '/Home/GetOrgan', url: config.baseUrl + '/Home/GetOrgan',
model: { model: {
organ: null, organ: null,
building:null building: null,
expanded:[],
}, },
events: ['OrganEntityInserted', events: ['OrganEntityInserted',
'OrganEntityUpdated', 'OrganEntityUpdated',
@ -194,34 +199,56 @@
}); });
}, },
onSelect(selectedKeys, info) { onSelect(selectedKeys, info) {
var url = config.baseUrl + '/Home/GetBuilding/' + selectedKeys[0]; var parent = this;
axios.get(url).then(function (response) { var key = selectedKeys[0];
parent.model.building = response.data; if (key === this.model.organ.organ.id) {
}); this.model.building = null;
}
else {
var url = config.baseUrl + '/Home/GetBuilding/' + key;
axios.get(url).then(function (response) {
parent.model.building = response.data;
});
}
}, },
findBuilding: function (buildings, id) { findBuildings: function (buildings,id) {
for (var i in buildings) { for (var i in buildings) {
var item = buildings[i]; var item = buildings[i];
if (item.id == id) { if (item.id == id) {
return item.children; return item.children;
} }
if (item.children.length > 0) { if (item.children.length > 0) {
this.findBuilding(item.children, id); return this.findBuildings(item.children, id);
} }
} }
} }
}, },
computed: { computed: {
tree: function () { tree: function () {
return this.model.organ.organ.buildings; var result = [];
if (this.model.organ != null) {
result.push({
id:this.model.organ.organ.id,
name:this.model.organ.organ.name,
children: this.model.organ.organ.buildings
});
}
return result;
},
expanded : function () {
var result = [];
if (this.model.organ != null) {
result.push(this.model.organ.organ.id);
}
return result;
}, },
buildings: function () { buildings: function () {
console.log(this.model.buildingId); //console.log(this.model.buildingId);
if (!this.model.buildingId) { if (!this.model.building) {
return this.model.organ.organ.buildings; return this.model.organ.organ.buildings;
} }
else { else {
return this.findBuilding(this.model.organ.organ.buildings, this.model.buildingId); return this.findBuildings(this.model.organ.organ.buildings,this.model.building.building.id);
} }
} }
} }

Write Preview
Loading…
Cancel
Save