fix 枚举调整

Src/Dlhis.Common/FileOperation/Response/ApkFileResponse.cs

@@ -9,16 +9,16 @@ namespace Dlhis.Common.FileOperation.Response
         /// </summary>
         public string Name { get; set; }
 
-        /// <summary>
-        /// 地址
-        /// </summary>
-        public string Url { get; set; }
-
         /// <summary>
         /// 版本号
         /// </summary>
         public int VersionCode { get; set; }
 
+        /// <summary>
+        /// 版本名称
+        /// </summary>
+        public int VersionName { get; set; }
+
         /// <summary>
         /// 修改信息
         /// </summary>

Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs

@@ -2,6 +2,7 @@
 using Kurisu.Core.DataAccess.Entity;
 using Kurisu.SqlSugar;
 using SqlSugar;
+using SqlSugar.DbConvert;
 
 namespace Dlhis.Entity.Basic.Entity;
 
@@ -44,7 +45,7 @@ public class DeviceEntity : SugarBaseEntity, ITenantId
     /// <summary>
     /// 设备机功能类型
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(150)",  ColumnDescription = "设备机功能类型")]
+    [SugarColumn(ColumnDescription = "设备机功能类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
     public DeviceGroupFunctionEnumType Type { get; set; }
 
     /// <summary>

Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs

@@ -2,6 +2,7 @@
 using Kurisu.Core.DataAccess.Entity;
 using Kurisu.SqlSugar;
 using SqlSugar;
+using SqlSugar.DbConvert;
 
 namespace Dlhis.Entity.Device.Entities;
 
@@ -15,7 +16,7 @@ public class DeviceGroupEntity : SugarBaseEntity, ITenantId, ISoftDeleted
     /// <summary>
     /// 设备组功能类型
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(150)", ColumnDescription = "设备组功能类型")]
+    [SugarColumn(ColumnDescription = "设备组功能类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
     public DeviceGroupFunctionEnumType Type { get; set; }
 
     /// <summary>

Src/Dlhis.ScheduledTask/TaskAssignment/Request/TaskRecordsRequest.cs

@@ -15,10 +15,10 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Request
         public string GainfoNo { get; set; }
 
         /// <summary>
-        /// 设备功能
+        /// 设备机功能类型
         /// </summary>
         [Required]
-        [EnumDataType(typeof(DeviceFuncEnumType))]
-        public DeviceFuncEnumType type { get; set; }
+        [EnumDataType(typeof(DeviceGroupFunctionEnumType))]
+        public DeviceGroupFunctionEnumType type { get; set; }
     }
 }

Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs

@@ -51,7 +51,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
     {
         //获取启用的功能设备
         var devices = await _dbContext.Queryable<DeviceEntity>()
-            .Where(x => x.Funcs.Contains(request.type))
+            .Where(x => x.Type == request.type)
             .Select(x => x.UniqueNo)
             .ToListAsync();
         devices.ThrowIfNull($"{request.type.GetDescription}功能机器为空");