From 0082905b4eff09280560fd33055db3c0c7753bc3 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 28 Sep 2020 16:49:16 +0800 Subject: [PATCH] 1.0.0.20092802 Former-commit-id: f2e6447a9a1d1e7906d71b2795bb54ba458cc0bc Former-commit-id: 036bc081b2d6b3f244da352fe9719785f39a0cf0 --- docs/研发/跨部门流程步骤权限.vsdx | Bin 0 -> 30603 bytes .../Extensions/HelperExtensions.cs | 2 +- .../Admin/Controlls/ParameterController.cs | 6 +-- .../Admin/Controlls/ProductController.cs | 8 ++-- .../Admin/Controllers/OrganSceneController.cs | 3 +- .../Controllers/OrganSceneTiggerController.cs | 3 +- .../Controllers/OrganSceneTimerController.cs | 5 +-- .../DeviceServices/FBee/FBeeService.cs | 4 +- projects/IoTNode/Version.cs | 2 +- projects/Version.cs | 2 +- .../wwwroot/components/shared/display.html | 6 +-- .../shared/edit/multiselectlist.html | 3 +- .../wwwroot/components/shared/layout.html | 13 ++++++- .../wwwroot/components/shared/list.html | 14 +++---- .../wwwroot/components/shared/update.html | 6 +-- projects/WebMVC/wwwroot/index.html | 2 +- projects/WebMVC/wwwroot/js/config.js | 2 +- .../wwwroot/routes/admin/command/edit.html | 6 +-- .../WebMVC/wwwroot/routes/admin/index.html | 5 +-- .../wwwroot/routes/admin/setting/edit.html | 6 +-- .../WebMVC/wwwroot/routes/admin/system.html | 35 ++++++++++++++++++ projects/WebMVC/wwwroot/routes/home.html | 6 +-- .../WebMVC/wwwroot/routes/iot/device.html | 18 ++++++--- projects/WebMVC/wwwroot/routes/iot/node.html | 6 +-- projects/WebMVC/wwwroot/routes/iot/nodes.html | 6 +-- .../WebMVC/wwwroot/routes/iot/organs.html | 6 +-- .../WebMVC/wwwroot/routes/iot/product.html | 6 +-- projects/WebMVC/wwwroot/routes/login.html | 6 +-- .../publish/apps/srs/conf/srs.conf | 1 + publish/src/linux-arm64/publish/install.sh | 2 +- 30 files changed, 122 insertions(+), 68 deletions(-) create mode 100644 docs/研发/跨部门流程步骤权限.vsdx create mode 100644 projects/WebMVC/wwwroot/routes/admin/system.html diff --git a/docs/研发/跨部门流程步骤权限.vsdx b/docs/研发/跨部门流程步骤权限.vsdx new file mode 100644 index 0000000000000000000000000000000000000000..54a6d03ec68185e7c354cb9d535aa7db0a582c36 GIT binary patch literal 30603 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 literal 0 HcmV?d00001 diff --git a/projects/Infrastructure/Extensions/HelperExtensions.cs b/projects/Infrastructure/Extensions/HelperExtensions.cs index 4b743355..2ca9d6f0 100644 --- a/projects/Infrastructure/Extensions/HelperExtensions.cs +++ b/projects/Infrastructure/Extensions/HelperExtensions.cs @@ -53,7 +53,7 @@ namespace Infrastructure.Extensions var ret = new StringBuilder(); foreach (var item in ms.ToArray()) { - ret.AppendFormat("{0:X2}", item); + ret.AppendFormat(CultureInfo.InvariantCulture, "{0:X2}", item); } return ret.ToString(); } diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/ParameterController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/ParameterController.cs index 5905337b..3bc94471 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/ParameterController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/ParameterController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Application.Models; using Infrastructure.Application; using Infrastructure.Data; @@ -37,8 +37,8 @@ namespace IoT.Shared.Areas.Admin.Controlls .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); + .WhereIf(!string.IsNullOrEmpty(model.Query.Minimum), o => o.Minimum == model.Query.Minimum) + .WhereIf(!string.IsNullOrEmpty(model.Query.Maxinum), o => o.Maxinum == model.Query.Maxinum); } public override void ToDisplayModel(Parameter entity, EditParameterModel model) diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs index 4f9352f7..abd8a1f7 100644 --- a/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs +++ b/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Application.Models; using Infrastructure.Application; using Infrastructure.Data; @@ -33,9 +33,9 @@ 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, 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)); + .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path, StringComparison.OrdinalIgnoreCase)) + .WhereIf(!string.IsNullOrEmpty(model.Query.ApiJson), o => o.ApiJson.Contains(model.Query.ApiJson, StringComparison.OrdinalIgnoreCase)); } public override void ToDisplayModel(Product entity, EditProductModel model) diff --git a/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneController.cs b/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneController.cs index a7ba2222..cf75025a 100644 --- a/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneController.cs +++ b/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Infrastructure.Application; using Infrastructure.Data; using Infrastructure.Extensions; @@ -32,6 +32,7 @@ namespace IoTCenter.Areas.Admin.Controllers { ViewData.SelectList(o => model.Query.OrganId, () => this._ajax.GetOrganSelectList(model.Query.OrganId)); return query + .WhereIf(model.Query.OrganId.HasValue, o => o.OrganId == model.Query.OrganId.Value) .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) .WhereIf(model.Query.Hidden.HasValue, o => o.Hidden == model.Query.Hidden.Value) .OrderBy(o => o.DisplayOrder); diff --git a/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneTiggerController.cs b/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneTiggerController.cs index dbdb6e1a..6ba0a6da 100644 --- a/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneTiggerController.cs +++ b/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneTiggerController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Infrastructure.Application; using Infrastructure.Data; using Infrastructure.Extensions; @@ -37,6 +37,7 @@ namespace IoTCenter.Areas.Admin.Controllers public override IQueryable Query(PagedListModel model, IQueryable query) { return query + .WhereIf(model.Query.OrganId.HasValue, o => o.OrganScene.OrganId == model.Query.OrganId.Value) .WhereIf(model.Query.NodeId.HasValue, o => o.Data.Device.NodeId == model.Query.NodeId.Value) .WhereIf(model.Query.OrganSceneId.HasValue, o => o.OrganSceneId == model.Query.OrganSceneId.Value) .WhereIf(model.Query.DeviceId.HasValue, o => o.Data.DeviceId == model.Query.DeviceId.Value) diff --git a/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneTimerController.cs b/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneTimerController.cs index 391ae9b9..23303e7b 100644 --- a/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneTimerController.cs +++ b/projects/IoTCenter/Areas/Admin/Controllers/OrganSceneTimerController.cs @@ -1,4 +1,4 @@ -using Application.Domain.Entities; +using Application.Domain.Entities; using Infrastructure.Application; using Infrastructure.Data; using Infrastructure.Extensions; @@ -7,7 +7,6 @@ using IoT.Shared.Areas.Admin.Controlls; using IoTCenter.Application.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.ModelBinding.Binders; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using System; @@ -31,10 +30,10 @@ namespace IoTCenter.Areas.Admin.Controllers public override IQueryable Query(PagedListModel model, IQueryable query) { return query + .WhereIf(model.Query.OrganId.HasValue, o => o.OrganScene.OrganId == model.Query.OrganId.Value) .WhereIf(model.Query.OrganSceneId.HasValue, o => o.OrganSceneId == model.Query.OrganSceneId.Value) .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name)) .WhereIf(model.Query.Disabled.HasValue, o => o.Disabled == model.Query.Disabled.Value); - ; } public override IQueryable Include(IQueryable query) diff --git a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs index 98cf5eae..4187560a 100644 --- a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs +++ b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs @@ -486,7 +486,7 @@ namespace IoTNode.DeviceServices.FBee if (deviceId == 0x000a) { } - if (deviceType != null) + if (deviceType != null && zoneType != 0x0000) { var deviceIcon = deviceType.Icon; var deviceName = deviceType.Name; @@ -623,7 +623,7 @@ namespace IoTNode.DeviceServices.FBee } else { - this._logger.LogDebug($"unknown device id :{deviceId}"); + this._logger.LogDebug($"unknown device id or zone type :{deviceId} {zoneType}"); } } catch (Exception ex) diff --git a/projects/IoTNode/Version.cs b/projects/IoTNode/Version.cs index 64a68a43..60019fca 100644 --- a/projects/IoTNode/Version.cs +++ b/projects/IoTNode/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.20092702")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.20092801")] \ No newline at end of file diff --git a/projects/Version.cs b/projects/Version.cs index 64a68a43..a21c9298 100644 --- a/projects/Version.cs +++ b/projects/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.20092702")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0.0.20092802")] \ No newline at end of file diff --git a/projects/WebMVC/wwwroot/components/shared/display.html b/projects/WebMVC/wwwroot/components/shared/display.html index 47373793..f1bb913b 100644 --- a/projects/WebMVC/wwwroot/components/shared/display.html +++ b/projects/WebMVC/wwwroot/components/shared/display.html @@ -1,5 +1,5 @@ -