Desktop.Scatl.V4.2
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
ningshuxia
2023-02-24 1e4b358de58e36bfbf692ab2538ff9e7d60fd025 
 BLL/IStation.BLL.Monitor/monitor_point/signal/Signal.cs


@@ -21,7 +21,7 @@


        {


            return SignalCacheHelper.GetSet(projectId, () =>


            {


                var entities = _dal.QueryAll(projectId);


                var entities = _dal.GetAll(projectId);


                var models = Entity2Models(entities);


                if (models == null)


                {


@@ -34,7 +34,7 @@


        //根据 Id 更新缓存


        private void UpdateProjectCache(long projectId, long Id)


        {


            var entity_ds = _dal.QueryById(projectId, Id);


            var entity_ds = _dal.GetById(projectId, Id);


            var model_ds = Entity2Model(entity_ds);


            var all = GetProjectCache(projectId);


            var model = all.Find(x => x.Id == Id);


@@ -53,7 +53,7 @@


        {


            if (Ids == null || Ids.Count() < 1)


                return;


            var entities = _dal.QueryByIds(projectId, Ids);


            var entities = _dal.GetByIds(projectId, Ids);


            var models = Entity2Models(entities);


            var all = GetProjectCache(projectId);


            all.RemoveAll(x => Ids.Contains(x.Id));


@@ -72,12 +72,12 @@




        #endregion




        #region Query 


        #region Get 




        /// <summary>


        /// 查询全部


        /// </summary>


        public List<Model.Signal> QueryAll(long projectId)


        public List<Model.Signal> GetAll(long projectId)


        {


            var all = GetProjectCache(projectId);


            return all.OrderBy(x => x.SortCode).ToList();


@@ -86,27 +86,27 @@


        /// <summary>


        /// 根据 Id查询


        /// </summary>


        public Model.Signal QueryById(long projectId, long Id)


        public Model.Signal GetById(long projectId, long Id)


        {


            var all = QueryAll(projectId);


            var all = GetAll(projectId);


            return all.Find(x => x.Id == Id);


        }




        /// <summary>


        /// 根据 Ids 查询


        /// </summary>


        public List<Model.Signal> QueryByIds(long projectId, IEnumerable<long> Ids)


        public List<Model.Signal> GetByIds(long projectId, IEnumerable<long> Ids)


        {


            if (Ids == null || Ids.Count() < 1)


                return default;


            var all = QueryAll(projectId);


            var all = GetAll(projectId);


            return all.Where(x => Ids.Contains(x.Id)).ToList();


        }




        /// <summary>


        /// 根据 monitorPointId 查询


        /// </summary>


        public List<Model.Signal> QueryByMonitorPointId(long projectId, long monitorPointId)


        public List<Model.Signal> GetByMonitorPointId(long projectId, long monitorPointId)


        {


            var all = GetProjectCache(projectId);


            all = all.Where(x => monitorPointId == x.MonitorPointId).ToList();


@@ -126,7 +126,7 @@


        /// <summary>


        /// 根据 monitorPointIds 查询


        /// </summary>


        public List<Model.Signal> QueryByMonitorPointIds(long projectId, IEnumerable<long> monitorPointIds)


        public List<Model.Signal> GetByMonitorPointIds(long projectId, IEnumerable<long> monitorPointIds)


        {


            if (monitorPointIds == null || monitorPointIds.Count() < 1)


                return default;


@@ -138,13 +138,13 @@


        /// <summary>


        /// 根据 monitorPointId 查询 信号+信号类型


        /// </summary>


        public List<Model.Signal_SignalType> QueryExSignalTypeByMonitorPointId(long projectId, long monitorPointId)


        public List<Model.Signal_SignalType> GetExSignalTypeByMonitorPointId(long projectId, long monitorPointId)


        {


            var list = QueryByMonitorPointId(projectId, monitorPointId);


            var list = GetByMonitorPointId(projectId, monitorPointId);


            if (list == null || list.Count < 1)


                return default;


            var identifiers = list.Select(x => x.SignalType).Distinct().ToList();


            var typeList = new SignalType().QueryByIdentifiers(projectId,identifiers);


            var typeList = new SignalType().GetByIdentifiers(projectId,identifiers);


            if (typeList == null || typeList.Count < 1)


                return default;


            var vmList = (from x in list


@@ -158,12 +158,12 @@


        /// <summary>


        /// 根据 monitorPointId 查询第一条 信号+信号类型


        /// </summary>


        public Model.Signal_SignalType QueryFirstExSignalTypeByMonitorPointId(long projectId, long monitorPointId)


        public Model.Signal_SignalType GetFirstExSignalTypeByMonitorPointId(long projectId, long monitorPointId)


        {


            var first = GetFirstByMonitorPointId(projectId, monitorPointId);


            if (first == null)


                return default;


            var signalType = new SignalType().QueryByIdentifier(projectId,first.SignalType);


            var signalType = new SignalType().GetByIdentifier(projectId,first.SignalType);


            if (signalType == null)


                return default;


            return new Model.Signal_SignalType(first, signalType);


@@ -172,15 +172,15 @@


        /// <summary>


        /// 根据 MonitorPointIds 查询 信号+信号类型


        /// </summary>


        public List<Model.Signal_SignalType> QueryExSignalTypeByMonitorPointIds(long projectId, IEnumerable<long> monitorPointIds)


        public List<Model.Signal_SignalType> GetExSignalTypeByMonitorPointIds(long projectId, IEnumerable<long> monitorPointIds)


        {


            if (monitorPointIds == null || monitorPointIds.Count() < 1)


                return default;


            var list = QueryByMonitorPointIds(projectId, monitorPointIds);


            var list = GetByMonitorPointIds(projectId, monitorPointIds);


            if (list == null || list.Count < 1)


                return default;


            var identifiers = list.Select(x => x.SignalType).Distinct().ToList();


            var typeList = new SignalType().QueryByIdentifiers(projectId, identifiers);


            var typeList = new SignalType().GetByIdentifiers(projectId, identifiers);


            if (typeList == null || typeList.Count < 1)


                return default;


            var vmList = (from x in list


@@ -284,7 +284,7 @@


        /// </summary>


        public bool IsExistById(long projectId, long Id)


        {


            var all = QueryAll(projectId);


            var all = GetAll(projectId);


            return all.Exists(x => x.Id == Id);


        }


        #endregion