修复bug和计算表达式问题

IoTGateway/Areas/BasicData/Controllers/DeviceVariableController.cs

@@ -50,6 +50,9 @@ namespace IoTGateway.Controllers
         [ActionDescription("Sys.Create")]
         public ActionResult Create(DeviceVariableVM vm)
         {
+
+            if (vm.FC.ContainsKey("Entity.Expressions"))
+                vm.Entity.Expressions = vm.FC["Entity.Expressions"].ToString();
             if (!ModelState.IsValid)
             {
                 return PartialView(vm);
@@ -83,6 +86,8 @@ namespace IoTGateway.Controllers
         [ValidateFormItemOnly]
         public ActionResult Edit(DeviceVariableVM vm)
         {
+            if (vm.FC.ContainsKey("Entity.Expressions"))
+                vm.Entity.Expressions = vm.FC["Entity.Expressions"].ToString();
             if (!ModelState.IsValid)
             {
                 return PartialView(vm);

Plugins/Plugin/DeviceService.cs

@@ -82,11 +82,16 @@ namespace Plugin
         {
             try
             {
-                _logger.LogInformation($"CreateDeviceThread Start:{Device.DeviceName}");
+                _logger.LogInformation($"CreateDeviceThread Start:{Device.DeviceName},Driver:{Device.Driver}");
+                if (Device.Driver == null)
+                    return;
                 using (var DC = new DataContext(connnectSetting, DBType))
                 {
                     var systemManage = DC.Set<SystemConfig>().FirstOrDefault();
                     var driver = _DrvierManager.DriverInfos.Where(x => x.Type.FullName == Device.Driver.AssembleName).SingleOrDefault();
+                    if (driver == null)
+                        return;
+                    
                     var settings = DC.Set<DeviceConfig>().Where(x => x.DeviceId == Device.ID).AsNoTracking().ToList();
                     Type[] types = new Type[1] { typeof(Guid) };
                     object[] param = new object[1] { Device.ID };

Plugins/Plugin/DeviceThread.cs

@@ -274,7 +274,7 @@ namespace Plugin
         //mysql会把一些符号转义，没找到原因，先临时处理下
         private string DealMysqlStr(string Expression)
         {
-            return Expression.Replace("&lt;", ">").Replace("&gt;", "<").Replace("&amp;", "&");
+            return Expression.Replace("&lt;", "<").Replace("&gt;", ">").Replace("&amp;", "&");
         }
     }
 

WalkingTec.Mvvm/WalkingTec.Mvvm.Core/BaseCRUDVM.cs

@@ -344,8 +344,9 @@ namespace WalkingTec.Mvvm.Core
         /// <param name="updateAllFields">为true时，框架会更新当前Entity的全部值，为false时，框架会检查Request.Form里的key，只更新表单提交的字段</param>
         public virtual void DoEdit(bool updateAllFields = false)
         {
+           
             DoEditPrepare(updateAllFields);
-
+           
             try
             {
                 DC.SaveChanges();
@@ -629,10 +630,11 @@ namespace WalkingTec.Mvvm.Core
                         string name = f.Replace("entity.", "");
                         try
                         {
-                            DC.UpdateProperty(Entity, pros.Where(x => x.Name.ToLower() == name).Select(x => x.Name).FirstOrDefault());
+                            DC.UpdateProperty(Entity, pros.Where(x => name!="id" && x.Name.ToLower() == name).Select(x => x.Name).FirstOrDefault());//id字段不可修改
                         }
-                        catch (Exception)
+                        catch (Exception ex)
                         {
+                            MSD.AddModelError("", CoreProgram._localizer?["Sys.EditPrepare"]);
                         }
                     }
                 }

WalkingTec.Mvvm/WalkingTec.Mvvm.Core/DataContext.cs

@@ -508,6 +508,8 @@ namespace WalkingTec.Mvvm.Core
         public void UpdateProperty<T>(T entity, string fieldName)
             where T : TopBasePoco
         {
+            if (string.IsNullOrEmpty(fieldName))
+                return;
             var set = this.Set<T>();
             if (set.Local.AsQueryable().CheckID(entity.GetID()).FirstOrDefault() == null)
             {