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/07-PumpMainAndPartMap/PumpMainAndPartMap.cs

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

        //获取缓存
        private static List<Model.PumpMainAndPartMap> GetCache()
        private static List<Model.AssetsPumpMainAndPartMap> GetCache()
        {
            var all = PumpMainAndPartMapCacheHelper.GetSet(() =>
            var all = AssetsPumpMainAndPartMapCacheHelper.GetSet(() =>
            {
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMainAndPartMap>();
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMainAndPartMap>();
                var entity_list = dal.GetAll();
                var model_list = Entity2Models(entity_list);
                if (model_list == null)
                {
                    model_list = new List<Model.PumpMainAndPartMap>();
                    model_list = new List<Model.AssetsPumpMainAndPartMap>();
                }
                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.IPumpMainAndPartMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMainAndPartMap>();
            var entity_ds = dal.GetByID(ID);
            var model_ds = Entity2Model(entity_ds);
            var all = GetCache();
@@ -40,13 +40,13 @@
            {
                model.Reset(model_ds);
            }
            PumpSeriesCacheHelper.Trigger();
            AssetsPumpSeriesCacheHelper.Trigger();
        }

        //通过 PartID 更新缓存
        public static void UpdateCacheByPartID(long ID)
        {
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMainAndPartMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMainAndPartMap>();
            var alllist = dal.GetAll();
            var select = alllist.Find(x => x.PumpPartID == ID);
            var model_ds = Entity2Model(select);
@@ -60,7 +60,7 @@
            {
                model.Reset(model_ds);
            }
            PumpSeriesCacheHelper.Trigger();
            AssetsPumpSeriesCacheHelper.Trigger();
        }

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

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

        //通过组ID移除缓存
        public static void RemoveCacheByGroupID(long ID)
        {
            var all = GetCache();
            var maplist = PumpGroupAndMainMap.GetMainIDByGroupID(ID);
            var maplist = AssetsPumpGroupAndMainMap.GetMainIDByGroupID(ID);
            all.RemoveAll(item => maplist.Any(mapItem => mapItem == item.ID));
            PumpSeriesCacheHelper.Trigger();
            AssetsPumpSeriesCacheHelper.Trigger();
        }

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

        #endregion Cache
@@ -114,7 +114,7 @@
        /// <summary>
        /// 获取所有
        /// </summary>
        public List<Model.PumpMainAndPartMap> GetAll()
        public List<Model.AssetsPumpMainAndPartMap> GetAll()
        {
            var all = GetCache();
            return all;
@@ -123,7 +123,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public Model.PumpMainAndPartMap GetByID(long ID)
        public Model.AssetsPumpMainAndPartMap GetByID(long ID)
        {
            var all = GetAll();
            return all.Find(x => x.ID == ID);
@@ -132,7 +132,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public List<Model.PumpMainAndPartMap> GetByIds(List<long> Ids)
        public List<Model.AssetsPumpMainAndPartMap> GetByIds(List<long> Ids)
        {
            if (Ids == null || Ids.Count < 1)
            {
@@ -162,13 +162,13 @@
        /// <summary>
        /// 插入一条数据
        /// </summary>
        public long Insert(Model.PumpMainAndPartMap model)
        public long Insert(Model.AssetsPumpMainAndPartMap model)
        {
            if (model == null)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMainAndPartMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMainAndPartMap>();
            var entity = Model2Entity(model);
            var id = dal.Insert(entity);
            if (id > 0)
@@ -181,13 +181,13 @@
        /// <summary>
        /// 插入多条
        /// </summary>
        public bool Inserts(List<Model.PumpMainAndPartMap> list)
        public bool Inserts(List<Model.AssetsPumpMainAndPartMap> list)
        {
            if (list == null || list.Count < 1)
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMainAndPartMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMainAndPartMap>();
            var entity_list = Model2Entities(list);
            var ids = dal.InsertsR(entity_list);
            if (ids != null && ids.Count > 0)
@@ -205,14 +205,14 @@
        /// <summary>
        /// 更新一条
        /// </summary>
        public bool Update(Model.PumpMainAndPartMap model)
        public bool Update(Model.AssetsPumpMainAndPartMap model)
        {
            if (model == null)
            {
                return false;
            }
            var entity = Model2Entity(model);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMainAndPartMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMainAndPartMap>();
            var bol = dal.Update(entity);
            if (bol)
            {
@@ -224,7 +224,7 @@
        /// <summary>
        /// 批量更新
        /// </summary>
        public bool Updates(List<Model.PumpMainAndPartMap> list)
        public bool Updates(List<Model.AssetsPumpMainAndPartMap> list)
        {
            if (list == null || list.Count < 1)
            {
@@ -235,7 +235,7 @@
                return false;
            }
            var entity_list = Model2Entities(list);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMainAndPartMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMainAndPartMap>();
            var bol = dal.Updates(entity_list);
            if (bol)
            {
@@ -254,7 +254,7 @@
        public bool DeleteByID(long ID, out string Msg)
        {
            Msg = string.Empty;
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMainAndPartMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMainAndPartMap>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {