处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

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

@@ -43,29 +43,28 @@
            AssetsPumpSeriesCacheHelper.Trigger();
        }

        /*
                //通过 产品ID 更新缓存
                public static void UpdateCacheByPartID(long ID)
        //通过 产品ID 更新缓存
        public static void UpdateCacheByPartID(long ID)
        {
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPropContent>();
            var alllist = dal.GetAll();
            var selectlist = alllist.Where(x => x.PartID == ID).ToList();
            var model_ds = Entity2Models(selectlist);
            var all = GetCache();
            var model = all.Find(x => x.ID == ID);
            if (model == null)
            {
                all.AddRange(model_ds);
            }
            else
            {
                foreach (var item in model_ds)
                {
                    var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPropContent>();
                    var alllist = dal.GetAll();
                    var selectlist = alllist.Where(x => x.PartID == ID).ToList();
                    var model_ds = Entity2Models(selectlist);
                    var all = GetCache();
                    var model = all.Find(x => x.ID == ID);
                    if (model == null)
                    {
                        all.AddRange(model_ds);
                    }
                    else
                    {
                        foreach (var item in model_ds)
                        {
                            model.Reset(item);
                        }
                    }
                    AssetsPumpSeriesCacheHelper.Trigger();
                }*/
                    model.Reset(item);
                }
            }
            AssetsPumpSeriesCacheHelper.Trigger();
        }

        //通过 Ids 更新缓存
        public static void UpdateCache(List<long> Ids)
@@ -142,6 +141,15 @@
        }

        /// <summary>
        /// 通过 产品ID 获取
        /// </summary>
        public static List<Model.AssetsPumpPropContent> GetProplistByPartID(long ID)
        {
            var all = GetCache();
            return all.Where(x => x.PartID == ID).ToList();
        }

        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public List<Model.AssetsPumpPropContent> GetByIds(List<long> Ids)