diff --git a/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs b/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs index f3d377a7..5ff75a77 100644 --- a/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs +++ b/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs @@ -4,7 +4,7 @@ using Dlhis.Basic.Organization.Response; using Dlhis.Basic.Organization.Services; using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop; -using Kurisu.AspNetCore.UnifyResultAndValidation.Abstractions; +using Kurisu.AspNetCore.UnifyResultAndValidation; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -78,7 +78,7 @@ public class GainfosController : ControllerBase [HttpPost("face")] [IgnoreTenant] [Transactional] - public async Task UploadFaceAsync(GainfoUploadFaceRequest request) + public async Task> UploadFaceAsync(GainfoUploadFaceRequest request) { return await _gainfoFaceService.UploadFaceAsync(request); } diff --git a/Src/Dlhis.Basic/Organization/Services/IGainfoFaceService.cs b/Src/Dlhis.Basic/Organization/Services/IGainfoFaceService.cs index bd11220d..5ce07ff6 100644 --- a/Src/Dlhis.Basic/Organization/Services/IGainfoFaceService.cs +++ b/Src/Dlhis.Basic/Organization/Services/IGainfoFaceService.cs @@ -2,7 +2,6 @@ using Dlhis.Basic.Organization.Response; using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.UnifyResultAndValidation; -using Kurisu.AspNetCore.UnifyResultAndValidation.Abstractions; using Microsoft.AspNetCore.Mvc; namespace Dlhis.Basic.Organization.Services; @@ -17,7 +16,7 @@ public interface IGainfoFaceService : IScopeDependency Task GetFaceAsync(string token); - Task UploadFaceAsync(GainfoUploadFaceRequest request); + Task> UploadFaceAsync(GainfoUploadFaceRequest request); Task UploadFacesAsync(List request); diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs index 9f885719..b5b4382c 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs @@ -18,7 +18,6 @@ using Kurisu.AspNetCore.DataAccess.Extensions; using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions; using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; using Kurisu.AspNetCore.UnifyResultAndValidation; -using Kurisu.AspNetCore.UnifyResultAndValidation.Abstractions; using Kurisu.AspNetCore.Utils.Extensions; using Mapster; using Microsoft.AspNetCore.DataProtection; @@ -146,7 +145,11 @@ public class GainfoFaceService : IGainfoFaceService face = new GainfoFaceEntity { UserCode = gainfo.Code, - Face = request.Face + Face = request.Face, + CreatedBy = 1, + CreateTime = DateTime.Now, + ModifiedBy = 1, + ModifiedTime = DateTime.Now, }; await _faceDbContext.InsertAsync(face); @@ -198,7 +201,6 @@ public class GainfoFaceService : IGainfoFaceService public async Task GetFaceAsync(string token) { var timeLimitedDataProtector = _dataProtectionProvider.CreateProtector("down:face").ToTimeLimitedDataProtector(); - try { var password = timeLimitedDataProtector.Unprotect(token); @@ -220,11 +222,13 @@ public class GainfoFaceService : IGainfoFaceService } } - public async Task UploadFaceAsync(GainfoUploadFaceRequest request) + public async Task> UploadFaceAsync(GainfoUploadFaceRequest request) { var gainfo = await _gainfoStore.Queryable().Where(x => x.No == request.UserNo || x.Code == request.UserNo).SingleAsync(); gainfo.ThrowIfNull("人员档案信息不存在"); + var userId = _currentUser.GetIntSubjectId(); + await DetectFaceImageQualityAsync(request.Face, gainfo.Factory); var face = await _faceDbContext.Queryable().Where(x => x.UserCode == gainfo.Code).SingleAsync(); @@ -235,7 +239,11 @@ public class GainfoFaceService : IGainfoFaceService face = new GainfoFaceEntity { UserCode = gainfo.Code, - Face = request.Face + Face = request.Face, + CreateTime = DateTime.Now, + ModifiedTime = DateTime.Now, + CreatedBy = userId, + ModifiedBy = userId }; await _faceDbContext.InsertAsync(face); @@ -276,6 +284,8 @@ public class GainfoFaceService : IGainfoFaceService } face.Face = request.Face; + face.ModifiedTime = DateTime.Now; + face.ModifiedBy = userId; await _faceDbContext.UpdateAsync(face); } diff --git a/Src/Dlhis.Entity/Basic/Entity/HikValidateResultEntity.cs b/Src/Dlhis.Entity/Basic/Entity/HikValidateResultEntity.cs index 0a351903..af04dd0f 100644 --- a/Src/Dlhis.Entity/Basic/Entity/HikValidateResultEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/HikValidateResultEntity.cs @@ -24,11 +24,11 @@ public class HikValidateResultEntity : SugarBaseEntity , ITenantId public double AcceptSimilarity { get; set; } - [SugarColumn(ColumnDataType = "text")] + [SugarColumn(ColumnDataType = "longtext")] public string CurrentFace { get; set; } - [SugarColumn(ColumnDataType = "text")] + [SugarColumn(ColumnDataType = "longtext")] public string UploadFace { get; set; } ///