fix 实体位置

Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs

@@ -1,6 +1,6 @@
 using Dlhis.Basic.BusinessPlace.Request;
 using Dlhis.Basic.BusinessPlace.Response;
-using Dlhis.Entity.Canteen.Entities;
+using Dlhis.Entity.Basic;
 using Dlhis.Entity.Canteen.Enums;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.DataAccess.Dto;

Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs

@@ -1,6 +1,6 @@
 using Dlhis.Basic.BusinessShift.Request;
 using Dlhis.Basic.BusinessShift.Response;
-using Dlhis.Entity.Canteen.Entities;
+using Dlhis.Entity.Basic;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.CustomClass;
 using Kurisu.Core.DataAccess.Dto;

Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs

@@ -1,13 +1,12 @@
 using Dlhis.Basic.Device.Request;
 using Dlhis.Basic.Device.Response;
-using Dlhis.Entity.Device.Entities;
+using Dlhis.Entity.Basic;
 using Kurisu.AspNetCore.UnifyResultAndValidation;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.DataAccess.Dto;
 using Kurisu.SqlSugar.Extensions;
 using Kurisu.SqlSugar.Services;
 using Mapster;
-using NetTaste;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -34,6 +33,7 @@ public class DeviceService : IDeviceService
 
     public async Task SaveAsync(DeviceSaveRequest request)
     {
+        await CheckUniqueNoExistsAsync(request);
         var template = await CheckTemplateExistsAsync(request.TemplateCode);
         await CheckTemplateFieldAsync(request.TemplateCode, request.ConnectionInfo);
 
@@ -102,4 +102,19 @@ public class DeviceService : IDeviceService
             throw;
         }
     }
+
+    /// <summary>
+    /// 检查唯一号是否存在
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    private async Task CheckUniqueNoExistsAsync(DeviceSaveRequest request)
+    {
+        var exists = await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == request.UniqueNo)
+              .WhereIF(request.Id.HasValue, x => x.Id != request.Id)
+              .AnyAsync();
+
+        exists.ThrowIfTrue("唯一号已经存在");
+    }
 }
+

Src/Dlhis.Basic/Device/Services/Implements/DeviceTemplateService.cs

@@ -1,6 +1,6 @@
 using Dlhis.Basic.Device.Request;
 using Dlhis.Basic.Device.Response;
-using Dlhis.Entity.Device.Entities;
+using Dlhis.Entity.Basic;
 using Kurisu.AspNetCore.UnifyResultAndValidation;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.DataAccess.Dto;

Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs

@@ -1,6 +1,5 @@
-namespace Dlhis.Basic.MealUser.Response
+namespace Dlhis.Basic.MealUser.Response;
+
+public class MealUserResponse
 {
-    public class MealUserResponse
-    {
-    }
 }

Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs

@@ -1,6 +1,6 @@
 using Dlhis.Basic.MealUser.Request;
 using Dlhis.Basic.MealUser.Response;
-using Dlhis.Entity.Canteen.Entities;
+using Dlhis.Entity.Basic;
 using Kurisu.Core.DataAccess.Dto;
 using Kurisu.SqlSugar.Extensions;
 using Kurisu.SqlSugar.Services;

Src/Dlhis.Basic/Program.cs

@@ -1,5 +1,6 @@
 using Kurisu.AspNetCore.Startup;
 using Kurisu.Startup;
+using Microsoft.IdentityModel.Logging;
 
 class Program
 {
@@ -13,5 +14,6 @@ public class Startup : DefaultStartup
 {
     public Startup(IConfiguration configuration) : base(configuration)
     {
+        IdentityModelEventSource.ShowPII = true;
     }
 }

Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs

@@ -1,6 +1,6 @@
 using Dlhis.Canteen.Setting.Request;
 using Dlhis.Canteen.Setting.Response;
-using Dlhis.Entity.Canteen.Entities;
+using Dlhis.Entity.Basic;
 using Dlhis.Entity.Canteen.Enums;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.DataAccess.Dto;

Src/Dlhis.Entity/Basic/CanteenBusinessPlaceEntity.cs

@@ -3,7 +3,7 @@ using Kurisu.Core.DataAccess.Entity;
 using SqlSugar;
 using SqlSugar.DbConvert;
 
-namespace Dlhis.Entity.Canteen.Entities;
+namespace Dlhis.Entity.Basic;
 
 /// <summary>
 /// 营业点

Src/Dlhis.Entity/Basic/CanteenBusinessShiftEntity.cs

@@ -1,7 +1,7 @@
 using Kurisu.Core.DataAccess.Entity;
 using SqlSugar;
 
-namespace Dlhis.Entity.Canteen.Entities;
+namespace Dlhis.Entity.Basic;
 
 /// <summary>
 /// 营业点餐次

Src/Dlhis.Entity/Basic/CanteenSettingEntity.cs

@@ -3,7 +3,7 @@ using Kurisu.Core.DataAccess.Entity;
 using SqlSugar;
 using SqlSugar.DbConvert;
 
-namespace Dlhis.Entity.Canteen.Entities;
+namespace Dlhis.Entity.Basic;
 
 /// <summary>
 /// 就餐配置

Src/Dlhis.Entity/Basic/CanteenUserEntity.cs

@@ -3,7 +3,7 @@ using Kurisu.Core.DataAccess.Entity;
 using SqlSugar;
 using SqlSugar.DbConvert;
 
-namespace Dlhis.Entity.Canteen.Entities;
+namespace Dlhis.Entity.Basic;
 
 /// <summary>
 /// 就餐人员

Src/Dlhis.Entity/Basic/DeviceEntity.cs

@@ -2,7 +2,7 @@
 using Kurisu.Core.DataAccess.Entity;
 using SqlSugar;
 
-namespace Dlhis.Entity.Device.Entities;
+namespace Dlhis.Entity.Basic;
 
 /// <summary>
 /// 设备
@@ -25,7 +25,7 @@ public class DeviceEntity : SugarBaseEntity, ITenantId
     /// <summary>
     /// 心跳间隔
     /// </summary>
-    [SugarColumn(ColumnDescription = "心跳检查")]
+    [SugarColumn(ColumnDescription = "心跳检查间隔")]
     public int HeartbeatInterval { get; set; }
 
     /// <summary>

Src/Dlhis.Entity/Basic/DeviceTemplateEntity.cs

@@ -2,7 +2,7 @@
 using Kurisu.Core.DataAccess.Entity;
 using SqlSugar;
 
-namespace Dlhis.Entity.Device.Entities;
+namespace Dlhis.Entity.Basic;
 
 /// <summary>
 /// 设备配置模板