no message

performance/Performance.Api/Controllers/AgainAllotController.cs

@@ -32,13 +32,13 @@ public class AgainAllotController : Controller
         private ComputeService computeService;
         private ClaimService claimService;
         private AllotService allotService;
-        private IHostingEnvironment evn;
+        private IHostingEnvironment env;
         private ConfigService configService;
         private Application application;
         public AgainAllotController(AgainAllotService againAllotService,
              ClaimService claimService,
              AllotService allotService,
-             IHostingEnvironment evn,
+             IHostingEnvironment env,
              ConfigService configService,
              ComputeService computeService,
              IOptions<Application> options)
@@ -46,7 +46,7 @@ public class AgainAllotController : Controller
             this.againAllotService = againAllotService;
             this.claimService = claimService;
             this.allotService = allotService;
-            this.evn = evn;
+            this.env = env;
             this.configService = configService;
             this.computeService = computeService;
             this.application = options.Value;
@@ -91,7 +91,7 @@ public ApiResponse Import([FromForm] IFormCollection form)
 
             var name = FileHelper.GetFileNameNoExtension(file.FileName) + DateTime.Now.ToString("yyyyMMddHHmmssfff");
             var ext = FileHelper.GetExtension(file.FileName);
-            var dpath = Path.Combine(evn.ContentRootPath, "Files", $"{allot.HospitalId}", $"{allot.Year}{allot.Month.ToString().PadLeft(2, '0')}");
+            var dpath = Path.Combine(env.ContentRootPath.Substring(0, env.ContentRootPath.LastIndexOf("\\")), "Files", $"{allot.HospitalId}", $"{allot.Year}{allot.Month.ToString().PadLeft(2, '0')}");
             FileHelper.CreateDirectory(dpath);
 
             var path = Path.Combine(dpath, $"{name}{ext}");

performance/Performance.Api/Controllers/AllotController.cs

@@ -120,7 +120,7 @@ public ApiResponse Import([FromForm] IFormCollection form)
 
             var name = FileHelper.GetFileNameNoExtension(file.FileName) + DateTime.Now.ToString("yyyyMMddHHmmssfff");
             var ext = FileHelper.GetExtension(file.FileName);
-            var dpath = Path.Combine(_evn.ContentRootPath, "Files", $"{allot.HospitalId}", $"{allot.Year}{allot.Month.ToString().PadLeft(2, '0')}");
+            var dpath = Path.Combine(_evn.ContentRootPath.Substring(0, _evn.ContentRootPath.LastIndexOf("\\")), "Files", $"{allot.HospitalId}", $"{allot.Year}{allot.Month.ToString().PadLeft(2, '0')}");
             FileHelper.CreateDirectory(dpath);
 
             var path = Path.Combine(dpath, $"{name}{ext}");

performance/Performance.Api/Controllers/TemplateController.cs

@@ -69,7 +69,7 @@ public ApiResponse Import([FromForm] IFormCollection form)
 
             var name = FileHelper.GetFileNameNoExtension(file.FileName) + DateTime.Now.ToString("yyyyMMddHHmmssfff");
             var ext = FileHelper.GetExtension(file.FileName);
-            var dpath = Path.Combine(evn.ContentRootPath, "Files", $"{hospitalid}", "first");
+            var dpath = Path.Combine(evn.ContentRootPath.Substring(0, evn.ContentRootPath.LastIndexOf("\\")), "Files", $"{hospitalid}", "first");
             FileHelper.CreateDirectory(dpath);
 
             var path = Path.Combine(dpath, $"{name}{ext}");
@@ -133,11 +133,17 @@ public IActionResult DownFile([FromQuery]AllotRequest request)
             {
                 return new ObjectResult(new ApiResponse(ResponseType.Fail, "文件不存在"));
             }
-            var stream = new FileStream(allot.ExtractPath, FileMode.Open);
+
+            var memoryStream = new MemoryStream();
+            using (var stream = new FileStream(allot.ExtractPath, FileMode.Open))
+            {
+                stream.CopyToAsync(memoryStream).Wait();
+            }
+            memoryStream.Seek(0, SeekOrigin.Begin);
             string fileExt = Path.GetExtension(allot.ExtractPath);
             var provider = new FileExtensionContentTypeProvider();
             var memi = provider.Mappings[fileExt];
-            return File(stream, memi, Path.GetFileName(allot.ExtractPath));
+            return File(memoryStream, memi, Path.GetFileName(allot.ExtractPath));
         }
     }
 }
\ No newline at end of file

performance/Performance.Api/Filters/ActionsFilter.cs

@@ -85,6 +85,7 @@ public ActionsFilter(ILoggerFactory factory, IMemoryCache cache, IHostingEnviron
 
                 if (executedContext.Result is ObjectResult)
                 {
+                    LogHelper.Information(JsonHelper.Serialize(executedContext.Result), "响应结果");
                     var objectResult = (ObjectResult)executedContext.Result;
                     var jsonData = JsonHelper.Serialize(objectResult.Value);
                     _logger.LogInformation($"响应结果:{jsonData}");

performance/Performance.Api/Startup.cs

@@ -187,7 +187,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             app.UseHangfireDashboard("/hangfire", new DashboardOptions { Authorization = new[] { new HangfireAuthorizationFilter() } });
 
             #endregion
-
             loggerFactory.CreateLogger<Startup>().LogDebug(env.EnvironmentName);
             app.UseMvc();
         }

performance/Performance.Api/appsettings.Development.json

@@ -19,6 +19,8 @@
     //护士长二次绩效管理员
     "NurseRole": "3",
     //科主任二次绩效管理员
-    "DirectorRole": "4"
+    "DirectorRole": "4",
+    "AbsolutePath": "E:\\wwwroot\\testjx.suvalue.com",
+    "HttpPath": "http://testjx.suvalue.com:81"
   }
 }

performance/Performance.Api/appsettings.json

@@ -34,6 +34,8 @@
     //科主任二次绩效管理员
     "DirectorRole": "4",
     //邮件指定接收人
-    "Receiver": [ "chengxiang.li@suvalue.com", "486035085@qq.com" ]
+    "Receiver": [ "chengxiang.li@suvalue.com", "486035085@qq.com" ],
+    "AbsolutePath": "E:\\wwwroot\\testjx.suvalue.com",
+    "HttpPath": "http://testjx.suvalue.com:81"
   }
 }

performance/Performance.DtoModels/AppSettings/Application.cs

@@ -30,5 +30,13 @@ public class Application
         /// 邮件指定接收人
         /// </summary>
         public string[] Receiver { get; set; }
+        /// <summary>
+        /// 绝对路径
+        /// </summary>
+        public string AbsolutePath { get; set; }
+        /// <summary>
+        /// 相对
+        /// </summary>
+        public string HttpPath { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/sys_extract.cs

@@ -7,38 +7,38 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 医院数据提取脚本
     /// </summary>
     [Table("sys_extract")]
-	public class sys_extract
+    public class sys_extract
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 医院ID
         /// </summary>
         public Nullable<int> HospitalId { get; set; }
-    
+
         /// <summary>
         /// EXCEL中SHEET名称
         /// </summary>
         public string SheetName { get; set; }
-    
+
         /// <summary>
         /// 执行脚本
         /// </summary>
         public string ExecuteScript { get; set; }
-    
+
         /// <summary>
         /// 是否可用 1 可用 2 不可用
         /// </summary>
-        public string IsEnable { get; set; }
+        public Nullable<int> IsEnable { get; set; }
     }
 }

performance/Performance.Infrastructure/Helper/LogHelper.cs

@@ -65,7 +65,7 @@ private static void WriteLog(string message, string[] tag, LogLevel logLevel)
     {
         try
         {
-            if (_contextAccessor.HttpContext == null)
+            if (_contextAccessor.HttpContext == null || string.IsNullOrEmpty(_contextAccessor.HttpContext.TraceIdentifier))
             {
                 if (string.IsNullOrEmpty(_asyncLocal.Value))
                     lock (_lockObject)

performance/Performance.Services/AllotService.cs

 using AutoMapper;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Performance.DtoModels;
+using Performance.DtoModels.AppSettings;
 using Performance.EntityModels;
 using Performance.Infrastructure;
 using Performance.Repository;
@@ -28,6 +30,7 @@ public class AllotService : IAutoInjection
         private ILogger<AllotService> _logger;
         private PerforPerallotRepository _allotRepository;
         private IEmailService emailService;
+        private readonly IOptions<Application> options;
         private PerforPeragainallotRepository _againallotRepository;
         private PerforLogcheckRepository perforLogcheckRepository;
         private readonly PerforHospitalRepository perforHospitalRepository;
@@ -42,6 +45,7 @@ public class AllotService : IAutoInjection
              PerforLogdbugRepository logdbug,
              IHostingEnvironment evn, ILogger<AllotService> logger,
              IEmailService emailService,
+             IOptions<Application> options,
              PerforPeragainallotRepository againallotRepository,
              PerforLogcheckRepository perforLogcheckRepository,
              PerforHospitalRepository perforHospitalRepository)
@@ -56,6 +60,7 @@ public class AllotService : IAutoInjection
             this.processComputService = processComputService;
             this.resultComputeService = resultComputeService;
             this.emailService = emailService;
+            this.options = options;
             this.configService = configService;
             this.logdbug = logdbug;
             this.perforLogcheckRepository = perforLogcheckRepository;
@@ -75,7 +80,12 @@ public List<AllotResponse> GetAllotList(int? hospitalId)
             var allotList = _allotRepository.GetEntities(t => t.HospitalId == hospitalId);
             allotList = allotList == null ? allotList : allotList.OrderByDescending(t => t.ID).ToList();
             var reuslt = Mapper.Map<List<AllotResponse>>(allotList);
-            reuslt.ForEach(t => t.IsDown = !string.IsNullOrEmpty(t.ExtractPath));
+            reuslt.ForEach(t =>
+            {
+                t.IsDown = !string.IsNullOrEmpty(t.ExtractPath);
+                if (!string.IsNullOrEmpty(t.ExtractPath))
+                    t.ExtractPath = t.ExtractPath.Replace(options.Value.AbsolutePath, options.Value.HttpPath).Replace("\\", "/");
+            });
             return reuslt;
         }