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/09-PumpTypeSeriesMap/PumpTypeSeriesMap.cs

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

        //获取缓存
        private static List<Model.AssetsPumpTypeSeriesMap> GetCache()
        private static List<Model.AssetsPumpSeriesTypeMapping> GetCache()
        {
            var all = AssetsPumpTypeSeriesMapCacheHelper.GetSet(() =>
            var all = AssetsPumpSeriesTypeMappingCacheHelper.GetSet(() =>
            {
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpTypeSeriesMap>();
                var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeriesTypeMapping>();
                var entity_list = dal.GetAll();
                var model_list = Entity2Models(entity_list);
                if (model_list == null)
                {
                    model_list = new List<Model.AssetsPumpTypeSeriesMap>();
                    model_list = new List<Model.AssetsPumpSeriesTypeMapping>();
                }
                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.IAssetsPumpTypeSeriesMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeriesTypeMapping>();
            var entity_ds = dal.GetByID(ID);
            var model_ds = Entity2Model(entity_ds);
            var all = GetCache();
@@ -50,7 +50,7 @@
            {
                return;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpTypeSeriesMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeriesTypeMapping>();
            var entity_list = dal.GetByIds(Ids);
            var model_list = Entity2Models(entity_list);
            var all = GetCache();
@@ -85,7 +85,7 @@
        /// <summary>
        /// 获取所有
        /// </summary>
        public List<Model.AssetsPumpTypeSeriesMap> GetAll()
        public List<Model.AssetsPumpSeriesTypeMapping> GetAll()
        {
            var all = GetCache();
            return all.OrderBy(x => x.SortCode).ToList();
@@ -94,7 +94,7 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public Model.AssetsPumpTypeSeriesMap GetByID(long ID)
        public Model.AssetsPumpSeriesTypeMapping GetByID(long ID)
        {
            var all = GetAll();
            return all.Find(x => x.ID == ID);
@@ -106,14 +106,14 @@
        public List<long> GetSeriesIDByTypeID(long ID)
        {
            var all = GetAll();
            return all.Where(x => x.PumpTypeID == ID).Select(x => x.PumpSeriesID)
            return all.Where(x => x.TypeID == ID).Select(x => x.SeriesID)
        .ToList();
        }

        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public List<Model.AssetsPumpTypeSeriesMap> GetByIds(List<long> Ids)
        public List<Model.AssetsPumpSeriesTypeMapping> GetByIds(List<long> Ids)
        {
            if (Ids == null || Ids.Count < 1)
            {
@@ -143,13 +143,13 @@
        /// <summary>
        /// 插入一条数据
        /// </summary>
        public long Insert(Model.AssetsPumpTypeSeriesMap model)
        public long Insert(Model.AssetsPumpSeriesTypeMapping model)
        {
            if (model == null)
            {
                return default;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpTypeSeriesMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeriesTypeMapping>();
            var entity = Model2Entity(model);
            var id = dal.Insert(entity);
            if (id > 0)
@@ -162,13 +162,13 @@
        /// <summary>
        /// 插入多条
        /// </summary>
        public bool Inserts(List<Model.AssetsPumpTypeSeriesMap> list)
        public bool Inserts(List<Model.AssetsPumpSeriesTypeMapping> list)
        {
            if (list == null || list.Count < 1)
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpTypeSeriesMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeriesTypeMapping>();
            var entity_list = Model2Entities(list);
            var ids = dal.InsertsR(entity_list);
            if (ids != null && ids.Count > 0)
@@ -186,14 +186,14 @@
        /// <summary>
        /// 更新一条
        /// </summary>
        public bool Update(Model.AssetsPumpTypeSeriesMap model)
        public bool Update(Model.AssetsPumpSeriesTypeMapping model)
        {
            if (model == null)
            {
                return false;
            }
            var entity = Model2Entity(model);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpTypeSeriesMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeriesTypeMapping>();
            var bol = dal.Update(entity);
            if (bol)
            {
@@ -205,7 +205,7 @@
        /// <summary>
        /// 批量更新
        /// </summary>
        public bool Updates(List<Model.AssetsPumpTypeSeriesMap> list)
        public bool Updates(List<Model.AssetsPumpSeriesTypeMapping> list)
        {
            if (list == null || list.Count < 1)
            {
@@ -216,7 +216,7 @@
                return false;
            }
            var entity_list = Model2Entities(list);
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpTypeSeriesMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeriesTypeMapping>();
            var bol = dal.Updates(entity_list);
            if (bol)
            {
@@ -234,7 +234,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpTypeSeriesMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeriesTypeMapping>();
            var bol = dal.UpdateSortCode(ID, SortCode);
            if (bol)
            {
@@ -256,7 +256,7 @@
            {
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpTypeSeriesMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeriesTypeMapping>();
            var bol = dal.UpdateSorter(sorters.ToEntityList());
            if (bol)
            {
@@ -275,7 +275,7 @@
        public bool DeleteByID(long ID, out string Msg)
        {
            Msg = string.Empty;
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpTypeSeriesMap>();
            var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpSeriesTypeMapping>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {