From f19c9aa2d35fb31a3a8df4b5c47004444396c89f Mon Sep 17 00:00:00 2001
From: iioter <535915157@qq.com>
Date: Thu, 25 Aug 2022 08:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=98=E9=87=8F=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20220825004835_variableindex.Designer.cs  | 859 ++++++++++++++++++
 .../20220825004835_variableindex.cs           |  26 +
 .../Migrations/DataContextModelSnapshot.cs    |   5 +-
 IoTGateway.Model/DeviceVariable.cs            |   3 +
 .../DeviceVariableImportVM.cs                 |   2 +
 .../DeviceVariableVMs/DeviceVariableListVM.cs |   3 +-
 .../Views/DeviceVariable/Create.cshtml        |   1 +
 .../Views/DeviceVariable/Edit.cshtml          |   1 +
 IoTGateway/iotgateway.db                      | Bin 311296 -> 311296 bytes
 Plugins/Plugin/DeviceThread.cs                |   2 +-
 10 files changed, 899 insertions(+), 3 deletions(-)
 create mode 100644 IoTGateway.DataAccess/Migrations/20220825004835_variableindex.Designer.cs
 create mode 100644 IoTGateway.DataAccess/Migrations/20220825004835_variableindex.cs

diff --git a/IoTGateway.DataAccess/Migrations/20220825004835_variableindex.Designer.cs b/IoTGateway.DataAccess/Migrations/20220825004835_variableindex.Designer.cs
new file mode 100644
index 0000000..8cce579
--- /dev/null
+++ b/IoTGateway.DataAccess/Migrations/20220825004835_variableindex.Designer.cs
@@ -0,0 +1,859 @@
+// <auto-generated />
+using System;
+using IoTGateway.DataAccess;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace IoTGateway.DataAccess.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("20220825004835_variableindex")]
+    partial class variableindex
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.0");
+
+            modelBuilder.Entity("IoTGateway.Model.Device", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AutoStart")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("CgUpload")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreateBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DeviceTypeEnum")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("DriverId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("EnforcePeriod")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DriverId");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("IoTGateway.Model.DeviceConfig", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DataSide")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceConfigName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DeviceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EnumInfo")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceId");
+
+                    b.ToTable("DeviceConfigs");
+                });
+
+            modelBuilder.Entity("IoTGateway.Model.DeviceVariable", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DataType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceAddress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DeviceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Expressions")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Method")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ProtectType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceId");
+
+                    b.ToTable("DeviceVariables");
+                });
+
+            modelBuilder.Entity("IoTGateway.Model.Driver", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AssembleName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("AuthorizesNum")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DriverName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("Drivers");
+                });
+
+            modelBuilder.Entity("IoTGateway.Model.RpcLog", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DeviceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsSuccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Method")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Params")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RpcSide")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("StartTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeviceId");
+
+                    b.ToTable("RpcLogs");
+                });
+
+            modelBuilder.Entity("IoTGateway.Model.SystemConfig", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClientId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GatewayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("IoTPlatformType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("MqttIp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("MqttPort")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("MqttUName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MqttUPwd")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("SystemConfig");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.ActionLog", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionName")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ActionTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionUrl")
+                        .HasMaxLength(250)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("Duration")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("IP")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ITCode")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LogType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ModuleName")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("ActionLogs");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.DataPrivilege", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Domain")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GroupCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RelateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TableName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserCode")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("DataPrivileges");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FileAttachment", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExtraInfo")
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("FileData")
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("FileExt")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("HandlerInfo")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("Length")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SaveMode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UploadTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("FileAttachments");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FrameworkGroup", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GroupCode")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GroupRemark")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TenantCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("FrameworkGroups");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FrameworkMenu", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClassName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("DisplayOrder")
+                        .IsRequired()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Domain")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("FolderOnly")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Icon")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsInherit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool?>("IsInside")
+                        .IsRequired()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("MethodName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ModuleName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PageName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ShowOnMenu")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("FrameworkMenus");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FrameworkRole", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleCode")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleRemark")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TenantCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("FrameworkRoles");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FrameworkUser", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Address")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CellPhone")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Gender")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HomePhone")
+                        .HasMaxLength(30)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ITCode")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsValid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PhotoId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TenantCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ZipCode")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("PhotoId");
+
+                    b.ToTable("FrameworkUsers");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FrameworkUserGroup", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GroupCode")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserCode")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("FrameworkUserGroups");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FrameworkUserRole", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleCode")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserCode")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("FrameworkUserRoles");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FunctionPrivilege", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("Allowed")
+                        .IsRequired()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("MenuItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdateBy")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("MenuItemId");
+
+                    b.ToTable("FunctionPrivileges");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.PersistedGrant", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Expiration")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RefreshToken")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserCode")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("PersistedGrants");
+                });
+
+            modelBuilder.Entity("IoTGateway.Model.Device", b =>
+                {
+                    b.HasOne("IoTGateway.Model.Driver", "Driver")
+                        .WithMany()
+                        .HasForeignKey("DriverId");
+
+                    b.HasOne("IoTGateway.Model.Device", "Parent")
+                        .WithMany("Children")
+                        .HasForeignKey("ParentId");
+
+                    b.Navigation("Driver");
+
+                    b.Navigation("Parent");
+                });
+
+            modelBuilder.Entity("IoTGateway.Model.DeviceConfig", b =>
+                {
+                    b.HasOne("IoTGateway.Model.Device", "Device")
+                        .WithMany("DeviceConfigs")
+                        .HasForeignKey("DeviceId");
+
+                    b.Navigation("Device");
+                });
+
+            modelBuilder.Entity("IoTGateway.Model.DeviceVariable", b =>
+                {
+                    b.HasOne("IoTGateway.Model.Device", "Device")
+                        .WithMany("DeviceVariables")
+                        .HasForeignKey("DeviceId");
+
+                    b.Navigation("Device");
+                });
+
+            modelBuilder.Entity("IoTGateway.Model.RpcLog", b =>
+                {
+                    b.HasOne("IoTGateway.Model.Device", "Device")
+                        .WithMany()
+                        .HasForeignKey("DeviceId");
+
+                    b.Navigation("Device");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FrameworkMenu", b =>
+                {
+                    b.HasOne("WalkingTec.Mvvm.Core.FrameworkMenu", "Parent")
+                        .WithMany("Children")
+                        .HasForeignKey("ParentId");
+
+                    b.Navigation("Parent");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FrameworkUser", b =>
+                {
+                    b.HasOne("WalkingTec.Mvvm.Core.FileAttachment", "Photo")
+                        .WithMany()
+                        .HasForeignKey("PhotoId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("Photo");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FunctionPrivilege", b =>
+                {
+                    b.HasOne("WalkingTec.Mvvm.Core.FrameworkMenu", "MenuItem")
+                        .WithMany("Privileges")
+                        .HasForeignKey("MenuItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MenuItem");
+                });
+
+            modelBuilder.Entity("IoTGateway.Model.Device", b =>
+                {
+                    b.Navigation("Children");
+
+                    b.Navigation("DeviceConfigs");
+
+                    b.Navigation("DeviceVariables");
+                });
+
+            modelBuilder.Entity("WalkingTec.Mvvm.Core.FrameworkMenu", b =>
+                {
+                    b.Navigation("Children");
+
+                    b.Navigation("Privileges");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/IoTGateway.DataAccess/Migrations/20220825004835_variableindex.cs b/IoTGateway.DataAccess/Migrations/20220825004835_variableindex.cs
new file mode 100644
index 0000000..eda47bc
--- /dev/null
+++ b/IoTGateway.DataAccess/Migrations/20220825004835_variableindex.cs
@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IoTGateway.DataAccess.Migrations
+{
+    public partial class variableindex : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<uint>(
+                name: "Index",
+                table: "DeviceVariables",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0u);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Index",
+                table: "DeviceVariables");
+        }
+    }
+}
diff --git a/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs b/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs
index b1a73d3..d98b429 100644
--- a/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs
+++ b/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs
@@ -15,7 +15,7 @@ namespace IoTGateway.DataAccess.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "6.0.1");
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.0");
 
             modelBuilder.Entity("IoTGateway.Model.Device", b =>
                 {
@@ -137,6 +137,9 @@ namespace IoTGateway.DataAccess.Migrations
                     b.Property<string>("Expressions")
                         .HasColumnType("TEXT");
 
+                    b.Property<uint>("Index")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("Method")
                         .HasColumnType("TEXT");
 
diff --git a/IoTGateway.Model/DeviceVariable.cs b/IoTGateway.Model/DeviceVariable.cs
index 350621c..4f8b449 100644
--- a/IoTGateway.Model/DeviceVariable.cs
+++ b/IoTGateway.Model/DeviceVariable.cs
@@ -28,6 +28,9 @@ namespace IoTGateway.Model
         [Display(Name = "权限")]
         public ProtectTypeEnum ProtectType { get; set; }
 
+        [Display(Name = "排序")]
+        public uint Index { get; set; }
+
         [Newtonsoft.Json.JsonIgnore]
         public Device Device { get; set; }
         [Display(Name = "设备")]
diff --git a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableImportVM.cs b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableImportVM.cs
index 4460fd6..04fe596 100644
--- a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableImportVM.cs
+++ b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableImportVM.cs
@@ -15,6 +15,8 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
     {
         [Display(Name = "变量名")]
         public ExcelPropety Name_Excel = ExcelPropety.CreateProperty<DeviceVariable>(x => x.Name);
+        [Display(Name = "排序")]
+        public ExcelPropety Index_Excel = ExcelPropety.CreateProperty<DeviceVariable>(x => x.Index);
         [Display(Name = "描述")]
         public ExcelPropety Description_Excel = ExcelPropety.CreateProperty<DeviceVariable>(x => x.Description);
         [Display(Name = "方法")]
diff --git a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs
index d15e0d0..8f8fa10 100644
--- a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs
+++ b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs
@@ -121,6 +121,7 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
                     ID = x.ID,
                     DeviceId = x.DeviceId,
                     Name = x.Name,
+                    Index = x.Index,
                     Description = x.Description,
                     Method = x.Method,
                     DeviceAddress = x.DeviceAddress,
@@ -130,7 +131,7 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
                     DeviceName_view = x.Device.DeviceName,
                     Device = x.Device
                 })
-                .OrderBy(x => x.DeviceName_view).ThenBy(x => x.DeviceAddress);
+                .OrderBy(x => x.DeviceName_view).ThenBy(x => x.Index);
             return query;
         }
 
diff --git a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Create.cshtml b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Create.cshtml
index 7c6eba3..528140f 100644
--- a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Create.cshtml
+++ b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Create.cshtml
@@ -5,6 +5,7 @@
     <wt:row items-per-row="ItemsPerRowEnum.Two">
         <wt:combobox field="Entity.DeviceId" items="AllDevices" trigger-url="/BasicData/Device/GetMethods" link-field="Entity.Method" required="true" />
         <wt:textbox field="Entity.Name" required="true" />
+        <wt:textbox field="Entity.Index"/>
         <wt:textbox field="Entity.Description" />
         <wt:combobox field="Entity.Method" items="AllMethods" required="true" />
         <wt:textbox field="Entity.DeviceAddress" />
diff --git a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Edit.cshtml b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Edit.cshtml
index d41a4d7..82f3c63 100644
--- a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Edit.cshtml
+++ b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Edit.cshtml
@@ -5,6 +5,7 @@
     <wt:row items-per-row="ItemsPerRowEnum.Two">
         <wt:combobox field="Entity.DeviceId" items="AllDevices" />
         <wt:textbox field="Entity.Name" />
+        <wt:textbox field="Entity.Index" />
         <wt:textbox field="Entity.Description" />
         <wt:combobox field="Entity.Method" items=AllMethods />
         <wt:textbox field="Entity.DeviceAddress" />
diff --git a/IoTGateway/iotgateway.db b/IoTGateway/iotgateway.db
index c43349b8b9caaf6193d290ca18f833180a71f964..23bc712fa0c5d39aabaaa74264e90f2f60599e68 100644
GIT binary patch
delta 7107
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

delta 2276
zcmb7FYm8k}6u#%2J2Q74ozrV7#Wd}-oiRnX?$<ecZ<VS2M7$=_^2ehSkBFc&swsw<
z5d;aEA)7{0Kl~9@uW<b$BqS24_${PF1d*sm_#weMW9}S&%E`GmS!=Jo*80Bntur?_
zGB-E!<Y;?KqtUn+-izSvg?HlMR+emeZTAcLn%3|yjr{BUz5Mz7zWnNZDnDiTmp9te
zpAGkHZe@1u;@Gy)#gPp^t!d@!8u|D6$N8)IV!j_vo|~_ObIp8l-L|h^pH9XeNTxf<
zbkaP&Hl0ld_6{Cvo!xVN^RMQiY%x1Ion7^3T!+)`2dDc6dcI6ItUc?j<l#MW2B({o
ziMVwty(NBhVKNk7A?aYe#wP3Iqa-~w?onxP{9-B{jn7V{8`oShbIZOP!pwDd?%BI(
z>~gO!9=r6ic!Z=|7k4*X@phGt#P*JKLmWLn$>TAX^u|Lw(i=OoG(D%)Y&4R!otJ$w
zl5~!3PjNc%!2M_TE!9zUppN|sT+&;IJ`ACqLp!n?pX?;Zv%m7r>f_mod=Zbe-#U@?
zz1r?s#`HY+zYyN3&MD6~zss*p-)*$hc4O5AgFg&DJvi0>SU+!l-aFBAtY?3EQ`*j7
z%r77QWB7&POa9N(c(eP&-DAyNxcO0X)vl3U{gAi8oYUM2fwUwPaf30^-WXKSLIz5W
z!L*Eb+?7pMQ9a!#;#{GvH^{NlBhHORl2VM6Hl;O%vx?|Adv<e@L5ic@D2x@A1vkhz
zTOh72L5698ys!>4FW^>&F^Tirvx#ku#+7v(#+p-#Fm(oT8yqqo6Xd~cu;4-%9)H}_
z+%mY(?(YW0^}l7~@z!4xu&%DHbH9RBZ)#5B-h0!xyN5Lq5^Cm%Q|$l+?~&%LL{xho
zO0HNbiiqydCK*J{bfcspN|a0^A~0ZAIE{?p1wg57kVImp%Br7@AEe`~Z$2GZ2`r^h
zm<nVmRfsDhkQ9<YYfj<7Lm*@+@ZkIDIN)9*SUP5;G#E);LY)DAH1!l2EJ+YpNvYHl
z?p4$ZeuWi8mx?3LaDeWZM-oaymdV06@1$40;&{uph0ztHq{O9`h9OdQ$OQ%303CpY
zQeBh`Q>B+6!F}`pDzH!$U>123fMVk~%ml}%U?qUUJSj^XHy(g-T6MTCu%y-+>MWw%
zF~k|<QofoFCAeq2Bu0{oG@!C?rNDSWMKF3I18Z+>-3!*NLjCyD+4#`Tg`V2=T-P;o
zPBxDFzp9y3&SEM(N5PO1aVa#EEgce86{Y3ciJ;?=(_v~_57jDAS_D-xiAt+sbTCn%
z9e@a6)<zfJ(O~1Je<YKv^-v9wbj&+w2-(5{hcrN+C1uDLT5<zvF<nx@?w7K0HlS*h
zBvBd*;ZR`%$RGres#X%=(mI$N7-2=L#y_h9cP^}7X<P+aVC*~+QUWQVWC-*r5EjG~
zLNad%=$^#ac0geNS9Ph%0Sg+cR06cltpVXFQ6N?NAgRHu5K9@W0S7$mQWb|WfTW;|
z0+3NAAjkw6fm$29Cx#XOXmfscrOfzYm!HR%sGGmHcAcoW-hTkNp1-HIp7#4P*GDuE
zI%Mm$CIcyqhUp_hOQ1$ERFMcPgBu=P8HA8=&pr_JkgdxuohSnZjf5aT(Abs8Xb(}o
z5T1K4A*=%G%R|iy;jxuUV3kRwDWvlb!#>0cNh>8{gbP!6tuf<OAZ)hr|76rgQ5Px&
zYYv-$!g5pw7O5~`#ljFqRTWqvJhXHEu9b|@b$g#V+^k&tYS(RDR|N~W?yOzUfa{;W
zR~@bgSrVZ_wYfOaP=(ik7Aq8T90siLMJb_}<-S2uo9g>c`Wf!4^gQ%$J;xg=GYIyK
zf!ph|?^n4$xjUPLk7?s*{N|D7u6W?V<`shrll7tVep;rq8b-)<dhNOyT+3^IqP9NO
a4S;1iF}N^Zd*1o4XLIfOwz{eMsQnFIYYXxK

diff --git a/Plugins/Plugin/DeviceThread.cs b/Plugins/Plugin/DeviceThread.cs
index a9ec41e..b51ae5d 100644
--- a/Plugins/Plugin/DeviceThread.cs
+++ b/Plugins/Plugin/DeviceThread.cs
@@ -78,7 +78,7 @@ namespace Plugin
                                 {
                                     if (Device.DeviceVariables != null)
                                     {
-                                        foreach (var item in Device.DeviceVariables)
+                                        foreach (var item in Device.DeviceVariables.OrderBy(x=>x.Index))
                                         {
                                             var ret = new DriverReturnValueModel();
                                             var ioarg = new DriverAddressIoArgModel