Merge branch 'master' of http://git.ius.plus/Project-Wing/WingAIDiagnosisService

Service/AIDiagnosisService.URM.cs

@@ -548,6 +548,8 @@ namespace WingAIDiagnosisService.Service
                         urmProcessRequest.PointsDataPath = File.Exists(pointsPath) ? pointsPath : string.Empty;
                         urmProcessRequest.PointNumsDataPath = File.Exists(pointNumsPath) ? pointNumsPath : string.Empty;
                         urmProcessRequest.GUID = urmProcessRequest.GetUniqueCode();
+                        // 预加载其它Process
+                        // LoadVideoProcessInfos(urmProcessRequest);
 
                         Logger.WriteLineInfo($"AIDiagnosisService URMVideoProcessAsync DoUrmVideoProcess start, remedicalCode:{remedicalCode}");
                         Logger.WriteLineInfo($"urmProcessRequest:{JsonConvert.SerializeObject(urmProcessRequest)}");
@@ -575,6 +577,38 @@ namespace WingAIDiagnosisService.Service
             return new URMVideoProcessResult();
         }
 
+        private void LoadVideoProcessInfos(DoUrmVideoProcessRequest videoProcessProcess)
+        {
+            try
+            {
+                var videoParameterInfos = new List<float> { 1, 2, 3 };
+                var videoTypeInfos = new List<float> { 0, 1, 2 };
+
+                var videoProcessProcessNew = JsonConvert.DeserializeObject<DoUrmVideoProcessRequest>(JsonConvert.SerializeObject(videoProcessProcess));
+                foreach (var videoParameter in videoParameterInfos)
+                {
+                    foreach (var videoType in videoTypeInfos)
+                    {
+                        if (videoParameter != videoProcessProcess.URMVideoParameter || videoType != videoProcessProcess.URMVideoType)
+                        {
+                            videoProcessProcessNew.URMVideoParameter = videoParameter;
+                            videoProcessProcessNew.URMVideoType = videoType;
+                            videoProcessProcessNew.GUID = videoProcessProcessNew.GetUniqueCode();
+                            var process = URMAnalysisManager.VideoProcessorList.FirstOrDefault(x => x.GUID == videoProcessProcessNew.GUID);
+                            if (process == null)
+                            {
+                                URMAnalysisManager.InitVideoProcessor(videoProcessProcessNew);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.WriteLineWarn($"AIDiagnosisService LoadVideoProcessInfos error, remedicalCode:{videoProcessProcess.RemedicalCode}, ex:{ex}");
+            }
+        }
+
         /// <summary>
         /// URM测量-预加载
         /// </summary>

URMManage/ImagePostProcess.cs

@@ -276,7 +276,6 @@ namespace WingAIDiagnosisService.URMManage
             try
             {
                 processorClass = VideoProcessorList.FirstOrDefault(x => x.GUID == request.GUID);
-                Logger.WriteLineInfo($"AIDiagnosisService InitVideoProcessor, remedicalCode:{request.RemedicalCode}, GUID:{request.GUID}, existed:{processorClass != null}");
                 if (processorClass == null)
                 {
                     double urmMaxVal = 0;