From 0cd48df8ccca96a8a0117a508c342a90dc2eacb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 08 十一月 2024 13:07:43 +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/05-Sprinkler/02-SprinklerSeries/AssetsSprinklerSeries_Instance.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/05-service/09-Nozzle/02-ThreeLinkSeries/NozzleSeries_Instance.cs b/Service/HStation.Service.Assets.Core/05-service/05-Sprinkler/02-SprinklerSeries/AssetsSprinklerSeries_Instance.cs
similarity index 74%
rename from Service/HStation.Service.Assets.Core/05-service/09-Nozzle/02-ThreeLinkSeries/NozzleSeries_Instance.cs
rename to Service/HStation.Service.Assets.Core/05-service/05-Sprinkler/02-SprinklerSeries/AssetsSprinklerSeries_Instance.cs
index bf45b01..4eb5563 100644
--- a/Service/HStation.Service.Assets.Core/05-service/09-Nozzle/02-ThreeLinkSeries/NozzleSeries_Instance.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/05-Sprinkler/02-SprinklerSeries/AssetsSprinklerSeries_Instance.cs
@@ -1,6 +1,8 @@
-锘縩amespace HStation.Service
+锘縰sing SqlSugar;
+
+namespace HStation.Service
{
- public partial class AssetsNozzleSeries
+ public partial class AssetsSprinklerSeries
{
//Entity to GetModel
internal static Model.AssetsSprinklerSeries Entity2Model(Entity.AssetsSprinklerSeries entity)
@@ -8,7 +10,8 @@
if (entity == null)
return default;
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsSprinklerSeries, Model.AssetsSprinklerSeries>()
- .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.AssetsSprinklerSeries, Model.AssetsSprinklerSeries>(entity);
@@ -21,7 +24,8 @@
if (entities == null || entities.Count < 1)
return default;
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsSprinklerSeries, Model.AssetsSprinklerSeries>()
- .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 models = mapper.Map<List<Entity.AssetsSprinklerSeries>, List<Model.AssetsSprinklerSeries>>(entities);
@@ -34,7 +38,8 @@
if (model == null)
return default;
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsSprinklerSeries, Entity.AssetsSprinklerSeries>()
- .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.AssetsSprinklerSeries, Entity.AssetsSprinklerSeries>(model);
@@ -47,6 +52,7 @@
if (models == null || models.Count < 1)
return default;
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsSprinklerSeries, Entity.AssetsSprinklerSeries>()
+ .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();
@@ -60,7 +66,10 @@
if (model == null || entity == null)
return;
var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsSprinklerSeries, Entity.AssetsSprinklerSeries>()
- ).CreateMapper();
+ .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();
mapper.Map(model, entity);
}
}
--
Gitblit v1.9.3