Merge pull request #197 from Dokyeongyun/ft-220322-historyNavigator

Ft 220322 history navigator

Author: Dokyeongyun

src/main/java/root/core/usecase/constracts/ReportUsecase.java

@@ -7,15 +7,24 @@
 import root.utils.UnitUtils.FileSize;
 
 public interface ReportUsecase {
+
 	<T extends MonitoringResult> List<T> getMonitoringReportData(Class<T> clazz, String alias, FileSize unit,
 			int round);
 
 	<T extends MonitoringResult> Map<String, List<T>> getMonitoringReportDataByTime(Class<T> clazz, String alias,
 			FileSize unit, int round, String inquiryDate);
 
+	<T extends MonitoringResult> Map<String, List<T>> getPrevMonitoringReportDataByTime(Class<T> clazz, String alias,
+			FileSize unit, int round, String inquiryDateTime);
+	
+	<T extends MonitoringResult> Map<String, List<T>> getNextMonitoringReportDataByTime(Class<T> clazz, String alias,
+			FileSize unit, int round, String inquiryDateTime);
+
 	<T extends MonitoringResult> Map<Integer, Long> getMonitoringReportCountByTime(Class<T> clazz, String alias,
 			FileSize unit, int round, String inquiryDate);
-	
+
 	<T extends MonitoringResult> Map<Integer, List<String>> getMonitoringReportTimesByTime(Class<T> clazz, String alias,
 			FileSize unit, int round, String inquiryDate);
+	
+	<T extends MonitoringResult> List<String> getMonitoringHistoryDays(Class<T> clazz, String alias);
 }

src/main/java/root/core/usecase/implement/ReportUsecaseImpl.java

@@ -1,6 +1,8 @@
 package root.core.usecase.implement;
 
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -51,9 +53,67 @@ public <T extends MonitoringResult> Map<String, List<T>> getMonitoringReportData
 		return getMonitoringReportData(clazz, alias, unit, round)
 				.stream()
 				.filter(m -> inquiryDate.equals(m.getMonitoringDate()))
+				.sorted(Comparator.comparing(MonitoringResult::getMonitoringDateTime))
+				.collect(Collectors.groupingBy(MonitoringResult::getMonitoringDateTime, 
+						LinkedHashMap::new, 
+						Collectors.mapping(m -> m, Collectors.toList())));
+	}
+	
+	@Override
+	public <T extends MonitoringResult> Map<String, List<T>> getPrevMonitoringReportDataByTime(Class<T> clazz,
+			String alias, FileSize unit, int round, String inquiryDateTime) {
+
+		String prevDateTime = getPrevHistoryDateTime(clazz, alias, unit, round, inquiryDateTime);
+
+		return getMonitoringReportData(clazz, alias, unit, round)
+				.stream()
+				.filter(m -> prevDateTime.equals(m.getMonitoringDateTime()))
+				.sorted(Comparator.comparing(MonitoringResult::getMonitoringDateTime).reversed())
+				.collect(Collectors.groupingBy(m -> m.getMonitoringDateTime(), 
+						Collectors.mapping(m -> m, Collectors.toList())));
+	}
+
+	private <T extends MonitoringResult> String getPrevHistoryDateTime(Class<T> clazz, String alias, FileSize unit,
+			int round, String curHistoryDateTime) {
+		
+		// TODO 날짜 컬럼만 읽기
+		MonitoringResult result =  getMonitoringReportData(clazz, alias, unit, round)
+				.stream()
+				.filter(m -> DateUtils.compareTo("yyyyMMddHHmmss", curHistoryDateTime, m.getMonitoringDateTime()) == 1)
+				.sorted(Comparator.comparing(MonitoringResult::getMonitoringDateTime).reversed())
+				.findFirst()
+				.orElse(null);
+		
+		return result == null ? curHistoryDateTime : result.getMonitoringDateTime();
+	}
+	
+	@Override
+	public <T extends MonitoringResult> Map<String, List<T>> getNextMonitoringReportDataByTime(Class<T> clazz,
+			String alias, FileSize unit, int round, String inquiryDateTime) {
+
+		String nextDateTime = getNextHistoryDateTime(clazz, alias, unit, round, inquiryDateTime);
+		
+		return getMonitoringReportData(clazz, alias, unit, round)
+				.stream()
+				.filter(m -> nextDateTime.equals(m.getMonitoringDateTime()))
+				.sorted(Comparator.comparing(MonitoringResult::getMonitoringDateTime))
 				.collect(Collectors.groupingBy(m -> m.getMonitoringDateTime(), 
 						Collectors.mapping(m -> m, Collectors.toList())));
 	}
+	
+	private <T extends MonitoringResult> String getNextHistoryDateTime(Class<T> clazz, String alias, FileSize unit,
+			int round, String curHistoryDateTime) {
+		
+		// TODO 날짜 컬럼만 읽기
+		MonitoringResult result =  getMonitoringReportData(clazz, alias, unit, round)
+				.stream()
+				.filter(m -> DateUtils.compareTo("yyyyMMddHHmmss", curHistoryDateTime, m.getMonitoringDateTime()) == -1)
+				.sorted(Comparator.comparing(MonitoringResult::getMonitoringDateTime))
+				.findFirst()
+				.orElse(null);
+		
+		return result == null ? curHistoryDateTime : result.getMonitoringDateTime();
+	}
 
 	@Override
 	public <T extends MonitoringResult> Map<Integer, Long> getMonitoringReportCountByTime(Class<T> clazz,
@@ -84,6 +144,7 @@ public <T extends MonitoringResult> Map<Integer, List<String>> getMonitoringRepo
 				.stream()
 				.collect(Collectors.groupingBy(
 						m -> Integer.parseInt(DateUtils.convertDateFormat("yyyyMMddHHmmss", "HH", m, Locale.KOREA)),
+						LinkedHashMap::new,
 						Collectors.mapping(m -> m, Collectors.toList())));
 
 		for (int i = 0; i < 24; i++) {
@@ -94,4 +155,12 @@ public <T extends MonitoringResult> Map<Integer, List<String>> getMonitoringRepo
 
 		return result;
 	}
+
+	@Override
+	public <T extends MonitoringResult> List<String> getMonitoringHistoryDays(Class<T> clazz, String alias) {
+		return getMonitoringReportData(clazz, alias, FileSize.B, 2)
+				.stream()
+				.map(r -> r.getMonitoringDate())
+				.collect(Collectors.toList());
+	}
 }

src/main/java/root/javafx/Controller/HistoryMenuController.java

@@ -41,7 +41,7 @@
 import root.core.usecase.implement.DBCheckUsecaseImpl;
 import root.core.usecase.implement.ServerCheckUsecaseImpl;
 import root.javafx.CustomView.AlertLogListViewCell;
-import root.javafx.CustomView.DisableAfterTodayDateCell;
+import root.javafx.CustomView.dateCell.DisableAfterTodayDateCell;
 import root.utils.AlertUtils;
 
 public class HistoryMenuController implements Initializable {