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

lixiaojun

2024-11-18 a302d7d16e6bed80511cb49813d16829eb933560

 Service/HStation.Service.Assets.Core/05-service/01-PumpMain/04-PumpGroupAndMainMapping/PumpMaping.cs

ÎļþÃû´Ó Service/HStation.Service.Assets.Core/05-service/01-PumpMain/04-PumpGroupAndMainMap/PumpMaping.cs ÐÞ¸Ä
@@ -3,21 +3,21 @@
    /// <summary>
    ///
    /// </summary>
    public partial class AssetsPumpGroupAndMainMap
    public partial class AssetsPumpGroupAndMainMapping
    {
        #region Cache

        //获取缓存
        private static List<Model.AssetsPumpGroupAndMainMap> GetCache()
        private static List<Model.AssetsPumpGroupAndMainMapping> GetCache()
        {
            var all = AssetsPumpGroupAndMainMapCacheHelper.GetSet(() =>
            var all = AssetsPumpGroupAndMainMappingCacheHelper.GetSet(() =>
            {
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
                var entity_list = dal.GetAll();
                var model_list = Entity2Models(entity_list);
                if (model_list == null)
                {
                    model_list = new List<Model.AssetsPumpGroupAndMainMap>();
                    model_list = new List<Model.AssetsPumpGroupAndMainMapping>();
                }
                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.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var entity_ds = dal.GetByID(ID);
            var model_ds = Entity2Model(entity_ds);
            var all = GetCache();
@@ -46,14 +46,14 @@
        //通过型号ID更新缓存
        public static void UpdateCacheByMainID(long ID)
        {
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var alllist = dal.GetAll();
            var entity_ds = alllist.Find(x => x.PumpMainID == ID);
            var entity_ds = alllist.Find(x => x.MainID == ID);
            if (entity_ds != null)
            {
                var model_ds = Entity2Model(entity_ds);
                var all = GetCache();
                var model = all.Find(x => x.PumpMainID == ID);
                var model = all.Find(x => x.MainID == ID);
                if (model == null)
                {
                    all.Add(model_ds);
@@ -73,7 +73,7 @@
            {
                return;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var entity_list = dal.GetByIds(Ids);
            var model_list = Entity2Models(entity_list);
            var all = GetCache();
@@ -97,7 +97,7 @@
        public static void RemoveCacheByMainID(long ID)
        {
            var all = GetCache();
            all.RemoveAll(x => x.PumpMainID == ID);
            all.RemoveAll(x => x.MainID == ID);
            AssetsPumpSeriesCacheHelper.Trigger();
        }

@@ -116,7 +116,7 @@
        /// <summary>
        /// èŽ·å–所有
        /// </summary>
        public List<Model.AssetsPumpGroupAndMainMap> GetAll()
        public List<Model.AssetsPumpGroupAndMainMapping> GetAll()
        {
            var all = GetCache();
            return all;
@@ -125,7 +125,7 @@
        /// <summary>
        /// é€šè¿‡ ID èŽ·å–
        /// </summary>
        public Model.AssetsPumpGroupAndMainMap GetByID(long ID)
        public Model.AssetsPumpGroupAndMainMapping GetByID(long ID)
        {
            var all = GetAll();
            return all.Find(x => x.ID == ID);
@@ -134,10 +134,10 @@
        /// <summary>
        /// é€šè¿‡ç³»åˆ— ID èŽ·å–
        /// </summary>
        public static List<Model.AssetsPumpGroupAndMainMap> GetBySeriesID(long ID)
        public static List<Model.AssetsPumpGroupAndMainMapping> GetBySeriesID(long ID)
        {
            var all = GetCache();
            return all.Where(x => x.PumpGroupID == ID).ToList();
            return all.Where(x => x.GroupID == ID).ToList();
        }

        /// <summary>
@@ -146,13 +146,13 @@
        public static List<long> GetMainIDByGroupID(long ID)
        {
            var all = GetCache();
            return all.Where(x => x.PumpGroupID == ID).Select(x => x.PumpMainID).ToList();
            return all.Where(x => x.GroupID == ID).Select(x => x.MainID).ToList();
        }

        /// <summary>
        /// é€šè¿‡ ID èŽ·å–
        /// </summary>
        public List<Model.AssetsPumpGroupAndMainMap> GetByIds(List<long> Ids)
        public List<Model.AssetsPumpGroupAndMainMapping> GetByIds(List<long> Ids)
        {
            if (Ids == null || Ids.Count < 1)
            {
@@ -169,13 +169,13 @@
        /// <summary>
        /// æ’入一条数据
        /// </summary>
        public long Insert(Model.AssetsPumpGroupAndMainMap model)
        public long Insert(Model.AssetsPumpGroupAndMainMapping model)
        {
            if (model == null)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var entity = Model2Entity(model);
            var id = dal.Insert(entity);
            if (id > 0)
@@ -188,13 +188,13 @@
        /// <summary>
        /// æ’入多条
        /// </summary>
        public bool Inserts(List<Model.AssetsPumpGroupAndMainMap> list)
        public bool Inserts(List<Model.AssetsPumpGroupAndMainMapping> list)
        {
            if (list == null || list.Count < 1)
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var entity_list = Model2Entities(list);
            var ids = dal.InsertsR(entity_list);
            if (ids != null && ids.Count > 0)
@@ -212,14 +212,14 @@
        /// <summary>
        /// æ›´æ–°ä¸€æ¡
        /// </summary>
        public bool Update(Model.AssetsPumpGroupAndMainMap model)
        public bool Update(Model.AssetsPumpGroupAndMainMapping model)
        {
            if (model == null)
            {
                return false;
            }
            var entity = Model2Entity(model);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var bol = dal.Update(entity);
            if (bol)
            {
@@ -231,7 +231,7 @@
        /// <summary>
        /// æ‰¹é‡æ›´æ–°
        /// </summary>
        public bool Updates(List<Model.AssetsPumpGroupAndMainMap> list)
        public bool Updates(List<Model.AssetsPumpGroupAndMainMapping> list)
        {
            if (list == null || list.Count < 1)
            {
@@ -242,7 +242,7 @@
                return false;
            }
            var entity_list = Model2Entities(list);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var bol = dal.Updates(entity_list);
            if (bol)
            {
@@ -260,7 +260,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var bol = dal.UpdateParas(ID, ParasHelper.ToString(Paras));
            if (bol)
            {
@@ -278,7 +278,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var bol = dal.UpdateFlags(ID, FlagsHelper.ToString(Flags));
            if (bol)
            {
@@ -296,7 +296,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var bol = dal.UpdateTagName(ID, TagName);
            if (bol)
            {
@@ -345,7 +345,7 @@
        public bool DeleteByID(long ID, out string Msg)
        {
            Msg = string.Empty;
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpGroupAndMainMapping>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {