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/02-AdaptingManage/AdaptingManage.cs

@@ -10,7 +10,7 @@
        #region Cache

        //获取缓存
        private static List<Model.UserDefined> GetCache()
        private static List<Model.AssetsUserDefined> GetCache()
        {
            var all = AdaptingManageCacheHelper.GetSet(() =>
            {
@@ -19,7 +19,7 @@
                var model_list = Entity2Models(entity_list);
                if (model_list == null)
                {
                    model_list = new List<Model.UserDefined>();
                    model_list = new List<Model.AssetsUserDefined>();
                }
                return model_list;
            }, Yw.Service.ConfigHelper.CacheKeepTime, Yw.Service.ConfigHelper.CacheRandomTime);
@@ -42,7 +42,7 @@
            {
                model.Reset(model_ds);
            }
            PumpSeriesCacheHelper.Trigger();
            AssetsPumpSeriesCacheHelper.Trigger();
        }

        //通过 Ids 更新缓存
@@ -61,7 +61,7 @@
            {
                all.AddRange(model_list);
            }
            PumpSeriesCacheHelper.Trigger();
            AssetsPumpSeriesCacheHelper.Trigger();
        }

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

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

        #endregion Cache
@@ -87,7 +87,7 @@
        /// <summary>
        /// 获取所有
        /// </summary>
        public List<Model.UserDefined> GetAll()
        public List<Model.AssetsUserDefined> GetAll()
        {
            var all = GetCache();
            return all;
@@ -109,7 +109,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public Model.UserDefined GetByID(long ID)
        public Model.AssetsUserDefined GetByID(long ID)
        {
            var all = GetAll();
            return all.Find(x => x.ID == ID);
@@ -118,7 +118,7 @@
        /// <summary>
        /// 通过 设备类型获取
        /// </summary>
        public List<Model.UserDefined> GetByAdaptingType(eAdaptingType type)
        public List<Model.AssetsUserDefined> GetByAdaptingType(eAdaptingType type)
        {
            var all = GetAll();
            return all.Where(x => x.AdaptingType == type).ToList();
@@ -127,7 +127,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public List<Model.UserDefined> GetByIds(List<long> Ids)
        public List<Model.AssetsUserDefined> GetByIds(List<long> Ids)
        {
            if (Ids == null || Ids.Count < 1)
            {
@@ -144,7 +144,7 @@
        /// <summary>
        /// 插入一条数据
        /// </summary>
        public long Insert(Model.UserDefined model)
        public long Insert(Model.AssetsUserDefined model)
        {
            if (model == null)
            {
@@ -163,7 +163,7 @@
        /// <summary>
        /// 插入多条
        /// </summary>
        public bool Inserts(List<Model.UserDefined> list)
        public bool Inserts(List<Model.AssetsUserDefined> list)
        {
            if (list == null || list.Count < 1)
            {
@@ -187,7 +187,7 @@
        /// <summary>
        /// 更新一条
        /// </summary>
        public bool Update(Model.UserDefined model)
        public bool Update(Model.AssetsUserDefined model)
        {
            if (model == null)
            {
@@ -206,7 +206,7 @@
        /// <summary>
        /// 批量更新
        /// </summary>
        public bool Updates(List<Model.UserDefined> list)
        public bool Updates(List<Model.AssetsUserDefined> list)
        {
            if (list == null || list.Count < 1)
            {