diff --git a/Device/DeviceManager.cs b/Device/DeviceManager.cs
index f8e71d4..6a82c93 100644
--- a/Device/DeviceManager.cs
+++ b/Device/DeviceManager.cs
@@ -97,7 +97,12 @@ namespace LY.App.Device
             }
         }
 
-        public async void RemoveDevice(long deviceId)
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <returns></returns>
+        public async Task RemoveDevice(long deviceId)
         {
             if (_devices.TryRemove(deviceId, out var device))
             {
diff --git a/Model/Alarm.cs b/Model/Alarm.cs
index 9506a5e..0d54033 100644
--- a/Model/Alarm.cs
+++ b/Model/Alarm.cs
@@ -6,6 +6,7 @@ namespace LY.App.Model
 {
     [SplitTable(SplitType.Month)]//按年分表 （自带分表支持 年、季、月、周、日）
     [SugarTable("ly_alarm_{year}{month}{day}")]
+    [SugarIndex("index_ly_alarm_batchid", nameof(BatchId), OrderByType.Asc)]
     public class Alarm : BaseEntity
     {
         /// <summary>
diff --git a/Model/MultPolygonEntity.cs b/Model/MultPolygonEntity.cs
index 5c27ce2..67a0c96 100644
--- a/Model/MultPolygonEntity.cs
+++ b/Model/MultPolygonEntity.cs
@@ -12,14 +12,6 @@ namespace LY.App.Model
     /// </summary>
     public class MultPolygonEntity : BaseEntity
     {
-        /// <summary>
-        /// 空间位置点数据
-        /// </summary>
-        [SugarColumn(QuerySql = "st_astext(location)", ColumnDataType = "point", ColumnName = "location",
-            UpdateSql = "ST_GeomFromText(@location)",
-            InsertSql = "ST_GeomFromText(@location)", IsNullable = true, ColumnDescription = "空间位置点数据")]
-        [JsonIgnore]
-        public string? Location { get; set; } //   Geometry 
         /// <summary>
         /// 空间面数据
         /// </summary>
@@ -32,16 +24,6 @@ namespace LY.App.Model
         [SugarColumn(IsIgnore = true)]
         public string RegionJson { get; set; }
 
-        /// <summary>
-        /// 空间位置点经度
-        /// </summary>
-        public double Lon { get; set; }
-
-        /// <summary>
-        /// 空间位置点纬度
-        /// </summary>
-        public double Lat { get; set; }
-
         /// <summary>
         /// 空间位置点Json数据
         /// </summary>
@@ -68,18 +50,6 @@ namespace LY.App.Model
                 Region = region.AsText();
             }
         }
-
-        /// <summary>
-        /// 设置空间位置点
-        /// </summary>
-        /// <param name="lon"></param>
-        /// <param name="lat"></param>
-        public void SetLocation(double lon, double lat)
-        {
-            Lon = lon;
-            Lat = lat;
-            SetLocation();
-        }
         /// <summary>
         /// 设置空间位置点
         /// </summary>
@@ -96,12 +66,5 @@ namespace LY.App.Model
                 }
             }
         }
-        /// <summary>
-        /// 设置空间位置点
-        /// </summary>
-        public void SetLocation()
-        {
-            Location = $"POINT({Lon} {Lat})";
-        }
     }
 }
diff --git a/Service/DeviceService.cs b/Service/DeviceService.cs
index 18736da..c82e61f 100644
--- a/Service/DeviceService.cs
+++ b/Service/DeviceService.cs
@@ -93,6 +93,8 @@ namespace LY.App.Service
         {
             var entity = input.Adapt<DeviceEntity>();
             await _db.Updateable(entity).ExecuteCommandAsync();
+            await deviceManager.RemoveDevice(entity.Id);
+            await AddDevice2Manager(entity);
             return new ApiResult()
             {
                 code = 0,
@@ -109,7 +111,7 @@ namespace LY.App.Service
             var entity = await _db.Queryable<DeviceEntity>().FirstAsync(s => s.Id == Id);
             entity.IsDeleted = true;
             await _db.Updateable(entity).ExecuteCommandAsync();
-            deviceManager.RemoveDevice(entity.Id);
+            await deviceManager.RemoveDevice(entity.Id);
             return new ApiResult()
             {
                 code = 0,
diff --git a/Service/PositionService.cs b/Service/PositionService.cs
index b669f0c..329ea41 100644
--- a/Service/PositionService.cs
+++ b/Service/PositionService.cs
@@ -48,7 +48,6 @@ namespace LY.App.Service
                 }
             }
             // 位置
-            entity.SetLocation();
             await _db.Insertable(entity).ExecuteReturnSnowflakeIdAsync();
             return new ApiResult(true, "添加成功");
         }
@@ -69,8 +68,6 @@ namespace LY.App.Service
                         return new ApiResult(false, "空间数据无效");
                     }
                 }
-                // 位置
-                entity.SetLocation();
                 await _db.Updateable(entity).ExecuteCommandAsync();
                 return new ApiResult(true, "添加成功");
             }
diff --git a/Service/UserService.cs b/Service/UserService.cs
index 99b644e..ef9c47c 100644
--- a/Service/UserService.cs
+++ b/Service/UserService.cs
@@ -242,9 +242,6 @@ namespace LY.App.Service
                 var entity = input.Adapt<UserEntity>();
                 await _db.Updateable(entity).UpdateColumns(it => new
                 {
-                    it.UpdatePwdTime,
-                    it.Password,
-                    it.Email,
                     it.IsAdmin
                 }).ExecuteCommandAsync();
                 return null;