Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-10-12 f2333318a31e92f6cbc3a572d8eb9fae9da0f892

 Service/HStation.Service.Assets.Core/05-service/01-PumpMainManage/01-PumpSeries/PumpSeries.cs

@@ -3,21 +3,21 @@
    /// <summary>
    ///
    /// </summary>
    public partial class PumpSeries
    public partial class AssetsPumpSeries
    {
        #region Cache

        //获取缓存
        private static List<Model.PumpSeries> GetCache()
        private static List<Model.AssetsPumpSeries> GetCache()
        {
            var all = PumpSeriesCacheHelper.GetSet(() =>
            var all = AssetsPumpSeriesCacheHelper.GetSet(() =>
            {
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
                var entity_list = dal.GetAll();
                var model_list = Entity2Models(entity_list);
                if (model_list == null)
                {
                    model_list = new List<Model.PumpSeries>();
                    model_list = new List<Model.AssetsPumpSeries>();
                }
                return model_list;
            }, Yw.Service.ConfigHelper.CacheKeepTime, Yw.Service.ConfigHelper.CacheRandomTime);
@@ -27,7 +27,7 @@
        //通过 ID 更新缓存
        private static void UpdateCache(long ID)
        {
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var entity_ds = dal.GetByID(ID);
            var model_ds = Entity2Model(entity_ds);
            var all = GetCache();
@@ -40,7 +40,7 @@
            {
                model.Reset(model_ds);
            }
            PumpSeriesCacheHelper.Trigger();
            AssetsPumpSeriesCacheHelper.Trigger();
        }

        //通过 Ids 更新缓存
@@ -50,7 +50,7 @@
            {
                return;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var entity_list = dal.GetByIds(Ids);
            var model_list = Entity2Models(entity_list);
            var all = GetCache();
@@ -59,7 +59,7 @@
            {
                all.AddRange(model_list);
            }
            PumpSeriesCacheHelper.Trigger();
            AssetsPumpSeriesCacheHelper.Trigger();
        }

        //移除缓存
@@ -67,7 +67,7 @@
        {
            var all = GetCache();
            all.RemoveAll(x => x.ID == ID);
            PumpSeriesCacheHelper.Trigger();
            AssetsPumpSeriesCacheHelper.Trigger();
        }

        /// <summary>
@@ -75,7 +75,7 @@
        /// </summary>
        public static void PublishCache(string key)
        {
            PumpSeriesCacheHelper.Publish(key);
            AssetsPumpSeriesCacheHelper.Publish(key);
        }

        #endregion Cache
@@ -85,7 +85,7 @@
        /// <summary>
        /// 获取所有
        /// </summary>
        public List<Model.PumpSeries> GetAll()
        public List<Model.AssetsPumpSeries> GetAll()
        {
            var all = GetCache();
            return all.OrderBy(x => x.SortCode).ToList();
@@ -94,7 +94,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public Model.PumpSeries GetByID(long ID)
        public Model.AssetsPumpSeries GetByID(long ID)
        {
            var all = GetAll();
            return all.Find(x => x.ID == ID);
@@ -103,7 +103,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public List<Model.PumpSeries> GetByIds(List<long> Ids)
        public List<Model.AssetsPumpSeries> GetByIds(List<long> Ids)
        {
            if (Ids == null || Ids.Count < 1)
            {
@@ -133,13 +133,13 @@
        /// <summary>
        /// 插入一条数据
        /// </summary>
        public long Insert(Model.PumpSeries model)
        public long Insert(Model.AssetsPumpSeries model)
        {
            if (model == null)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var entity = Model2Entity(model);
            var id = dal.Insert(entity);
            if (id > 0)
@@ -152,13 +152,13 @@
        /// <summary>
        /// 插入多条
        /// </summary>
        public bool Inserts(List<Model.PumpSeries> list)
        public bool Inserts(List<Model.AssetsPumpSeries> list)
        {
            if (list == null || list.Count < 1)
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var entity_list = Model2Entities(list);
            var ids = dal.InsertsR(entity_list);
            if (ids != null && ids.Count > 0)
@@ -176,14 +176,14 @@
        /// <summary>
        /// 更新一条
        /// </summary>
        public bool Update(Model.PumpSeries model)
        public bool Update(Model.AssetsPumpSeries model)
        {
            if (model == null)
            {
                return false;
            }
            var entity = Model2Entity(model);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var bol = dal.Update(entity);
            if (bol)
            {
@@ -195,7 +195,7 @@
        /// <summary>
        /// 批量更新
        /// </summary>
        public bool Updates(List<Model.PumpSeries> list)
        public bool Updates(List<Model.AssetsPumpSeries> list)
        {
            if (list == null || list.Count < 1)
            {
@@ -206,7 +206,7 @@
                return false;
            }
            var entity_list = Model2Entities(list);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var bol = dal.Updates(entity_list);
            if (bol)
            {
@@ -224,7 +224,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var bol = dal.UpdateSortCode(ID, SortCode);
            if (bol)
            {
@@ -246,7 +246,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var bol = dal.UpdateSorter(sorters.ToEntityList());
            if (bol)
            {
@@ -264,7 +264,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var bol = dal.UpdateParas(ID, ParasHelper.ToString(Paras));
            if (bol)
            {
@@ -282,7 +282,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var bol = dal.UpdateFlags(ID, FlagsHelper.ToString(Flags));
            if (bol)
            {
@@ -300,7 +300,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var bol = dal.UpdateTagName(ID, TagName);
            if (bol)
            {
@@ -318,7 +318,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var bol = dal.UpdateUseStatus(ID, (int)UseStatus);
            if (bol)
            {
@@ -367,7 +367,7 @@
        public bool DeleteByID(long ID, out string Msg)
        {
            Msg = string.Empty;
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {
@@ -385,13 +385,13 @@
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpSeries>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeries>();
            var result = dal.DeleteEx(ID);
            if (result)
            {
                RemoveCache(ID);
                PumpGroup.RemoveCacheBySeriesID(ID);
                PumpMain.RemoveCacheBySeriesID(ID);
                AssetsPumpGroup.RemoveCacheBySeriesID(ID);
                AssetsPumpMain.RemoveCacheBySeriesID(ID);
                return true;
            }
            return default;