From 8fed094cd92287c607b25d78cb2a467f7c10561a Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Thu, 17 Nov 2022 11:36:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=88=B9=E5=90=8D=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Core/Myshipping.Core.xml                  | 5 +++++
 Myshipping.Core/Service/Cache/SysCacheService.cs     | 8 ++++++--
 Myshipping.Core/Service/CommonDB/CommonDBService.cs  | 2 ++
 Myshipping.Core/Service/CommonDB/ICommonDBService.cs | 5 +++++
 Myshipping.Report/Myshipping.Report.csproj.user      | 2 +-
 Myshipping.Web.Core/Startup.cs                       | 6 +++++-
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index 348d4c8e..604e3a04 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -7761,6 +7761,11 @@
             运输服务映射
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.ICommonDBService.GetAllCodeIssueType">
+            <summary>
+            签单方式
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonService.GetEntityInfos(System.Boolean)">
             <summary>
             获取库表信息
diff --git a/Myshipping.Core/Service/Cache/SysCacheService.cs b/Myshipping.Core/Service/Cache/SysCacheService.cs
index b75695c1..10955145 100644
--- a/Myshipping.Core/Service/Cache/SysCacheService.cs
+++ b/Myshipping.Core/Service/Cache/SysCacheService.cs
@@ -2,6 +2,7 @@
 using Furion.DynamicApiController;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Myshipping.Core.Entity;
 using Myshipping.Core.Entity.CommonDB;
@@ -22,9 +23,11 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
 {
     private readonly ICache _cache;
     private readonly CacheOptions _cacheOptions;
+    private readonly ILogger<SysCacheService> _logger;
 
-    public SysCacheService(IOptions<CacheOptions> cacheOptions, Func<string, ISingleton, object> resolveNamed)
+    public SysCacheService(IOptions<CacheOptions> cacheOptions, ILogger<SysCacheService> logger, Func<string, ISingleton, object> resolveNamed)
     {
+        _logger = logger;
         _cacheOptions = cacheOptions.Value;
         _cache = resolveNamed(_cacheOptions.CacheType.ToString(), default) as ICache;
     }
@@ -444,7 +447,8 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     /// <returns></returns>
     public Task SetAllCodeVessel(List<CodeVessel> list)
     {
-        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_VESSEL, list);
+        _logger.LogInformation("接收到缓存船名");
+        return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_VESSEL, list.ToJsonString());
     }
 
     /// <summary>
diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
index 7ddc082a..ced6b22b 100644
--- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs
+++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
@@ -845,7 +845,9 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     [NonAction]
     public async Task<List<CodeVessel>> GetAllVessel()
     {
+        _logger.LogInformation("缓存船名！");
         var list = await _codeVesselRep.ToListAsync();
+        _logger.LogInformation(list.ToJsonString());
         await _sysCacheService.SetAllCodeVessel(list);
         return list;
     }
diff --git a/Myshipping.Core/Service/CommonDB/ICommonDBService.cs b/Myshipping.Core/Service/CommonDB/ICommonDBService.cs
index 1364bb2a..3f524920 100644
--- a/Myshipping.Core/Service/CommonDB/ICommonDBService.cs
+++ b/Myshipping.Core/Service/CommonDB/ICommonDBService.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using System.Collections.Generic;
+using Myshipping.Core.Entity.CommonDB;
 
 namespace Myshipping.Core.Service;
 
@@ -114,4 +115,8 @@ public interface ICommonDBService
     /// 运输服务映射
     /// </summary>
     Task<List<MappingService>> GetAllMappingService();
+    /// <summary>
+    /// 签单方式
+    /// </summary>
+    Task<List<CodeIssueType>> GetAllCodeIssueType();
 }
diff --git a/Myshipping.Report/Myshipping.Report.csproj.user b/Myshipping.Report/Myshipping.Report.csproj.user
index c54031d1..5831b7bf 100644
--- a/Myshipping.Report/Myshipping.Report.csproj.user
+++ b/Myshipping.Report/Myshipping.Report.csproj.user
@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
diff --git a/Myshipping.Web.Core/Startup.cs b/Myshipping.Web.Core/Startup.cs
index 684fa813..70c708cc 100644
--- a/Myshipping.Web.Core/Startup.cs
+++ b/Myshipping.Web.Core/Startup.cs
@@ -114,7 +114,7 @@ public class Startup : AppStartup
         });
         #region  缓存
 
-     
+
 
         //船公司
         App.GetService<ICommonDBService>().GetAllCarrier();
@@ -168,9 +168,13 @@ public class Startup : AppStartup
 
         //包装映射
         App.GetService<ICommonDBService>().GetAllMappingPackage();
+
         //运输服务映射
         App.GetService<ICommonDBService>().GetAllMappingService();
 
+        //签单方式
+        App.GetService<ICommonDBService>().GetAllCodeIssueType();
+
         //缓存EDI数据
         App.GetService<IDjyEdiSettingService>().CacheData();