From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +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/09-NozzleManage/01-NozzleMain/NozzleManage.cs | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/05-service/09-NozzleManage/01-NozzleMain/NozzleManage.cs b/Service/HStation.Service.Assets.Core/05-service/09-NozzleManage/01-NozzleMain/NozzleManage.cs
index 939b080..e413da9 100644
--- a/Service/HStation.Service.Assets.Core/05-service/09-NozzleManage/01-NozzleMain/NozzleManage.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/09-NozzleManage/01-NozzleMain/NozzleManage.cs
@@ -5,21 +5,21 @@
/// <summary>
///
/// </summary>
- public partial class NozzleMain
+ public partial class AssetsNozzleMain
{
#region Cache
//鑾峰彇缂撳瓨
- private static List<Model.NozzleMain> GetCache()
+ private static List<Model.AssetsSprinklerMain> GetCache()
{
- var all = NozzleMainCacheHelper.GetSet(() =>
+ var all = AssetsNozzleMainCacheHelper.GetSet(() =>
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.INozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
var entity_list = dal.GetAll();
var model_list = Entity2Models(entity_list);
if (model_list == null)
{
- model_list = new List<Model.NozzleMain>();
+ model_list = new List<Model.AssetsSprinklerMain>();
}
return model_list;
}, Yw.Service.ConfigHelper.CacheKeepTime, Yw.Service.ConfigHelper.CacheRandomTime);
@@ -29,7 +29,7 @@
//閫氳繃 ID 鏇存柊缂撳瓨
private static void UpdateCache(long ID)
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.INozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
var entity_ds = dal.GetByID(ID);
var model_ds = Entity2Model(entity_ds);
var all = GetCache();
@@ -42,7 +42,7 @@
{
model.Reset(model_ds);
}
- PumpSeriesCacheHelper.Trigger();
+ AssetsPumpSeriesCacheHelper.Trigger();
}
//閫氳繃 Ids 鏇存柊缂撳瓨
@@ -52,7 +52,7 @@
{
return;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.INozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
var entity_list = dal.GetByIds(Ids);
var model_list = Entity2Models(entity_list);
var all = GetCache();
@@ -61,7 +61,7 @@
{
all.AddRange(model_list);
}
- PumpSeriesCacheHelper.Trigger();
+ AssetsPumpSeriesCacheHelper.Trigger();
}
//绉婚櫎缂撳瓨
@@ -69,7 +69,7 @@
{
var all = GetCache();
all.RemoveAll(x => x.ID == ID);
- PumpSeriesCacheHelper.Trigger();
+ AssetsPumpSeriesCacheHelper.Trigger();
}
/// <summary>
@@ -77,7 +77,7 @@
/// </summary>
public static void PublishCache(string key)
{
- PumpSeriesCacheHelper.Publish(key);
+ AssetsPumpSeriesCacheHelper.Publish(key);
}
#endregion Cache
@@ -87,7 +87,7 @@
/// <summary>
/// 鑾峰彇鎵�鏈�
/// </summary>
- public List<Model.NozzleMain> GetAll()
+ public List<Model.AssetsSprinklerMain> GetAll()
{
var all = GetCache();
return all;
@@ -96,7 +96,7 @@
/// <summary>
/// 閫氳繃 ID 鑾峰彇
/// </summary>
- public Model.NozzleMain GetByID(long ID)
+ public Model.AssetsSprinklerMain GetByID(long ID)
{
var all = GetAll();
return all.Find(x => x.ID == ID);
@@ -105,7 +105,7 @@
/// <summary>
/// 閫氳繃 ID 鑾峰彇
/// </summary>
- public List<Model.NozzleMain> GetByIds(List<long> Ids)
+ public List<Model.AssetsSprinklerMain> GetByIds(List<long> Ids)
{
if (Ids == null || Ids.Count < 1)
{
@@ -118,7 +118,7 @@
/// <summary>
/// 閫氳繃 绯诲垪ID 鑾峰彇
/// </summary>
- public List<Model.NozzleMain> GetBySeriesID(long id)
+ public List<Model.AssetsSprinklerMain> GetBySeriesID(long id)
{
if (id < 1)
{
@@ -135,13 +135,13 @@
/// <summary>
/// 鎻掑叆涓�鏉℃暟鎹�
/// </summary>
- public long Insert(Model.NozzleMain model)
+ public long Insert(Model.AssetsSprinklerMain model)
{
if (model == null)
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.INozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
var entity = Model2Entity(model);
var id = dal.Insert(entity);
if (id > 0)
@@ -154,13 +154,13 @@
/// <summary>
/// 鎻掑叆澶氭潯
/// </summary>
- public bool Inserts(List<Model.NozzleMain> list)
+ public bool Inserts(List<Model.AssetsSprinklerMain> list)
{
if (list == null || list.Count < 1)
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.INozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
var entity_list = Model2Entities(list);
var ids = dal.InsertsR(entity_list);
if (ids != null && ids.Count > 0)
@@ -178,14 +178,14 @@
/// <summary>
/// 鏇存柊涓�鏉�
/// </summary>
- public bool Update(Model.NozzleMain model)
+ public bool Update(Model.AssetsSprinklerMain model)
{
if (model == null)
{
return false;
}
var entity = Model2Entity(model);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.INozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
var bol = dal.Update(entity);
if (bol)
{
@@ -206,7 +206,7 @@
var model = GetByID(ID);
model.IsDefault = Status;
var entity = Model2Entity(model);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.INozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
var bol = dal.Update(entity);
if (bol)
{
@@ -218,7 +218,7 @@
/// <summary>
/// 鎵归噺鏇存柊
/// </summary>
- public bool Updates(List<Model.NozzleMain> list)
+ public bool Updates(List<Model.AssetsSprinklerMain> list)
{
if (list == null || list.Count < 1)
{
@@ -229,7 +229,7 @@
return false;
}
var entity_list = Model2Entities(list);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.INozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
var bol = dal.Updates(entity_list);
if (bol)
{
@@ -248,7 +248,7 @@
public bool DeleteByID(long ID, out string Msg)
{
Msg = string.Empty;
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.INozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
var bol = dal.DeleteByID(ID);
if (bol)
{
--
Gitblit v1.9.3