From 5746f93f8ed8947476a164673cc7274a4c5377cd Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 19 Apr 2024 17:27:49 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=88=86?= =?UTF-8?q?=E9=85=8D=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/AppointmentAreaAssignmentEntity.cs | 9 ++++----- .../ApponintmentAreasController.cs | 2 +- .../Request/AppointmentAreaAssignRequest.cs | 3 +-- .../Services/Implements/AppointmentService.cs | 20 ++++++++----------- .../Implements/ApponintmentAreaService.cs | 4 ++-- Src/Dlhis.Visitor/Dlhis.Visitor.csproj | 1 - Src/Dlhis.Visitor/Dockerfile | 1 - 7 files changed, 16 insertions(+), 24 deletions(-) diff --git a/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaAssignmentEntity.cs b/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaAssignmentEntity.cs index 3635b96b..320f9599 100644 --- a/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaAssignmentEntity.cs +++ b/Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaAssignmentEntity.cs @@ -17,12 +17,11 @@ public class AppointmentAreaAssignmentEntity : SugarBaseEntity, ITenantId public string CustomCode { get; set; } /// - /// 分组code + /// 设备code /// - [SugarColumn(IsNullable = false, ColumnDescription = "分组code")] - public Guid GroupCode { get; set; } - //UniqueGroupNameList = new[] { "idx_aaa_cc_grpc_tid" } + [SugarColumn(IsNullable = false, ColumnDescription = "设备code")] + public Guid DeviceCode { get; set; } - [SugarColumn()] + [SugarColumn] public string TenantId { get; set; } } diff --git a/Src/Dlhis.Visitor/Appointment/Controllers/ApponintmentAreasController.cs b/Src/Dlhis.Visitor/Appointment/Controllers/ApponintmentAreasController.cs index c7055988..f2392cbb 100644 --- a/Src/Dlhis.Visitor/Appointment/Controllers/ApponintmentAreasController.cs +++ b/Src/Dlhis.Visitor/Appointment/Controllers/ApponintmentAreasController.cs @@ -57,7 +57,7 @@ public class ApponintmentAreasController : ControllerBase } /// - /// 分配设备组 + /// 分配设备 /// /// [HttpPost("assign")] diff --git a/Src/Dlhis.Visitor/Appointment/Request/AppointmentAreaAssignRequest.cs b/Src/Dlhis.Visitor/Appointment/Request/AppointmentAreaAssignRequest.cs index 7ef2b7e9..755a14a8 100644 --- a/Src/Dlhis.Visitor/Appointment/Request/AppointmentAreaAssignRequest.cs +++ b/Src/Dlhis.Visitor/Appointment/Request/AppointmentAreaAssignRequest.cs @@ -10,9 +10,8 @@ public class AppointmentAreaAssignRequest [Required] public string CustomCode { get; set; } - /// /// 分组 /// - public List GroupCodes { get; set; } + public List DeviceCodes { get; set; } } diff --git a/Src/Dlhis.Visitor/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Visitor/Appointment/Services/Implements/AppointmentService.cs index 2e4a405b..3942964b 100644 --- a/Src/Dlhis.Visitor/Appointment/Services/Implements/AppointmentService.cs +++ b/Src/Dlhis.Visitor/Appointment/Services/Implements/AppointmentService.cs @@ -1,5 +1,4 @@ -using Dlhis.Basic.Api; -using Dlhis.Entity.Basic.Entity; +using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Device.Entities; using Dlhis.Entity.Device.Enums; using Dlhis.Entity.Visitor.Entity; @@ -20,13 +19,11 @@ namespace Dlhis.Visitor.Appointment.Services.Implements; public class AppointmentService : IAppointmentService { private readonly IDbContext _dbContext; - private readonly IDeviceGroupApi _deviceGroupApi; private readonly IDataProtectionProvider _dataProtectionProvider; - public AppointmentService(IDbContext dbContext, IDeviceGroupApi deviceGroupApi, IDataProtectionProvider dataProtectionProvider) + public AppointmentService(IDbContext dbContext, IDataProtectionProvider dataProtectionProvider) { _dbContext = dbContext; - _deviceGroupApi = deviceGroupApi; _dataProtectionProvider = dataProtectionProvider; } @@ -136,23 +133,22 @@ public class AppointmentService : IAppointmentService detail.ThrowIfNull("预约信息不存在"); var mst = await _dbContext.Queryable().Where(x => x.Id == detail.AppointmentId).FirstAsync(); - var deviceGroup = await _dbContext.Queryable() + var deviceCodes = await _dbContext.Queryable() .Where(x => x.CustomCode == mst.AreaCustomCode) - .Select(x => x.GroupCode) - .FirstAsync(); + .Select(x => x.DeviceCode) + .ToListAsync(); - var deviceCodesResult = await _deviceGroupApi.GetDevicesByCodeAsync(deviceGroup); - var deviceCodes = deviceCodesResult.Data; + var deviceUniqueNos = await _dbContext.Queryable().Where(x => deviceCodes.Contains(x.Code)).Select(x => x.UniqueNo).ToListAsync(); var userNo = detail.IsExternal ? await _dbContext.Queryable().Where(x => x.IdNo == detail.IdNo).Select(x => x.No).FirstAsync() : await _dbContext.Queryable().Where(x => x.IdNo == detail.IdNo).Select(x => x.No).FirstAsync(); - await _dbContext.InsertAsync(deviceCodes.Select(x => new DeviceTaskEntity + await _dbContext.InsertAsync(deviceUniqueNos.Select(x => new DeviceTaskEntity { CancellationId = 0, DeviceType = DeviceTypeEnumType.Door, - DeviceUniqueNo = x.UniqueNo, + DeviceUniqueNo = x, Status = DeviceTaskStatusEnumType.Wait, UserNo = userNo, Type = DeviceTaskEnumType.Add, diff --git a/Src/Dlhis.Visitor/Appointment/Services/Implements/ApponintmentAreaService.cs b/Src/Dlhis.Visitor/Appointment/Services/Implements/ApponintmentAreaService.cs index 64e6d6e5..b67159aa 100644 --- a/Src/Dlhis.Visitor/Appointment/Services/Implements/ApponintmentAreaService.cs +++ b/Src/Dlhis.Visitor/Appointment/Services/Implements/ApponintmentAreaService.cs @@ -63,10 +63,10 @@ public class ApponintmentAreaService : IApponintmentAreaService .Where(x => x.CustomCode == request.CustomCode) .ExecuteCommandAsync(); - var data = request.GroupCodes.Select(x => new AppointmentAreaAssignmentEntity + var data = request.DeviceCodes.Select(x => new AppointmentAreaAssignmentEntity { CustomCode = request.CustomCode, - GroupCode = x, + DeviceCode = x, }) .ToList(); diff --git a/Src/Dlhis.Visitor/Dlhis.Visitor.csproj b/Src/Dlhis.Visitor/Dlhis.Visitor.csproj index 3e4a2742..e76f0181 100644 --- a/Src/Dlhis.Visitor/Dlhis.Visitor.csproj +++ b/Src/Dlhis.Visitor/Dlhis.Visitor.csproj @@ -19,7 +19,6 @@ - diff --git a/Src/Dlhis.Visitor/Dockerfile b/Src/Dlhis.Visitor/Dockerfile index 104cb4f1..bf1c8a0e 100644 --- a/Src/Dlhis.Visitor/Dockerfile +++ b/Src/Dlhis.Visitor/Dockerfile @@ -8,7 +8,6 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["Src/Dlhis.Visitor/Dlhis.Visitor.csproj", "Src/Dlhis.Visitor/"] -COPY ["Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj", "Src/Dlhis.Basic.Api/"] COPY ["Src/Dlhis.Entity/Dlhis.Entity.csproj", "Src/Dlhis.Entity/"] RUN dotnet restore "./Src/Dlhis.Visitor/./Dlhis.Visitor.csproj" COPY . .