From e37b6f2ca026097b83da3ec989cb0d454cceddad Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期四, 19 十二月 2024 14:13:22 +0800 Subject: [PATCH] 压力表整改 --- Service/HStation.Service.Assets.Core/05-service/18-pressmeter/02-main/AssetsPressmeterMain_Instance.cs | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Service/HStation.Service.Assets.Core/05-service/19-Pressmeter/02-PressmeterMain/AssetsPressmeterMain_Instance.cs b/Service/HStation.Service.Assets.Core/05-service/18-pressmeter/02-main/AssetsPressmeterMain_Instance.cs similarity index 84% rename from Service/HStation.Service.Assets.Core/05-service/19-Pressmeter/02-PressmeterMain/AssetsPressmeterMain_Instance.cs rename to Service/HStation.Service.Assets.Core/05-service/18-pressmeter/02-main/AssetsPressmeterMain_Instance.cs index 3f564a9..8d08ab8 100644 --- a/Service/HStation.Service.Assets.Core/05-service/19-Pressmeter/02-PressmeterMain/AssetsPressmeterMain_Instance.cs +++ b/Service/HStation.Service.Assets.Core/05-service/18-pressmeter/02-main/AssetsPressmeterMain_Instance.cs @@ -1,8 +1,5 @@ 锘縩amespace HStation.Service { - /// <summary> - /// 鍘嬪姏琛� - ///</summary> public partial class AssetsPressmeterMain { //Entity to GetModel @@ -11,24 +8,23 @@ if (entity == null) return default; var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsPressmeterMain, Model.AssetsPressmeterMain>() + .ForMember(d => d.KeyWords, opt => opt.MapFrom(src => KeyWordHelper.ToList(src.KeyWords))) .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToDictionary(src.Paras))) .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags))) - .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToList(src.KeyWord))) ).CreateMapper(); var model = mapper.Map<Entity.AssetsPressmeterMain, Model.AssetsPressmeterMain>(entity); return model; } - //Entities to GetModels internal static List<Model.AssetsPressmeterMain> Entity2Models(List<Entity.AssetsPressmeterMain> entities) { if (entities == null || entities.Count < 1) return default; var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsPressmeterMain, Model.AssetsPressmeterMain>() + .ForMember(d => d.KeyWords, opt => opt.MapFrom(src => KeyWordHelper.ToList(src.KeyWords))) .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToDictionary(src.Paras))) - .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags))) - .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToList(src.KeyWord))) - ).CreateMapper(); + .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags))) + ).CreateMapper(); var models = mapper.Map<List<Entity.AssetsPressmeterMain>, List<Model.AssetsPressmeterMain>>(entities); return models; } @@ -39,9 +35,9 @@ if (model == null) return default; var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsPressmeterMain, Entity.AssetsPressmeterMain>() + .ForMember(d => d.KeyWords, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWords))) .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras))) .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags))) - .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWord))) ).CreateMapper(); var entity = mapper.Map<Model.AssetsPressmeterMain, Entity.AssetsPressmeterMain>(model); return entity; @@ -53,9 +49,9 @@ if (models == null || models.Count < 1) return default; var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsPressmeterMain, Entity.AssetsPressmeterMain>() + .ForMember(d => d.KeyWords, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWords))) .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras))) .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags))) - .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWord))) ).CreateMapper(); var entities = mapper.Map<List<Model.AssetsPressmeterMain>, List<Entity.AssetsPressmeterMain>>(models); return entities; @@ -67,11 +63,11 @@ if (model == null || entity == null) return; var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsPressmeterMain, Entity.AssetsPressmeterMain>() + .ForMember(d => d.KeyWords, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWords))) .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras))) - .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags))) - .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWord))) - ).CreateMapper(); + .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags))) + ).CreateMapper(); mapper.Map(model, entity); } } -} \ No newline at end of file +} -- Gitblit v1.9.3