From a302d7d16e6bed80511cb49813d16829eb933560 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 18 十一月 2024 09:34:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Assets.Core/05-service/01-PumpMain/03-PumpMain/PumpMain_Instance.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/05-service/01-PumpMain/03-PumpMain/PumpMain_Instance.cs b/Service/HStation.Service.Assets.Core/05-service/01-PumpMain/03-PumpMain/PumpMain_Instance.cs
index c8b9a42..7a561e3 100644
--- a/Service/HStation.Service.Assets.Core/05-service/01-PumpMain/03-PumpMain/PumpMain_Instance.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/01-PumpMain/03-PumpMain/PumpMain_Instance.cs
@@ -10,6 +10,7 @@
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsPumpMain, Model.AssetsPumpMain>()
.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.AssetsPumpMain, Model.AssetsPumpMain>(entity);
return model;
@@ -23,6 +24,7 @@
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsPumpMain, Model.AssetsPumpMain>()
.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 models = mapper.Map<List<Entity.AssetsPumpMain>, List<Model.AssetsPumpMain>>(entities);
return models;
@@ -36,7 +38,8 @@
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsPumpMain, Entity.AssetsPumpMain>()
.ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras)))
.ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags)))
- ).CreateMapper();
+ .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWord)))
+ ).CreateMapper();
var entity = mapper.Map<Model.AssetsPumpMain, Entity.AssetsPumpMain>(model);
return entity;
}
@@ -49,7 +52,8 @@
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsPumpMain, Entity.AssetsPumpMain>()
.ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras)))
.ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags)))
- ).CreateMapper();
+ .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWord)))
+ ).CreateMapper();
var entities = mapper.Map<List<Model.AssetsPumpMain>, List<Entity.AssetsPumpMain>>(models);
return entities;
}
@@ -60,7 +64,8 @@
if (model == null || entity == null)
return;
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsPumpMain, Entity.AssetsPumpMain>()
- ).CreateMapper();
+ .ForMember(d => d.KeyWord, opt => opt.MapFrom(src => KeyWordHelper.ToString(src.KeyWord)))
+ ).CreateMapper();
mapper.Map(model, entity);
}
}
--
Gitblit v1.9.3