feat 升级版本, 设备权限

Src/Dlhis.Entity/Basic/Entity/BasicTypeEntity.cs

@@ -1,4 +1,5 @@
-using SqlSugar;
+using Kurisu.SqlSugar;
+using SqlSugar;
 
 namespace Dlhis.Entity.Basic.Entity;
 

Src/Dlhis.Entity/Basic/Entity/CanteenBusinessPlaceEntity.cs

@@ -1,5 +1,6 @@
 using Dlhis.Entity.Canteen.Enums;
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 using SqlSugar.DbConvert;
 

Src/Dlhis.Entity/Basic/Entity/CanteenBusinessShiftEntity.cs

@@ -1,4 +1,5 @@
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 
 namespace Dlhis.Entity.Basic.Entity;

Src/Dlhis.Entity/Basic/Entity/CanteenSettingEntity.cs

@@ -1,5 +1,6 @@
 using Dlhis.Entity.Canteen.Enums;
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 using SqlSugar.DbConvert;
 

Src/Dlhis.Entity/Basic/Entity/CanteenUserEntity.cs

@@ -1,5 +1,6 @@
 using Dlhis.Entity.Canteen.Enums;
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 using SqlSugar.DbConvert;
 

Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs

@@ -1,4 +1,5 @@
-using SqlSugar;
+using Kurisu.SqlSugar;
+using SqlSugar;
 
 namespace Dlhis.Entity.Basic.Entity;
 

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

@@ -1,5 +1,6 @@
 using Dlhis.Entity.Device.Enums;
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 
 namespace Dlhis.Entity.Basic.Entity;

Src/Dlhis.Entity/Basic/Entity/DeviceTemplateEntity.cs

@@ -1,5 +1,6 @@
 using System;
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 
 namespace Dlhis.Entity.Basic.Entity;

Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs

@@ -1,4 +1,5 @@
 using Dlhis.Entity.Basic.Enums;
+using Kurisu.SqlSugar;
 using SqlSugar;
 using SqlSugar.DbConvert;
 

Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs

@@ -1,4 +1,5 @@
-using SqlSugar;
+using Kurisu.SqlSugar;
+using SqlSugar;
 
 namespace Dlhis.Entity.Basic.Entity;
 

Src/Dlhis.Entity/Basic/Entity/ZHRF_SYN_01Entity.cs

@@ -1,4 +1,5 @@
 using Dlhis.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 
 namespace Dlhis.ScheduledTask.Entities

Src/Dlhis.Entity/Basic/Entity/ZHRF_SYN_02Entity.cs

@@ -1,4 +1,5 @@
 using Dlhis.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 
 namespace Dlhis.ScheduledTask.Entities

Src/Dlhis.Entity/Canteen/Entities/BalanceRecordEntity.cs

@@ -1,5 +1,6 @@
 using Dlhis.Entity.Canteen.Enums;
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 using SqlSugar.DbConvert;
 

Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs

@@ -40,4 +40,5 @@ public class CanteenOrderEntity : BalanceRecordEntity, ITenantId
     /// </summary>
     [SugarColumn(ColumnDescription = "处理结果")]
     public string Result { get; set; }
+    public string TenantId { get; set; }
 }

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

@@ -1,4 +1,5 @@
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 
 namespace Dlhis.Entity.Device.Entities;
@@ -9,6 +10,12 @@ namespace Dlhis.Entity.Device.Entities;
 [SugarTable(TableName = "DeviceGroup", TableDescription = "设备组")]
 public class DeviceGroupEntity : SugarBaseEntity, ITenantId, ISoftDeleted
 {
+    /// <summary>
+    /// 上级设备组code
+    /// </summary>
+    [SugarColumn(ColumnDescription = "上级设备组code")]
+    public Guid? PCode { get; set; }
+
     /// <summary>
     /// 设备组code
     /// </summary>
@@ -21,6 +28,7 @@ public class DeviceGroupEntity : SugarBaseEntity, ITenantId, ISoftDeleted
     [SugarColumn(ColumnDescription = "设备组名称")]
     public string Name { get; set; }
 
+
     public string TenantId { get; set; }
 
 

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

@@ -1,4 +1,5 @@
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 
 namespace Dlhis.Entity.Device.Entities;

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

@@ -1,4 +1,5 @@
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 
 namespace Dlhis.Entity.Device.Entities;

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

@@ -1,4 +1,5 @@
-using SqlSugar;
+using Kurisu.SqlSugar;
+using SqlSugar;
 
 namespace Dlhis.Entity.Device.Entities;
 

Src/Dlhis.Entity/Dlhis.Entity.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Kurisu.SqlSugar" Version="0.0.3" />
+    <PackageReference Include="Kurisu.SqlSugar" Version="0.0.4" />
   </ItemGroup>
 
 </Project>

Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs

@@ -1,6 +1,8 @@
 using Dlhis.Entity.Sys.Enums;
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
+using SqlSugar.DbConvert;
 
 namespace Dlhis.Entity.Sys.Entities;
 
@@ -8,25 +10,27 @@ namespace Dlhis.Entity.Sys.Entities;
 /// 设备权限
 /// </summary>
 [SugarTable(TableName = "DevicePermission", TableDescription = "设备权限")]
-public class DevicePermissionEntity : ITenantId
+public class DevicePermissionEntity : SugarBaseEntity, ITenantId, ISoftDeleted
 {
+    /// <summary>
+    /// 人员档案
+    /// </summary>
+    [SugarColumn(ColumnDescription = "人员档案")]
+    public string UserId { get; set; }
+
     /// <summary>
     /// 设备权限类型
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "设备权限类型", SqlParameterDbType = typeof(DevicePermissionTypeEnumType))]
-    public DevicePermissionTypeEnumType UniqueType { get; set; }
+    [SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "设备权限类型", SqlParameterDbType = typeof(EnumToStringConvert))]
+    public DeviceAssignmentTypeEnumType UniqueType { get; set; }
 
     /// <summary>
     /// 类型值
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "类型值")]
-    public string UniqueValue { get; set; }
-
-    /// <summary>
-    /// 设备code
-    /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "设备code")]
-    public string Code { get; set; }
+    [SugarColumn(ColumnDescription = "类型值")]
+    public Guid UniqueValue { get; set; }
 
     public string TenantId { get; set; }
+
+    public bool IsDeleted { get; set; }
 }

Src/Dlhis.Entity/Sys/Entities/MenuEntity.cs

@@ -1,4 +1,5 @@
 using Dlhis.Entity.Sys.Enums;
+using Kurisu.SqlSugar;
 using SqlSugar;
 using SqlSugar.DbConvert;
 

Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs

@@ -1,5 +1,6 @@
 using Dlhis.Entity.Sys.Enums;
 using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 using SqlSugar.DbConvert;
 

Src/Dlhis.Entity/Sys/Entities/TenantEntity.cs

@@ -0,0 +1,22 @@
+using SqlSugar;
+
+namespace Dlhis.Entity.Sys.Entities;
+
+/// <summary>
+/// 租户
+/// </summary>
+[SugarTable(TableName = "Tenants")]
+public class TenantEntity
+{
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 基地code
+    /// </summary>
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 租户名称
+    /// </summary>
+    public string Name { get; set; }
+}

Src/Dlhis.Entity/Sys/Enums/DeviceAssignmentTypeEnumType.cs

@@ -5,18 +5,18 @@ namespace Dlhis.Entity.Sys.Enums;
 /// <summary>
 /// 设备权限类型
 /// </summary>
-[Description("设备权限类型")]
-public enum DevicePermissionTypeEnumType
+[Description("设备分配权限类型")]
+public enum DeviceAssignmentTypeEnumType
 {
+    /// <summary>
+    /// 设备
+    /// </summary>
+    [Description("设备")]
+    Device = 1,
+
     /// <summary>
     /// 设备组
     /// </summary>
     [Description("设备组")]
-    Group = 1,
-
-    /// <summary>
-    /// 人员
-    /// </summary>
-    [Description("人员")]
-    Person = 2
+    Group = 2
 }