update

Former-commit-id: c6960544a10706b5fbce288aeb5f3d46c5cd93c9
Former-commit-id: a5959ae2dd171fdcfcadfc4d9f2b665d20e77877

projects/IoT.Shared/Areas/Admin/Views/Command/_Script.cshtml

@@ -46,13 +46,19 @@
         list['wind'] = form.find("[name = 'wind']:checked").val();
         list['temperature'] = form.find("[name = 'temperature']").val();
         list[event.target.name] = event.target.value;
-        code = 0;
-        for (var name in list) {
-            code += parseInt(list[name]);
+        var code = 0;
+        if (list['power'] === "1") {
+            code = 1;
         }
+        else {
+            for (var name in list) {
+                code += parseInt(list[name]);
+            }
+        }
+
         $('#ircodeid').val(code);
     }
-        function CodeChange(e) {
+    function CodeChange(e) {
         var form = $('#ircodediv');
         var list = {};
         list['power'] = form.find("[name = 'power']:checked").val();

projects/IoTCenter/Application/Domain/Organ.cs

@@ -14,5 +14,7 @@ namespace IoTCenter.Application.Domain
         public string Image { get; set; }
 
         public List<OrganNode> OrganNodes { get; set; } = new List<OrganNode>();
+
+        public List<OrganUser> OrganUsers { get; set; } = new List<OrganUser>();
     }
 }

projects/IoTCenter/Application/Domain/OrganUser.cs

@@ -0,0 +1,16 @@
+using Application.Domain.Entities;
+using Infrastructure.Domain;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace IoTCenter.Application.Domain
+{
+    [Display(Name = "机构用户")]
+    public class OrganUser : BaseEntity
+    {
+        public Guid OrganId { get; set; }
+        public Guid UserId { get; set; }
+        public Organ Organ { get; set; }
+        public User User { get; set; }
+    }
+}

projects/IoTCenter/DbConfig.cs

@@ -34,6 +34,9 @@ namespace IoTCenter
             modelBuilder.Entity<NodeCategoryNode>().HasIndex(o => new { o.CategoryId, o.NodeId }).IsUnique();
             modelBuilder.Entity<Organ>().Property(o => o.Number).IsRequired();
             modelBuilder.Entity<Organ>().HasIndex(o => o.Number).IsUnique();
+            modelBuilder.Entity<OrganUser>().HasOne(o => o.Organ).WithMany(o => o.OrganUsers).HasForeignKey(o => o.OrganId);
+            modelBuilder.Entity<OrganUser>().HasOne(o => o.User).WithMany().HasForeignKey(o => o.UserId);
+            modelBuilder.Entity<OrganUser>().HasIndex(o => new { o.OrganId, o.UserId }).IsUnique();
             modelBuilder.Entity<OrganNode>().HasOne(o => o.Organ).WithMany(o => o.OrganNodes).HasForeignKey(o => o.OrganId);
             modelBuilder.Entity<OrganNode>().HasOne(o => o.Node).WithMany().HasForeignKey(o => o.NodeId);
             modelBuilder.Entity<OrganNode>().HasIndex(o => new { o.OrganId, o.NodeId }).IsUnique();

projects/Version.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.604")]
+[assembly: AssemblyInformationalVersion("1.0.0.609")]

publish/src/linux-x64/publish/conf/nginx.conf

@@ -1,76 +1,78 @@
 #user  nobody;
-worker_processes  1;
+worker_processes 1;
 
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
 
 #pid        logs/nginx.pid;
-
-
 events {
-    worker_connections  1024;
+    worker_connections 1024;
 }
 
 
 http {
-    include       mime.types;
-    default_type  application/octet-stream;
+    include mime.types;
+    default_type application/octet-stream;
 
-    sendfile        on;
+    sendfile on;
 
-    keepalive_timeout  65;
+    keepalive_timeout 65;
 
     server {
-        listen       0.0.0.0:80;
-        server_name  localhost;
-
-	location / {
-		#proxy_set_header Host $host:$server_port;
-		if ($http_user_agent ~* "(mobile|android|ipad|iphone|ipod|tablet)") {
-			proxy_pass   http://localhost:5002;
-			break;
-		}
-		proxy_pass   http://localhost:5001/;
-	}
+        listen 0.0.0.0:80;
+        server_name localhost;
+
+        location / {
+            #proxy_set_header Host $host:$server_port;
+            if ($http_user_agent ~* "(mobile|android|ipad|iphone|ipod|tablet)") {
+                proxy_pass http://localhost:5002;
+                break;
+            }
+            proxy_pass http://localhost:5001/;
+        }
 
         location ^~ /dfs/ {
-		 proxy_set_header Host $host;
-                 proxy_set_header X-Real-IP $remote_addr;
-                 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                 proxy_pass http://localhost:9000/;
-	}
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://localhost:9000/;
+        }
 
         location ^~ /live/ {
-		proxy_pass   http://localhost:8080/live/;
-	}
+            proxy_pass http://localhost:8080/live/;
+        }
 
         location ^~ /video/ {
-		proxy_pass   http://localhost:8080/video/;
-	}
+            proxy_pass http://localhost:8080/video/;
+        }
+
+        location ^~ /influxdb/ {
+            proxy_pass http://localhost:8086/;
+        }
 
         location ^~ /UserCenter/ {
-		proxy_pass   http://localhost:8010/UserCenter/;
-	}
+            proxy_pass http://localhost:8010/UserCenter/;
+        }
 
         location ^~ /IoTCenter/ {
-		proxy_pass   http://localhost:8011/IoTCenter/;
-	}
+            proxy_pass http://localhost:8011/IoTCenter/;
+        }
 
         location ^~ /IoTCenter/hub {
-		proxy_pass   http://localhost:8011/IoTCenter/hub;
-		proxy_http_version 1.1;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade"; 
-	}
+            proxy_pass http://localhost:8011/IoTCenter/hub;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
 
         location ^~ /JobServer/ {
-		proxy_pass   http://localhost:8013/JobServer/;
-	}
+            proxy_pass http://localhost:8013/JobServer/;
+        }
 
-        error_page   500 502 503 504  /50x.html;
+        error_page 500 502 503 504 /50x.html;
         location = /50x.html {
-            root   html;
+            root html;
         }
     }
 }

publish/src/linux-x64/publish/docker/conf/nginx/nginx.conf

@@ -43,6 +43,10 @@ http {
             proxy_pass http://172.172.0.60:8080/video/;
         }
 
+        location ^~ /influxdb/ {
+            proxy_pass http://172.172.0.50:8086/;
+        }
+
         location ^~ /UserCenter/ {
             proxy_pass http://172.172.0.70/UserCenter/;
         }

publish/src/linux-x64/publish/docker/conf/nginx/nginx.development.conf

@@ -43,6 +43,10 @@ http {
             proxy_pass http://host.docker.internal:8080/video/;
         }
 
+        location ^~ /influxdb/ {
+            proxy_pass http://host.docker.internal:8086/;
+        }
+
         location ^~ /UserCenter/ {
             proxy_pass http://host.docker.internal:8010/UserCenter/;
         }