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

公共类缓存

Browse Source
booking_auth_dev
wet 2 years ago
parent 88e362dbb2
commit 33b26cd540
9 changed files with 184 additions and 31 deletions
Show Stats Download Patch File Download Diff File

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

@ -3245,7 +3245,7 @@
状态
</summary>
</member>
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto.OpTiem">
<member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto.OPTime">
<summary>
状态时间
</summary>

6
Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
Unescape Escape View File

@ -673,6 +673,7 @@ namespace Myshipping.Application
/// </summary>
[AllowAnonymous]
[SqlSugarUnitOfWork]
[HttpPost("/BookingOrder/AddBookingStatusLog")]
public async Task AddBookingStatusLog(List<BookingStatusLogDto> all)
{
@ -691,7 +692,7 @@ namespace Myshipping.Application
bookingStatusLog.Gategory = "ship";
bookingStatusLog.CreatedTime = DateTime.Now;
bookingStatusLog.Status = item.Status;
bookingStatusLog.OpTiem = item.OpTiem;
bookingStatusLog.OpTiem = item.OPTime;
bookingStatusLog.MBLNO = item.MBLNO;
var id = await _statuslog.InsertReturnSnowflakeIdAsync(bookingStatusLog);
if (item.detail != null && item.detail.Count > 0)
@ -704,11 +705,8 @@ namespace Myshipping.Application
BookingStatusLogDetail.CNTRNO = dt.CNTRNO;
BookingStatusLogDetail.OPTime = dt.OPTime;
await _statuslogdetail.InsertAsync(BookingStatusLogDetail);
}
}
}
}
}

2
Myshipping.Application/Service/BookingOrder/Dto/BookingStatusLogDto.cs
Unescape Escape View File

@ -22,7 +22,7 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
/// <summary>
/// 状态时间
/// </summary>
public DateTime? OpTiem { get; set; }
public DateTime? OPTime { get; set; }
/// <summary>
/// 类别
/// </summary>

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

@ -5779,13 +5779,13 @@
</member>
<member name="M:Myshipping.Core.Service.SysCacheService.GetAllMappingCtn">
<summary>
获取公共库 船司映射
获取公共库 箱型映射
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.SysCacheService.GetAllMappingCarrier">
<summary>
获取公共库 箱型映射
获取公共库 船司映射
</summary>
<returns></returns>
</member>
@ -6435,11 +6435,31 @@
获取船公司列表信息
</summary>
</member>
<member name="M:Myshipping.Core.Service.CommonDBService.AddCarrier(Myshipping.Core.Entity.CodeCarrier)">
<summary>
新增船公司信息
</summary>
</member>
<member name="M:Myshipping.Core.Service.CommonDBService.MappingCarrierList(Myshipping.Core.Service.MappingQueryDto)">
<summary>
获取船公司映射列表信息
</summary>
</member>
<member name="M:Myshipping.Core.Service.CommonDBService.AddOrUpdateCarrier(Myshipping.Core.Entity.MappingCarrier)">
<summary>
新增编辑船公司映射信息
</summary>
</member>
<member name="M:Myshipping.Core.Service.CommonDBService.VesselList(Myshipping.Core.Service.NameQueryDto)">
<summary>
获取船名列表信息
</summary>
</member>
<member name="M:Myshipping.Core.Service.CommonDBService.AddVessel(Myshipping.Core.Entity.CodeVessel)">
<summary>
新增船公司信息
</summary>
</member>
<member name="M:Myshipping.Core.Service.CommonDBService.ForwarderList(Myshipping.Core.Service.NameQueryDto)">
<summary>
获取船代列表信息
@ -6480,12 +6500,33 @@
付费方式
</summary>
</member>
<member name="P:Myshipping.Core.Service.MappingQueryDto.Module">
<summary>
模块
</summary>
</member>
<member name="P:Myshipping.Core.Service.MappingQueryDto.MapCode">
<summary>
映射代码
</summary>
</member>
<member name="P:Myshipping.Core.Service.MappingQueryDto.MapName">
<summary>
映射名称
</summary>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllCarrier">
<summary>
获取船公司
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingCarrier">
<summary>
获取船公司映射
</summary>
<returns></returns>
</member>
<member name="M:Myshipping.Core.Service.ICommonDBService.GetAllVessel">
<summary>
获取船名

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

@ -41,6 +41,7 @@ public interface ISysCacheService
/// <returns></returns>
Task<List<CodeCarrier>> GetAllCodeCarrier();
/// <summary>
/// 获取公共库 船名
/// </summary>

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

@ -383,7 +383,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
}
/// <summary>
/// 获取公共库 船司映射
/// 获取公共库 箱型映射
/// </summary>
/// <returns></returns>
public Task<List<MappingCtn>> GetAllMappingCtn()
@ -392,7 +392,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
}
/// <summary>
/// 获取公共库 箱型映射
/// 获取公共库 船司映射
/// </summary>
/// <returns></returns>
public Task<List<MappingCarrier>> GetAllMappingCarrier()
@ -610,5 +610,6 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
{
return _cache.SetAsync(CommonConst.CACHE_KEY_DJY_EDI_SETTING, list);
}
#endregion
}

127
Myshipping.Core/Service/CommonDB/CommonDBService.cs
Unescape Escape View File

@ -1,12 +1,9 @@

using Furion.DependencyInjection;
using Furion.DependencyInjection;
using Furion.DynamicApiController;
using Furion.FriendlyException;
using Myshipping.Core.Entity;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using System.Linq;
using System.Threading.Tasks;
@ -14,7 +11,6 @@ using System.Collections.Generic;
using System;
namespace Myshipping.Core.Service;
/// <summary>
/// 公共库
/// </summary>
@ -23,6 +19,8 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
{
private readonly SqlSugarRepository<CodeCarrier> _codeCarrierRep;
private readonly SqlSugarRepository<MappingCarrier> _mappingCarrierRep;
private readonly SqlSugarRepository<CodeVessel> _codeVesselRep;
private readonly SqlSugarRepository<CodeForwarder> _codeForwarderRep;
private readonly SqlSugarRepository<CodeYard> _codeYardRep;
@ -44,7 +42,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
SqlSugarRepository<CodeService> codeServiceRep,
SqlSugarRepository<CodeCtn> codeCtnRep,
SqlSugarRepository<CodeFrt> codeFrtRep,
SqlSugarRepository<MappingCarrier> mappingCarrierRep,
ISysCacheService sysCacheService)
{
_codeCarrierRep = codeCarrierRep;
@ -57,11 +55,13 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
_codeServiceRep = codeServiceRep;
_codeCtnRep = codeCtnRep;
_codeFrtRep = codeFrtRep;
_mappingCarrierRep = mappingCarrierRep;
_sysCacheService = sysCacheService;
}
#region 船公司
/// <summary>
/// 获取船公司列表信息
/// </summary>
@ -69,14 +69,63 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
public async Task<dynamic> CarrierList([FromQuery] CodeCnEnQueryDto input)
{
var list = await GetAllCarrier();
var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
.WhereIF(!string.IsNullOrEmpty(input.CnName), x => x.Code.Contains(input.CnName))
.WhereIF(!string.IsNullOrEmpty(input.EnName), x => x.Code.Contains(input.EnName, System.StringComparison.CurrentCultureIgnoreCase));
return queryList.ToList();
}
/// <summary>
/// 新增船公司信息
/// </summary>
[HttpPost("/commondb/addcarrier")]
public async Task AddCarrier(CodeCarrier dto)
{
var entity = dto.Adapt<CodeCarrier>();
await _codeCarrierRep.InsertAsync(entity);
await GetAllCarrier();
}
/// <summary>
/// 获取船公司映射列表信息
/// </summary>
[HttpGet("/commondb/mappingcarrierlist")]
public async Task<dynamic> MappingCarrierList([FromQuery] MappingQueryDto input)
{
var list = await GetAllMappingCarrier();
var queryList = list
.WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
.WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
.WhereIF(!string.IsNullOrEmpty(input.Module), x => x.Module == input.Module)
.WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.Code.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase));
return queryList.ToList();
}
/// <summary>
/// 新增编辑船公司映射信息
/// </summary>
[HttpPost("/commondb/addorupdatecarrier")]
public async Task AddOrUpdateCarrier(MappingCarrier dto)
{
var entity = dto.Adapt<MappingCarrier>();
if (string.IsNullOrWhiteSpace(dto.GID))
{
await _mappingCarrierRep.InsertAsync(entity);
}
else
{
await _mappingCarrierRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
await GetAllMappingCarrier();
}
#endregion
#region 船名
/// <summary>
/// 获取船名列表信息
/// </summary>
@ -96,6 +145,25 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
return queryList.ToList();
}
/// <summary>
/// 新增船名信息
/// </summary>
[HttpPost("/commondb/addvessel")]
public async Task AddVessel(CodeVessel dto)
{
var entity = dto.Adapt<CodeVessel>();
await _codeVesselRep.InsertAsync(entity);
}
#endregion
/// <summary>
/// 获取船代列表信息
/// </summary>
@ -206,23 +274,38 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
return queryList.ToList();
}
#region 实现接口，获取公共数据并缓存
[NonAction]
public async Task<List<CodeCarrier>> GetAllCarrier()
{
var list = await _sysCacheService.GetAllCodeCarrier();
if (list != null && list.Count > 0)
{
return list;
}
else
{
list = await _codeCarrierRep.ToListAsync();
await _sysCacheService.SetAllCodeCarrier(list);
return list;
}
var list = await _codeCarrierRep.ToListAsync();
await _sysCacheService.SetAllCodeCarrier(list);
return list;
}
[NonAction]
public async Task<List<MappingCarrier>> GetAllMappingCarrier()
{
var list = await _mappingCarrierRep.ToListAsync();
await _sysCacheService.SetAllMappingCarrier(list);
return list;
}
[NonAction]
public async Task CacheMappingCarrier()
{
var list = await _mappingCarrierRep.ToListAsync();
await _sysCacheService.SetAllMappingCarrier(list);
}
[NonAction]
public async Task<List<CodeVessel>> GetAllVessel()
{
@ -238,7 +321,11 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
return list;
}
}
public async Task CacheVessel()
{
var list = await _codeVesselRep.ToListAsync();
await _sysCacheService.SetAllCodeVessel(list);
}
[NonAction]
public async Task<List<CodeForwarder>> GetAllForwarder()
{

20
Myshipping.Core/Service/CommonDB/Dto/QueryDto.cs
Unescape Escape View File

@ -19,4 +19,24 @@ namespace Myshipping.Core.Service
{
public string Name { get; set; }
}
public class MappingQueryDto
{
public string Code { get; set; }
/// <summary>
/// 模块
/// </summary>
public string Module { get; set; }
/// <summary>
/// 映射代码
/// </summary>
public string MapCode { get; set; }
/// <summary>
/// 映射名称
/// </summary>
public string MapName { get; set; }
}
}

7
Myshipping.Core/Service/CommonDB/ICommonDBService.cs
Unescape Escape View File

@ -12,7 +12,12 @@ public interface ICommonDBService
/// </summary>
/// <returns></returns>
Task<List<CodeCarrier>> GetAllCarrier();
/// <summary>
/// 获取船公司映射
/// </summary>
/// <returns></returns>
Task<List<MappingCarrier>> GetAllMappingCarrier();
/// <summary>
/// 获取船名
/// </summary>

Write Preview
Loading…
Cancel
Save