From 004717e950398ec7b3c03f32c5cea560b19c7e1f Mon Sep 17 00:00:00 2001
From: iioter <535915157@qq.com>
Date: Tue, 6 Dec 2022 22:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=98=E9=87=8F=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20221206143332_EndianType.Designer.cs     | 865 ++++++++++++++++++
 .../Migrations/20221206143332_EndianType.cs   |  26 +
 .../Migrations/DataContextModelSnapshot.cs    |   3 +
 IoTGateway.Model/DeviceVariable.cs            |   5 +-
 .../DeviceVariableBatchVM.cs                  |   2 +
 .../DeviceVariableImportVM.cs                 |   2 +
 .../DeviceVariableVMs/DeviceVariableListVM.cs |   2 +
 .../Views/DeviceVariable/BatchEdit.cshtml     |  17 +-
 .../Views/DeviceVariable/Create.cshtml        |   1 +
 .../Views/DeviceVariable/Details.cshtml       |  21 +-
 .../Views/DeviceVariable/Edit.cshtml          |   1 +
 IoTGateway/iotgateway.db                      | Bin 311296 -> 311296 bytes
 .../DriverModbusMaster/ModbusMaster.cs        |   2 +-
 Plugins/Plugin/DeviceThread.cs                |   3 +-
 .../DriverAddressIoArgModel.cs                |   4 +-
 Plugins/PluginInterface/EndianEnum.cs         |  21 +-
 16 files changed, 939 insertions(+), 36 deletions(-)
 create mode 100644 IoTGateway.DataAccess/Migrations/20221206143332_EndianType.Designer.cs
 create mode 100644 IoTGateway.DataAccess/Migrations/20221206143332_EndianType.cs

diff --git a/IoTGateway.DataAccess/Migrations/20221206143332_EndianType.Designer.cs b/IoTGateway.DataAccess/Migrations/20221206143332_EndianType.Designer.cs
new file mode 100644
index 0000000..c448a1d
--- /dev/null
+++ b/IoTGateway.DataAccess/Migrations/20221206143332_EndianType.Designer.cs
@@ -0,0 +1,865 @@
+// <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("20221206143332_EndianType")]
+    partial class EndianType
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.10");
+
+            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<uint>("CmdPeriod")
+                        .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<int>("EndianType")
+                        .HasColumnType("INTEGER");
+
+                    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/20221206143332_EndianType.cs b/IoTGateway.DataAccess/Migrations/20221206143332_EndianType.cs
new file mode 100644
index 0000000..02359ef
--- /dev/null
+++ b/IoTGateway.DataAccess/Migrations/20221206143332_EndianType.cs
@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IoTGateway.DataAccess.Migrations
+{
+    public partial class EndianType : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "EndianType",
+                table: "DeviceVariables",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EndianType",
+                table: "DeviceVariables");
+        }
+    }
+}
diff --git a/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs b/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs
index a29e1d4..73de5c2 100644
--- a/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs
+++ b/IoTGateway.DataAccess/Migrations/DataContextModelSnapshot.cs
@@ -137,6 +137,9 @@ namespace IoTGateway.DataAccess.Migrations
                     b.Property<Guid?>("DeviceId")
                         .HasColumnType("TEXT");
 
+                    b.Property<int>("EndianType")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("Expressions")
                         .HasColumnType("TEXT");
 
diff --git a/IoTGateway.Model/DeviceVariable.cs b/IoTGateway.Model/DeviceVariable.cs
index 4f8b449..770ba45 100644
--- a/IoTGateway.Model/DeviceVariable.cs
+++ b/IoTGateway.Model/DeviceVariable.cs
@@ -20,7 +20,10 @@ namespace IoTGateway.Model
         public string DeviceAddress { get; set; }
 
         [Display(Name = "类型")]
-        public PluginInterface.DataTypeEnum DataType { get; set; }
+        public DataTypeEnum DataType { get; set; }
+
+        [Display(Name = "大小端")]
+        public EndianEnum EndianType { get; set; }
 
         [Display(Name = "表达式")]
         public string Expressions { get; set; }
diff --git a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableBatchVM.cs b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableBatchVM.cs
index 0d8d2aa..fa9bdfc 100644
--- a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableBatchVM.cs
+++ b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableBatchVM.cs
@@ -53,6 +53,8 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
         public String DeviceAddress { get; set; }
         [Display(Name = "数据类型")]
         public DataTypeEnum? DataType { get; set; }
+        [Display(Name = "大小端")]
+        public EndianEnum? EndianType { get; set; }
         [Display(Name = "表达式")]
         public string Expression { get; set; }
         [Display(Name = "权限")]
diff --git a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableImportVM.cs b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableImportVM.cs
index 04fe596..dd94121 100644
--- a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableImportVM.cs
+++ b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableImportVM.cs
@@ -25,6 +25,8 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
         public ExcelPropety DeviceAddress_Excel = ExcelPropety.CreateProperty<DeviceVariable>(x => x.DeviceAddress);
         [Display(Name = "数据类型")]
         public ExcelPropety DataType_Excel = ExcelPropety.CreateProperty<DeviceVariable>(x => x.DataType);
+        [Display(Name = "大小端")]
+        public ExcelPropety EndianType_Excel = ExcelPropety.CreateProperty<DeviceVariable>(x => x.EndianType);
         [Display(Name = "表达式")]
         public ExcelPropety Expressions_Excel = ExcelPropety.CreateProperty<DeviceVariable>(x => x.Expressions);
         [Display(Name = "权限")]
diff --git a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs
index 8f8fa10..73420e3 100644
--- a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs
+++ b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs
@@ -66,6 +66,7 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
                 this.MakeGridHeader(x => x.Method).SetSort(true).SetWidth(160),
                 this.MakeGridHeader(x => x.DeviceAddress).SetSort(true).SetWidth(80),
                 this.MakeGridHeader(x => x.DataType).SetSort(true).SetWidth(80),
+                this.MakeGridHeader(x => x.EndianType).SetSort(true).SetWidth(120),
                 this.MakeGridHeader(x => x.Value).SetWidth(80).SetFormat((a,b)=>{
                     return $"<div id='id{a.ID}_Value'>{a.Value}</div>";
                 }),
@@ -126,6 +127,7 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs
                     Method = x.Method,
                     DeviceAddress = x.DeviceAddress,
                     DataType = x.DataType,
+                    EndianType = x.EndianType,
                     Expressions = x.Expressions,
                     ProtectType = x.ProtectType,
                     DeviceName_view = x.Device.DeviceName,
diff --git a/IoTGateway/Areas/BasicData/Views/DeviceVariable/BatchEdit.cshtml b/IoTGateway/Areas/BasicData/Views/DeviceVariable/BatchEdit.cshtml
index 6d1cc6d..d902dba 100644
--- a/IoTGateway/Areas/BasicData/Views/DeviceVariable/BatchEdit.cshtml
+++ b/IoTGateway/Areas/BasicData/Views/DeviceVariable/BatchEdit.cshtml
@@ -3,15 +3,16 @@
 
 <wt:form vm="@Model">
     <div style="margin-bottom:10px">@Localizer["Sys.BatchEditConfirm"] </div>
-<wt:row items-per-row="ItemsPerRowEnum.Two">
-<wt:textbox field="LinkedVM.Name" />
-<wt:textbox field="LinkedVM.DeviceAddress" />
-<wt:combobox field="LinkedVM.DataType" />
-<wt:textbox field="LinkedVM.Expression" />
-<wt:combobox field="LinkedVM.ProtectType" />
-</wt:row>
+    <wt:row items-per-row="ItemsPerRowEnum.Two">
+        <wt:textbox field="LinkedVM.Name" />
+        <wt:textbox field="LinkedVM.DeviceAddress" />
+        <wt:combobox field="LinkedVM.DataType" />
+        <wt:combobox field="LinkedVM.EndianType" />
+        <wt:textbox field="LinkedVM.Expression" />
+        <wt:combobox field="LinkedVM.ProtectType" />
+    </wt:row>
     <wt:hidden field="Ids" />
-    <wt:grid vm="ListVM" use-local-data="true" height="300"  hidden-checkbox="true" hidden-panel="true"/>
+    <wt:grid vm="ListVM" use-local-data="true" height="300" hidden-checkbox="true" hidden-panel="true" />
     <wt:row align="AlignEnum.Right">
         <wt:submitbutton />
         <wt:closebutton />
diff --git a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Create.cshtml b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Create.cshtml
index 528140f..3c606e5 100644
--- a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Create.cshtml
+++ b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Create.cshtml
@@ -10,6 +10,7 @@
         <wt:combobox field="Entity.Method" items="AllMethods" required="true" />
         <wt:textbox field="Entity.DeviceAddress" />
         <wt:combobox field="Entity.DataType" />
+        <wt:combobox field="Entity.EndianType" />
         <wt:textbox field="Entity.Expressions"/>
         <wt:combobox field="Entity.ProtectType" />
     </wt:row>
diff --git a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Details.cshtml b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Details.cshtml
index 5d8a4ce..f71ed93 100644
--- a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Details.cshtml
+++ b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Details.cshtml
@@ -2,16 +2,17 @@
 @inject IStringLocalizer<Program> Localizer;
 
 <wt:form vm="@Model">
-<wt:row items-per-row="ItemsPerRowEnum.Two">
-<wt:display field="Entity.Name" />
-<wt:display field="Entity.Description" />
-<wt:display field="Entity.Method" />
-<wt:display field="Entity.DeviceAddress" />
-<wt:display field="Entity.DataType" />
-<wt:display field="Entity.Expressions" />
-<wt:display field="Entity.ProtectType" />
-<wt:display field="Entity.Device.DeviceName" />
-</wt:row>
+    <wt:row items-per-row="ItemsPerRowEnum.Two">
+        <wt:display field="Entity.Name" />
+        <wt:display field="Entity.Description" />
+        <wt:display field="Entity.Method" />
+        <wt:display field="Entity.DeviceAddress" />
+        <wt:display field="Entity.DataType" />
+        <wt:display field="Entity.EndianType" />
+        <wt:display field="Entity.Expressions" />
+        <wt:display field="Entity.ProtectType" />
+        <wt:display field="Entity.Device.DeviceName" />
+    </wt:row>
     <wt:row align="AlignEnum.Right">
         <wt:closebutton />
     </wt:row>
diff --git a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Edit.cshtml b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Edit.cshtml
index 82f3c63..a425d32 100644
--- a/IoTGateway/Areas/BasicData/Views/DeviceVariable/Edit.cshtml
+++ b/IoTGateway/Areas/BasicData/Views/DeviceVariable/Edit.cshtml
@@ -10,6 +10,7 @@
         <wt:combobox field="Entity.Method" items=AllMethods />
         <wt:textbox field="Entity.DeviceAddress" />
         <wt:combobox field="Entity.DataType" />
+        <wt:combobox field="Entity.EndianType" />
         <wt:textbox field="Entity.Expressions" />
         <wt:combobox field="Entity.ProtectType" />
     </wt:row>
diff --git a/IoTGateway/iotgateway.db b/IoTGateway/iotgateway.db
index 6059c2e39f74c8457a8e1c0ba26fde0086a84989..4f4e88cc9fb7e13512d801d17f19761c9a03551d 100644
GIT binary patch
delta 477
zcmZo@5N>D?o**r#&A`Cm1H|4y%mTz36LpLkwKpa#;g{m(Yh&Pl!heu|0e>BTEWaJU
z1m9=AvwW-g+BPdHWbmmdaWmUX8W|WF85$Xw8JZXy8ym&D=A~pN=7m%iq?+j&=ouPp
zUL_aB2sG&c1OF@jGyEI)C-avB&9dQ_;rq>ZkM97`q(yvkvds33I1S=%zNgoIPmgi?
zJv}B3Mk75&t|IPp9D1xNEdN<%F;8X|WvXS+V~J*8!TN|rg^L&H2L|>D3=AzkTI}N5
z+Ke6k+Y=3#W;1dqC_x-I{h%R}*z{f}M(*kLwoKB~XW28QwbvRk0WtITS|gSYUP0E6
zEUX`Sh54KKq<AOtwequU7js~VVddpyVyI{2<quUhmFD1>{xpt7b^0+M79T$5T1K8w
zkc6zMGEkz=pQUJffg8(rW+t9#+cUjbbeTXwTQhx@4@(6fe-#r<u`E!rh(AmI^nPEK
zul)SAY!C@WQ+W=c41YX}%5*1R7GK^Pc8CPT-i1Cag?u&45Fu4lNs!tuklMX|EI!Ku
GSPB4{gLWVQ

delta 344
zcmZo@5N>D?o**r##lXPe1H|4y%mT#f6LpLkwKgU!;g{gzTgAZtg#RG_0{%MwSbjTx
z3BJ#KXZcobR#fQY+q_CHiV>*f9s~a?{xkd=_$Tw10~Oiu%kcf?ySG^|;1FN)J-zmO
zdW_re=`m?As)aLh6>*>A&|^(u`Oh+oc`~yoQ!PU{OEmim)<-NVT)aTL8Q3RGR#edD
zYEjl=7uVKiY_HvJVZbz-aeBQill1gi_DpH*wMI-p%)GtUh^2#9kgb4;znPztua{4X
zcOtJ4&$R7g4lFUOlMNL9GIDM&aAWz-%*5BSJ=2Rtmx-l{ohx+uEFYE%o@zF(P)1(<
zP(@RDj_LgIEGpBt`?2^=@AqZ-Dgtx`Cs?wI8KOwlRC0R1KT9EZ1rtO-)>L-7f-g%x
TcQqqSKzaH<SC*n>0W1XojSW}*

diff --git a/Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs b/Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs
index f2e3a99..0eaf7e8 100644
--- a/Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs
+++ b/Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs
@@ -348,7 +348,7 @@ namespace DriverModbusMaster
                     else if (funCode == 4)
                         rawBuffers = _master.ReadInputRegisters(SlaveAddress, startAddress, count);
 
-                    var retBuffers = ChangeBuffersOrder(rawBuffers, ioarg.Endian);
+                    var retBuffers = ChangeBuffersOrder(rawBuffers, ioarg.EndianType);
                     if (ioarg.ValueType == DataTypeEnum.AsciiString)
                         retBuffers = rawBuffers;
 
diff --git a/Plugins/Plugin/DeviceThread.cs b/Plugins/Plugin/DeviceThread.cs
index 70496bb..b0d1526 100644
--- a/Plugins/Plugin/DeviceThread.cs
+++ b/Plugins/Plugin/DeviceThread.cs
@@ -87,7 +87,8 @@ namespace Plugin
                                             {
                                                 ID = item.ID,
                                                 Address = item.DeviceAddress,
-                                                ValueType = item.DataType
+                                                ValueType = item.DataType,
+                                                EndianType = item.EndianType
                                             };
                                             var method = Methods.Where(x => x.Name == item.Method).FirstOrDefault();
                                             if (method == null)
diff --git a/Plugins/PluginInterface/DriverAddressIoArgModel.cs b/Plugins/PluginInterface/DriverAddressIoArgModel.cs
index 21d4c02..8a5d00a 100644
--- a/Plugins/PluginInterface/DriverAddressIoArgModel.cs
+++ b/Plugins/PluginInterface/DriverAddressIoArgModel.cs
@@ -13,10 +13,10 @@ namespace PluginInterface
         public object Value { get; set; }
         public DataTypeEnum ValueType { get; set; }
 
-        public EndianEnum Endian { get; set; }
+        public EndianEnum EndianType { get; set; }
         public override string ToString()
         {
-            return $"变量ID:{ID},Address:{Address},Value:{Value},ValueType:{ValueType},Endian{Endian}";
+            return $"变量ID:{ID},Address:{Address},Value:{Value},ValueType:{ValueType},Endian:{EndianType}";
         }
     }
 }
diff --git a/Plugins/PluginInterface/EndianEnum.cs b/Plugins/PluginInterface/EndianEnum.cs
index cd33efc..c510e9e 100644
--- a/Plugins/PluginInterface/EndianEnum.cs
+++ b/Plugins/PluginInterface/EndianEnum.cs
@@ -1,19 +1,14 @@
 using System.ComponentModel.DataAnnotations;
 using System.Xml.Linq;
 
-namespace PluginInterface
-{
+namespace PluginInterface
+{
     public enum EndianEnum
     {
-        [Display(Name = "无")]
-        None,
-        [Display(Name = "大端")]
-        BigEndian,
-        [Display(Name = "小端")]
-        LittleEndian,
-        [Display(Name = "大端交换")]
-        BigEndianSwap,
-        [Display(Name = "小端交换")]
-        LittleEndianSwap
-    }
+        [Display(Name = "无")] None = 0,
+        [Display(Name = "大端")] BigEndian,
+        [Display(Name = "小端")] LittleEndian,
+        [Display(Name = "大端交换")] BigEndianSwap,
+        [Display(Name = "小端交换")] LittleEndianSwap
+    }
 }