处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

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

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

        //获取缓存
        private static List<Model.PumpPartMain> GetCache()
        private static List<Model.AssetsPumpPartMain> GetCache()
        {
            var all = PumpPartMainCacheHelper.GetSet(() =>
            var all = AssetsPumpPartMainCacheHelper.GetSet(() =>
            {
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
                var entity_list = dal.GetAll();
                var model_list = Entity2Models(entity_list);
                if (model_list == null)
                {
                    model_list = new List<Model.PumpPartMain>();
                    model_list = new List<Model.AssetsPumpPartMain>();
                }
                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.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            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.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            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.PumpPartMain> GetAll()
        public List<Model.AssetsPumpPartMain> GetAll()
        {
            var all = GetCache();
            return all;
@@ -94,7 +94,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public Model.PumpPartMain GetByID(long ID)
        public Model.AssetsPumpPartMain GetByID(long ID)
        {
            var all = GetAll();
            return all.Find(x => x.ID == ID);
@@ -103,16 +103,16 @@
        /// <summary>
        /// 通过 型号ID 获取
        /// </summary>
        public List<Model.PumpPartMain> GetByMainID(long ID)
        public List<Model.AssetsPumpPartMain> GetByMainID(long ID)
        {
            var idlist = PumpMainAndPartMap.GetByPumpMainID(ID);
            var idlist = AssetsPumpMainAndPartMap.GetByPumpMainID(ID);
            return GetByIds(idlist);
        }

        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public List<Model.PumpPartMain> GetByIds(List<long> Ids)
        public List<Model.AssetsPumpPartMain> GetByIds(List<long> Ids)
        {
            if (Ids == null || Ids.Count < 1)
            {
@@ -142,13 +142,13 @@
        /// <summary>
        /// 插入一条数据
        /// </summary>
        public long Insert(Model.PumpPartMain model)
        public long Insert(Model.AssetsPumpPartMain model)
        {
            if (model == null)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            var entity = Model2Entity(model);
            var id = dal.Insert(entity);
            if (id > 0)
@@ -161,13 +161,13 @@
        /// <summary>
        /// 插入多条
        /// </summary>
        public bool Inserts(List<Model.PumpPartMain> list)
        public bool Inserts(List<Model.AssetsPumpPartMain> list)
        {
            if (list == null || list.Count < 1)
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            var entity_list = Model2Entities(list);
            var ids = dal.InsertsR(entity_list);
            if (ids != null && ids.Count > 0)
@@ -181,22 +181,22 @@
        /// <summary>
        /// 插入一条数据
        /// </summary>
        public long InsertEX(Model.PumpPartMain part, List<Model.PumpPropContent> pumpPropContents, Model.PumpMainAndPartMap partmap)
        public long InsertEX(Model.AssetsPumpPartMain part, List<Model.AssetsPumpPropContent> AssetsPumpPropContents, Model.AssetsPumpMainAndPartMap partmap)
        {
            if (part == null || pumpPropContents == null || partmap == null)
            if (part == null || AssetsPumpPropContents == null || partmap == null)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            var partentity = Model2Entity(part);
            var propcontentsentity = PumpPropContent.Model2Entities(pumpPropContents);
            var partmapentity = PumpMainAndPartMap.Model2Entity(partmap);
            var propcontentsentity = AssetsPumpPropContent.Model2Entities(AssetsPumpPropContents);
            var partmapentity = AssetsPumpMainAndPartMap.Model2Entity(partmap);
            var id = dal.InsertsEx(partentity, propcontentsentity, partmapentity);
            if (id > 0)
            {
                UpdateCache(id);
                PumpPropContent.UpdateCacheByPartID(id);
                PumpMainAndPartMap.UpdateCacheByPartID(id);
                AssetsPumpPropContent.UpdateCacheByPartID(id);
                AssetsPumpMainAndPartMap.UpdateCacheByPartID(id);
            }
            return id;
        }
@@ -208,14 +208,14 @@
        /// <summary>
        /// 更新一条
        /// </summary>
        public bool Update(Model.PumpPartMain model)
        public bool Update(Model.AssetsPumpPartMain model)
        {
            if (model == null)
            {
                return false;
            }
            var entity = Model2Entity(model);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            var bol = dal.Update(entity);
            if (bol)
            {
@@ -227,7 +227,7 @@
        /// <summary>
        /// 批量更新
        /// </summary>
        public bool Updates(List<Model.PumpPartMain> list)
        public bool Updates(List<Model.AssetsPumpPartMain> list)
        {
            if (list == null || list.Count < 1)
            {
@@ -238,7 +238,7 @@
                return false;
            }
            var entity_list = Model2Entities(list);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            var bol = dal.Updates(entity_list);
            if (bol)
            {
@@ -250,20 +250,20 @@
        /// <summary>
        /// 更新一条
        /// </summary>
        public bool UpdateEX(Model.PumpPartMain pumppart, List<Model.PumpPropContent> pumpPropContents)
        public bool UpdateEX(Model.AssetsPumpPartMain pumppart, List<Model.AssetsPumpPropContent> AssetsPumpPropContents)
        {
            if (pumppart == null || pumpPropContents.Count < 0)
            if (pumppart == null || AssetsPumpPropContents.Count < 0)
            {
                return false;
            }
            var pumppartentity = Model2Entity(pumppart);
            var pumpPropContentsentity = PumpPropContent.Model2Entities(pumpPropContents);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
            var bol = dal.UpdateEx(pumppartentity, pumpPropContentsentity);
            var AssetsPumpPropContentsentity = AssetsPumpPropContent.Model2Entities(AssetsPumpPropContents);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            var bol = dal.UpdateEx(pumppartentity, AssetsPumpPropContentsentity);
            if (bol)
            {
                UpdateCache(pumppart.ID);
                PumpPropContent.UpdateCache(pumpPropContentsentity.Select(x => x.ID).ToList());
                AssetsPumpPropContent.UpdateCache(AssetsPumpPropContentsentity.Select(x => x.ID).ToList());
            }
            return bol;
        }
@@ -277,7 +277,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            var bol = dal.UpdateSortCode(ID, SortCode);
            if (bol)
            {
@@ -299,7 +299,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            var bol = dal.UpdateSorter(sorters.ToEntityList());
            if (bol)
            {
@@ -318,7 +318,7 @@
        public bool DeleteByID(long ID, out string Msg)
        {
            Msg = string.Empty;
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {
@@ -330,15 +330,15 @@
        //通过 ID 删除产品表及属性表
        public bool DeleteExByID(long ID)
        {
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IPumpPartMain>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
            var partmain = dal.GetByID(ID);
            var propmodellist = PumpPropContent.GetProplistByPartID(ID);
            var propentitylist = PumpPropContent.Model2Entities(propmodellist);
            var propmodellist = AssetsPumpPropContent.GetProplistByPartID(ID);
            var propentitylist = AssetsPumpPropContent.Model2Entities(propmodellist);
            var bol = dal.DeleteEx(partmain, propentitylist);
            if (bol)
            {
                RemoveCache(ID);
                PumpPropContent.RemoveCacheByIDs(propmodellist.Select(x => x.ID).ToList());
                AssetsPumpPropContent.RemoveCacheByIDs(propmodellist.Select(x => x.ID).ToList());
            }
            return bol;
        }