From 7404fb2ba6f925a5423e13f17208f68c0802a519 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 29 Oct 2019 09:57:09 +0800
Subject: [PATCH] update

Former-commit-id: 8b06d7dbe61adeffa7bc3f7c6b5e8049ffbd94de
---
 .../IoTCenter/Controllers/AppController.cs    |  26 +++++-
 projects/IoTCenter/iotcenter.db               | Bin 573440 -> 573440 bytes
 .../StreamingAssets/IoT.Resources.csproj      |  10 +++
 .../Assets/StreamingAssets/wwwroot/index.html |  81 ++++++++++++++----
 .../Assets/StreamingAssets/wwwroot/nodes.html |  51 ++++++++++-
 projects/IoTNode/iotnode.db                   | Bin 516096 -> 516096 bytes
 6 files changed, 146 insertions(+), 22 deletions(-)

diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs
index 73fa2b02..416c40d5 100644
--- a/projects/IoTCenter/Controllers/AppController.cs
+++ b/projects/IoTCenter/Controllers/AppController.cs
@@ -25,6 +25,8 @@ namespace IoTCenter.Controllers
     {
         private readonly IConfiguration _configuration;
         private readonly IJwtHelper _jwtHelper;
+        private readonly IRepository<Category> _categoryRepo;
+        private readonly IRepository<Product> _productRepo;
         private readonly IRepository<Node> _nodeRepo;
         private readonly IRepository<Scene> _sceneRepo;
         private readonly IRepository<SceneCommand> _sceneCommandRepo;
@@ -35,6 +37,8 @@ namespace IoTCenter.Controllers
 
         public AppController(IConfiguration configuration,
             IJwtHelper jwtHelper,
+            IRepository<Category> categoryRepo,
+            IRepository<Product> productRepo,
             IRepository<Node> nodeRepo,
             IRepository<Scene> sceneRepo,
             IRepository<SceneCommand> sceneCommandRepo,
@@ -45,6 +49,8 @@ namespace IoTCenter.Controllers
         {
             this._configuration = configuration;
             this._jwtHelper = jwtHelper;
+            this._categoryRepo = categoryRepo;
+            this._productRepo = productRepo;
             this._nodeRepo = nodeRepo;
             this._sceneRepo = sceneRepo;
             this._sceneCommandRepo = sceneCommandRepo;
@@ -60,13 +66,27 @@ namespace IoTCenter.Controllers
             return View();
         }
 
+        public IActionResult GetProducts(string token)
+        {
+            var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString();
+            var model = this._productRepo.ReadOnlyTable().Select(o => new
+            {
+                o.Id,
+                o.Number,
+                o.Name,
+                o.Image,
+                DeviceCount = o.Devices.Count()
+            }).ToList();
+            return Json(model);
+        }
+
         public IActionResult GetNodes(string token)
         {
             var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString();
             var model = this._nodeRepo.ReadOnlyTable()
                 .Include(o => o.Scenes)
-                .OrderBy(o=>o.DisplayOrder)
-                .ThenBy(o=>o.Name)
+                .OrderBy(o => o.DisplayOrder)
+                .ThenBy(o => o.Name)
                 .Select(o => new
                 {
                     o.Id,
@@ -75,7 +95,7 @@ namespace IoTCenter.Controllers
                     o.Image,
                     o.DisplayOrder,
                     o.Scenes,
-                    o.Devices.Count
+                    DeviceCount = o.Devices.Count
                 })
                 .ToList();
             return Json(model);
diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db
index 0ecdb1a462595fa206d26d1974f6bea7c96fd699..1fdb98810c4409a82cc86b0b3be054d4a8c5666f 100644
GIT binary patch
delta 5613
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

delta 2646
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

diff --git a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
index 41857b7d..03684cc3 100644
--- a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
+++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
@@ -22,6 +22,8 @@
     <None Remove="wwwroot\fonts\Framework7Icons-Regular.woff" />
     <None Remove="wwwroot\fonts\Framework7Icons-Regular.woff2" />
     <None Remove="wwwroot\images\empty.png" />
+    <None Remove="wwwroot\lib\signalr\signalr-protocol-msgpack.min.js" />
+    <None Remove="wwwroot\lib\signalr\signalr.min.js" />
     <None Remove="wwwroot\nodes.html" />
     <None Remove="wwwroot\user.html" />
   </ItemGroup>
@@ -30,5 +32,13 @@
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
+    <Content Include="wwwroot\lib\signalr\signalr-protocol-msgpack.min.js">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="wwwroot\lib\signalr\signalr.min.js">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
index c0ee3fb9..bfce3b0a 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
@@ -13,9 +13,29 @@
         <f7-app :params="$root.f7params">
             <f7-view main>
                 <f7-page>
-                    <f7-navbar title="首页">
-                        <a href="config.html" slot="nav-right" class="link external"><i class="icon f7-icons if-not-md">menu</i></a>
+                    <f7-navbar title="产品">
+                        <f7-nav-right>
+                            <f7-link class="searchbar-enable" data-searchbar=".searchbar" icon-ios="f7:search"></f7-link>
+                        </f7-nav-right>
+                        <f7-searchbar class="searchbar-demo"
+                                      expandable
+                                      search-container=".search-list"
+                                      search-in=".item-title"></f7-searchbar>
                     </f7-navbar>
+                    <f7-list class="searchbar-not-found">
+                        <f7-list-item title="没有匹配的结果"></f7-list-item>
+                    </f7-list>
+                    <f7-list class="search-list searchbar-found">
+                        <li style="width:33.3%;display:inline-block;" v-if="model" v-for="n in model">
+                            <a :href="'node.html?number='+n.Number" class="card external" style="display:block;text-align:center;">
+                                <div class="card-header">
+                                    <span class="item-title">{{n.Name}}</span>
+                                    <span class="right"><span class="badge color-green">{{n.DeviceCount}}</span></span>
+                                </div>
+                                <img style="margin:0 auto;" :src="server+'/IoTCenter'+n.Image" />
+                            </a>
+                        </li>
+                    </f7-list>
                     <f7-toolbar tabbar labels position="bottom">
                         <a href="index.html" class="tab-link external tab-link-active">
                             <i class="icon icon f7-icons">house</i>
@@ -34,6 +54,7 @@
             </f7-view>
         </f7-app>
     </div>
+    <script type="text/javascript" src="lib/signalr/signalr.min.js"></script>
     <script type="text/javascript" src="lib/axios/axios.min.js"></script>
     <script type="text/javascript" src="lib/jquery/jquery.min.js"></script>
     <script type="text/javascript" src="lib/jquery.validation/jquery.validate.min.js"></script>
@@ -41,6 +62,39 @@
     <script type="text/javascript" src="lib/vue/vue.min.js"></script>
     <script type="text/javascript" src="lib/framework7/js/framework7.bundle.min.js"></script>
     <script type="text/javascript" src="lib/framework7/js/framework7-vue.bundle.min.js"></script>
+    <script>
+        var debug = true;
+        var wsUrl = localStorage.getItem('server') + '/IoTCenter/hub?group=page';
+        var connectionId;
+        const connection = new signalR.HubConnectionBuilder()
+            .withUrl(wsUrl)
+            .build();
+        function connect() {
+            if (debug) { console.log('start connect to server:' + Date()); }
+            connection.start().then(function () {
+
+            }).catch(function (err) {
+                console.error(err.toString());
+                setTimeout(connect, 15 * 1000);
+            });
+        }
+        connection.on('Connected', function (id) {
+            connectionId = id;
+            console.log(connectionId);
+        });
+        connection.onclose(function (err) {
+            console.error(err);
+            setTimeout(connect, 15 * 1000);
+        });
+        connection.on("ServerToClient", function (method, json, from) {
+            console.log(method + ':' + json);
+            if (method == 'ProductEntityInserted' ||
+                method == 'DeviceEntityInserted' ||
+                method == 'DeviceEntityDeleted') {
+                vm.load();
+            }
+        });
+    </script>
     <script type="text/javascript">
         Framework7.use(Framework7Vue);
         var app;
@@ -55,7 +109,8 @@
                         theme: 'ios',
                     },
                     server: localStorage.getItem('server'),
-                    token: localStorage.getItem('token')
+                    token: localStorage.getItem('token'),
+                    model: null
                 };
             },
             mounted() {
@@ -68,25 +123,19 @@
                 this.$f7ready((f7) => {
                     app = this.$f7;
                 });
+                connect();
+                this.load();
             },
             methods: {
-                submit: function (e) {
-                    if (!$(e.target).valid()) {
-                        return;
-                    }
-                    var url = e.target.action;
-                    var data = $(e.target).serialize();
+                load: function () {
+                    var url = this.server + '/IoTCenter/App/GetProducts';
+                    var data = new FormData();
+                    data.append('token', this.token);
                     axios.post(url, data)
                         .then(function (response) {
                             console.log(response);
                             var data = response.data;
-                            if (data.Code === 0) {
-                                localStorage.setItem("token", data.Token);
-                                window.location.href = "index.html";
-                            }
-                            else {
-                                app.dialog.alert(data.Message, '警告', function () { });
-                            }
+                            vm.model = data;
                         })
                         .catch(function (error) {
                             app.dialog.alert(error, '警告', function () { })
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html
index 27cd4164..94fd70c2 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html
@@ -26,7 +26,15 @@
                         <f7-list-item title="没有匹配的结果"></f7-list-item>
                     </f7-list>
                     <f7-list class="search-list searchbar-found">
-                        <f7-list-item  v-if="nodes" v-for="n in nodes" :title="n.Name" ></f7-list-item>
+                        <li style="width:33.3%;display:inline-block;" v-if="model" v-for="n in model">
+                            <a :href="'product.html?number='+n.Number" class="card external" style="display:block;text-align:center;">
+                                <div class="card-header">
+                                    <span class="item-title">{{n.Name}}</span>
+                                    <span class="right"><span class="badge color-green">{{n.DeviceCount}}</span></span>
+                                </div>
+                                <img style="margin:0 auto;" :src="server+'/IoTCenter'+n.Image" />
+                            </a>
+                        </li>
                     </f7-list>
                     <f7-toolbar tabbar labels position="bottom">
                         <a href="index.html" class="tab-link external">
@@ -46,6 +54,7 @@
             </f7-view>
         </f7-app>
     </div>
+    <script type="text/javascript" src="lib/signalr/signalr.min.js"></script>
     <script type="text/javascript" src="lib/axios/axios.min.js"></script>
     <script type="text/javascript" src="lib/jquery/jquery.min.js"></script>
     <script type="text/javascript" src="lib/jquery.validation/jquery.validate.min.js"></script>
@@ -53,6 +62,41 @@
     <script type="text/javascript" src="lib/vue/vue.min.js"></script>
     <script type="text/javascript" src="lib/framework7/js/framework7.bundle.min.js"></script>
     <script type="text/javascript" src="lib/framework7/js/framework7-vue.bundle.min.js"></script>
+    <script>
+        var debug = true;
+        var wsUrl = localStorage.getItem('server') + '/IoTCenter/hub?group=page';
+        var connectionId;
+        const connection = new signalR.HubConnectionBuilder()
+            .withUrl(wsUrl)
+            .build();
+        function connect() {
+            if (debug) { console.log('start connect to server:' + Date()); }
+            connection.start().then(function () {
+
+            }).catch(function (err) {
+                console.error(err.toString());
+                setTimeout(connect, 15 * 1000);
+            });
+        }
+        connection.on('Connected', function (id) {
+            connectionId = id;
+            console.log(connectionId);
+        });
+        connection.onclose(function (err) {
+            console.error(err);
+            setTimeout(connect, 15 * 1000);
+        });
+        connection.on("ServerToClient", function (method, json, from) {
+            console.log(method + ':' + json);
+            if (method == 'NodeEntityInserted' ||
+                'NodeEntityUpdated' ||
+                'NodeEntityDeleted' ||
+                method == 'DeviceEntityInserted' ||
+                method == 'DeviceEntityDeleted') {
+                vm.load();
+            }
+        });
+    </script>
     <script type="text/javascript">
         Framework7.use(Framework7Vue);
         var app;
@@ -68,7 +112,7 @@
                     },
                     server: localStorage.getItem('server'),
                     token: localStorage.getItem('token'),
-                    nodes: null
+                    model: null
                 };
             },
             mounted() {
@@ -82,6 +126,7 @@
                     app = this.$f7;
                 });
                 this.load();
+                connect();
             },
             methods: {
                 load: function () {
@@ -92,7 +137,7 @@
                         .then(function (response) {
                             console.log(response);
                             var data = response.data;
-                            vm.nodes = data;
+                            vm.model = data;
                         })
                         .catch(function (error) {
                             app.dialog.alert(error, '警告', function () { })
diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db
index 130496225bf6a87cbfa430fda82c8232c69b91f3..776c56a1f08d6790b8e7bb783aac6c49ffb5d3b3 100644
GIT binary patch
delta 8708
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
V>$9J4|7^|H&vvz3lFNlm{udDoi^Ko`

delta 5959
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
H2&(vRAk$t$