duheng
2024-07-25 713d5218ee2b47c0c92f75c19c49bb7e883cd214
WinFrmUI/IStation.WinFrmUI.Monitor/HistoryDataAPiHelper.cs
@@ -18,9 +18,11 @@
        /// <returns></returns>
        public List<(DateTime, DateTime, int, double, double, double)> MergeTimeSlots(List<(DateTime, DateTime, double, double, double)> Date)
        {
            if(Date==null)
                return null;
            List<(DateTime, DateTime, int, double, double, double)> mergedSlots = new List<(DateTime, DateTime, int, double, double, double)>(); // 初始化合并后的列表
            Date.Sort((x, y) => x.Item1.CompareTo(y.Item1)); // 按照起始时间排序
            Date.Sort((x, y) => x.Item2.CompareTo(y.Item2)); // 按照起始时间排序
            if (Date.Count==0)
                return null;
            DateTime mergedStart = Date[0].Item1;