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/01-SprinklerMain/AssetsSprinklerMain.cs | 41 ++++++++++-------------------------------
1 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/05-service/09-Nozzle/01-NozzleMain/NozzleManage.cs b/Service/HStation.Service.Assets.Core/05-service/05-Sprinkler/01-SprinklerMain/AssetsSprinklerMain.cs
similarity index 87%
rename from Service/HStation.Service.Assets.Core/05-service/09-Nozzle/01-NozzleMain/NozzleManage.cs
rename to Service/HStation.Service.Assets.Core/05-service/05-Sprinkler/01-SprinklerMain/AssetsSprinklerMain.cs
index 9be0834..7a177e8 100644
--- a/Service/HStation.Service.Assets.Core/05-service/09-Nozzle/01-NozzleMain/NozzleManage.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/05-Sprinkler/01-SprinklerMain/AssetsSprinklerMain.cs
@@ -5,16 +5,16 @@
/// <summary>
///
/// </summary>
- public partial class AssetsNozzleMain
+ public partial class AssetsSprinklerMain
{
#region Cache
//鑾峰彇缂撳瓨
private static List<Model.AssetsSprinklerMain> GetCache()
{
- var all = AssetsNozzleMainCacheHelper.GetSet(() =>
+ var all = AssetsSprinklerMainCacheHelper.GetSet(() =>
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerMain>();
var entity_list = dal.GetAll();
var model_list = Entity2Models(entity_list);
if (model_list == null)
@@ -29,7 +29,7 @@
//閫氳繃 ID 鏇存柊缂撳瓨
private static void UpdateCache(long ID)
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerMain>();
var entity_ds = dal.GetByID(ID);
var model_ds = Entity2Model(entity_ds);
var all = GetCache();
@@ -52,7 +52,7 @@
{
return;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerMain>();
var entity_list = dal.GetByIds(Ids);
var model_list = Entity2Models(entity_list);
var all = GetCache();
@@ -154,7 +154,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerMain>();
var entity = Model2Entity(model);
var id = dal.Insert(entity);
if (id > 0)
@@ -173,7 +173,7 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerMain>();
var entity_list = Model2Entities(list);
var ids = dal.InsertsR(entity_list);
if (ids != null && ids.Count > 0)
@@ -198,28 +198,7 @@
return false;
}
var entity = Model2Entity(model);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
- var bol = dal.Update(entity);
- if (bol)
- {
- UpdateCache(model.ID);
- }
- return bol;
- }
-
- /// <summary>
- /// 鏇存柊榛樿鍊肩姸鎬�
- /// </summary>
- public bool UpdateDefaultStatus(long ID, bool Status)
- {
- if (ID < 1)
- {
- return false;
- }
- var model = GetByID(ID);
- model.IsDefault = Status;
- var entity = Model2Entity(model);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerMain>();
var bol = dal.Update(entity);
if (bol)
{
@@ -242,7 +221,7 @@
return false;
}
var entity_list = Model2Entities(list);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerMain>();
var bol = dal.Updates(entity_list);
if (bol)
{
@@ -261,7 +240,7 @@
public bool DeleteByID(long ID, out string Msg)
{
Msg = string.Empty;
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsNozzleMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsSprinklerMain>();
var bol = dal.DeleteByID(ID);
if (bol)
{
--
Gitblit v1.9.3