diff --git a/projects/Infrastructure/Views/Shared/DisplayTemplates/Object.cshtml b/projects/Infrastructure/Views/Shared/DisplayTemplates/Object.cshtml index bf6583ba..c25e3abd 100644 --- a/projects/Infrastructure/Views/Shared/DisplayTemplates/Object.cshtml +++ b/projects/Infrastructure/Views/Shared/DisplayTemplates/Object.cshtml @@ -1,11 +1,11 @@ -
+
-
+
@foreach (var prop in ViewData.ModelMetadata.Properties.Where(pm => pm.ShowForEdit && !pm.HideSurroundingHtml)) { var uihit = prop.DataTypeName ?? prop.TemplateHint; -
- @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = "col-sm-2 control-label" }) +
+ @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = "col-sm-2 col-form-label" })
@Html.Display(prop.PropertyName, prop.DataTypeName ?? prop.TemplateHint) @@ -14,22 +14,20 @@
}
-
-
+
+
@if (!DisableBackUrl) { var BackUrl = Url.Action("Index", null); - 返回 } @if (ViewData["HasEditPermission"] != null) { - 编辑 } diff --git a/projects/IoT.Shared/Application/Models/DisplayDataHistoryModel.cs b/projects/IoT.Shared/Application/Models/DisplayDataHistoryModel.cs new file mode 100644 index 00000000..0d8c5511 --- /dev/null +++ b/projects/IoT.Shared/Application/Models/DisplayDataHistoryModel.cs @@ -0,0 +1,27 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace Application.Models +{ + [Display(Name = "历史数据")] + public class DisplayDataHistoryModel + { + [Display(Name = "设备编号")] + public string DeviceNumber { get; set; } + + [Display(Name = "设备名称")] + public string DeviceName { get; set; } + + [Display(Name = "数据名称")] + public string Name { get; set; } + + [Display(Name = "数据值")] + public string Value { get; set; } + + [Display(Name = "单位")] + public string Unit { get; set; } + + [Display(Name = "日期")] + public DateTime? Date { get; set; } + } +} \ No newline at end of file diff --git a/projects/IoT.Shared/Application/Models/SearchDataHistoryModel.cs b/projects/IoT.Shared/Application/Models/SearchDataHistoryModel.cs new file mode 100644 index 00000000..009e7ce0 --- /dev/null +++ b/projects/IoT.Shared/Application/Models/SearchDataHistoryModel.cs @@ -0,0 +1,18 @@ +using Application.Domain.Entities; +using Infrastructure.Application; +using System; +using System.ComponentModel.DataAnnotations; + +namespace Application.Models +{ + public class SearchDataHistoryModel : PagedListModel + { + [Display(Name = "开始")] + [DataType(DataType.Date)] + public DateTime Start { get; set; } = DateTime.Now.Date.AddMonths(-1); + + [Display(Name = "结束")] + [DataType(DataType.Date)] + public DateTime End { get; set; } = DateTime.Now.Date; + } +} \ No newline at end of file diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs index 57f6b934..f25bc4df 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/DataController.cs @@ -5,8 +5,11 @@ using Infrastructure.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; using System; using System.Linq; +using Vibrant.InfluxDB.Client; +using Vibrant.InfluxDB.Client.Rows; namespace IoT.Shared.Areas.Admin.Controlls { @@ -14,11 +17,13 @@ namespace IoT.Shared.Areas.Admin.Controlls [Area(nameof(Admin))] public class DataController : SharedController { + private readonly IConfiguration _configuration; private readonly IRepository _nodeRepo; private readonly AjaxController _ajax; - public DataController(IRepository nodeRepo, IRepository repo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) + public DataController(IConfiguration configuration, IRepository nodeRepo, IRepository repo, AjaxController ajax, IServiceProvider sp) : base(repo, sp) { + this._configuration = configuration; this._nodeRepo = nodeRepo; this._ajax = ajax; } @@ -58,5 +63,49 @@ namespace IoT.Shared.Areas.Admin.Controlls { return this._nodeRepo.ReadOnlyTable().Where(o => o.Id == model.NodeId).Select(o => o.Number).FirstOrDefault(); } + + public IActionResult DataHistory(Guid id, SearchDataHistoryModel model) + { + var data = this._repo.ReadOnlyTable() + .Include(o => o.Device).ThenInclude(o => o.Node) + .Include(o => o.Device).ThenInclude(o => o.Product) + .FirstOrDefault(o => o.Id == id); + var url = this._configuration["influxdb:url"]; + var usr = this._configuration["influxdb:usr"]; + var pwd = this._configuration["influxdb:pwd"]; + var dbName = "iot"; + var measurementName = "data"; + using (var client = new InfluxClient(new Uri(url), usr, pwd)) + { + 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}'"; + + var dataQuery = $"select {data.Key} {query} limit {model.PageSize} offset {(model.PageIndex - 1) * model.PageSize}"; + var result = client.ReadAsync(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(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); + } + } } } \ No newline at end of file diff --git a/projects/IoTCenter/Areas/Admin/Views/Data/DataHistory.cshtml b/projects/IoTCenter/Areas/Admin/Views/Data/DataHistory.cshtml new file mode 100644 index 00000000..a78dce80 --- /dev/null +++ b/projects/IoTCenter/Areas/Admin/Views/Data/DataHistory.cshtml @@ -0,0 +1,40 @@ +@model SearchDataHistoryModel +@{ + var start = (Model.PageIndex - 1) * Model.PageSize; +} +@Html.EditorForModel("Search") +
+
+ + + + + + + + + + + + @foreach (var item in Model.List) + { + + + + + + + + + + } + +
行号设备编号设备名称数据名称数据值单位时间
@(++start)@item.DeviceNumber@item.DeviceName@item.Name@item.Value@item.Unit@item.Date
+
+ @if (Model.PageCount() > 1) + { +
+ @(await Html.PartialAsync("_Paged")) +
+ } +
\ No newline at end of file diff --git a/projects/IoTCenter/Areas/Admin/Views/Data/Details.cshtml b/projects/IoTCenter/Areas/Admin/Views/Data/Details.cshtml new file mode 100644 index 00000000..59dc58aa --- /dev/null +++ b/projects/IoTCenter/Areas/Admin/Views/Data/Details.cshtml @@ -0,0 +1,12 @@ +@model EditDataModel +@{ + HtmlTitle = "查看" + ViewContext.ViewData.ModelMetadata.ModelType.GetDisplayName(); +} +@if (Model.Type == DeviceDataType.Int || Model.Type == DeviceDataType.Float) +{ +
+ 查看历史数据 +
+} +
+@Html.DisplayForModel() \ No newline at end of file diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs index 122e6b1c..17ad20be 100644 --- a/projects/IoTCenter/Controllers/AppController.cs +++ b/projects/IoTCenter/Controllers/AppController.cs @@ -133,6 +133,9 @@ namespace IoTCenter.Controllers var userName = User.Identity.IsAuthenticated ? User.Identity.Name : this._jwtHelper.GetPayload(token)["UserName"].ToString(); var model = this._deviceRepo.ReadOnlyTable() .Include(o => o.Data) + .Include(o => o.Product) + .ThenInclude(o => o.Apis) + .ThenInclude(o => o.Parameters) .Include(o => o.Commands) .FirstOrDefault(o => o.Number == number); return Json(model); @@ -178,6 +181,23 @@ namespace IoTCenter.Controllers } } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")] + public IActionResult ExecCommand(string token, string connectionId, Guid id) + { + try + { + var userName = User.Identity.IsAuthenticated ? User.Identity.Name : this._jwtHelper.GetPayload(token)["UserName"].ToString(); + var command = this._commandRepo.ReadOnlyTable().Include(o => o.Device).ThenInclude(o => o.Node).FirstOrDefault(o => o.Id == id); + this._hub.ServerToClient(Methods.ExecCommand, command.Id, command.Device.Node.Number, connectionId); + return Json(ApiResponse.AsyncSuccess()); + } + catch (Exception ex) + { + ex.PrintStack(); + return Json(ApiResponse.Error(ex)); + } + } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")] public IActionResult ExecScene(string token, string connectionId, Guid id) { @@ -308,22 +328,6 @@ namespace IoTCenter.Controllers /************************************************************/ - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")] - public IActionResult ExecCommand(string connectionId, Guid id) - { - try - { - var command = this._commandRepo.ReadOnlyTable().Include(o => o.Device).ThenInclude(o => o.Node).FirstOrDefault(o => o.Id == id); - this._hub.ServerToClient(Methods.ExecCommand, command.Id, command.Device.Node.Number, connectionId); - return Json(ApiResponse.AsyncSuccess()); - } - catch (Exception ex) - { - ex.PrintStack(); - return Json(ApiResponse.Error(ex)); - } - } - public IActionResult Data(Guid id, string time = "10m") { var device = this._deviceRepo.ReadOnlyTable().Include(o => o.Node).Include(o => o.Data).FirstOrDefault(o => o.Id == id); diff --git a/projects/IoTCenter/IoTCenter.csproj b/projects/IoTCenter/IoTCenter.csproj index cdfcff80..357e3d03 100644 --- a/projects/IoTCenter/IoTCenter.csproj +++ b/projects/IoTCenter/IoTCenter.csproj @@ -8,8 +8,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - diff --git a/projects/IoTCenter/Views/Home/Device.cshtml b/projects/IoTCenter/Views/Home/Device.cshtml index 91d72bed..6d06239e 100644 --- a/projects/IoTCenter/Views/Home/Device.cshtml +++ b/projects/IoTCenter/Views/Home/Device.cshtml @@ -1,7 +1,6 @@ @{ - HideBread = true; + HtmlTitle = "设备详情"; } -