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

update

Browse Source 
Former-commit-id: e676968c74c42a033adbcebfb33aaf54f9dca660
Former-commit-id: dcb6f89da398d0da463f8df8e4f023f10b763bfb
1.0
wanggang 5 years ago
parent 416039c437
commit c001f33606
13 changed files with 88 additions and 26 deletions
Show Stats Download Patch File Download Diff File

10
projects/IoT.Shared/Areas/IoTCenter/Controlls/AjaxController.cs → projects/IoT.Shared/Areas/IoTCenter/Controlls/AjaxBaseController.cs
Unescape View File

@ -16,9 +16,10 @@ using System.Linq;
namespace IoT.Shared.Areas.IoTCenter.Controlls namespace IoT.Shared.Areas.IoTCenter.Controlls
{ {
[Area("IoTCenter")] [Area("IoTCenter")]
public class AjaxController public class AjaxBaseController
{ {
protected readonly ILogger<AjaxController> _logger; protected readonly IServiceProvider _services;
protected readonly ILogger _logger;
protected readonly IHttpContextAccessor _httpContext; protected readonly IHttpContextAccessor _httpContext;
protected readonly IRepository<IoTProductCategory> _categoryRepo; protected readonly IRepository<IoTProductCategory> _categoryRepo;
protected readonly IRepository<Organ> _organRepo; protected readonly IRepository<Organ> _organRepo;
@ -33,7 +34,8 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
protected readonly IRepository<IoTScene> _sceneRepo; protected readonly IRepository<IoTScene> _sceneRepo;
protected readonly IRepository<IoTSceneTigger> _sceneTiggerRepo; protected readonly IRepository<IoTSceneTigger> _sceneTiggerRepo;
public AjaxController(ILogger<AjaxController> logger, public AjaxBaseController(IServiceProvider services,
ILogger logger,
IHttpContextAccessor httpContxt, IHttpContextAccessor httpContxt,
IRepository<IoTProductCategory> categoryRepo, IRepository<IoTProductCategory> categoryRepo,
IRepository<IoTProduct> productRepo, IRepository<IoTProduct> productRepo,
@ -48,6 +50,7 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
IRepository<IoTApi> apiRepo, IRepository<IoTApi> apiRepo,
IRepository<IoTSceneTigger> sceneTiggerRepo) IRepository<IoTSceneTigger> sceneTiggerRepo)
{ {
this._services = services;
this._logger = logger; this._logger = logger;
this._httpContext = httpContxt; this._httpContext = httpContxt;
this._categoryRepo = categoryRepo; this._categoryRepo = categoryRepo;
@ -96,6 +99,7 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
.OrderBy(o => o.Parent) .OrderBy(o => o.Parent)
.ThenBy(o => o.DisplayOrder) .ThenBy(o => o.DisplayOrder)
.Select(o => new { o.Id, Name = $"{o.Name}({o.Number})" }) .Select(o => new { o.Id, Name = $"{o.Name}({o.Number})" })
.Take(20)
.ToList(); .ToList();
return new JsonResult(new SelectList(list, "Id", "Name", selected)); return new JsonResult(new SelectList(list, "Id", "Name", selected));
} }

4
projects/IoT.Shared/Areas/IoTCenter/Controlls/ApiController.cs
Unescape View File

@ -11,9 +11,9 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
{ {
public class ApiController : SharedController<IoTApi, EditApiModel> public class ApiController : SharedController<IoTApi, EditApiModel>
{ {
private readonly AjaxController _ajax; private readonly AjaxBaseController _ajax;
public ApiController(IRepository<IoTApi> repo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) public ApiController(IRepository<IoTApi> repo, AjaxBaseController ajax, IServiceProvider sp) : base(repo, sp)
{ {
this._ajax = ajax; this._ajax = ajax;
} }

4
projects/IoT.Shared/Areas/IoTCenter/Controlls/CommandController.cs
Unescape View File

@ -20,9 +20,9 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
private readonly IRepository<IoTGateway> _nodeRepo; private readonly IRepository<IoTGateway> _nodeRepo;
private readonly IRepository<IoTApi> _apiRepo; private readonly IRepository<IoTApi> _apiRepo;
private readonly IRepository<IoTDevice> _deviceRepo; private readonly IRepository<IoTDevice> _deviceRepo;
private readonly AjaxController _ajax; private readonly AjaxBaseController _ajax;
public CommandController(IRepository<IoTGateway> nodeRepo, IRepository<IoTCommand> repo, IRepository<IoTApi> apiRepo, IRepository<IoTDevice> deviceRepo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) public CommandController(IRepository<IoTGateway> nodeRepo, IRepository<IoTCommand> repo, IRepository<IoTApi> apiRepo, IRepository<IoTDevice> deviceRepo, AjaxBaseController ajax, IServiceProvider sp) : base(repo, sp)
{ {
this._nodeRepo = nodeRepo; this._nodeRepo = nodeRepo;
this._apiRepo = apiRepo; this._apiRepo = apiRepo;

4
projects/IoT.Shared/Areas/IoTCenter/Controlls/DataController.cs
Unescape View File

@ -17,9 +17,9 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
{ {
private readonly IConfiguration _configuration; private readonly IConfiguration _configuration;
private readonly IRepository<IoTGateway> _nodeRepo; private readonly IRepository<IoTGateway> _nodeRepo;
private readonly AjaxController _ajax; private readonly AjaxBaseController _ajax;
public DataController(IConfiguration configuration, IRepository<IoTGateway> nodeRepo, IRepository<IoTData> repo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) public DataController(IConfiguration configuration, IRepository<IoTGateway> nodeRepo, IRepository<IoTData> repo, AjaxBaseController ajax, IServiceProvider sp) : base(repo, sp)
{ {
this._configuration = configuration; this._configuration = configuration;
this._nodeRepo = nodeRepo; this._nodeRepo = nodeRepo;

4
projects/IoT.Shared/Areas/IoTCenter/Controlls/DeviceController.cs
Unescape View File

@ -12,9 +12,9 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
{ {
public class DeviceController : SharedController<IoTDevice, EditDeviceModel> public class DeviceController : SharedController<IoTDevice, EditDeviceModel>
{ {
private readonly AjaxController _ajax; private readonly AjaxBaseController _ajax;
public DeviceController(IRepository<IoTDevice> repo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) public DeviceController(IRepository<IoTDevice> repo, AjaxBaseController ajax, IServiceProvider sp) : base(repo, sp)
{ {
this._ajax = ajax; this._ajax = ajax;
} }

4
projects/IoT.Shared/Areas/IoTCenter/Controlls/ParameterController.cs
Unescape View File

@ -11,9 +11,9 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
{ {
public class ParameterController : SharedController<IoTParameter, EditParameterModel> public class ParameterController : SharedController<IoTParameter, EditParameterModel>
{ {
private readonly AjaxController _ajax; private readonly AjaxBaseController _ajax;
public ParameterController(IRepository<IoTParameter> repo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) public ParameterController(IRepository<IoTParameter> repo, AjaxBaseController ajax, IServiceProvider sp) : base(repo, sp)
{ {
this._ajax = ajax; this._ajax = ajax;
} }

4
projects/IoT.Shared/Areas/IoTCenter/Controlls/ProductController.cs
Unescape View File

@ -11,9 +11,9 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
{ {
public class ProductController : SharedController<IoTProduct, EditProductModel> public class ProductController : SharedController<IoTProduct, EditProductModel>
{ {
private readonly AjaxController _ajax; private readonly AjaxBaseController _ajax;
public ProductController(IRepository<IoTProduct> repo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) public ProductController(IRepository<IoTProduct> repo, AjaxBaseController ajax, IServiceProvider sp) : base(repo, sp)
{ {
this._ajax = ajax; this._ajax = ajax;
} }

4
projects/IoT.Shared/Areas/IoTCenter/Controlls/SceneCommandController.cs
Unescape View File

@ -12,9 +12,9 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
public class SceneCommandController : SharedController<IoTSceneIoTCommand, EditSceneCommandModel> public class SceneCommandController : SharedController<IoTSceneIoTCommand, EditSceneCommandModel>
{ {
private readonly IRepository<IoTGateway> _nodeRepo; private readonly IRepository<IoTGateway> _nodeRepo;
private readonly AjaxController _ajax; private readonly AjaxBaseController _ajax;
public SceneCommandController(IRepository<IoTGateway> nodeRepo, IRepository<IoTSceneIoTCommand> repo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) public SceneCommandController(IRepository<IoTGateway> nodeRepo, IRepository<IoTSceneIoTCommand> repo, AjaxBaseController ajax, IServiceProvider sp) : base(repo, sp)
{ {
this._nodeRepo = nodeRepo; this._nodeRepo = nodeRepo;
this._ajax = ajax; this._ajax = ajax;

4
projects/IoT.Shared/Areas/IoTCenter/Controlls/SceneController.cs
Unescape View File

@ -12,9 +12,9 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
public class SceneController : SharedController<IoTScene, EditSceneModel> public class SceneController : SharedController<IoTScene, EditSceneModel>
{ {
private readonly IRepository<IoTGateway> _nodeRepo; private readonly IRepository<IoTGateway> _nodeRepo;
private readonly AjaxController _ajax; private readonly AjaxBaseController _ajax;
public SceneController(IRepository<IoTScene> repo, IRepository<IoTGateway> nodeRepo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) public SceneController(IRepository<IoTScene> repo, IRepository<IoTGateway> nodeRepo, AjaxBaseController ajax, IServiceProvider sp) : base(repo, sp)
{ {
this._nodeRepo = nodeRepo; this._nodeRepo = nodeRepo;
this._ajax = ajax; this._ajax = ajax;

4
projects/IoT.Shared/Areas/IoTCenter/Controlls/SceneTiggerController.cs
Unescape View File

@ -14,9 +14,9 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
private readonly IRepository<IoTGateway> _nodeRepo; private readonly IRepository<IoTGateway> _nodeRepo;
private readonly IRepository<IoTDevice> _deviceRepo; private readonly IRepository<IoTDevice> _deviceRepo;
private readonly IRepository<IoTData> _dataRepo; private readonly IRepository<IoTData> _dataRepo;
private readonly AjaxController _ajax; private readonly AjaxBaseController _ajax;
public SceneTiggerController(IRepository<IoTGateway> nodeRepo, IRepository<IoTSceneTigger> repo, IRepository<IoTDevice> deviceRepo, IRepository<IoTData> dataRepo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) public SceneTiggerController(IRepository<IoTGateway> nodeRepo, IRepository<IoTSceneTigger> repo, IRepository<IoTDevice> deviceRepo, IRepository<IoTData> dataRepo, AjaxBaseController ajax, IServiceProvider sp) : base(repo, sp)
{ {
this._nodeRepo = nodeRepo; this._nodeRepo = nodeRepo;
this._deviceRepo = deviceRepo; this._deviceRepo = deviceRepo;

4
projects/IoT.Shared/Areas/IoTCenter/Controlls/SceneTimerController.cs
Unescape View File

@ -12,9 +12,9 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
public class SceneTimerController : SharedController<IoTSceneTimer, EditSceneTimerModel> public class SceneTimerController : SharedController<IoTSceneTimer, EditSceneTimerModel>
{ {
private readonly IRepository<IoTGateway> _nodeRepo; private readonly IRepository<IoTGateway> _nodeRepo;
private readonly AjaxController _ajax; private readonly AjaxBaseController _ajax;
public SceneTimerController(IRepository<IoTGateway> nodeRepo, IRepository<IoTSceneTimer> repo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) public SceneTimerController(IRepository<IoTGateway> nodeRepo, IRepository<IoTSceneTimer> repo, AjaxBaseController ajax, IServiceProvider sp) : base(repo, sp)
{ {
this._nodeRepo = nodeRepo; this._nodeRepo = nodeRepo;
this._ajax = ajax; this._ajax = ajax;

56
projects/IoTNode/Areas/IoTCenter/Controllers/AjaxController.cs
Unescape View File

@ -0,0 +1,56 @@
using Infrastructure.Data;
using IoT.Shared.Application.Domain.Entities;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using System;
namespace Platform.Areas.IoTCenter.Controllers
{
[Area("IoTCenter")]
public class AjaxController : IoT.Shared.Areas.IoTCenter.Controlls.AjaxBaseController
{
private readonly IRepository<Area> _areaRepo;
private readonly IRepository<Building> _buildingRepo;
private readonly IRepository<Role> _roleRepo;
public AjaxController(IServiceProvider services,
ILogger<AjaxController> logger,
IHttpContextAccessor httpContxt,
IRepository<IoTProductCategory> categoryRepo,
IRepository<IoTProduct> productRepo,
IRepository<Organ> organRepo,
IRepository<BuildingIoTGateway> buildingIoTGatewayRepo,
IRepository<OrganIoTScene> organSceneRepo,
IRepository<IoTGateway> nodeRepo,
IRepository<IoTScene> sceneRepo,
IRepository<IoTCommand> commandRepo,
IRepository<IoTDevice> deviceRepo,
IRepository<IoTData> dataRepo,
IRepository<IoTApi> apiRepo,
IRepository<IoTSceneTigger> sceneTiggerRepo,
IRepository<Area> areaRepo,
IRepository<Building> buildingRepo,
IRepository<Role> roleRepo)
: base(services,
logger,
httpContxt,
categoryRepo,
productRepo,
organRepo,
buildingIoTGatewayRepo,
organSceneRepo,
nodeRepo,
sceneRepo,
commandRepo,
deviceRepo,
dataRepo,
apiRepo,
sceneTiggerRepo)
{
this._areaRepo = areaRepo;
this._buildingRepo = buildingRepo;
this._roleRepo = roleRepo;
}
}
}

8
projects/Platform/Areas/IoTCenter/Controllers/AjaxController.cs
Unescape View File

@ -12,13 +12,14 @@ using System.Linq;
namespace Platform.Areas.IoTCenter.Controllers namespace Platform.Areas.IoTCenter.Controllers
{ {
[Area("IoTCenter")] [Area("IoTCenter")]
public class AjaxController : IoT.Shared.Areas.IoTCenter.Controlls.AjaxController public class AjaxController : IoT.Shared.Areas.IoTCenter.Controlls.AjaxBaseController
{ {
private readonly IRepository<Area> _areaRepo; private readonly IRepository<Area> _areaRepo;
private readonly IRepository<Building> _buildingRepo; private readonly IRepository<Building> _buildingRepo;
private readonly IRepository<Role> _roleRepo; private readonly IRepository<Role> _roleRepo;
public AjaxController(ILogger<AjaxController> logger, public AjaxController(IServiceProvider services,
ILogger<AjaxController> logger,
IHttpContextAccessor httpContxt, IHttpContextAccessor httpContxt,
IRepository<IoTProductCategory> categoryRepo, IRepository<IoTProductCategory> categoryRepo,
IRepository<IoTProduct> productRepo, IRepository<IoTProduct> productRepo,
@ -35,7 +36,8 @@ namespace Platform.Areas.IoTCenter.Controllers
IRepository<Area> areaRepo, IRepository<Area> areaRepo,
IRepository<Building> buildingRepo, IRepository<Building> buildingRepo,
IRepository<Role> roleRepo) IRepository<Role> roleRepo)
: base(logger, : base(services,
logger,
httpContxt, httpContxt,
categoryRepo, categoryRepo,
productRepo, productRepo,

Write Preview
Loading…
Cancel
Save