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.cs | 56 +++++++++++++++++++-------------------------------------
1 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/05-service/09-Nozzle/02-ThreeLinkSeries/NozzleSeries.cs b/Service/HStation.Service.Assets.Core/05-service/05-Sprinkler/02-SprinklerSeries/AssetsSprinklerSeries.cs
similarity index 89%
rename from Service/HStation.Service.Assets.Core/05-service/09-Nozzle/02-ThreeLinkSeries/NozzleSeries.cs
rename to Service/HStation.Service.Assets.Core/05-service/05-Sprinkler/02-SprinklerSeries/AssetsSprinklerSeries.cs
index ca811a9..7a0916b 100644
--- a/Service/HStation.Service.Assets.Core/05-service/09-Nozzle/02-ThreeLinkSeries/NozzleSeries.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/05-Sprinkler/02-SprinklerSeries/AssetsSprinklerSeries.cs
@@ -3,16 +3,16 @@
/// <summary>
///
/// </summary>
- public partial class AssetsNozzleSeries
+ public partial class AssetsSprinklerSeries
{
#region Cache
//鑾峰彇缂撳瓨
private static List<Model.AssetsSprinklerSeries> GetCache()
{
- var all = AssetsNozzleSeriesCacheHelper.GetSet(() =>
+ var all = AssetsSprinklerSeriesCacheHelper.GetSet(() =>
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var entity_list = dal.GetAll();
var model_list = Entity2Models(entity_list);
if (model_list == null)
@@ -27,7 +27,7 @@
//閫氳繃 ID 鏇存柊缂撳瓨
private static void UpdateCache(long ID)
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var entity_ds = dal.GetByID(ID);
var model_ds = Entity2Model(entity_ds);
var all = GetCache();
@@ -40,7 +40,7 @@
{
model.Reset(model_ds);
}
- AssetsNozzleSeriesCacheHelper.Trigger();
+ AssetsSprinklerSeriesCacheHelper.Trigger();
}
//閫氳繃 Ids 鏇存柊缂撳瓨
@@ -50,7 +50,7 @@
{
return;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var entity_list = dal.GetByIds(Ids);
var model_list = Entity2Models(entity_list);
var all = GetCache();
@@ -59,7 +59,7 @@
{
all.AddRange(model_list);
}
- AssetsNozzleSeriesCacheHelper.Trigger();
+ AssetsSprinklerSeriesCacheHelper.Trigger();
}
//绉婚櫎缂撳瓨
@@ -67,7 +67,7 @@
{
var all = GetCache();
all.RemoveAll(x => x.ID == ID);
- AssetsNozzleSeriesCacheHelper.Trigger();
+ AssetsSprinklerSeriesCacheHelper.Trigger();
}
/// <summary>
@@ -75,7 +75,7 @@
/// </summary>
public static void PublishCache(string key)
{
- AssetsNozzleSeriesCacheHelper.Publish(key);
+ AssetsSprinklerSeriesCacheHelper.Publish(key);
}
#endregion Cache
@@ -139,7 +139,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var entity = Model2Entity(model);
var id = dal.Insert(entity);
if (id > 0)
@@ -158,7 +158,7 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var entity_list = Model2Entities(list);
var ids = dal.InsertsR(entity_list);
if (ids != null && ids.Count > 0)
@@ -183,7 +183,7 @@
return false;
}
var entity = Model2Entity(model);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var bol = dal.Update(entity);
if (bol)
{
@@ -206,7 +206,7 @@
return false;
}
var entity_list = Model2Entities(list);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var bol = dal.Updates(entity_list);
if (bol)
{
@@ -224,7 +224,7 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var bol = dal.UpdateSortCode(ID, SortCode);
if (bol)
{
@@ -246,7 +246,7 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var bol = dal.UpdateSorter(sorters.ToEntityList());
if (bol)
{
@@ -264,7 +264,7 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var bol = dal.UpdateParas(ID, ParasHelper.ToString(Paras));
if (bol)
{
@@ -282,7 +282,7 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var bol = dal.UpdateFlags(ID, FlagsHelper.ToString(Flags));
if (bol)
{
@@ -300,26 +300,8 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var bol = dal.UpdateTagName(ID, TagName);
- if (bol)
- {
- UpdateCache(ID);
- }
- return bol;
- }
-
- /// <summary>
- /// 鏇存柊 UseStatus
- /// </summary>
- public bool UpdateUseStatus(long ID, Yw.Model.eUseStatus UseStatus)
- {
- if (ID < 1)
- {
- return false;
- }
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
- var bol = dal.UpdateUseStatus(ID, (int)UseStatus);
if (bol)
{
UpdateCache(ID);
@@ -367,7 +349,7 @@
public bool DeleteByID(long ID, out string Msg)
{
Msg = string.Empty;
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleSeries>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerSeries>();
var bol = dal.DeleteByID(ID);
if (bol)
{
--
Gitblit v1.9.3