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/11-ManufacturerMapping/Manufacturer.cs | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/05-service/11-ManufacturerMapping/Manufacturer.cs b/Service/HStation.Service.Assets.Core/05-service/11-ManufacturerMapping/Manufacturer.cs
index cb56b47..d713b47 100644
--- a/Service/HStation.Service.Assets.Core/05-service/11-ManufacturerMapping/Manufacturer.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/11-ManufacturerMapping/Manufacturer.cs
@@ -5,21 +5,21 @@
/// <summary>
///
/// </summary>
- public partial class ManufacturerMapping
+ public partial class AssetsManufacturerMapping
{
#region Cache
//鑾峰彇缂撳瓨
- private static List<Model.ManufacturerMapping> GetCache()
+ private static List<Model.AssetsManufacturerMapping> GetCache()
{
- var all = ManufacturerMappingCacheHelper.GetSet(() =>
+ var all = AssetsManufacturerMappingCacheHelper.GetSet(() =>
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IManufacturerMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerMapping>();
var entity_list = dal.GetAll();
var model_list = Entity2Models(entity_list);
if (model_list == null)
{
- model_list = new List<Model.ManufacturerMapping>();
+ model_list = new List<Model.AssetsManufacturerMapping>();
}
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.IManufacturerMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerMapping>();
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.IManufacturerMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerMapping>();
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.ManufacturerMapping> GetAll()
+ public List<Model.AssetsManufacturerMapping> GetAll()
{
var all = GetCache();
return all;
@@ -96,7 +96,7 @@
/// <summary>
/// 閫氳繃 ID 鑾峰彇
/// </summary>
- public Model.ManufacturerMapping GetByID(long ID)
+ public Model.AssetsManufacturerMapping GetByID(long ID)
{
var all = GetAll();
return all.Find(x => x.ID == ID);
@@ -105,7 +105,7 @@
/// <summary>
/// 閫氳繃 ID 鑾峰彇
/// </summary>
- public List<Model.ManufacturerMapping> GetByIds(List<long> Ids)
+ public List<Model.AssetsManufacturerMapping> GetByIds(List<long> Ids)
{
if (Ids == null || Ids.Count < 1)
{
@@ -122,13 +122,13 @@
/// <summary>
/// 鎻掑叆涓�鏉℃暟鎹�
/// </summary>
- public long Insert(Model.ManufacturerMapping model)
+ public long Insert(Model.AssetsManufacturerMapping model)
{
if (model == null)
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IManufacturerMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerMapping>();
var entity = Model2Entity(model);
var id = dal.Insert(entity);
if (id > 0)
@@ -141,13 +141,13 @@
/// <summary>
/// 鎻掑叆澶氭潯
/// </summary>
- public bool Inserts(List<Model.ManufacturerMapping> list)
+ public bool Inserts(List<Model.AssetsManufacturerMapping> list)
{
if (list == null || list.Count < 1)
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IManufacturerMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerMapping>();
var entity_list = Model2Entities(list);
var ids = dal.InsertsR(entity_list);
if (ids != null && ids.Count > 0)
@@ -165,14 +165,14 @@
/// <summary>
/// 鏇存柊涓�鏉�
/// </summary>
- public bool Update(Model.ManufacturerMapping model)
+ public bool Update(Model.AssetsManufacturerMapping model)
{
if (model == null)
{
return false;
}
var entity = Model2Entity(model);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IManufacturerMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerMapping>();
var bol = dal.Update(entity);
if (bol)
{
@@ -184,7 +184,7 @@
/// <summary>
/// 鎵归噺鏇存柊
/// </summary>
- public bool Updates(List<Model.ManufacturerMapping> list)
+ public bool Updates(List<Model.AssetsManufacturerMapping> list)
{
if (list == null || list.Count < 1)
{
@@ -195,7 +195,7 @@
return false;
}
var entity_list = Model2Entities(list);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IManufacturerMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerMapping>();
var bol = dal.Updates(entity_list);
if (bol)
{
@@ -214,7 +214,7 @@
public bool DeleteByID(long ID, out string Msg)
{
Msg = string.Empty;
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IManufacturerMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerMapping>();
var bol = dal.DeleteByID(ID);
if (bol)
{
--
Gitblit v1.9.3