From 8fffdb244d080783d043162edc1f27238e01d335 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 31 Aug 2023 16:14:00 +0800
Subject: [PATCH] =?UTF-8?q?oos=20=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/UploadDownLoadController.cs      |  2 +-
 IRaCIS.Core.API/IRaCIS.Core.API.xml              |  7 +++++++
 .../Helper/FileStoreHelper.cs                    | 16 +++++++++++++---
 .../IRaCIS.Core.Application.xml                  |  3 ++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
index 1b5d4681f..00bacfaaa 100644
--- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
+++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
@@ -973,7 +973,7 @@ namespace IRaCIS.Core.API.Controllers
         [HttpPost, Route("TrialSiteSurvey/TestOOS")]
         public string TestUploadFileToOOS(string path)
         {
-            return FileStoreHelper.UploadOOS(path, true);
+            return FileStoreHelper.UploadOOS(path, "testc/test", true);
         }
 
         [HttpPost, Route("TrialSiteSurvey/UploadTrialSiteSurveyUser")]
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 7812272dd..fe5eb4c96 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -212,6 +212,13 @@
         <member name="M:IRaCIS.Core.API.Controllers.StudyController.ArchiveStudyNew(System.Guid,System.Guid,System.String,System.Nullable{System.Guid},System.Guid,Microsoft.Extensions.Logging.ILogger{IRaCIS.Core.API.Controllers.UploadDownLoadController},EasyCaching.Core.IEasyCachingProvider,IRaCIS.Core.Application.Contracts.IStudyService,Microsoft.AspNetCore.SignalR.IHubContext{IRaCIS.Core.API.UploadHub,IRaCIS.Core.API.IUploadClient},IRaCIS.Core.Application.Contracts.Dicom.IDicomArchiveService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
             <summary>Dicom 归档</summary>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFile(IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFileCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
+            <summary>
+            上传非Dicom 文件 支持压缩包 多文件上传
+            </summary>
+            <param name="_noneDicomStudyRepository"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadVisitCheckExcel(System.Guid)">
             <summary>
             一致性核查 excel上传 支持三种格式
diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
index e5b875cce..ceaea5e16 100644
--- a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
+++ b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
@@ -20,13 +20,20 @@ public static class FileStoreHelper
     /// 上传文件到OOS
     /// </summary>
     /// <param name="filePath">本地文件路径</param>
+    /// <param name="oosPath">OOS路径例如(test/test)</param>
     /// <param name="isDeleteOriginalFile">是否删除本地文件</param>
     /// <returns>返回文件路径</returns>
     /// <exception cref="BusinessValidationFailedException"></exception>
-    public static string UploadOOS(string filePath, bool isDeleteOriginalFile)
+    public static string UploadOOS(string filePath,string oosPath, bool isDeleteOriginalFile)
     {
+        var config = new ConfigurationBuilder()
+                      .AddEnvironmentVariables()
+                      .Build();
+
+        var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
+
         var configuration = new ConfigurationBuilder()
-          .AddJsonFile("appsettings.json")
+          .AddJsonFile($"appsettings.{enviromentName}.json")
           .Build();
 
         var endpoint = configuration.GetSection("AliyunOSS:endpoint").Value;
@@ -41,7 +48,10 @@ public static class FileStoreHelper
 
         var fileNameList = filePath.Split('\\').ToList();
         var fileName = fileNameList[fileNameList.Count() - 1];
-
+        if (oosPath != string.Empty)
+        {
+            fileName = oosPath + "/" + fileName;
+        }
         var objectName = fileName;
         // 填写本地文件完整路径，例如D:\\localpath\\examplefile.txt。如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件。
         var localFilename = filePath;
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 9d436a2cc..bcb55045d 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -34,11 +34,12 @@
             主要为了 处理项目结束 锁库，不允许操作
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.Helper.FileStoreHelper.UploadOOS(System.String,System.Boolean)">
+        <member name="M:IRaCIS.Core.Application.Helper.FileStoreHelper.UploadOOS(System.String,System.String,System.Boolean)">
             <summary>
             上传文件到OOS
             </summary>
             <param name="filePath">本地文件路径</param>
+            <param name="oosPath">OOS路径例如(test/test)</param>
             <param name="isDeleteOriginalFile">是否删除本地文件</param>
             <returns>返回文件路径</returns>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>