blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
ningshuxia
2025-03-31 d321346f204a69b1929cc39098a5d88f44509e7b 
 02-desktop/DAL/IStation.DAL.Monitor/MonitorDataSet/MonitorMonthlyDataSet.cs


@@ -83,8 +83,8 @@


        /// </summary> 


        public List<Model.MonitorDataSet> GetMonitorDataSet(long monitorDataSourcesId)


        {


            var rootFolder = this.GetRootFolder(monitorDataSourcesId);


            var dateFolderInfoList = this.GetDateFolderInfoList(rootFolder);


            var rootFolder = GetRootFolder(monitorDataSourcesId);


            var dateFolderInfoList = GetDateFolderInfoList(rootFolder);


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


                return default;




@@ -92,7 +92,7 @@


            var MonitorDataSetList = new List<Model.MonitorDataSet>(MonitorDataSetCount);


            foreach (var dateFolderInfo in dateFolderInfoList)


            {


                var monitorDataSetFolderInfoList = this.GetMonitorDataSetFolderInfoList(dateFolderInfo);


                var monitorDataSetFolderInfoList = GetMonitorDataSetFolderInfoList(dateFolderInfo);


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


                    continue;




@@ -118,15 +118,15 @@


            if (monitorPointId < 1)


                return default;




            var rootFolder = this.GetRootFolder(monitorDataSourcesId);


            var dateFolderInfoList = this.GetDateFolderInfoList(rootFolder);


            var rootFolder = GetRootFolder(monitorDataSourcesId);


            var dateFolderInfoList = GetDateFolderInfoList(rootFolder);


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


                return default;




            var MonitorDataSetList = new List<Model.MonitorDataSet>(dateFolderInfoList.Count());


            foreach (var dateFolderInfo in dateFolderInfoList)


            {


                var monitorDataSetFolderInfoList = this.GetMonitorDataSetFolderInfoList(dateFolderInfo);


                var monitorDataSetFolderInfoList = GetMonitorDataSetFolderInfoList(dateFolderInfo);


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


                    continue;


                var monitorDataSetFolderInfo = monitorDataSetFolderInfoList.Find(x => x.MonitorPointID == monitorPointId);


@@ -151,8 +151,8 @@


            if (monitorPointId < 1)


                return default;




            var monitorDataSetFolder = this.GetMonitorDataSetFolder(monitorDataSourcesId, monitorPointId, year, month);


            var signalRecordPacketFileInfoList = this.GetSignalRecordPackFileInfoList(monitorDataSetFolder, year, month);


            var monitorDataSetFolder = GetMonitorDataSetFolder(monitorDataSourcesId, monitorPointId, year, month);


            var signalRecordPacketFileInfoList = GetSignalRecordPackFileInfoList(monitorDataSetFolder, year, month);


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


                return default;




@@ -195,8 +195,8 @@


            if (signalId < 1)


                return default;




            var rootFolder = this.GetRootFolder(monitorDataSourcesId);


            var dateFolderInfoList = this.GetDateFolderInfoList(rootFolder);


            var rootFolder = GetRootFolder(monitorDataSourcesId);


            var dateFolderInfoList = GetDateFolderInfoList(rootFolder);


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


                return default;




@@ -214,7 +214,7 @@


            {


                var year = dateFolderInfo.Year;


                var month = dateFolderInfo.Month;


                var valid = this.GetSignalRecordPacketFile(monitorDataSourcesId, monitorPointId, signalId, year, month, out string filePath);


                var valid = GetSignalRecordPacketFile(monitorDataSourcesId, monitorPointId, signalId, year, month, out string filePath);


                if (!valid)


                    continue;


                using (var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read))


@@ -241,7 +241,7 @@


            if (signalId < 1)


                return default;




            var valid = this.GetSignalRecordPacketFile(monitorDataSourcesId, monitorPointId, signalId, year, month, out string filePath);


            var valid = GetSignalRecordPacketFile(monitorDataSourcesId, monitorPointId, signalId, year, month, out string filePath);


            if (!valid)


                return default;


            var signalRecordCount = _monitorDataSetSummary.GetSignalRecordCount(monitorDataSourcesId, monitorPointId, signalId, year, month);


@@ -276,8 +276,8 @@


            if (signalIds == null || !signalIds.Any())


                return default;




            var dateFolder = this.GetYearMonthFolder(monitorDataSourcesId, year, month);


            var signalRecordPackFileInfoList = this.GetSignalRecordPackFileInfoList(dateFolder);


            var dateFolder = GetYearMonthFolder(monitorDataSourcesId, year, month);


            var signalRecordPackFileInfoList = GetSignalRecordPackFileInfoList(dateFolder);


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


                return default;


            signalRecordPackFileInfoList = signalRecordPackFileInfoList.Where(x => signalIds.Contains(x.SignalID)).ToList();


@@ -326,7 +326,7 @@


            if (signalId < 1)


                return default;




            var valid = this.GetSignalRecordPacketFile(monitorDataSourcesId, monitorPointId, signalId, year, month, out string filePath);


            var valid = GetSignalRecordPacketFile(monitorDataSourcesId, monitorPointId, signalId, year, month, out string filePath);


            if (!valid)


                return default;


            var signalRecordCount = _monitorDataSetSummary.GetSignalRecordCount(monitorDataSourcesId, monitorPointId, signalId, year, month);