whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Browse Source 
# Conflicts:
#	Myshipping.Core/Const/CommonConst.cs
#	Myshipping.Core/Service/Cache/ISysCacheService.cs
#	Myshipping.Web.Core/Startup.cs
booking_auth_dev
wet 2 years ago
parent 300124d65a 44805ec454
commit ab8385dc72
10 changed files with 108 additions and 86 deletions
Show Stats Download Patch File Download Diff File

18
Myshipping.Application/EDI/Yard/XiahuozhiHelpler.cs
Unescape Escape View File

@ -21,17 +21,17 @@ namespace Myshipping.Application.EDI.Yard
public static class XiahuozhiHelpler
{
public static bool Send(
SqlSugarRepository<BookingOrder> repOrder,
SqlSugarRepository<BookingCtn> repCtn,
SqlSugarRepository<SysDictType> repDictType,
SqlSugarRepository<SysDictData> repDictData,
SqlSugarRepository<BookingFile> repBookingFile,
SqlSugarRepository<DjyEdiSetting> repEdiSetting,
//SqlSugarRepository<BookingOrder> repOrder,
//SqlSugarRepository<BookingCtn> repCtn,
//SqlSugarRepository<SysDictType> repDictType,
//SqlSugarRepository<SysDictData> repDictData,
//SqlSugarRepository<BookingFile> repBookingFile,
//SqlSugarRepository<DjyEdiSetting> repEdiSetting,
long bookingId, string filerole, out string msg, string attShowName = "系统")
{
var sugerClient = App.GetService<ISqlSugarClient>();
var order = repOrder.FirstOrDefault(o => o.Id == bookingId);
var order = sugerClient.Queryable<BookingOrder>().First(o => o.Id == bookingId);
if (order == null)
{
msg = "订舱信息未找到";
@ -132,7 +132,7 @@ namespace Myshipping.Application.EDI.Yard
var ctnCodes = GetAllCodeCtn().Result.Select(x => new { x.Code, x.Size }).ToList();
var ctnEdiList = GetAllMappingCtn().Result.AsQueryable().Where(x => x.Module == "XHZ_GLJ" && x.CarrierCode == order.CARRIERID).ToList();
var ctns = repCtn.Where(c => c.BILLID == bookingId).ToList();
var ctns = sugerClient.Queryable<BookingCtn>().Where(c => c.BILLID == bookingId).ToList();
foreach (var ctn in ctns)
{
var ctnFind = ctnCodes.FirstOrDefault(c => c.Code == ctn.CTNCODE);
@ -174,7 +174,7 @@ namespace Myshipping.Application.EDI.Yard
attFile.TypeCode = "xiahuozhi";
attFile.TypeName = "下货纸";
attFile.TenantName = order.TenantName;
repBookingFile.Insert(attFile);
sugerClient.Insertable(attFile).ExecuteCommand();
msg = "已发送";
return true;

5
Myshipping.Application/Myshipping.Application.csproj
Unescape Escape View File

@ -13,6 +13,7 @@
</ItemGroup>
<ItemGroup>
<Compile Remove="EDI\Yard\XiahuozhiHelpler.cs" />
<Compile Remove="Entity\DjyBooking.cs" />
<Compile Remove="Service\BookingCtnDetail\BookingCtnDetailService.cs" />
<Compile Remove="Service\BookingCtnDetail\IBookingCtnDetailService.cs" />
@ -34,4 +35,8 @@
<ProjectReference Include="..\Myshipping.Core\Myshipping.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="EDI\Yard\" />
</ItemGroup>
</Project>

75
Myshipping.Application/Myshipping.Application.xml
Unescape Escape View File

@ -34,81 +34,6 @@
订舱附件文件配置
</summary>
</member>
<member name="T:Myshipping.Application.EDI.Yard.XiahuozhiHelpler">
<summary>
下货纸辅助类
</summary>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.formatEdiStr(System.String,System.String)">
<summary>
各种文本转义字符（东胜7移植）
</summary>
<param name="fileType">文件类型（例如：txt、xml）</param>
<param name="str">文本字符串</param>
<returns></returns>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.GetCtnEDICode(System.String,System.String)">
<summary>
获取箱型的EDI代码
</summary>
<param name="ctnCode"></param>
<param name="EDINAME"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.GetAllCodeCtn">
<summary>
获取所有箱型（使用缓存）
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.GetAllCodeCarrier">
<summary>
获取所有船司（使用缓存）
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.GetAllMappingCtn">
<summary>
获取所有箱型映射（使用缓存）
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.GetAllMappingCarrier">
<summary>
获取所有船司映射（使用缓存）
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.GetAllCodeFrt">
<summary>
获取所有付费方式（使用缓存）
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.GetAllMappingFrt">
<summary>
获取所有付费方式映射（使用缓存）
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.GetAllTenantParam">
<summary>
获取所有公司参数（使用缓存）
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.GetAllCodeVessel">
<summary>
获取所有船名（使用缓存）
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Application.EDI.Yard.XiahuozhiHelpler.GetAllMappingVessel">
<summary>
获取所有船名映射（使用缓存）
</summary>
<returns></returns>
</member>
<member name="T:Myshipping.Application.Entity.BookingCtn">
<summary>

6
Myshipping.Core/Const/CommonConst.cs
Unescape Escape View File

@ -120,6 +120,12 @@ public class CommonConst
/// </summary>
public const string CACHE_KEY_COMMON_DB_DICT_DATA = "DictDataList";
/// <summary>
/// 船名映射
/// </summary>
public const string CACHE_KEY_DJY_EDI_SETTING = "DjyEdiSetting";
#endregion

36
Myshipping.Core/Myshipping.Core.xml
Unescape Escape View File

@ -647,6 +647,11 @@
船名映射
</summary>
</member>
<member name="F:Myshipping.Core.CommonConst.CACHE_KEY_DJY_EDI_SETTING">
<summary>
船名映射
</summary>
</member>
<member name="F:Myshipping.Core.CommonConst.ENTITY_ASSEMBLY_NAME">
<summary>
程序集
@ -5411,6 +5416,18 @@
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ISysCacheService.GetAllEdiSetting">
<summary>
获取EDI参数
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ISysCacheService.SetAllEdiSetting(System.Collections.Generic.List{Myshipping.Core.Entity.DjyEdiSetting})">
<summary>
设置EDI参数
</summary>
<returns></returns>
</member>
<member name="T:Myshipping.Core.Service.SysCacheService">
<summary>
系统缓存服务
@ -5767,6 +5784,18 @@
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.SysCacheService.GetAllEdiSetting">
<summary>
获取EDI参数
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.SysCacheService.SetAllEdiSetting(System.Collections.Generic.List{Myshipping.Core.Entity.DjyEdiSetting})">
<summary>
设置EDI参数
</summary>
<returns></returns>
</member>
<member name="T:Myshipping.Core.Service.CodeGenConfigService">
<summary>
代码生成详细配置服务
@ -7746,6 +7775,13 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.DjyEdiSettingService.CacheData">
<summary>
缓存数据
</summary>
<returns></returns>
<exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="T:Myshipping.Core.Service.DjyTenantParamService">
<summary>
租户参数

11
Myshipping.Core/Service/Cache/ISysCacheService.cs
Unescape Escape View File

@ -229,5 +229,16 @@ public interface ISysCacheService
/// <param name="list"></param>
/// <returns></returns>
Task SetAllDictData(List<DictDataDto> list);
/// <summary>
/// 获取EDI参数
/// </summary>
/// <returns></returns>
Task<List<DjyEdiSetting>> GetAllEdiSetting();
/// <summary>
/// 设置EDI参数
/// </summary>
/// <returns></returns>
Task SetAllEdiSetting(List<DjyEdiSetting> list);
#endregion
}

17
Myshipping.Core/Service/Cache/SysCacheService.cs
Unescape Escape View File

@ -590,5 +590,22 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_DICT_DATA, list);
}
/// <summary>
/// 获取EDI参数
/// </summary>
/// <returns></returns>
public Task<List<DjyEdiSetting>> GetAllEdiSetting()
{
return _cache.GetAsync<List<DjyEdiSetting>>(CommonConst.CACHE_KEY_DJY_EDI_SETTING);
}
/// <summary>
/// 设置EDI参数
/// </summary>
/// <returns></returns>
public Task SetAllEdiSetting(List<DjyEdiSetting> list)
{
return _cache.SetAsync(CommonConst.CACHE_KEY_DJY_EDI_SETTING, list);
}
#endregion
}

21
Myshipping.Core/Service/DjyEdiSetting/DjyEdiSettingService.cs
Unescape Escape View File

@ -19,12 +19,14 @@ namespace Myshipping.Core.Service
public class DjyEdiSettingService : IDjyEdiSettingService, IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<DjyEdiSetting> _rep;
private readonly ISysCacheService _cacheService;
private readonly ILogger<DjyEdiSetting> _logger;
public DjyEdiSettingService(SqlSugarRepository<DjyEdiSetting> rep, ILogger<DjyEdiSetting> logger)
public DjyEdiSettingService(SqlSugarRepository<DjyEdiSetting> rep, ILogger<DjyEdiSetting> logger, ISysCacheService cacheService)
{
_rep = rep;
_logger = logger;
_cacheService = cacheService;
}
/// <summary>
@ -86,6 +88,7 @@ namespace Myshipping.Core.Service
entity = input.Adapt(entity);
await _rep.UpdateAsync(entity);
}
await CacheData();
}
/// <summary>
@ -98,6 +101,7 @@ namespace Myshipping.Core.Service
{
var entity = input.Adapt<DjyEdiSetting>();
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
await CacheData();
}
/// <summary>
@ -110,6 +114,7 @@ namespace Myshipping.Core.Service
{
var entity = await _rep.FirstOrDefaultAsync(u => u.Id == input.Id);
await _rep.DeleteAsync(entity);
await CacheData();
}
/// <summary>
@ -123,6 +128,20 @@ namespace Myshipping.Core.Service
return await _rep.FirstOrDefaultAsync(u => u.Id == input.Id);
}
/// <summary>
/// 缓存数据
/// </summary>
/// <returns></returns>
/// <exception cref="System.NotImplementedException"></exception>
[NonAction]
public async Task CacheData()
{
_logger.LogInformation($"准备缓存EDI参数……");
var list = _rep.AsQueryable().Filter(null, true).ToList();
await _cacheService.SetAllEdiSetting(list);
_logger.LogInformation($"缓存EDI参数完成");
}
///// <summary>
///// 获取EDI参数设置列表
///// </summary>

2
Myshipping.Core/Service/DjyEdiSetting/IDjyEdiSettingService.cs
Unescape Escape View File

@ -13,5 +13,7 @@ namespace Myshipping.Core.Service
Task Delete(GetDjyEdiSettingInput input);
Task<DjyEdiSetting> Get([FromQuery] GetDjyEdiSettingInput input);
//Task<dynamic> List([FromQuery] QueryDjyEdiSettingInput input);
Task CacheData();
}
}

3
Myshipping.Web.Core/Startup.cs
Unescape Escape View File

@ -111,7 +111,8 @@ public class Startup : AppStartup
builder.AddSubscriber<LogEventSubscriber>();
});
//缓存EDI数据
App.GetService<IDjyEdiSettingService>().CacheData();
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

Write Preview
Loading…
Cancel
Save