From ed868331e02326a4cb39bf184c63f748350ddbcd Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 26 Dec 2023 17:05:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=AE=9E=E4=BD=93=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/BusinessPlaceService.cs | 2 +- .../Implements/BusinessPlaceShiftService.cs | 2 +- .../Services/Implements/DeviceService.cs | 19 +++++++++++++++++-- .../Implements/DeviceTemplateService.cs | 2 +- .../MealUser/Response/MealUserResponse.cs | 7 +++---- .../Services/Implements/MealUserService.cs | 2 +- Src/Dlhis.Basic/Program.cs | 2 ++ .../Implements/CanteenSettingService.cs | 2 +- .../CanteenBusinessPlaceEntity.cs | 2 +- .../CanteenBusinessShiftEntity.cs | 2 +- .../CanteenSettingEntity.cs | 2 +- .../Entities => Basic}/CanteenUserEntity.cs | 2 +- .../Entities => Basic}/DeviceEntity.cs | 4 ++-- .../DeviceTemplateEntity.cs | 2 +- 14 files changed, 34 insertions(+), 18 deletions(-) rename Src/Dlhis.Entity/{Canteen/Entities => Basic}/CanteenBusinessPlaceEntity.cs (97%) rename Src/Dlhis.Entity/{Canteen/Entities => Basic}/CanteenBusinessShiftEntity.cs (96%) rename Src/Dlhis.Entity/{Canteen/Entities => Basic}/CanteenSettingEntity.cs (97%) rename Src/Dlhis.Entity/{Canteen/Entities => Basic}/CanteenUserEntity.cs (97%) rename Src/Dlhis.Entity/{Device/Entities => Basic}/DeviceEntity.cs (96%) rename Src/Dlhis.Entity/{Device/Entities => Basic}/DeviceTemplateEntity.cs (96%) diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs index 2dde7134..234a3fe5 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs +++ b/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; diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs index 6562c181..b54f731a 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs +++ b/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; diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 4a49e07e..804592aa 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/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; } } + + /// + /// 检查唯一号是否存在 + /// + /// + /// + private async Task CheckUniqueNoExistsAsync(DeviceSaveRequest request) + { + var exists = await _dbContext.Queryable().Where(x => x.UniqueNo == request.UniqueNo) + .WhereIF(request.Id.HasValue, x => x.Id != request.Id) + .AnyAsync(); + + exists.ThrowIfTrue("唯一号已经存在"); + } } + diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceTemplateService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceTemplateService.cs index 9c48da6e..de920927 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceTemplateService.cs +++ b/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; diff --git a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs index 2aee574d..630f92b8 100644 --- a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs +++ b/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 - { - } } diff --git a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs index c33e7ef0..27e1c48f 100644 --- a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs +++ b/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; diff --git a/Src/Dlhis.Basic/Program.cs b/Src/Dlhis.Basic/Program.cs index 49e05881..d7c99860 100644 --- a/Src/Dlhis.Basic/Program.cs +++ b/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; } } \ No newline at end of file diff --git a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs index 3e11cccb..54751746 100644 --- a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs +++ b/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; diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenBusinessPlaceEntity.cs b/Src/Dlhis.Entity/Basic/CanteenBusinessPlaceEntity.cs similarity index 97% rename from Src/Dlhis.Entity/Canteen/Entities/CanteenBusinessPlaceEntity.cs rename to Src/Dlhis.Entity/Basic/CanteenBusinessPlaceEntity.cs index ad8edfc8..89c58af1 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenBusinessPlaceEntity.cs +++ b/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; /// /// 营业点 diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenBusinessShiftEntity.cs b/Src/Dlhis.Entity/Basic/CanteenBusinessShiftEntity.cs similarity index 96% rename from Src/Dlhis.Entity/Canteen/Entities/CanteenBusinessShiftEntity.cs rename to Src/Dlhis.Entity/Basic/CanteenBusinessShiftEntity.cs index 4531ec87..1ea46c29 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenBusinessShiftEntity.cs +++ b/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; /// /// 营业点餐次 diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenSettingEntity.cs b/Src/Dlhis.Entity/Basic/CanteenSettingEntity.cs similarity index 97% rename from Src/Dlhis.Entity/Canteen/Entities/CanteenSettingEntity.cs rename to Src/Dlhis.Entity/Basic/CanteenSettingEntity.cs index d719e7b5..cadb4416 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenSettingEntity.cs +++ b/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; /// /// 就餐配置 diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenUserEntity.cs b/Src/Dlhis.Entity/Basic/CanteenUserEntity.cs similarity index 97% rename from Src/Dlhis.Entity/Canteen/Entities/CanteenUserEntity.cs rename to Src/Dlhis.Entity/Basic/CanteenUserEntity.cs index 062cc6ec..502431ec 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenUserEntity.cs +++ b/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; /// /// 就餐人员 diff --git a/Src/Dlhis.Entity/Device/Entities/DeviceEntity.cs b/Src/Dlhis.Entity/Basic/DeviceEntity.cs similarity index 96% rename from Src/Dlhis.Entity/Device/Entities/DeviceEntity.cs rename to Src/Dlhis.Entity/Basic/DeviceEntity.cs index afaf4ff1..0af99042 100644 --- a/Src/Dlhis.Entity/Device/Entities/DeviceEntity.cs +++ b/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; /// /// 设备 @@ -25,7 +25,7 @@ public class DeviceEntity : SugarBaseEntity, ITenantId /// /// 心跳间隔 /// - [SugarColumn(ColumnDescription = "心跳检查")] + [SugarColumn(ColumnDescription = "心跳检查间隔")] public int HeartbeatInterval { get; set; } /// diff --git a/Src/Dlhis.Entity/Device/Entities/DeviceTemplateEntity.cs b/Src/Dlhis.Entity/Basic/DeviceTemplateEntity.cs similarity index 96% rename from Src/Dlhis.Entity/Device/Entities/DeviceTemplateEntity.cs rename to Src/Dlhis.Entity/Basic/DeviceTemplateEntity.cs index c395334d..f5fc98c4 100644 --- a/Src/Dlhis.Entity/Device/Entities/DeviceTemplateEntity.cs +++ b/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; /// /// 设备配置模板