项目文件整理

lixiaojun

2022-08-22 cd280a9457eda95433896e3e9e3aa5164bdd64a0

 Service/IStation.Service4Monitor/monitor_point/signal/Signal.cs

@@ -267,11 +267,11 @@
        }

        /// <summary>
        /// 通过 SignalID 获取 信号+信号类型
        /// 通过 ID 获取 信号+信号类型
        /// </summary>
        public Model.Signal_SignalType GetExSignalTypeBySignalID(long CorpID, long SignalID)
        public Model.Signal_SignalType GetExSignalTypeByID(long CorpID, long ID)
        {
            var signal = GetByID(CorpID, SignalID);
            var signal = GetByID(CorpID, ID);
            if (signal == null)
                return default;
            var signalType = new SignalType().GetByIdentifier(signal.SignalType);
@@ -282,13 +282,13 @@
        }

        /// <summary>
        /// 通过 SignalIds 获取 信号+信号类型
        /// 通过 Ids 获取 信号+信号类型
        /// </summary>
        public List<Model.Signal_SignalType> GetExSignalTypeBySignalIds(long CorpID, IEnumerable<long> SignalIds)
        public List<Model.Signal_SignalType> GetExSignalTypeBySignalIds(long CorpID, IEnumerable<long> Ids)
        {
            if (SignalIds == null || SignalIds.Count() < 1)
            if (Ids == null || Ids.Count() < 1)
                return default;
            var signalList = GetByIds(CorpID,SignalIds);
            var signalList = GetByIds(CorpID,Ids);
            if (signalList == null || signalList.Count < 1)
                return default;
            var identifiers = signalList.Where(x => !string.IsNullOrEmpty(x.SignalType)).Select(x => x.SignalType).Distinct().ToList();