From 5e36b680904d3fef81e0a4dcde2e9d1e08313fdf Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 17 Apr 2019 19:04:11 +0800 Subject: [PATCH] =?UTF-8?q?update=20beta.103=20=E4=BF=AE=E5=A4=8DIoTCenter?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E8=8A=82=E7=82=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B0=86APP?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=9A=84API=E4=BB=8EHome=E5=88=86=E7=A6=BB?= =?UTF-8?q?=E5=88=B0App?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/Demo/Demo/wwwroot/js/app.js | Bin 22552 -> 22548 bytes .../Extensions/HelperExtensions.cs | 2 +- projects/IoT/IoTNode/appsettings.json | 2 +- .../IoTServices/APService/appsettings.json | 2 +- .../LiChuangService/appsettings.json | 2 +- .../src/main/resources/application.properties | 2 +- .../IoTServices/ONVIFService/appsettings.json | 2 +- .../SerialPortService/appsettings.json | 2 +- .../IoTServices/WinService/appsettings.json | 2 +- .../IoTCenter/Controllers/AppController.cs | 51 ++++++++++++++++++ .../IoTCenter/Controllers/HomeController.cs | 24 ++++----- projects/IoTCenter/IoTCenter.csproj | 1 + projects/IoTCenter/appsettings.json | 2 +- projects/StudyCenter/appsettings.json | 2 +- projects/UserCenter/appsettings.json | 2 +- 15 files changed, 73 insertions(+), 25 deletions(-) create mode 100644 projects/IoTCenter/Controllers/AppController.cs diff --git a/projects/Demo/Demo/wwwroot/js/app.js b/projects/Demo/Demo/wwwroot/js/app.js index 9fb73cab75eecd73ffc7ea8adca0e8c360779205..0bbf6000cb1f53720aace6e00a4342a07368d3e2 100644 GIT binary patch delta 31 hcmbQSfpN+P#tmLltd0x?3>dpH47m)coBgG>tHC+kj-28E$Lk5( diff --git a/projects/Infrastructure/Extensions/HelperExtensions.cs b/projects/Infrastructure/Extensions/HelperExtensions.cs index 09ee1b8b..da6a0aef 100644 --- a/projects/Infrastructure/Extensions/HelperExtensions.cs +++ b/projects/Infrastructure/Extensions/HelperExtensions.cs @@ -48,7 +48,7 @@ namespace Infrastructure.Extensions } } } - var ip = ipList.Where(o => !o.ToString().StartsWith("10.") && o.ToString().StartsWith("172.") && o.ToString().StartsWith("192.")) + var ip = ipList.Where(o => !o.ToString().StartsWith("10.") && o.ToString().StartsWith("172.") && o.ToString().StartsWith("192.") && o.ToString().StartsWith("127.")) .FirstOrDefault() ?? ipList.FirstOrDefault(o => !o.ToString().StartsWith("192.168.")) ?? ipList.FirstOrDefault(o => !o.ToString().StartsWith("192.")) ?? ipList.FirstOrDefault(); diff --git a/projects/IoT/IoTNode/appsettings.json b/projects/IoT/IoTNode/appsettings.json index 7e57ec69..dc0d1b4f 100644 --- a/projects/IoT/IoTNode/appsettings.json +++ b/projects/IoT/IoTNode/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.102", + "version": "1.0.0-beta.103", "Logging": { "LogLevel": { "Default": "Warning" diff --git a/projects/IoT/IoTServices/APService/appsettings.json b/projects/IoT/IoTServices/APService/appsettings.json index 67307138..efc59ef9 100644 --- a/projects/IoT/IoTServices/APService/appsettings.json +++ b/projects/IoT/IoTServices/APService/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.102", + "version": "1.0.0-beta.103", "Logging": { "LogLevel": { "Default": "Warning" diff --git a/projects/IoT/IoTServices/LiChuangService/appsettings.json b/projects/IoT/IoTServices/LiChuangService/appsettings.json index 8192d3b2..522bb70d 100644 --- a/projects/IoT/IoTServices/LiChuangService/appsettings.json +++ b/projects/IoT/IoTServices/LiChuangService/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.102", + "version": "1.0.0-beta.103", "Logging": { "LogLevel": { "Default": "Information" diff --git a/projects/IoT/IoTServices/NJWLService/src/main/resources/application.properties b/projects/IoT/IoTServices/NJWLService/src/main/resources/application.properties index 75451480..548171f6 100644 --- a/projects/IoT/IoTServices/NJWLService/src/main/resources/application.properties +++ b/projects/IoT/IoTServices/NJWLService/src/main/resources/application.properties @@ -1,4 +1,4 @@ -version=1.0.0-beta.102 +version=1.0.0-beta.103 server.host=127.0.0.1 server.port=8003 spring.thymeleaf.cache=false diff --git a/projects/IoT/IoTServices/ONVIFService/appsettings.json b/projects/IoT/IoTServices/ONVIFService/appsettings.json index 59e91850..4c15ecbd 100644 --- a/projects/IoT/IoTServices/ONVIFService/appsettings.json +++ b/projects/IoT/IoTServices/ONVIFService/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.102", + "version": "1.0.0-beta.103", "Logging": { "LogLevel": { "Default": "Information" diff --git a/projects/IoT/IoTServices/SerialPortService/appsettings.json b/projects/IoT/IoTServices/SerialPortService/appsettings.json index 59e91850..4c15ecbd 100644 --- a/projects/IoT/IoTServices/SerialPortService/appsettings.json +++ b/projects/IoT/IoTServices/SerialPortService/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.102", + "version": "1.0.0-beta.103", "Logging": { "LogLevel": { "Default": "Information" diff --git a/projects/IoT/IoTServices/WinService/appsettings.json b/projects/IoT/IoTServices/WinService/appsettings.json index 67307138..efc59ef9 100644 --- a/projects/IoT/IoTServices/WinService/appsettings.json +++ b/projects/IoT/IoTServices/WinService/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.102", + "version": "1.0.0-beta.103", "Logging": { "LogLevel": { "Default": "Warning" diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs new file mode 100644 index 00000000..e590f607 --- /dev/null +++ b/projects/IoTCenter/Controllers/AppController.cs @@ -0,0 +1,51 @@ +using Application.Domain.Entities; +using Infrastructure.Data; +using Infrastructure.Jwt; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Newtonsoft.Json; +using System; +using System.Linq; + +namespace IoTCenter.Controllers +{ + public class AppController : Controller + { + private readonly IJwtHelper _jwtHelper; + private readonly IRepository _nodeRepo; + private readonly IRepository _deviceRepo; + + public AppController(IJwtHelper jwtHelper, IRepository nodeRepo, IRepository deviceRepo) + { + this._jwtHelper = jwtHelper; + this._nodeRepo = nodeRepo; + this._deviceRepo = deviceRepo; + } + + [Authorize] + public IActionResult Index() + { + return View(); + } + + public IActionResult GetNodes(string token) + { + var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString(); + var model = this._nodeRepo.ReadOnlyTable() + .Select(o => new { o.Number, o.Name, o.DisplayOrder, Count = o.Devices.Count }) + .ToList(); + return Json(model); + } + + public IActionResult GetNode(string token, string number) + { + var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString(); + var model = this._nodeRepo.ReadOnlyTable() + .Include(o => o.Sences) + .Include(o => o.Devices).ThenInclude(o => o.Data) + .FirstOrDefault(o => o.Number == number); + return Json(model, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }); + } + } +} \ No newline at end of file diff --git a/projects/IoTCenter/Controllers/HomeController.cs b/projects/IoTCenter/Controllers/HomeController.cs index bb45836b..d74f7936 100644 --- a/projects/IoTCenter/Controllers/HomeController.cs +++ b/projects/IoTCenter/Controllers/HomeController.cs @@ -1,56 +1,52 @@ +using System; +using System.Linq; using Application.Domain.Entities; using Infrastructure.Data; -using Infrastructure.Jwt; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -using System; -using System.Linq; namespace IoTCenter.Controllers { + [Authorize] public class HomeController : Controller { - private readonly IJwtHelper _jwtHelper; private readonly IRepository _nodeRepo; private readonly IRepository _deviceRepo; - public HomeController(IJwtHelper jwtHelper, IRepository nodeRepo, IRepository deviceRepo) + public HomeController(IRepository nodeRepo, IRepository deviceRepo) { - this._jwtHelper = jwtHelper; this._nodeRepo = nodeRepo; this._deviceRepo = deviceRepo; } - [Authorize] public IActionResult Index() { return View(); } - public IActionResult GetNodes(string token) + public IActionResult GetNodes() { - var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString(); var model = this._nodeRepo.ReadOnlyTable() - .Select(o => new { o.Number, o.Name, o.DisplayOrder, Count = o.Devices.Count }) + .Include(o => o.Devices) .ToList(); - return Json(model); + return Json(model, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }); } - [Authorize] public IActionResult Node(Guid id) { var model = this._nodeRepo.ReadOnlyTable().FirstOrDefault(o => o.Id == id); return View(model); } - public IActionResult GetNode(string number) + public IActionResult GetNode(Guid id) { var model = this._nodeRepo.ReadOnlyTable() .Include(o => o.Sences) .Include(o => o.Devices).ThenInclude(o => o.Data) - .FirstOrDefault(o => o.Number == number); + .Include(o => o.Devices).ThenInclude(o => o.Apis).ThenInclude(o => o.Parameters) + .FirstOrDefault(o => o.Id == id); return Json(model, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }); } } diff --git a/projects/IoTCenter/IoTCenter.csproj b/projects/IoTCenter/IoTCenter.csproj index c12e7775..1fbc2706 100644 --- a/projects/IoTCenter/IoTCenter.csproj +++ b/projects/IoTCenter/IoTCenter.csproj @@ -7,6 +7,7 @@ + diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json index 6988b919..c4ca0bfd 100644 --- a/projects/IoTCenter/appsettings.json +++ b/projects/IoTCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.102", + "version": "1.0.0-beta.103", "Logging": { "LogLevel": { "Default": "Warning" diff --git a/projects/StudyCenter/appsettings.json b/projects/StudyCenter/appsettings.json index 2294483f..4c938e63 100644 --- a/projects/StudyCenter/appsettings.json +++ b/projects/StudyCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.102", + "version": "1.0.0-beta.103", "Logging": { "LogLevel": { "Default": "Warning" diff --git a/projects/UserCenter/appsettings.json b/projects/UserCenter/appsettings.json index f0d88a38..8d050f1d 100644 --- a/projects/UserCenter/appsettings.json +++ b/projects/UserCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.102", + "version": "1.0.0-beta.103", "Logging": { "LogLevel": { "Default": "Warning"