From b0a694ccba71736f9092f30e45be94689ce92416 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 31 三月 2025 11:13:49 +0800
Subject: [PATCH] 计算模块替换
---
Service/HStation.Service.Assets.Core/05-service/03-Valve/01-ValveSeries/ValveSeries_Instance.cs | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/05-service/03-Valve/01-ValveSeries/ValveSeries_Instance.cs b/Service/HStation.Service.Assets.Core/05-service/03-Valve/01-ValveSeries/ValveSeries_Instance.cs
index 61709dc..3a8b855 100644
--- a/Service/HStation.Service.Assets.Core/05-service/03-Valve/01-ValveSeries/ValveSeries_Instance.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/03-Valve/01-ValveSeries/ValveSeries_Instance.cs
@@ -8,7 +8,8 @@
if (entity == null)
return default;
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsValveSeries, Model.AssetsValveSeries>()
- .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToDictionary(src.Paras)))
+ .ForMember(d => d.ParentIds, opt => opt.MapFrom(src => TreeParentIdsHelper.ToList(src.ParentIds)))
+ .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToDictionary(src.Paras)))
.ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags)))
).CreateMapper();
var model = mapper.Map<Entity.AssetsValveSeries, Model.AssetsValveSeries>(entity);
@@ -21,6 +22,7 @@
if (entities == null || entities.Count < 1)
return default;
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsValveSeries, Model.AssetsValveSeries>()
+ .ForMember(d => d.ParentIds, opt => opt.MapFrom(src => TreeParentIdsHelper.ToList(src.ParentIds)))
.ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToDictionary(src.Paras)))
.ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags)))
).CreateMapper();
@@ -34,7 +36,8 @@
if (model == null)
return default;
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsValveSeries, Entity.AssetsValveSeries>()
- .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras)))
+ .ForMember(d => d.ParentIds, opt => opt.MapFrom(src => TreeParentIdsHelper.ToString(src.ParentIds)))
+ .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();
var entity = mapper.Map<Model.AssetsValveSeries, Entity.AssetsValveSeries>(model);
@@ -47,21 +50,12 @@
if (models == null || models.Count < 1)
return default;
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsValveSeries, Entity.AssetsValveSeries>()
- .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.ParentIds, opt => opt.MapFrom(src => TreeParentIdsHelper.ToString(src.ParentIds)))
+ .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();
var entities = mapper.Map<List<Model.AssetsValveSeries>, List<Entity.AssetsValveSeries>>(models);
return entities;
- }
-
- //Model to Entity
- internal static void Model2Entity(Model.AssetsValveSeries model, Entity.AssetsValveSeries entity)
- {
- if (model == null || entity == null)
- return;
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsValveSeries, Entity.AssetsValveSeries>()
- ).CreateMapper();
- mapper.Map(model, entity);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3