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 @@ 运输服务映射 + + + 签单方式 + + 获取库表信息 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 _logger; - public SysCacheService(IOptions cacheOptions, Func resolveNamed) + public SysCacheService(IOptions cacheOptions, ILogger logger, Func resolveNamed) { + _logger = logger; _cacheOptions = cacheOptions.Value; _cache = resolveNamed(_cacheOptions.CacheType.ToString(), default) as ICache; } @@ -444,7 +447,8 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet /// public Task SetAllCodeVessel(List list) { - return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_VESSEL, list); + _logger.LogInformation("接收到缓存船名"); + return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_VESSEL, list.ToJsonString()); } /// 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> 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 /// 运输服务映射 /// Task> GetAllMappingService(); + /// + /// 签单方式 + /// + Task> 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 @@ - Release|Any CPU + Debug|Any CPU 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().GetAllCarrier(); @@ -168,9 +168,13 @@ public class Startup : AppStartup //包装映射 App.GetService().GetAllMappingPackage(); + //运输服务映射 App.GetService().GetAllMappingService(); + //签单方式 + App.GetService().GetAllCodeIssueType(); + //缓存EDI数据 App.GetService().CacheData();