From a5a97f9e6608db67b36b0c0186257b0b5c98c829 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 20 十二月 2024 09:06:04 +0800
Subject: [PATCH] 阀门解析默认使用节流控制阀
---
Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs | 12 +-
Service/HStation.Service.PhartRelation.Core/05-service/01-relation/PhartDiagramRelation.cs | 272 +++++++++++++++++++++++++++---------------------------
2 files changed, 142 insertions(+), 142 deletions(-)
diff --git a/Service/HStation.Service.PhartRelation.Core/05-service/01-relation/PhartDiagramRelation.cs b/Service/HStation.Service.PhartRelation.Core/05-service/01-relation/PhartDiagramRelation.cs
index 3d2b771..dbdb1e7 100644
--- a/Service/HStation.Service.PhartRelation.Core/05-service/01-relation/PhartDiagramRelation.cs
+++ b/Service/HStation.Service.PhartRelation.Core/05-service/01-relation/PhartDiagramRelation.cs
@@ -6,63 +6,63 @@
/// <summary>
/// 鍥捐〃鍏宠仈
///</summary>
- public partial class PhartDiagramRelation
+ public partial class PhartDiagramRelation
{
#region Cache
//鑾峰彇缂撳瓨
private static List<Model.PhartDiagramRelation> GetCache()
{
- var all = PhartDiagramRelationCacheHelper.GetSet(() =>
- {
- var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
- var entity_list = dal.GetAll();
- var model_list = Entity2Models(entity_list);
- if (model_list == null)
- {
- model_list = new List<Model.PhartDiagramRelation>();
- }
- return model_list;
- }, Yw.Service.ConfigHelper.CacheKeepTime, Yw.Service.ConfigHelper.CacheRandomTime);
- return all;
+ var all = PhartDiagramRelationCacheHelper.GetSet(() =>
+ {
+ var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
+ var entity_list = dal.GetAll();
+ var model_list = Entity2Models(entity_list);
+ if (model_list == null)
+ {
+ model_list = new List<Model.PhartDiagramRelation>();
+ }
+ return model_list;
+ }, Yw.Service.ConfigHelper.CacheKeepTime, Yw.Service.ConfigHelper.CacheRandomTime);
+ return all;
}
//閫氳繃 ID 鏇存柊缂撳瓨
private static void UpdateCache(long ID)
{
- var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
- var entity_ds = dal.GetByID(ID);
- var model_ds = Entity2Model(entity_ds);
- var all = GetCache();
- var model = all.Find(x => x.ID == ID);
- if (model == null)
- {
- all.Add(model_ds);
- }
- else
- {
- model.Reset(model_ds);
- }
- PhartDiagramRelationCacheHelper.Trigger();
+ var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
+ var entity_ds = dal.GetByID(ID);
+ var model_ds = Entity2Model(entity_ds);
+ var all = GetCache();
+ var model = all.Find(x => x.ID == ID);
+ if (model == null)
+ {
+ all.Add(model_ds);
+ }
+ else
+ {
+ model.Reset(model_ds);
+ }
+ PhartDiagramRelationCacheHelper.Trigger();
}
//閫氳繃 Ids 鏇存柊缂撳瓨
private static void UpdateCache(List<long> Ids)
{
- if (Ids == null || Ids.Count < 1)
- {
- return;
- }
- var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
- var entity_list = dal.GetByIds(Ids);
- var model_list = Entity2Models(entity_list);
- var all = GetCache();
- all.RemoveAll(x => Ids.Contains(x.ID));
- if (model_list != null && model_list.Count > 0)
- {
- all.AddRange(model_list);
- }
- PhartDiagramRelationCacheHelper.Trigger();
+ if (Ids == null || Ids.Count < 1)
+ {
+ return;
+ }
+ var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
+ var entity_list = dal.GetByIds(Ids);
+ var model_list = Entity2Models(entity_list);
+ var all = GetCache();
+ all.RemoveAll(x => Ids.Contains(x.ID));
+ if (model_list != null && model_list.Count > 0)
+ {
+ all.AddRange(model_list);
+ }
+ PhartDiagramRelationCacheHelper.Trigger();
}
//绉婚櫎缂撳瓨
@@ -93,7 +93,7 @@
/// </summary>
public static void PublishCache(string key)
{
- PhartDiagramRelationCacheHelper.Publish(key);
+ PhartDiagramRelationCacheHelper.Publish(key);
}
#endregion
@@ -105,8 +105,8 @@
/// </summary>
public List<Model.PhartDiagramRelation> GetAll()
{
- var all = GetCache();
- return all.OrderBy(x => x.SortCode).ToList();
+ var all = GetCache();
+ return all.OrderBy(x => x.SortCode).ToList();
}
/// <summary>
@@ -114,8 +114,8 @@
/// </summary>
public Model.PhartDiagramRelation GetByID(long ID)
{
- var all = GetAll();
- return all.Find(x => x.ID == ID);
+ var all = GetAll();
+ return all.Find(x => x.ID == ID);
}
/// <summary>
@@ -123,12 +123,12 @@
/// </summary>
public List<Model.PhartDiagramRelation> GetByIds(List<long> Ids)
{
- if (Ids == null || Ids.Count < 1)
- {
- return default;
- }
- var all = GetAll();
- return all.Where(x => Ids.Contains(x.ID)).OrderBy(x => x.SortCode).ToList();
+ if (Ids == null || Ids.Count < 1)
+ {
+ return default;
+ }
+ var all = GetAll();
+ return all.Where(x => Ids.Contains(x.ID)).OrderBy(x => x.SortCode).ToList();
}
/// <summary>
@@ -162,7 +162,7 @@
public List<Tuple<Model.PhartDiagramRelation, Yw.Model.PhartDiagram, List<Yw.Model.PhartGraph>>> GetTupleByObjectTypeAndObjectID
(string ObjectType, long ObjectID, eDiagramType? DiagramType = null, List<eGraphType> GraphTypeList = null)
{
- var allRelationList = GetByObjectTypeAndObjectID(ObjectType,ObjectID);
+ var allRelationList = GetByObjectTypeAndObjectID(ObjectType, ObjectID);
if (allRelationList == null || allRelationList.Count < 1)
{
return default;
@@ -327,18 +327,18 @@
/// </summary>
public long Insert(Model.PhartDiagramRelation model)
{
- if (model == null)
- {
- return default;
- }
- var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
- var entity = Model2Entity(model);
- var id = dal.Insert(entity);
- if (id > 0)
- {
- UpdateCache(id);
- }
- return id;
+ if (model == null)
+ {
+ return default;
+ }
+ var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
+ var entity = Model2Entity(model);
+ var id = dal.Insert(entity);
+ if (id > 0)
+ {
+ UpdateCache(id);
+ }
+ return id;
}
/// <summary>
@@ -376,22 +376,22 @@
/// </summary>
public bool Inserts(List<Model.PhartDiagramRelation> list)
{
- if (list == null || list.Count < 1)
- {
- return false;
+ if (list == null || list.Count < 1)
+ {
+ return false;
}
- var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
- var entity_list = Model2Entities(list);
- var ids = dal.InsertsR(entity_list);
- if (ids != null && ids.Count > 0)
- {
- UpdateCache(ids);
- return true;
- }
- return false;
+ var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
+ var entity_list = Model2Entities(list);
+ var ids = dal.InsertsR(entity_list);
+ if (ids != null && ids.Count > 0)
+ {
+ UpdateCache(ids);
+ return true;
+ }
+ return false;
}
-
- #endregion
+
+ #endregion
#region Update
@@ -400,19 +400,19 @@
/// </summary>
public bool Update(Model.PhartDiagramRelation model)
{
- if (model == null)
- {
- return false;
- }
- var entity = Model2Entity(model);
- var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
- var bol = dal.Update(entity);
- if (bol)
- {
- UpdateCache(model.ID);
- }
- return bol;
- }
+ if (model == null)
+ {
+ return false;
+ }
+ var entity = Model2Entity(model);
+ var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
+ var bol = dal.Update(entity);
+ if (bol)
+ {
+ UpdateCache(model.ID);
+ }
+ return bol;
+ }
/// <summary>
/// 鏇存柊鎷撳睍
@@ -448,40 +448,40 @@
/// </summary>
public bool Updates(List<Model.PhartDiagramRelation> list)
{
- if (list == null || list.Count < 1)
- {
- return false;
- }
- if (list.Exists(x => x.ID < 1))
- {
- return false;
- }
- var entity_list = Model2Entities(list);
- var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
- var bol = dal.Updates(entity_list);
- if (bol)
- {
- UpdateCache(list.Select(x => x.ID).ToList());
- }
- return bol;
- }
+ if (list == null || list.Count < 1)
+ {
+ return false;
+ }
+ if (list.Exists(x => x.ID < 1))
+ {
+ return false;
+ }
+ var entity_list = Model2Entities(list);
+ var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
+ var bol = dal.Updates(entity_list);
+ if (bol)
+ {
+ UpdateCache(list.Select(x => x.ID).ToList());
+ }
+ return bol;
+ }
/// <summary>
/// 鏇存柊鎺掑簭鐮�
/// </summary>
public bool UpdateSortCode(long ID, int SortCode)
{
- if (ID < 1)
- {
- return false;
- }
- var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
- var bol = dal.UpdateSortCode(ID, SortCode);
- if (bol)
- {
- UpdateCache(ID);
- }
- return bol;
+ if (ID < 1)
+ {
+ return false;
+ }
+ var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
+ var bol = dal.UpdateSortCode(ID, SortCode);
+ if (bol)
+ {
+ UpdateCache(ID);
+ }
+ return bol;
}
/// <summary>
@@ -489,22 +489,22 @@
/// </summary>
public bool UpdateSorter(List<Yw.Model.Sorter> sorters)
{
- if (sorters == null || sorters.Count < 1)
- {
- return false;
- }
- if (sorters.Exists(x => x.ID < 1))
- {
- return false;
- }
- var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
- var bol = dal.UpdateSorter(sorters.ToEntityList());
- if (bol)
- {
- UpdateCache(sorters.Select(x => x.ID).ToList());
- }
- return bol;
- }
+ if (sorters == null || sorters.Count < 1)
+ {
+ return false;
+ }
+ if (sorters.Exists(x => x.ID < 1))
+ {
+ return false;
+ }
+ var dal = DALCreateHelper.CreateDAL<DAL.IPhartDiagramRelation>();
+ var bol = dal.UpdateSorter(sorters.ToEntityList());
+ if (bol)
+ {
+ UpdateCache(sorters.Select(x => x.ID).ToList());
+ }
+ return bol;
+ }
/// <summary>
/// 鏇存柊 OtherName
diff --git a/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs b/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs
index 39efafe..20edb6a 100644
--- a/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs
+++ b/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs
@@ -5108,22 +5108,22 @@
valve.ValveType = valveType;
if (string.IsNullOrEmpty(valve.ValveType))
{
- valve.ValveType = ValveType.GPV;
- valve.UpdatePropStatus(nameof(valve.ValveType), ePropStatus.Lack, "[闃�闂ㄧ被鍨媇缂虹渷锛屼娇鐢ㄩ粯璁ゅ��(GPV)杩涜淇");
+ valve.ValveType = ValveType.TCV;
+ valve.UpdatePropStatus(nameof(valve.ValveType), ePropStatus.Lack, "[闃�闂ㄧ被鍨媇缂虹渷锛屼娇鐢ㄩ粯璁ゅ��(TCV)杩涜淇");
}
else
{
if (!ValveType.Contains(valve.ValveType))
{
- valve.ValveType = ValveType.GPV;
- valve.UpdatePropStatus(nameof(valve.ValveType), ePropStatus.Abnormal, "[闃�闂ㄧ被鍨媇璁剧疆閿欒锛屼娇鐢ㄩ粯璁ゅ��(GPV)杩涜淇");
+ valve.ValveType = ValveType.TCV;
+ valve.UpdatePropStatus(nameof(valve.ValveType), ePropStatus.Abnormal, "[闃�闂ㄧ被鍨媇璁剧疆閿欒锛屼娇鐢ㄩ粯璁ゅ��(TCV)杩涜淇");
}
}
}
else
{
- valve.ValveType = ValveType.GPV;
- valve.UpdatePropStatus(nameof(valve.ValveType), ePropStatus.Abnormal, "[闃�闂ㄧ被鍨媇缂哄皯鎴栨牸寮忛敊璇紝浣跨敤榛樿鍊�(GPV)杩涜淇");
+ valve.ValveType = ValveType.TCV;
+ valve.UpdatePropStatus(nameof(valve.ValveType), ePropStatus.Abnormal, "[闃�闂ㄧ被鍨媇缂哄皯鎴栨牸寮忛敊璇紝浣跨敤榛樿鍊�(TCV)杩涜淇");
}
#endregion
--
Gitblit v1.9.3