From 530b4943282e49dc1e5ce0e49593eb0ce97baaee Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 17 Feb 2020 15:42:19 +0800 Subject: [PATCH 1/2] update Former-commit-id: 700319900bdac5cb88439e5290f33e8778b0ce42 --- projects/Infrastructure/Data/EfDbContext.cs | 15 ++------------- projects/IoT.Shared/Services/DataService.cs | 11 ++++++++++- projects/WebApp/wwwroot/pages/home.html | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/projects/Infrastructure/Data/EfDbContext.cs b/projects/Infrastructure/Data/EfDbContext.cs index 74427281..001edcc8 100644 --- a/projects/Infrastructure/Data/EfDbContext.cs +++ b/projects/Infrastructure/Data/EfDbContext.cs @@ -14,15 +14,11 @@ namespace Infrastructure.Data { public class EfDbContext : DbContext { - public static readonly ILoggerFactory DebugLogFactory = LoggerFactory.Create(builder => + public static readonly ILoggerFactory MyLoggerFactory = LoggerFactory.Create(builder => { builder.AddConsole(); }); - public static readonly ILoggerFactory ProductLogFactory = LoggerFactory.Create(builder => - { - }); - private readonly IHostEnvironment _env; private readonly IConfiguration _cfg; @@ -34,14 +30,7 @@ namespace Infrastructure.Data protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - if (this._cfg.GetValue("debug", false)) - { - optionsBuilder?.UseLoggerFactory(DebugLogFactory); - } - else - { - optionsBuilder?.UseLoggerFactory(ProductLogFactory); - } + optionsBuilder?.UseLoggerFactory(MyLoggerFactory); optionsBuilder?.EnableSensitiveDataLogging(); base.OnConfiguring(optionsBuilder); } diff --git a/projects/IoT.Shared/Services/DataService.cs b/projects/IoT.Shared/Services/DataService.cs index ffeed65f..9d90e131 100644 --- a/projects/IoT.Shared/Services/DataService.cs +++ b/projects/IoT.Shared/Services/DataService.cs @@ -1,8 +1,10 @@ -using Infrastructure.Application; +using Application.Domain.Entities; +using Infrastructure.Application; using Infrastructure.Data; using Infrastructure.Domain; using Infrastructure.Events; using Infrastructure.Extensions; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using System; using System.Collections.Generic; @@ -84,6 +86,13 @@ namespace IoT.Shared.Services entity.From(model); if (repo.SaveChanges() > 0) { + if (entity is Data) + { + var data = entity as Data; + data.Device = scope.ServiceProvider.GetService>().ReadOnlyTable().Include(o => o.Node) + .Where(o => o.Id == data.DeviceId) + .Select(o => new Device { DisplayName = o.DisplayName, Node = new Node { Name = o.Node.Name } }).FirstOrDefault(); + } var eventPublisher = scope.ServiceProvider.GetService(); if (isNew) { diff --git a/projects/WebApp/wwwroot/pages/home.html b/projects/WebApp/wwwroot/pages/home.html index edb80f1b..2ccab357 100644 --- a/projects/WebApp/wwwroot/pages/home.html +++ b/projects/WebApp/wwwroot/pages/home.html @@ -4,7 +4,7 @@
- {{message.name}}:{{message.value}} {{message.unit}} {{message.description}} + {{message.device.node.name}}{{message.device.displayName}}{{message.name}}:{{message.value}} {{message.unit}} {{message.description}}
From ad800eb13da9c8f64c84eeadadb002cdb291a9a6 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 18 Feb 2020 10:37:24 +0800 Subject: [PATCH 2/2] update Former-commit-id: de2ffe8ca0e29fb69097a671f67488737a994860 --- labs/QrDemo/Assets/Scenes/SampleScene.unity | 87 ++++++++++++++++++++- projects/WebApp/wwwroot/js/store.js | 8 +- 2 files changed, 87 insertions(+), 8 deletions(-) diff --git a/labs/QrDemo/Assets/Scenes/SampleScene.unity b/labs/QrDemo/Assets/Scenes/SampleScene.unity index 59561d89..06087f15 100644 --- a/labs/QrDemo/Assets/Scenes/SampleScene.unity +++ b/labs/QrDemo/Assets/Scenes/SampleScene.unity @@ -146,13 +146,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 40919614} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 223974230} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -170,7 +170,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bcb2c646595564140aee7b32397fd755, type: 3} m_Name: m_EditorClassIdentifier: - cameraTexture: {fileID: 40919617} + rawImage: {fileID: 40919617} + text: {fileID: 1231679782} --- !u!114 &40919617 MonoBehaviour: m_ObjectHideFlags: 0 @@ -295,6 +296,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 40919615} + - {fileID: 1231679781} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -430,7 +432,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -543,3 +545,80 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1231679780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1231679781} + - component: {fileID: 1231679783} + - component: {fileID: 1231679782} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1231679781 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231679780} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 223974230} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 4.900879, y: -2.1437988} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1231679782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231679780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1231679783 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231679780} + m_CullTransparentMesh: 0 diff --git a/projects/WebApp/wwwroot/js/store.js b/projects/WebApp/wwwroot/js/store.js index 667892f1..98df8913 100644 --- a/projects/WebApp/wwwroot/js/store.js +++ b/projects/WebApp/wwwroot/js/store.js @@ -82,10 +82,10 @@ const store = new Vuex.Store({ updateByKey(device.data, model); } } - state.messages.push(model); - while (state.messages.length > 10) { - state.messages.unshift(); - } + //state.messages.push(model); + //while (state.messages.length > 10) { + // state.messages.unshift(); + //} } //update(state,method,message,to,from) { // alert(1);