From 1e3a24075476edda81677d3af48fea1240d256da Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Fri, 11 Nov 2022 15:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=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 | 52 ++++++++++++++++++-
.../Service/Cache/SysCacheService.cs | 30 +++++------
.../Service/CommonDB/CommonDBService.cs | 6 ---
3 files changed, 66 insertions(+), 22 deletions(-)
diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index 0c497550..b916bb80 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -652,6 +652,11 @@
船名映射
+
+
+ 场站映射
+
+
字典映射
@@ -659,7 +664,7 @@
- 船名映射
+ EDI映射
@@ -1262,6 +1267,11 @@
代码
+
+
+ 名称
+
+
模块
@@ -5503,6 +5513,12 @@
+
+
+ 获取公共库 场站映射
+
+
+
设置公共库 船公司
@@ -5587,6 +5603,12 @@
+
+
+ 设置公共库 场站映射
+
+
+
获取租户参数
@@ -5884,6 +5906,12 @@
+
+
+ 获取公共库 船名映射
+
+
+
设置公共库 船公司
@@ -5968,6 +5996,12 @@
+
+
+ 设置公共库 场站映射
+
+
+
获取租户参数
@@ -6573,6 +6607,16 @@
新增场站信息
+
+
+ 获取场站映射
+
+
+
+
+ 新增编辑场站映射信息
+
+
获取起始港信息
@@ -6704,6 +6748,12 @@
+
+
+ 获取场站映射
+
+
+
获取起始港
diff --git a/Myshipping.Core/Service/Cache/SysCacheService.cs b/Myshipping.Core/Service/Cache/SysCacheService.cs
index ebaff0ac..91dd987c 100644
--- a/Myshipping.Core/Service/Cache/SysCacheService.cs
+++ b/Myshipping.Core/Service/Cache/SysCacheService.cs
@@ -434,7 +434,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllCodeCarrier(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_CARRIER, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_CARRIER, list);
}
///
@@ -443,7 +443,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllCodeVessel(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_VESSEL, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_VESSEL, list);
}
///
@@ -452,7 +452,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllCodeForwarder(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_FORWARDER, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_FORWARDER, list);
}
///
@@ -461,7 +461,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllCodeYard(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_YARD, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_YARD, list);
}
///
@@ -470,7 +470,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllCodePortLoad(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PORTLOAD, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PORTLOAD, list);
}
///
@@ -479,7 +479,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllCodePort(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PORT, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PORT, list);
}
///
@@ -488,7 +488,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllCodePackage(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PACKAGE, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_PACKAGE, list);
}
///
@@ -497,7 +497,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllCodeService(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_SERVICE, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_SERVICE, list);
}
///
@@ -506,7 +506,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllCodeCtn(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_CTN, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_CTN, list);
}
///
@@ -515,7 +515,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllCodeFrt(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_FRT, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_FRT, list);
}
///
@@ -524,7 +524,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllMappingCtn(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_CTN, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_CTN, list);
}
///
@@ -533,7 +533,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllMappingCarrier(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_CARRIER, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_CARRIER, list);
}
///
@@ -542,7 +542,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllMappingFrt(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_FRT, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_FRT, list);
}
///
@@ -551,7 +551,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllMappingVessel(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_VESSEL, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_VESSEL, list);
}
///
@@ -560,7 +560,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
///
public Task SetAllMappingYard(List list)
{
- return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_YARD, list, TimeSpan.FromMinutes(5));
+ return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_YARD, list);
}
diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
index 37ad1cc7..be02d326 100644
--- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs
+++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
@@ -20,11 +20,8 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
private readonly SqlSugarRepository _codeCarrierRep;
private readonly SqlSugarRepository _mappingCarrierRep;
-
private readonly SqlSugarRepository _codeVesselRep;
private readonly SqlSugarRepository _mappingVesselRep;
-
-
private readonly SqlSugarRepository _codeForwarderRep;
private readonly SqlSugarRepository _codeYardRep;
private readonly SqlSugarRepository _mappingYardRep;
@@ -34,10 +31,8 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
private readonly SqlSugarRepository _codeServiceRep;
private readonly SqlSugarRepository _codeCtnRep;
private readonly SqlSugarRepository _mappingCtnRep;
-
private readonly SqlSugarRepository _codeFrtRep;
private readonly SqlSugarRepository _mappingFrtRep;
-
private readonly ISysCacheService _sysCacheService;
public CommonDBService(SqlSugarRepository codeCarrierRep,
@@ -164,7 +159,6 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
return queryList.ToList();
}
-
///
/// 新增船名信息
///