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

Shuxia Ning

2024-09-11 5dbe0ca9fe177aa83779ebad921b5d1d2cae6278

 Service/HStation.Service.Assets.Core/05-service/02-AdaptingManage/AdaptingManage.cs

ÎļþÃû´Ó Service/HStation.Service.Assets.Core/05-service/02-EquipmentManage/EquipmentManage.cs ÐÞ¸Ä
@@ -5,21 +5,21 @@
    /// <summary>
    ///
    /// </summary>
    public partial class EquipmentManage
    public partial class AdaptingManage
    {
        #region Cache

        //获取缓存
        private static List<Model.EquipmentManage> GetCache()
        private static List<Model.AdaptingManage> GetCache()
        {
            var all = EquipmentManageCacheHelper.GetSet(() =>
            var all = AdaptingManageCacheHelper.GetSet(() =>
            {
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IEquipmentManage>();
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAdaptingManage>();
                var entity_list = dal.GetAll();
                var model_list = Entity2Models(entity_list);
                if (model_list == null)
                {
                    model_list = new List<Model.EquipmentManage>();
                    model_list = new List<Model.AdaptingManage>();
                }
                return model_list;
            }, Yw.Service.ConfigHelper.CacheKeepTime, Yw.Service.ConfigHelper.CacheRandomTime);
@@ -29,7 +29,7 @@
        //通过 ID æ›´æ–°ç¼“å­˜
        private static void UpdateCache(long ID)
        {
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IEquipmentManage>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAdaptingManage>();
            var entity_ds = dal.GetByID(ID);
            var model_ds = Entity2Model(entity_ds);
            var all = GetCache();
@@ -52,7 +52,7 @@
            {
                return;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IEquipmentManage>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAdaptingManage>();
            var entity_list = dal.GetByIds(Ids);
            var model_list = Entity2Models(entity_list);
            var all = GetCache();
@@ -87,16 +87,29 @@
        /// <summary>
        /// èŽ·å–所有
        /// </summary>
        public List<Model.EquipmentManage> GetAll()
        public List<Model.AdaptingManage> GetAll()
        {
            var all = GetCache();
            return all;
        }

        /// <summary>
        /// èŽ·å–不同类型的排序码
        /// </summary>
        public int GetMaxSortCodeByAdaptingType(eAdaptingType AdaptingType)
        {
            var all = GetAll().Where(x => x.AdaptingType == AdaptingType).ToList();
            if (all == null || all.Count < 1)
            {
                return 0;
            }
            return all.Max(x => x.SortCode);
        }

        /// <summary>
        /// é€šè¿‡ ID èŽ·å–
        /// </summary>
        public Model.EquipmentManage GetByID(long ID)
        public Model.AdaptingManage GetByID(long ID)
        {
            var all = GetAll();
            return all.Find(x => x.ID == ID);
@@ -105,16 +118,16 @@
        /// <summary>
        /// é€šè¿‡ è®¾å¤‡ç±»åž‹èŽ·å–
        /// </summary>
        public List<Model.EquipmentManage> GetByEquipmentType(eAdaptingType type)
        public List<Model.AdaptingManage> GetByAdaptingType(eAdaptingType type)
        {
            var all = GetAll();
            return all.Where(x => x.EquipmentType == type).ToList();
            return all.Where(x => x.AdaptingType == type).ToList();
        }

        /// <summary>
        /// é€šè¿‡ ID èŽ·å–
        /// </summary>
        public List<Model.EquipmentManage> GetByIds(List<long> Ids)
        public List<Model.AdaptingManage> GetByIds(List<long> Ids)
        {
            if (Ids == null || Ids.Count < 1)
            {
@@ -131,13 +144,13 @@
        /// <summary>
        /// æ’入一条数据
        /// </summary>
        public long Insert(Model.EquipmentManage model)
        public long Insert(Model.AdaptingManage model)
        {
            if (model == null)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IEquipmentManage>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAdaptingManage>();
            var entity = Model2Entity(model);
            var id = dal.Insert(entity);
            if (id > 0)
@@ -150,13 +163,13 @@
        /// <summary>
        /// æ’入多条
        /// </summary>
        public bool Inserts(List<Model.EquipmentManage> list)
        public bool Inserts(List<Model.AdaptingManage> list)
        {
            if (list == null || list.Count < 1)
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IEquipmentManage>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAdaptingManage>();
            var entity_list = Model2Entities(list);
            var ids = dal.InsertsR(entity_list);
            if (ids != null && ids.Count > 0)
@@ -174,14 +187,14 @@
        /// <summary>
        /// æ›´æ–°ä¸€æ¡
        /// </summary>
        public bool Update(Model.EquipmentManage model)
        public bool Update(Model.AdaptingManage model)
        {
            if (model == null)
            {
                return false;
            }
            var entity = Model2Entity(model);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IEquipmentManage>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAdaptingManage>();
            var bol = dal.Update(entity);
            if (bol)
            {
@@ -193,7 +206,7 @@
        /// <summary>
        /// æ‰¹é‡æ›´æ–°
        /// </summary>
        public bool Updates(List<Model.EquipmentManage> list)
        public bool Updates(List<Model.AdaptingManage> list)
        {
            if (list == null || list.Count < 1)
            {
@@ -204,7 +217,7 @@
                return false;
            }
            var entity_list = Model2Entities(list);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IEquipmentManage>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAdaptingManage>();
            var bol = dal.Updates(entity_list);
            if (bol)
            {
@@ -223,7 +236,7 @@
        public bool DeleteByID(long ID, out string Msg)
        {
            Msg = string.Empty;
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IEquipmentManage>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAdaptingManage>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {