From 288711756347e7cd690f7ff2137a3829533667d5 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Tue, 16 Jan 2024 10:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9F=BA=E7=A1=80=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E5=92=8C=E6=89=93=E5=8D=B0=E6=8F=90=E9=86=92?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interfaces/IImportRecordAppService.cs | 4 + .../BaseConfig/Dto/BaseConfigCreateDto.cs | 26 +++ .../BaseConfig/Dto/BaseConfigDto.cs | 4 +- .../BaseConfig/Dto/QueryBaseConfigDto.cs | 27 +++ .../Interfaces/IBaseGonfigService.cs | 14 ++ .../WY.NewJit.Application.Contracts.csproj | 4 - .../WY.NewJit.Application.Contracts.xml | 40 ++++ .../EdiReceive/ImportRecordAppService.cs | 37 +++- .../BaseConfig/BaseGonfigService.cs | 175 ++++++++++++++++-- .../NewJitApplicationAutoMapperProfile.cs | 3 + .../PrintTable/WaitPrintAppService.cs | 11 +- .../WY.NewJit.Application.xml | 33 +++- .../MsgBaseData/Entitys/BaseConfig.cs | 17 +- .../Services/BaseGonfigDomainService.cs | 23 +++ .../NewJitDbContextModelCreatingExtensions.cs | 1 - 15 files changed, 394 insertions(+), 25 deletions(-) create mode 100644 src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/BaseConfigCreateDto.cs create mode 100644 src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/QueryBaseConfigDto.cs create mode 100644 src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Interfaces/IBaseGonfigService.cs diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/EdiReceive/Interfaces/IImportRecordAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/EdiReceive/Interfaces/IImportRecordAppService.cs index b835209..60aa61a 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/EdiReceive/Interfaces/IImportRecordAppService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/EdiReceive/Interfaces/IImportRecordAppService.cs @@ -6,7 +6,9 @@ using System.Text; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; +using Volo.Abp.Uow; using WY.NewJit.EdiReceive.Dtos; +using WY.NewJit.MsgCheck; namespace WY.NewJit.EdiReceive.Interfaces { @@ -63,6 +65,8 @@ namespace WY.NewJit.EdiReceive.Interfaces /// 导入文件流 /// 执行成功返回真 Task ImportAsync([FromForm] IFormFileCollection files); + [HttpPost, Route("print-timeout-remind"), UnitOfWork] + Task PrintTimeoutRemind(TimeOutRemindInputDto input); #endregion } diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/BaseConfigCreateDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/BaseConfigCreateDto.cs new file mode 100644 index 0000000..77c616c --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/BaseConfigCreateDto.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WY.NewJit.MsgBaseData +{ + public class BaseConfigCreateDto + { + /// + /// 参数名称 + /// + public virtual string ParamName { get; set; } + /// + /// 参数值 + /// + public virtual string ParamValue { get; set; } + /// + /// 状态 + /// + public virtual bool State { get; set; } + /// + /// 备注 + /// + public virtual string Remark { get; set; } + } +} diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/BaseConfigDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/BaseConfigDto.cs index cd10af3..5785fe7 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/BaseConfigDto.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/BaseConfigDto.cs @@ -22,10 +22,10 @@ namespace WY.NewJit.MsgBaseData /// /// 状态 /// - public virtual int State { get; set; } + public virtual bool State { get; set; } /// /// 备注 /// - public virtual int Remark { get; set; } + public virtual string Remark { get; set; } } } diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/QueryBaseConfigDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/QueryBaseConfigDto.cs new file mode 100644 index 0000000..cad20f0 --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Dto/QueryBaseConfigDto.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Text; +using WY.NewJit.Common; + +namespace WY.NewJit.MsgBaseData +{ + public class QueryBaseConfigDto : PagedAndSortedBase + { + /// + /// 参数名称 + /// + public virtual string ParamName { get; set; } + /// + /// 参数值 + /// + public virtual string ParamValue { get; set; } + /// + /// 状态 + /// + public virtual List State { get; set; } = new List(); + /// + /// 备注 + /// + public virtual string Remark { get; set; } + } +} diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Interfaces/IBaseGonfigService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Interfaces/IBaseGonfigService.cs new file mode 100644 index 0000000..1d42642 --- /dev/null +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/BaseConfig/Interfaces/IBaseGonfigService.cs @@ -0,0 +1,14 @@ +using System; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; + +namespace WY.NewJit.MsgBaseData +{ + public interface IBaseGonfigService + { + Task> CreateAsync(BaseConfigCreateDto input); + Task DeleteAsync(string id); + Task> GetListAsync(QueryBaseConfigDto input); + Task UpdateAsync(Guid id, BaseConfigCreateDto input); + } +} \ No newline at end of file diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj index c0fdf36..345f5f8 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.csproj @@ -32,8 +32,4 @@ - - - - diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml index 1832b26..3c1b4a6 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml @@ -1504,6 +1504,26 @@ 整车总成Id Erp总成列表 + + + 参数名称 + + + + + 参数值 + + + + + 状态 + + + + + 备注 + + 基础参数配置表 @@ -1529,6 +1549,26 @@ 备注 + + + 参数名称 + + + + + 参数值 + + + + + 状态 + + + + + 备注 + + 通用字典信息DTO diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportRecordAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportRecordAppService.cs index 6a7f24f..3e55b0f 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportRecordAppService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportRecordAppService.cs @@ -22,6 +22,7 @@ using WY.NewJit.EdiReceive.Entitys; using WY.NewJit.EdiReceive.Interfaces; using WY.NewJit.EntityFrameworkCore; using WY.NewJit.MsgBaseData; +using WY.NewJit.MsgCheck; namespace WY.NewJit.EdiReceive { @@ -57,6 +58,10 @@ namespace WY.NewJit.EdiReceive /// 字典领域服务 /// private readonly DicDomainService _dicDomainService; + /// + /// 配置 + /// + private readonly Microsoft.Extensions.Configuration.IConfiguration _configuration; /// /// 错误信息前缀 @@ -80,7 +85,8 @@ namespace WY.NewJit.EdiReceive ILogger logger, NewJitDapperRepository newJitDapperRepository, IBlobContainer blobContainer, - DicDomainService dicDomainService + DicDomainService dicDomainService, + Microsoft.Extensions.Configuration.IConfiguration configuration ) { _importRecordRepository = importRecordRepository; @@ -88,6 +94,7 @@ namespace WY.NewJit.EdiReceive _newJitDapperRepository = newJitDapperRepository; _blobContainer = blobContainer; _dicDomainService = dicDomainService; + _configuration = configuration; } #region 私有方法 @@ -472,5 +479,33 @@ namespace WY.NewJit.EdiReceive } } #endregion + + + /// + /// 打印时间提醒 + /// + /// + /// + [UnitOfWork] + [HttpPost] + [Route("print-timeout-remind")] + public virtual async Task PrintTimeoutRemind(TimeOutRemindInputDto input) + { + TimeOutRemindResultDto retObj = new TimeOutRemindResultDto(); + retObj.ConfigMinutes = _configuration[$"ConfigDic:ProductLineTimeoutRemind_New:{"Record"}"].TryToInt() ?? 40; + var qry =await _importRecordRepository.MaxAsync(itm => itm.CreateTime); + retObj.LastReceiveTime = qry != null ? Convert.ToDateTime(qry) : ServerHelper.CurrentDateTime; + retObj.TimeoutMinutes = MinuteDiff(retObj.LastReceiveTime, ServerHelper.CurrentDateTime); + return retObj; + } + + private int MinuteDiff(DateTime beginTime, DateTime endTime) + { + TimeSpan beginSpan = new TimeSpan(beginTime.Ticks); + TimeSpan endSpan = new TimeSpan(endTime.Ticks); + TimeSpan diffSpan = endSpan.Subtract(beginSpan).Duration(); + return (int)(diffSpan.TotalMinutes); + } + } } diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/BaseConfig/BaseGonfigService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/BaseConfig/BaseGonfigService.cs index 9a7980e..dc69e8a 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/BaseConfig/BaseGonfigService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/BaseConfig/BaseGonfigService.cs @@ -1,10 +1,13 @@ using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Dynamic.Core; using System.Text; using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using Volo.Abp.Uow; @@ -17,9 +20,11 @@ namespace WY.NewJit.MsgBaseData /// [Route("api/newjit/baseconfig")] [ApiExplorerSettings(GroupName = SwaggerGroupConsts.基础数据)] - public class BaseGonfigService : ApplicationService + public class BaseGonfigService : ApplicationService, IBaseGonfigService { - private readonly IRepository _repository; + public readonly IRepository _repository; + + private readonly BaseGonfigDomainService _baseConfigDomainService; /// /// 日志 /// @@ -41,11 +46,13 @@ namespace WY.NewJit.MsgBaseData /// public BaseGonfigService( IRepository repository, - ILogger logger + ILogger logger, + BaseGonfigDomainService baseConfigDomainService ) { _repository = repository; _logger = logger; + _baseConfigDomainService = baseConfigDomainService; } @@ -57,25 +64,171 @@ namespace WY.NewJit.MsgBaseData [HttpGet] [UnitOfWork(false)] [Route("list")] - public virtual async Task> GetBaseConfigListAsync() + public virtual async Task> GetListAsync(QueryBaseConfigDto input) { - _logger.LogDebug(_errorMessagePrefix + "GetBaseConfigListAsync 进入"); + _logger.LogDebug(_errorMessagePrefix + "GetListAsync 进入"); try { - var lst = await _repository.GetListAsync(); + var page = (PagedAndSortedBase)input; + IQueryable qry1 = QueryByCondition(input); + if (string.IsNullOrEmpty(page.Sorting)) + { + page.Sorting = "ParamName"; + } + + int totalCount = await qry1.CountAsync(); //返回总记录数而不是当前页记录数 + if (totalCount == 0) + { + return new PagedResultDto(0, new List()); + } + + var query = qry1.OrderBy(page.Sorting).Skip(page.SkipCount).Take(page.MaxResultCount); + + List lst = await query.ToListAsync(); - var items = ObjectMapper.Map, List>(lst); + var items = ObjectMapper.Map, List>(lst); - return new ListResultDto(items); + return new PagedResultDto(totalCount, items); } catch (Exception ex) { - string errMsg = _errorMessagePrefix + "GetBaseConfigListAsync 执行出错：" + ex.Message; + string errMsg = _errorMessagePrefix + "GetListAsync 执行出错：" + ex.Message; _logger.LogError(errMsg); - return new ListResultDto(new List()); + return new PagedResultDto(0, new List()); + } + } + + + + /// + /// 添加实体 + /// + /// 添加内容 + /// 执行成功返回真 + [HttpPost] + [UnitOfWork] + [Route("create")] + public async Task> CreateAsync(BaseConfigCreateDto input) + { + _logger.LogDebug(_errorMessagePrefix + "CreateAsync 进入"); + ObjectResultDto ret = new ObjectResultDto(); + try + { + var checkitem = await _repository.FirstOrDefaultAsync(r => r.ParamName == input.ParamName); + + if (checkitem != null) + { + ret.Status = false; + ret.Message = $"参数名称【{input.ParamName}】已存，在无法添加！"; + return ret; + } + BaseConfig obj = ObjectMapper.Map(input); + var obj2 = await _repository.InsertAsync(obj); + ret.Item = obj2.Id; //返回添加对象的主键 + await _baseConfigDomainService.UpdateBaseConfigCache(); + return ret; + } + catch (Exception ex) + { + ret.Status = false; + ret.Message = _errorMessagePrefix + "CreateAsync 执行出错：" + ex.Message; + _logger.LogError(ret.Message); + return ret; } } - #endregion + /// + /// 修改实体 + /// + /// 更新主键 + /// 修改内容 + /// 执行成功返回真 + [HttpPut] + [UnitOfWork] + [Route("update/{id}")] + public async Task UpdateAsync(Guid id, BaseConfigCreateDto input) + { + _logger.LogDebug(_errorMessagePrefix + "UpdateAsync 进入"); + ObjectResultDto ret = new ObjectResultDto(); + try + { + var checkitem = await _repository.FirstOrDefaultAsync(r => r.ParamName == input.ParamName && r.Id != id); + if (checkitem != null) + { + ret.Status = false; + ret.Message = $"参数名称【{input.ParamName}】已存，在无法添加！"; + return ret; + } + var item = await _repository.GetAsync(id); + ObjectMapper.Map(input, item); + await _repository.UpdateAsync(item); + await _baseConfigDomainService.UpdateBaseConfigCache(); + return ret; + } + catch (Exception ex) + { + ret.Status = false; + ret.Message = _errorMessagePrefix + "UpdateAsync 执行出错：" + ex.Message; + _logger.LogError(ret.Message); + return ret; + } + } + + /// + /// 删除实体 + /// + /// 删除主键 + /// 执行成功返回真 + [UnitOfWork] + [HttpDelete] + [Route("delete/{id}")]//delete/ + public async Task DeleteAsync(string id) + { + _logger.LogDebug(_errorMessagePrefix + "DeleteAsync 进入"); + ObjectResultDto ret = new ObjectResultDto(); + try + { + Guid guid = Guid.Parse(id); + await _repository.DeleteAsync(guid); + await _baseConfigDomainService.UpdateBaseConfigCache(); + return ret; + } + catch (Exception ex) + { + ret.Status = false; + ret.Message = _errorMessagePrefix + "DeleteAsync 执行出错：" + ex.Message; + _logger.LogError(ret.Message); + return ret; + } + } + #endregion + #region 私有方法 + /// + /// 根据筛选条件获取实体列表 + /// + /// + /// + private IQueryable QueryByCondition(QueryBaseConfigDto input) + { + IQueryable ret = _repository.Where(itm => 1 == 1); + if (!string.IsNullOrEmpty(input.ParamName)) + { + ret = ret.Where(itm => itm.ParamName.Contains(input.ParamName)); + } + if (!string.IsNullOrEmpty(input.ParamValue)) + { + ret = ret.Where(itm => itm.ParamValue.Contains(input.ParamValue)); + } + if (input.State.Count > 0) + { + ret = ret.Where(itm => input.State.Contains(itm.State)); + } + if (!string.IsNullOrEmpty(input.Remark)) + { + ret = ret.Where(itm => itm.Remark.Contains(input.Remark)); + } + return ret; + } + #endregion } } diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/NewJitApplicationAutoMapperProfile.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/NewJitApplicationAutoMapperProfile.cs index af465c3..b6aec95 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/NewJitApplicationAutoMapperProfile.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/NewJitApplicationAutoMapperProfile.cs @@ -46,6 +46,9 @@ namespace WY.NewJit CreateMap().ReverseMap(); CreateMap().ReverseMap(); + + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); #endregion #region 报文解析及校验 diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs index 4bd1794..68f6af9 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/PrintTable/WaitPrintAppService.cs @@ -116,6 +116,9 @@ namespace WY.NewJit.PrintTable /// BLOB存储 /// private readonly IBlobContainer _blobContainer; + + private readonly BaseGonfigDomainService _baseConfigDomainService; + #endregion public WaitPrintAppService( @@ -136,7 +139,8 @@ namespace WY.NewJit.PrintTable IRepository printTemplateConfigurationRepository, M100DomainService m100DomainService, IBlobContainer blobContainer, - IRepository billR100Repository + IRepository billR100Repository, + BaseGonfigDomainService baseConfigDomainService ) { _waitPrintRepository = waitPrintRepository; @@ -157,6 +161,7 @@ namespace WY.NewJit.PrintTable _m100DomainService = m100DomainService; _blobContainer = blobContainer; _billR100Repository = billR100Repository; + _baseConfigDomainService = baseConfigDomainService; } #region 私有方法 @@ -872,12 +877,14 @@ namespace WY.NewJit.PrintTable Stopwatch sw = new Stopwatch(); sw.Start(); _logger.LogDebug(_errorMessagePrefix + "SaveMenBanReport 进入"); - + var baseConfigCache= _baseConfigDomainService.GetCachesByName("打印条数"); + var printCount = baseConfigCache == null ? 10 : Convert.ToInt32(baseConfigCache.ParamValue); MenBanPrintResultDto retObj = new MenBanPrintResultDto(); ObjectResultDto ret = new ObjectResultDto(retObj); using (var uow = _unitOfWorkManager.Begin(requiresNew: true, isTransactional: true, isolationLevel: System.Data.IsolationLevel.Unspecified)) { + try { List reportMainLst = new List(); diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml index cc6ce29..65ea879 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml @@ -544,17 +544,46 @@ 错误信息前缀 - + 构造函数 - + 获取所有基本参数数据 + + + 添加实体 + + 添加内容 + 执行成功返回真 + + + + 修改实体 + + 更新主键 + 修改内容 + 执行成功返回真 + + + + 删除实体 + + 删除主键 + 执行成功返回真 + + + + 根据筛选条件获取实体列表 + + + + 通用字典应用服务实现 diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/BaseConfig.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/BaseConfig.cs index e6754cd..c598468 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/BaseConfig.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Entitys/BaseConfig.cs @@ -12,6 +12,19 @@ namespace WY.NewJit.MsgBaseData /// public class BaseConfig : AggregateRoot { + public BaseConfig() + { + + } + + public BaseConfig(Guid id ,string paramName, string paramValue, bool state, string remark):base(id) + { + ParamName = paramName; + ParamValue = paramValue; + State = state; + Remark = remark; + } + /// /// 参数名称 /// @@ -21,9 +34,9 @@ namespace WY.NewJit.MsgBaseData /// public virtual string ParamValue { get; set; } /// - /// 状态 + /// 是否启用 /// - public virtual int State { get; set; } + public virtual bool State { get; set; } /// /// 备注 /// diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Services/BaseGonfigDomainService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Services/BaseGonfigDomainService.cs index 30c2ff6..c1e3067 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Services/BaseGonfigDomainService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgBaseData/Services/BaseGonfigDomainService.cs @@ -10,6 +10,8 @@ namespace WY.NewJit.MsgBaseData { public class BaseGonfigDomainService : DomainService { + + private static List _baseConfigdCaches = new List();//记录缓存 private readonly IRepository _repository; public BaseGonfigDomainService(IRepository repository) @@ -17,6 +19,27 @@ namespace WY.NewJit.MsgBaseData _repository = repository; } + /// + /// 更新记录和内存 + /// + /// + public async Task UpdateBaseConfigCache() + { + ObjectResultDto ret = new ObjectResultDto(true, null); + _baseConfigdCaches.Clear();//清空缓存 + _baseConfigdCaches = await _repository.GetListAsync(); + return ret; + } + /// + /// 根据名称获取参数 + /// + /// + /// + public BaseConfig GetCachesByName(string name) + { + var item = _baseConfigdCaches.FirstOrDefault(r => r.ParamName == name); + return item; + } } } diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs index 989bf2d..3e789ff 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.EntityFrameworkCore/EntityFrameworkCore/NewJitDbContextModelCreatingExtensions.cs @@ -169,7 +169,6 @@ namespace WY.NewJit.EntityFrameworkCore b.ConfigureByConvention();//配置/映射继承的属性,应始终对你所有的实体使用它 b.Property("ParamName").HasMaxLength(50); b.Property("ParamValue").HasMaxLength(50); - b.Property("State").HasPrecision(1); b.Property("Remark").HasMaxLength(500); b.HasIndex(x => new { x.ParamName}).IsUnique(); });