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

1.0.0.8006d2

Browse Source 
Former-commit-id: 3d21a13fdf4fb4d07947d1eada77cef5694b2545
Former-commit-id: cbd8963105d850a2648692c28a216589fba02abc
TSXN
wanggang 5 years ago
parent 6684ac1bee
commit b2d464c54b
18 changed files with 82 additions and 92 deletions
Show Stats Download Patch File Download Diff File

6
projects/Infrastructure/Areas/Admin/Controllers/SettingController.cs
Unescape View File

@ -16,20 +16,18 @@ namespace Infrastructure.Areas.Admin.Controllers
[Area("Admin")]
public class SettingController : CrudController<Setting, EditSettingModel>
{
private readonly IRepository<Setting> _settingRepo;
private readonly ISettingService _settingService;
public SettingController(IRepository<Setting> settingRepo, ISettingService settingService) : base(settingRepo)
{
this._settingRepo = settingRepo;
this._settingService = settingService;
}
public override IQueryable<Setting> Query(PagedListModel<EditSettingModel> model, IQueryable<Setting> query)
{
return base.Query(model, query).WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
return query.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(model.Query.Type.HasValue, o => o.Type == model.Query.Type.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.Value.Contains(model.Query.Value))
.WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.Value.Contains(model.Query.Value, StringComparison.OrdinalIgnoreCase))
.OrderBy(o => o.Name);
}

6
projects/Infrastructure/Web/BaseStartup.cs
Unescape View File

@ -376,10 +376,8 @@ namespace Infrastructure.Web
{
File.Delete(file);
}
using (var fs = File.CreateText(file))
{
fs.Write(sql);
}
using var fs = File.CreateText(file);
fs.Write(sql);
}
using var scope = services.CreateScope();
scope.ServiceProvider.GetService<IDbConfig>().Seed(context);

5
projects/IoT.Shared/Areas/Admin/Controlls/AjaxController.cs
Unescape View File

@ -29,7 +29,6 @@ namespace IoT.Shared.Areas.Admin.Controlls
private readonly IRepository<Data> _dataRepo;
private readonly IRepository<Command> _commandRepo;
private readonly IRepository<Scene> _sceneRepo;
private readonly IRepository<SceneTimer> _sceneTimerRepo;
private readonly IRepository<SceneTigger> _sceneTiggerRepo;
public AjaxController(ILogger<AjaxController> logger,
@ -44,7 +43,6 @@ namespace IoT.Shared.Areas.Admin.Controlls
IRepository<Device> deviceRepo,
IRepository<Data> dataRepo,
IRepository<Api> apiRepo,
IRepository<SceneTimer> sceneTimerRepo,
IRepository<SceneTigger> sceneTiggerRepo)
{
this._logger = logger;
@ -59,7 +57,6 @@ namespace IoT.Shared.Areas.Admin.Controlls
this._deviceRepo = deviceRepo;
this._dataRepo = dataRepo;
this._apiRepo = apiRepo;
this._sceneTimerRepo = sceneTimerRepo;
this._sceneTiggerRepo = sceneTiggerRepo;
}
@ -323,7 +320,7 @@ namespace IoT.Shared.Areas.Admin.Controlls
}
catch (Exception ex)
{
ex.PrintStack();
this._logger.LogError(ex.ToString());
return new JsonResult(ex.Message);
}
}

9
projects/IoT.Shared/Areas/Admin/Controlls/ApiController.cs
Unescape View File

@ -7,6 +7,7 @@ using Infrastructure.Web.Mvc;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System;
using System.Linq;
namespace IoT.Shared.Areas.Admin.Controlls
@ -32,10 +33,10 @@ namespace IoT.Shared.Areas.Admin.Controlls
ViewData.SelectList(o => model.Query.ProductId, () => this._ajax.GetProductSelectList(model.Query.ProductId));
return query
.WhereIf(model.Query.ProductId.HasValue, o => o.ProductId == model.Query.ProductId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path))
.WhereIf(!string.IsNullOrEmpty(model.Query.Command), o => o.Command.Contains(model.Query.Command))
.WhereIf(!string.IsNullOrEmpty(model.Query.Method), o => o.Method.Contains(model.Query.Method));
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Command), o => o.Command.Contains(model.Query.Command, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Method), o => o.Method.Contains(model.Query.Method, StringComparison.OrdinalIgnoreCase));
}
public override void ToDisplayModel(Api entity, EditApiModel model)

6
projects/IoT.Shared/Areas/Admin/Controlls/CommandController.cs
Unescape View File

@ -46,8 +46,8 @@ namespace IoT.Shared.Areas.Admin.Controlls
.WhereIf(model.Query.NodeId.HasValue, o => o.Device.NodeId == model.Query.NodeId.Value)
.WhereIf(model.Query.DeviceId.HasValue, o => o.DeviceId == model.Query.DeviceId.Value)
.WhereIf(model.Query.ApiId.HasValue, o => o.ApiId == model.Query.ApiId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.QueryString), o => o.QueryString.Contains(model.Query.QueryString))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.QueryString), o => o.QueryString.Contains(model.Query.QueryString, StringComparison.OrdinalIgnoreCase))
.WhereIf(model.Query.Disabled.HasValue, o => o.Disabled == model.Query.Disabled.Value)
.WhereIf(model.Query.Delay.HasValue, o => o.Delay == model.Query.Delay.Value);
}
@ -128,7 +128,7 @@ namespace IoT.Shared.Areas.Admin.Controlls
}
if (device.Name == "红外转发器")
{
if (!api.Path.Contains("add") && !api.Path.Contains("get"))
if (!api.Path.Contains("add", StringComparison.OrdinalIgnoreCase) && !api.Path.Contains("get", StringComparison.OrdinalIgnoreCase))
{
foreach (var item in parameters)
{

62
projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs
Unescape View File

@ -41,12 +41,12 @@ namespace IoT.Shared.Areas.Admin.Controlls
ViewData.SelectList(o => model.Query.DeviceId, () => this._ajax.GetDeviceSelectList(model.Query.NodeId.Value, model.Query.DeviceId), model.Query.NodeId.HasValue);
return query.WhereIf(model.Query.NodeId.HasValue, o => o.Device.NodeId == model.Query.NodeId.Value)
.WhereIf(model.Query.DeviceId.HasValue, o => o.DeviceId == model.Query.DeviceId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Key), o => o.Key.Contains(model.Query.Key))
.WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.Value.Contains(model.Query.Value))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Key), o => o.Key.Contains(model.Query.Key, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.Value.Contains(model.Query.Value, StringComparison.OrdinalIgnoreCase))
.WhereIf(model.Query.Type.HasValue, o => o.Type == model.Query.Type.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Unit), o => o.Unit.Contains(model.Query.Unit))
.WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description))
.WhereIf(!string.IsNullOrEmpty(model.Query.Unit), o => o.Unit.Contains(model.Query.Unit, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description, StringComparison.OrdinalIgnoreCase))
.WhereIf(model.Query.Timestamp.HasValue, o => o.Timestamp == model.Query.Timestamp.Value)
.WhereIf(model.Query.Hidden.HasValue, o => o.Hidden == model.Query.Hidden.Value);
}
@ -85,37 +85,35 @@ namespace IoT.Shared.Areas.Admin.Controlls
var pwd = this._configuration["influxdb:pwd"];
var dbName = "iot";
var measurementName = "data";
using (var client = new InfluxClient(new Uri(url), usr, pwd))
using var client = new InfluxClient(new Uri(url), usr, pwd);
var parameters = new
{
var parameters = new
{
start = model.Start,
end = model.End.AddDays(1)
};
var query = $"from {measurementName} where time>=$start and time<$end and DeviceNumber = '{data.Device.Number}'";
start = model.Start,
end = model.End.AddDays(1)
};
var query = $"from {measurementName} where time>=$start and time<$end and DeviceNumber = '{data.Device.Number}'";
var dataQuery = $"select {data.Key} {query} limit {model.PageSize} offset {(model.PageIndex - 1) * model.PageSize}";
var result = client.ReadAsync<DynamicInfluxRow>(dbName, dataQuery, parameters: parameters).Result;
var rows = result.Results.FirstOrDefault()?
.Series.FirstOrDefault()?
.Rows;
model.List.AddRange(rows.Select(o => new DisplayDataHistoryModel
{
DeviceName = data.Device.DisplayName,
DeviceNumber = data.Device.Number,
Name = data.Name,
Unit = data.Unit,
Value = o.GetField(data.Key).ToString(),
Date = o.Timestamp
}));
var dataQuery = $"select {data.Key} {query} limit {model.PageSize} offset {(model.PageIndex - 1) * model.PageSize}";
var result = client.ReadAsync<DynamicInfluxRow>(dbName, dataQuery, parameters: parameters).Result;
var rows = result.Results.FirstOrDefault()?
.Series.FirstOrDefault()?
.Rows;
model.List.AddRange(rows.Select(o => new DisplayDataHistoryModel
{
DeviceName = data.Device.DisplayName,
DeviceNumber = data.Device.Number,
Name = data.Name,
Unit = data.Unit,
Value = o.GetField(data.Key).ToString(),
Date = o.Timestamp
}));
var countQuery = $"select count({data.Key}) {query}";
var countResult = client.ReadAsync<DynamicInfluxRow>(dbName, countQuery, parameters: parameters).Result;
model.TotalCount = Convert.ToInt32(countResult.Results.FirstOrDefault().Series.FirstOrDefault().Rows.FirstOrDefault().GetField("count"));
var countQuery = $"select count({data.Key}) {query}";
var countResult = client.ReadAsync<DynamicInfluxRow>(dbName, countQuery, parameters: parameters).Result;
model.TotalCount = Convert.ToInt32(countResult.Results.FirstOrDefault().Series.FirstOrDefault().Rows.FirstOrDefault().GetField("count"));
ViewBag.HtmlTitle = data.Name;
return View(model);
}
ViewBag.HtmlTitle = data.Name;
return View(model);
}
}
}

20
projects/IoT.Shared/Areas/Admin/Controlls/DeviceController.cs
Unescape View File

@ -36,16 +36,16 @@ namespace IoT.Shared.Areas.Admin.Controlls
return query
.WhereIf(model.Query.NodeId.HasValue, o => o.NodeId == model.Query.NodeId.Value)
.WhereIf(model.Query.ProductId.HasValue, o => o.ProductId == model.Query.ProductId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.DisplayName), o => o.DisplayName.Contains(model.Query.DisplayName))
.WhereIf(!string.IsNullOrEmpty(model.Query.Gateway), o => o.Gateway.Contains(model.Query.Gateway))
.WhereIf(!string.IsNullOrEmpty(model.Query.Tag), o => o.Tag.Contains(model.Query.Tag))
.WhereIf(!string.IsNullOrEmpty(model.Query.Ip), o => o.Ip.Contains(model.Query.Ip))
.WhereIf(!string.IsNullOrEmpty(model.Query.UserName), o => o.UserName.Contains(model.Query.UserName))
.WhereIf(!string.IsNullOrEmpty(model.Query.Password), o => o.Password.Contains(model.Query.Password))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number))
.WhereIf(!string.IsNullOrEmpty(model.Query.Icon), o => o.Icon.Contains(model.Query.Icon))
.WhereIf(!string.IsNullOrEmpty(model.Query.ConnectId), o => o.ConnectId.Contains(model.Query.ConnectId))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.DisplayName), o => o.DisplayName.Contains(model.Query.DisplayName, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Gateway), o => o.Gateway.Contains(model.Query.Gateway, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Tag), o => o.Tag.Contains(model.Query.Tag, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Ip), o => o.Ip.Contains(model.Query.Ip, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.UserName), o => o.UserName.Contains(model.Query.UserName, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Password), o => o.Password.Contains(model.Query.Password, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Icon), o => o.Icon.Contains(model.Query.Icon, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.ConnectId), o => o.ConnectId.Contains(model.Query.ConnectId, StringComparison.OrdinalIgnoreCase))
.WhereIf(model.Query.IsOnline.HasValue, o => o.IsOnline == model.Query.IsOnline.Value)
.WhereIf(model.Query.Disabled.HasValue, o => o.Disabled == model.Query.Disabled.Value);
}

14
projects/IoT.Shared/Areas/Admin/Controlls/NodeController.cs
Unescape View File

@ -24,13 +24,13 @@ namespace IoT.Shared.Areas.Admin.Controlls
public override IQueryable<Node> Query(PagedListModel<EditNodeModel> model, IQueryable<Node> query)
{
return base.Query(model, query)
.WhereIf(!string.IsNullOrEmpty(model.Query.OrganName), o => o.OrganName.Contains(model.Query.OrganName))
.WhereIf(!string.IsNullOrEmpty(model.Query.OrganNumber), o => o.OrganNumber.Contains(model.Query.OrganNumber))
.WhereIf(!string.IsNullOrEmpty(model.Query.CategoryName), o => o.CategoryName.Contains(model.Query.CategoryName))
.WhereIf(!string.IsNullOrEmpty(model.Query.CategoryNumber), o => o.CategoryNumber.Contains(model.Query.CategoryNumber))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number))
.WhereIf(!string.IsNullOrEmpty(model.Query.Version), o => o.Version.Contains(model.Query.Version))
.WhereIf(!string.IsNullOrEmpty(model.Query.OrganName), o => o.OrganName.Contains(model.Query.OrganName, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.OrganNumber), o => o.OrganNumber.Contains(model.Query.OrganNumber, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.CategoryName), o => o.CategoryName.Contains(model.Query.CategoryName, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.CategoryNumber), o => o.CategoryNumber.Contains(model.Query.CategoryNumber, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Version), o => o.Version.Contains(model.Query.Version, StringComparison.OrdinalIgnoreCase))
.WhereIf(model.Query.IsOnline.HasValue, o => o.IsOnline == model.Query.IsOnline.Value)
.WhereIf(model.Query.Hidden.HasValue, o => o.Hidden == model.Query.Hidden.Value);
}

7
projects/IoT.Shared/Areas/Admin/Controlls/ParameterController.cs
Unescape View File

@ -7,6 +7,7 @@ using Infrastructure.Web.Mvc;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System;
using System.Linq;
namespace IoT.Shared.Areas.Admin.Controlls
@ -33,9 +34,9 @@ namespace IoT.Shared.Areas.Admin.Controlls
.WhereIf(model.Query.Required.HasValue, o => o.Required == model.Query.Required.Value)
.WhereIf(model.Query.ProductId.HasValue, o => o.Api.ProductId == model.Query.ProductId.Value)
.WhereIf(model.Query.ApiId.HasValue, o => o.ApiId == model.Query.ApiId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Type), o => o.Type.Contains(model.Query.Type))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description))
.WhereIf(!string.IsNullOrEmpty(model.Query.Type), o => o.Type.Contains(model.Query.Type, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Description), o => o.Description.Contains(model.Query.Description, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Maxinum), o => o.Maxinum == model.Query.Maxinum)
.WhereIf(!string.IsNullOrEmpty(model.Query.Minimum), o => o.Minimum == model.Query.Maxinum);
}

9
projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs
Unescape View File

@ -7,6 +7,7 @@ using Infrastructure.Web.Mvc;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System;
using System.Linq;
namespace IoT.Shared.Areas.Admin.Controlls
@ -31,10 +32,10 @@ namespace IoT.Shared.Areas.Admin.Controlls
{
return base.Query(model, query)
.WhereIf(model.Query.CategoryId.HasValue, o => o.CategoryId == model.Query.CategoryId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Name.Contains(model.Query.Number))
.WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Name.Contains(model.Query.Path))
.WhereIf(!string.IsNullOrEmpty(model.Query.ApiJson), o => o.Name.Contains(model.Query.ApiJson));
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Name.Contains(model.Query.Number, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Name.Contains(model.Query.Path, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.ApiJson), o => o.Name.Contains(model.Query.ApiJson, StringComparison.OrdinalIgnoreCase));
}
public override void ToDisplayModel(Product entity, EditProductModel model)

2
projects/IoT.Shared/Areas/Admin/Controlls/SceneController.cs
Unescape View File

@ -34,7 +34,7 @@ namespace IoT.Shared.Areas.Admin.Controlls
ViewData.SelectList(o => model.Query.NodeId, () => this._ajax.GetNodeSelectList(model.Query.NodeId));
return query.Where(o => o.NodeId != null)
.WhereIf(model.Query.NodeId.HasValue, o => o.NodeId == model.Query.NodeId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(model.Query.Hidden.HasValue, o => o.Hidden == model.Query.Hidden.Value)
.OrderBy(o => o.DisplayOrder);
}

8
projects/IoT.Shared/Areas/Admin/Controlls/SceneTiggerController.cs
Unescape View File

@ -18,9 +18,7 @@ namespace IoT.Shared.Areas.Admin.Controlls
{
private readonly IRepository<Node> _nodeRepo;
private readonly IRepository<Device> _deviceRepo;
public IRepository<Data> _dataRepo { get; }
private readonly IRepository<Data> _dataRepo;
private readonly AjaxController _ajax;
public SceneTiggerController(IRepository<Node> nodeRepo, IRepository<SceneTigger> repo, IRepository<Device> deviceRepo, IRepository<Data> dataRepo, AjaxController ajax, IServiceProvider sp) : base(repo, sp)
@ -43,8 +41,8 @@ namespace IoT.Shared.Areas.Admin.Controlls
.WhereIf(model.Query.SceneId.HasValue, o => o.SceneId == model.Query.SceneId)
.WhereIf(model.Query.DeviceId.HasValue, o => o.Data.DeviceId == model.Query.DeviceId.Value)
.WhereIf(model.Query.DataId.HasValue, o => o.DataId == model.Query.DataId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Condition), o => o.Condition.Contains(model.Query.Condition))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Condition), o => o.Condition.Contains(model.Query.Condition, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(model.Query.Disabled.HasValue, o => o.Disabled == model.Query.Disabled.Value)
.OrderBy(o => o.SceneId);
}

2
projects/IoT.Shared/Areas/Admin/Controlls/SceneTimerController.cs
Unescape View File

@ -34,7 +34,7 @@ namespace IoT.Shared.Areas.Admin.Controlls
return query.Where(o => o.Scene.NodeId != null)
.WhereIf(model.Query.NodeId.HasValue, o => o.Scene.NodeId == model.Query.NodeId.Value)
.WhereIf(model.Query.SceneId.HasValue, o => o.SceneId == model.Query.SceneId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(model.Query.Disabled.HasValue, o => o.Disabled == model.Query.Disabled.Value);
}

4
projects/IoT.Shared/Areas/Admin/Controlls/Users/PermissionController.cs
Unescape View File

@ -40,8 +40,8 @@ namespace IoT.Shared.Areas.Admin.Controllers
{
return query
.WhereIf(model.Query.CategoryId.HasValue, o => o.CategoryId == model.Query.CategoryId.Value)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number, StringComparison.OrdinalIgnoreCase))
.OrderBy(o => o.CategoryId).ThenBy(o => o.Name);
}

2
projects/IoT.Shared/Areas/Admin/Controlls/Users/RoleController.cs
Unescape View File

@ -33,7 +33,7 @@ namespace IoT.Shared.Areas.Admin.Controllers
public override IQueryable<Role> Query(PagedListModel<EditRoleModel> model, IQueryable<Role> query)
{
return base.Query(model, query)
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name))
.WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
.OrderBy(o => o.Name);
}

3
projects/IoT.Shared/Areas/Admin/Controlls/Users/UserController.cs
Unescape View File

@ -7,6 +7,7 @@ using Infrastructure.Web.Mvc;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System;
using System.Linq;
namespace IoT.Shared.Areas.Admin.Controllers
@ -31,7 +32,7 @@ namespace IoT.Shared.Areas.Admin.Controllers
public override IQueryable<User> Query(PagedListModel<EditUserModel> model, IQueryable<User> query)
{
return base.Query(model, query)
.WhereIf(!string.IsNullOrEmpty(model.Query.UserName), o => o.UserName.Contains(model.Query.UserName))
.WhereIf(!string.IsNullOrEmpty(model.Query.UserName), o => o.UserName.Contains(model.Query.UserName, StringComparison.OrdinalIgnoreCase))
.OrderBy(o => o.UserName);
}

7
projects/IoTCenter/Services/IoTCenterEventHandler.cs
Unescape View File

@ -61,7 +61,6 @@ namespace IoTCenter.Services
private readonly IRepository<NodeCategoryNode> _nodeCategoryNodeRepo;
private readonly IRepository<Organ> _organRepo;
private readonly IRepository<OrganNode> _organNodeRepo;
private readonly IRepository<Scene> _sceneRepo;
private readonly IRepository<Device> _deviceRepo;
private readonly IRepository<OrganSceneTigger> _sceneTiggerRepo;
private readonly ISceneTiggerService _sceneTiggerService;
@ -76,7 +75,6 @@ namespace IoTCenter.Services
IRepository<NodeCategoryNode> nodeCategoryNodeRepo,
IRepository<Organ> organRepo,
IRepository<OrganNode> organNodeRepo,
IRepository<Scene> sceneRepo,
IRepository<Device> deviceRepo,
IRepository<OrganSceneTigger> sceneTiggerRepo,
ISceneTiggerService sceneTiggerService,
@ -91,7 +89,6 @@ namespace IoTCenter.Services
this._nodeCategoryNodeRepo = nodeCategoryNodeRepo;
this._organRepo = organRepo;
this._organNodeRepo = organNodeRepo;
this._sceneRepo = sceneRepo;
this._deviceRepo = deviceRepo;
this._sceneTiggerRepo = sceneTiggerRepo;
this._sceneTiggerService = sceneTiggerService;
@ -181,13 +178,13 @@ namespace IoTCenter.Services
public void Handle(EntityInsertedEvent<Organ> message)
{
this.Notify(message);
this.UpdateOrganNode(message.Data);
//this.UpdateOrganNode(message.Data);
}
public void Handle(EntityUpdatedEvent<Organ> message)
{
this.Notify(message);
this.UpdateOrganNode(message.Data);
//this.UpdateOrganNode(message.Data);
}
public void Handle(EntityDeletedEvent<Organ> message)

2
projects/Version.cs
Unescape View File

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0.8006d1")]
[assembly: AssemblyInformationalVersion("1.0.0.8006d2")]
Write Preview
Loading…
Cancel
Save