分布式锁 sqlserver 05 项目迁移修改

IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs

@@ -8,10 +8,11 @@ using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
 using Microsoft.AspNetCore.Hosting;
 using IRaCIS.Core.Infrastructure;
+using Medallion.Threading;
 
 namespace IRaCIS.Core.Application.Services
 {
-    public class DicomArchiveService :BaseService, IDicomArchiveService
+    public class DicomArchiveService : BaseService, IDicomArchiveService
     {
         private readonly IRepository<DicomStudy> _studyRepository;
         private readonly IRepository<DicomSeries> _seriesRepository;
@@ -21,7 +22,7 @@ namespace IRaCIS.Core.Application.Services
 
         private readonly IWebHostEnvironment _hostEnvironment;
 
-        private static object lockCodeGenerate = new object();
+        private readonly IDistributedLockProvider _distributedLockProvider;
 
 
         private List<Guid> _instanceIdList = new List<Guid>();
@@ -31,8 +32,9 @@ namespace IRaCIS.Core.Application.Services
             IRepository<DicomInstance> instanceRepository,
             IWebHostEnvironment hostEnvironment,
             IRepository<Dictionary> dictionaryRepository,
-            IEasyCachingProvider provider)
+            IEasyCachingProvider provider, IDistributedLockProvider distributedLockProvider)
         {
+            _distributedLockProvider = distributedLockProvider;
             _hostEnvironment = hostEnvironment;
             _studyRepository = studyRepository;
 
@@ -50,7 +52,7 @@ namespace IRaCIS.Core.Application.Services
             return success;
         }
 
-      
+
 
 
         public async Task<(Guid StudyId, string StudyCode)> ArchiveDicomStreamAsync(Stream dicomStream,
@@ -129,7 +131,7 @@ namespace IRaCIS.Core.Application.Services
 
             DicomStudy dicomStudy = CreateDicomStudy(dataset, addtionalInfo, out bool isStudyNeedAdd);
             DicomSeries dicomSeries = CreateDicomSeries(dataset, dicomStudy, out bool isSeriesNeedAdd);
-            DicomInstance dicomInstance = CreateDicomInstance(dataset, dicomStudy, dicomSeries,out bool isInstanceNeedAdd);
+            DicomInstance dicomInstance = CreateDicomInstance(dataset, dicomStudy, dicomSeries, out bool isInstanceNeedAdd);
 
             dicomSeries.DicomStudy = dicomStudy;
 
@@ -183,7 +185,7 @@ namespace IRaCIS.Core.Application.Services
                     //正常保存  不做处理
                     await dicomFile.SaveAsync(physicalPath);
                 }
-                else 
+                else
                 {
                     //RLELossless 保存
                     await dicomFile.Clone(DicomTransferSyntax.RLELossless).SaveAsync(physicalPath); //RLELossless
@@ -235,7 +237,7 @@ namespace IRaCIS.Core.Application.Services
             {
                 modalityForEdit = "PET";
             }
-            if(modality== "PT、CT")
+            if (modality == "PT、CT")
             {
                 modalityForEdit = "PET-CT";
             }
@@ -282,9 +284,10 @@ namespace IRaCIS.Core.Application.Services
                 dicomStudy.PatientBirthDate = $"{dicomStudy.PatientBirthDate[0]}{dicomStudy.PatientBirthDate[1]}{dicomStudy.PatientBirthDate[2]}{dicomStudy.PatientBirthDate[3]}-{dicomStudy.PatientBirthDate[4]}{dicomStudy.PatientBirthDate[5]}-{dicomStudy.PatientBirthDate[6]}{dicomStudy.PatientBirthDate[7]}";
             }
 
-            lock (lockCodeGenerate)
-            {
+            var @lock = _distributedLockProvider.CreateLock($"StudyCode");
 
+            using (@lock.Acquire())
+            {
                 //查询数据库获取最大的Code 没有记录则为0
                 var dbStudyCodeIntMax = _studyRepository.Where(s => s.TrialId == addtionalInfo.TrialId).Select(t => t.Code).DefaultIfEmpty().Max();
 
@@ -298,9 +301,9 @@ namespace IRaCIS.Core.Application.Services
                 dicomStudy.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy));
 
                 _provider.Set<int>($"{addtionalInfo.TrialId}_{StaticData.CacheKey.StudyMaxCode}", dicomStudy.Code, TimeSpan.FromMinutes(30));
-
             }
 
+
             #region Setting Code old
 
             //var studyCode = _studyRepository.Where(s => s.TrialId == addtionalInfo.TrialId).Select(t => t.StudyCode).OrderByDescending(c => c).FirstOrDefault();
@@ -468,7 +471,7 @@ namespace IRaCIS.Core.Application.Services
 
                 _instanceIdList.Add(instanceId);
             }
-       
+
             return dicomInstance;
 
         }

IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs

@@ -14,16 +14,13 @@ using IRaCIS.Core.Application.MediatR.Handlers;
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using System.Threading;
-using Nito.AsyncEx;
+using Medallion.Threading;
 
 namespace IRaCIS.Core.Application.Service.ImageAndDoc
 {
     [ApiExplorerSettings(GroupName = "Image")]
     public class StudyService : BaseService, IStudyService
     {
-        private static object lockObj = new object();
-        private static readonly AsyncLock _mutex = new AsyncLock();
-        private static readonly AsyncLock _mutex2 = new AsyncLock();
 
         private readonly IEasyCachingProvider _provider;
 
@@ -35,12 +32,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         private readonly IRepository<Dictionary> _dictionaryRepository;
 
         private readonly IRepository<StudyMonitor> _studyMonitorRepository;
-
+        private readonly IDistributedLockProvider _distributedLockProvider;
 
         public StudyService(IEasyCachingProvider provider
             , IRepository<SubjectVisit> subjectVisitRepository,
             IRepository<DicomInstance> dicomInstanceRepository,
-            IRepository<DicomSeries> dicomSeriesRepository, IRepository<DicomStudy> dicomstudyRepository, IRepository<Dictionary> dictionaryRepository, IRepository<StudyMonitor> studyMonitorRepository)
+            IRepository<DicomSeries> dicomSeriesRepository, IRepository<DicomStudy> dicomstudyRepository, IRepository<Dictionary> dictionaryRepository, IRepository<StudyMonitor> studyMonitorRepository, IDistributedLockProvider distributedLockProvider)
         {
             _provider = provider;
             _subjectVisitRepository = subjectVisitRepository;
@@ -49,6 +46,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             _dicomstudyRepository = dicomstudyRepository;
             _dictionaryRepository = dictionaryRepository;
             _studyMonitorRepository = studyMonitorRepository;
+            _distributedLockProvider = distributedLockProvider;
         }
 
 
@@ -160,7 +158,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 {
                     var study = _mapper.Map<DicomStudy>(incommand.Study);
 
-                    using (await _mutex.LockAsync())
+                    var @lock = _distributedLockProvider.CreateLock($"StudyCode");
+
+                    using (await @lock.AcquireAsync())
                     {
                         //查询数据库获取最大的Code 没有记录则为0
                         var dbStudyCodeIntMax = _dicomstudyRepository.Where(s => s.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max();
@@ -306,11 +306,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                 }
 
-                using (await _mutex2.LockAsync())
+                var @lock2 = _distributedLockProvider.CreateLock($"StudyCommit");
+
+                using (await @lock2.AcquireAsync())
                 {
                     await _dicomInstanceRepository.SaveChangesAsync();
-
-
                 }
             }
             catch (Exception ex)
@@ -826,22 +826,22 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             }
             result.StudyInstanceUid = studyInstanceUid;
 
+            var @lock = _distributedLockProvider.CreateLock($"StudyUpload");
 
-            if (result.AllowReUpload || result.AllowUpload)
+            using (@lock.Acquire())
             {
-                lock (lockObj)
+                if (result.AllowReUpload || result.AllowUpload)
                 {
                     _provider.Set($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(30));
                 }
-            }
-            else
-            {
-                lock (lockObj)
+                else
                 {
                     _provider.Remove($"StudyUid_{trialId}_{studyInstanceUid}");
                 }
             }
 
+
+
             return result;
         }