处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

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

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

        //获取缓存
        private static List<Model.PumpMain> GetCache()
        private static List<Model.AssetsPumpMain> GetCache()
        {
            var all = PumpMainCacheHelper.GetSet(() =>
            var all = AssetsPumpMainCacheHelper.GetSet(() =>
            {
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
                var entity_list = dal.GetAll();
                var model_list = Entity2Models(entity_list);
                if (model_list == null)
                {
                    model_list = new List<Model.PumpMain>();
                    model_list = new List<Model.AssetsPumpMain>();
                }
                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.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            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.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            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,25 +67,25 @@
        {
            var all = GetCache();
            all.RemoveAll(x => x.ID == ID);
            PumpSeriesCacheHelper.Trigger();
            AssetsPumpSeriesCacheHelper.Trigger();
        }

        //通过系列ID移除缓存
        public static void RemoveCacheBySeriesID(long ID)
        {
            var all = GetCache();
            var maplist = PumpGroupAndMainMap.GetBySeriesID(ID);
            var maplist = AssetsPumpGroupAndMainMap.GetBySeriesID(ID);
            all.RemoveAll(item => maplist.Any(mapItem => mapItem.PumpMainID == item.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>
@@ -93,7 +93,7 @@
        /// </summary>
        public static void PublishCache(string key)
        {
            PumpSeriesCacheHelper.Publish(key);
            AssetsPumpSeriesCacheHelper.Publish(key);
        }

        #endregion Cache
@@ -103,7 +103,7 @@
        /// <summary>
        /// 获取所有
        /// </summary>
        public List<Model.PumpMain> GetAll()
        public List<Model.AssetsPumpMain> GetAll()
        {
            var all = GetCache();
            return all.OrderBy(x => x.SortCode).ToList();
@@ -112,7 +112,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public Model.PumpMain GetByID(long ID)
        public Model.AssetsPumpMain GetByID(long ID)
        {
            var all = GetAll();
            return all.Find(x => x.ID == ID);
@@ -121,11 +121,11 @@
        /// <summary>
        /// 通过 ID 获取所有产品
        /// </summary>
        public List<Model.PumpPartMain> GetPartByID(long ID)
        public List<Model.AssetsPumpPartMain> GetPartByID(long ID)
        {
            var all = GetAll();
            var allidlist = PumpMainAndPartMap.GetByPumpMainID(ID);
            var partmain = new PumpPartMain();
            var allidlist = AssetsPumpMainAndPartMap.GetByPumpMainID(ID);
            var partmain = new AssetsPumpPartMain();
            var allpart = partmain.GetByIds(allidlist);
            return allpart;
        }
@@ -133,7 +133,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public List<Model.PumpMain> GetByIds(List<long> Ids)
        public List<Model.AssetsPumpMain> GetByIds(List<long> Ids)
        {
            if (Ids == null || Ids.Count < 1)
            {
@@ -146,7 +146,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public List<Model.PumpMain> GetByPumpSeriesID(long id)
        public List<Model.AssetsPumpMain> GetByPumpSeriesID(long id)
        {
            if (id < 0)
            {
@@ -176,13 +176,13 @@
        /// <summary>
        /// 插入一条数据
        /// </summary>
        public long Insert(Model.PumpMain model)
        public long Insert(Model.AssetsPumpMain model)
        {
            if (model == null)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var entity = Model2Entity(model);
            var id = dal.Insert(entity);
            if (id > 0)
@@ -195,20 +195,20 @@
        /// <summary>
        /// 插入拓展
        /// </summary>
        public long InsertEx(Model.PumpMain main, Model.PumpGroupAndMainMap map)
        public long InsertEx(Model.AssetsPumpMain main, Model.AssetsPumpGroupAndMainMap map)
        {
            if (main == null)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var mainEntity = Model2Entity(main);
            var groupMapEntity = PumpGroupAndMainMap.Model2Entity(map);
            var groupMapEntity = AssetsPumpGroupAndMainMap.Model2Entity(map);
            var id = dal.InsertsEx(mainEntity, groupMapEntity);
            if (id > 0)
            {
                UpdateCache(id);
                PumpGroupAndMainMap.UpdateCacheByMainID(id);
                AssetsPumpGroupAndMainMap.UpdateCacheByMainID(id);
            }
            return id;
        }
@@ -216,13 +216,13 @@
        /// <summary>
        /// 插入多条
        /// </summary>
        public bool Inserts(List<Model.PumpMain> list)
        public bool Inserts(List<Model.AssetsPumpMain> list)
        {
            if (list == null || list.Count < 1)
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var entity_list = Model2Entities(list);
            var ids = dal.InsertsR(entity_list);
            if (ids != null && ids.Count > 0)
@@ -240,14 +240,14 @@
        /// <summary>
        /// 更新一条
        /// </summary>
        public bool Update(Model.PumpMain model)
        public bool Update(Model.AssetsPumpMain model)
        {
            if (model == null)
            {
                return false;
            }
            var entity = Model2Entity(model);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var bol = dal.Update(entity);
            if (bol)
            {
@@ -259,7 +259,7 @@
        /// <summary>
        /// 批量更新
        /// </summary>
        public bool Updates(List<Model.PumpMain> list)
        public bool Updates(List<Model.AssetsPumpMain> list)
        {
            if (list == null || list.Count < 1)
            {
@@ -270,7 +270,7 @@
                return false;
            }
            var entity_list = Model2Entities(list);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var bol = dal.Updates(entity_list);
            if (bol)
            {
@@ -288,7 +288,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var bol = dal.UpdateSortCode(ID, SortCode);
            if (bol)
            {
@@ -310,7 +310,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var bol = dal.UpdateSorter(sorters.ToEntityList());
            if (bol)
            {
@@ -328,7 +328,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var bol = dal.UpdateParas(ID, ParasHelper.ToString(Paras));
            if (bol)
            {
@@ -346,7 +346,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var bol = dal.UpdateFlags(ID, FlagsHelper.ToString(Flags));
            if (bol)
            {
@@ -364,7 +364,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var bol = dal.UpdateTagName(ID, TagName);
            if (bol)
            {
@@ -413,7 +413,7 @@
        public bool DeleteByID(long ID, out string Msg)
        {
            Msg = string.Empty;
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {
@@ -427,12 +427,12 @@
        /// </summary>
        public bool DeleteByMainIDEx(long ID)
        {
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpMain>();
            var bol = dal.DeleteEx(ID);
            if (bol)
            {
                RemoveCache(ID);
                PumpGroupAndMainMap.RemoveCacheByMainID(ID);
                AssetsPumpGroupAndMainMap.RemoveCacheByMainID(ID);
            }
            return bol;
        }