修改异地登录bug 设置最后一次登录的iP

IRaCIS.Core.Application/Helper/OtherTool/ImageHelper.cs

@@ -15,14 +15,20 @@ public static class ImageHelper
 
         fileStorePath = fileStorePath ?? filePath + ".preview.jpeg";
 
-        using (var image = SixLabors.ImageSharp.Image.Load(filePath))
-        {
+        // 读取 DICOM 文件
+        var dicomImage = new DicomImage(filePath);
 
+        // 渲染 DICOM 图像到 ImageSharp 格式
+        using (var image = dicomImage.RenderImage().AsSharpImage())
+        {
+            // 生成缩略图（调整大小）
             image.Mutate(x => x.Resize(500, 500));
 
-            image.Save(fileStorePath);
-
+            // 保存缩略图为 JPEG
+            image.Save(fileStorePath, new JpegEncoder());
         }
+
+       
     }
 
 

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -970,19 +970,21 @@ namespace IRaCIS.Core.Application.Service
 
                 if (existUserLoginInfo.LastLoginIP != string.Empty)
                 {
+                    //设置上次登录的IP
+                    await _identityUserRepository.BatchUpdateNoTrackingAsync(x => x.Id == existUserLoginInfo.Id, x => new IdentityUser()
+                    {
+                        LastLoginIP = iPRegion,
+                        LastLoginTime = DateTime.Now
+
+                    });
+
+
                     // 与上一次区域不一致
                     if (SplitAndConcatenate(existUserLoginInfo.LastLoginIP) != SplitAndConcatenate(iPRegion))
                     {
 
                         isLoginUncommonly = true;
 
-                        //设置上次登录的IP
-                        await _identityUserRepository.BatchUpdateNoTrackingAsync(x => x.Id == existUserLoginInfo.Id, x => new IdentityUser()
-                        {
-                            LastLoginIP = iPRegion,
-                            LastLoginTime = DateTime.Now
-
-                        });
 
                         if (loginUser != null)
                         {
@@ -1018,13 +1020,6 @@ namespace IRaCIS.Core.Application.Service
             }
 
 
-            await _identityUserRepository.BatchUpdateNoTrackingAsync(x => x.Id == loginUser.IdentityUserId, x => new IdentityUser()
-            {
-                LastLoginTime = DateTime.Now,
-                LastLoginIP = _userInfo.IP,
-            });
-
-
             if (loginUser.Status == 0)
             {
                 await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = loginUser.IdentityUserId, ActionUserName = loginUser.UserName, OptType = UserOptType.LoginLockedAccount, IsLoginUncommonly = isLoginUncommonly }, true);

IRaCIS.Core.Application/TestService.cs

@@ -1,5 +1,6 @@
 using Aliyun.OSS;
 using DocumentFormat.OpenXml.Spreadsheet;
+using FellowOakDicom.Imaging;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.BusinessFilter;
 using IRaCIS.Core.Application.Contracts;
@@ -27,8 +28,13 @@ using Microsoft.Extensions.Options;
 using MiniExcelLibs;
 using NPOI.SS.Formula.Functions;
 using NPOI.XWPF.UserModel;
+using SharpCompress.Common;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Jpeg;
+using SixLabors.ImageSharp.Processing;
 using System.Globalization;
 using System.Linq.Dynamic.Core;
+using System.Reactive.Subjects;
 using System.Reflection.Metadata.Ecma335;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -54,6 +60,7 @@ namespace IRaCIS.Core.Application.Service
         IRepository<DicomSeries> _dicomSeriesRepository,
         IRepository<UserRole> _userRoleRepository,
         IRepository<TrialBodyPart> _trialBodyPartRepository,
+        IOSSService _IOSSService,
         IDistributedLockProvider _distributedLockProvider,
         ILogger<TestService> _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService
     {
@@ -160,7 +167,7 @@ namespace IRaCIS.Core.Application.Service
                 await _trialQCQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisitId == subjectVisitId);
             }
 
-          
+
 
             var success = await _subjectVisitRepository.SaveChangesAsync();
 
@@ -168,6 +175,63 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
+
+
+        /// <summary>
+        /// 后端处理某个中心缩略图有问题  先下载，生成缩略图上传，然后更新数据库
+        /// </summary>
+        /// <returns></returns>
+        [AllowAnonymous]
+        public async Task<IResponseOutput> BackImageResize(Guid trialSiteId ,Guid subjectId/* , [FromServices] IRepository<>*/)
+        {
+            ///${params.trialId}/ Image /${params.subjectId}/${params.subjectVisitId}/${ dicomInfo.studyUid}/${ v.seriesUid}.jpg
+
+            var dealSeriesList = await _dicomSeriesRepository.Where(t => t.DicomStudy.Subject.TrialSiteId == trialSiteId && t.SubjectId== subjectId).Select(t => new { t.Id, t.SubjectId, t.TrialId, t.SubjectVisitId, t.StudyInstanceUid, t.SeriesInstanceUid, t.ImageResizePath, t.UpdateUserId, FirstInstancePath = t.DicomInstanceList.First().Path }).ToListAsync();
+
+            //下载到本地
+            string tempFolderPath = Path.Combine(Directory.GetCurrentDirectory(), $"DownloadTemp_{NewId.NextGuid()}");
+            Directory.CreateDirectory(tempFolderPath);
+
+            foreach (var dealSeries in dealSeriesList)
+            {
+                var fileName = Path.GetFileNameWithoutExtension(dealSeries.FirstInstancePath);
+
+                var localFilePath = Path.Combine(tempFolderPath, fileName);
+
+                await _IOSSService.DownLoadFromOSSAsync(dealSeries.FirstInstancePath, localFilePath);
+
+
+                var resizePath = localFilePath + "_New.jpg";
+
+                //生成缩略图
+
+                // 读取 DICOM 文件
+                var dicomImage = new DicomImage(localFilePath);
+
+
+                // 渲染 DICOM 图像到 ImageSharp 格式
+                using (var image = dicomImage.RenderImage().AsSharpImage())
+                {
+                    // 生成缩略图（调整大小）
+                    image.Mutate(x => x.Resize(500, 500));
+
+                    // 保存缩略图为 JPEG
+                    image.Save(resizePath, new JpegEncoder());
+                }
+          
+                var ossFolder = $"{dealSeries.TrialId}/Image/{dealSeries.SubjectId}/{dealSeries.SubjectVisitId}/{dealSeries.StudyInstanceUid}";
+
+                var relativePath = await _IOSSService.UploadToOSSAsync(resizePath, ossFolder, false);
+
+                await _dicomSeriesRepository.BatchUpdateNoTrackingAsync(t => t.Id == dealSeries.Id, u => new DicomSeries() { ImageResizePath = relativePath, UpdateUserId = dealSeries.UpdateUserId });
+
+            }
+
+            return ResponseOutput.Ok();
+
+        }
+
+
         public async Task<IResponseOutput> DeleteOSSDate(string rootFolder,
             [FromServices] IOSSService _oSSService, [FromServices] IWebHostEnvironment _hostEnvironment)
         {