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.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/05-service/01-PumpMain/03-PumpMain/PumpMain.cs b/Service/HStation.Service.Assets.Core/05-service/01-PumpMain/03-PumpMain/PumpMain.cs
index 3f6e3d9..2cb3c8e 100644
--- a/Service/HStation.Service.Assets.Core/05-service/01-PumpMain/03-PumpMain/PumpMain.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/01-PumpMain/03-PumpMain/PumpMain.cs
@@ -74,8 +74,8 @@
public static void RemoveCacheBySeriesID(long ID)
{
var all = GetCache();
- var maplist = AssetsPumpGroupAndMainMap.GetBySeriesID(ID);
- all.RemoveAll(item => maplist.Any(mapItem => mapItem.PumpMainID == item.ID));
+ var maplist = AssetsPumpGroupAndMainMapping.GetBySeriesID(ID);
+ all.RemoveAll(item => maplist.Any(mapItem => mapItem.MainID == item.ID));
AssetsPumpSeriesCacheHelper.Trigger();
}
@@ -83,7 +83,7 @@
public static void RemoveCacheByGroupID(long ID)
{
var all = GetCache();
- var maplist = AssetsPumpGroupAndMainMap.GetMainIDByGroupID(ID);
+ var maplist = AssetsPumpGroupAndMainMapping.GetMainIDByGroupID(ID);
all.RemoveAll(item => maplist.Any(mapItem => mapItem == item.ID));
AssetsPumpSeriesCacheHelper.Trigger();
}
@@ -153,7 +153,7 @@
return default;
}
var all = GetAll();
- return all.Where(x => x.PumpSeriesID == id).ToList();
+ return all.Where(x => x.SeriesID == id).ToList();
}
/// <summary>
@@ -195,7 +195,7 @@
/// <summary>
/// 鎻掑叆鎷撳睍
/// </summary>
- public long InsertEx(Model.AssetsPumpMain main, Model.AssetsPumpGroupAndMainMap map)
+ public long InsertEx(Model.AssetsPumpMain main, Model.AssetsPumpGroupAndMainMapping map)
{
if (main == null)
{
@@ -203,12 +203,12 @@
}
var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
var mainEntity = Model2Entity(main);
- var groupMapEntity = AssetsPumpGroupAndMainMap.Model2Entity(map);
+ var groupMapEntity = AssetsPumpGroupAndMainMapping.Model2Entity(map);
var id = dal.InsertsEx(mainEntity, groupMapEntity);
if (id > 0)
{
UpdateCache(id);
- AssetsPumpGroupAndMainMap.UpdateCacheByMainID(id);
+ AssetsPumpGroupAndMainMapping.UpdateCacheByMainID(id);
}
return id;
}
@@ -432,7 +432,7 @@
if (bol)
{
RemoveCache(ID);
- AssetsPumpGroupAndMainMap.RemoveCacheByMainID(ID);
+ AssetsPumpGroupAndMainMapping.RemoveCacheByMainID(ID);
}
return bol;
}
--
Gitblit v1.9.3