Show monitoring datetime in tableColumn value

Author: Dokyeongyun

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

@@ -7,13 +7,17 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.jfoenix.controls.JFXComboBox;
 
 import javafx.beans.binding.Bindings;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -27,6 +31,7 @@
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.BorderPane;
+import javafx.util.Callback;
 import root.core.domain.MonitoringResult;
 import root.core.domain.enums.UsageUIType;
 import root.core.repository.constracts.PropertyRepository;
@@ -37,6 +42,7 @@
 import root.javafx.CustomView.UsageUI.UsageUI;
 import root.javafx.CustomView.UsageUI.UsageUIFactory;
 import root.utils.AlertUtils;
+import root.utils.DateUtils;
 import root.utils.UnitUtils.FileSize;
 
 public class MonitoringAPController<T extends MonitoringResult> extends BorderPane {
@@ -175,7 +181,14 @@ public void syncTableData(String id, int index) {
 		Map<String, List<T>> data = tableDataMap.get(id);
 		List<String> times = new ArrayList<>(data.keySet());
 		Collections.sort(times);
-		monitoringResultTV.setItems(FXCollections.observableList(data.get(times.get(index))));
+
+		ObservableList<T> tableData = null;
+		if(times.size() > index) {
+			tableData = FXCollections.observableList(data.get(times.get(index)));
+		}
+
+		monitoringResultTV.setItems(tableData);
+		monitoringResultTV.refresh();
 	}
 
 	/**
@@ -227,6 +240,19 @@ public <E> void addAndSetPropertyTableColumn(Class<E> fieldType, String fieldNam
 			});
 		}
 
+		if(fieldName.equals("monitoringDateTime")) {
+			tc.setCellValueFactory(new Callback<TableColumn.CellDataFeatures<T, E>, ObservableValue<E>>() {
+				@Override
+				public ObservableValue<E> call(TableColumn.CellDataFeatures<T, E> cell) {
+					SimpleStringProperty property = new SimpleStringProperty();
+					String value = DateUtils.convertDateFormat("yyyyMMddHHmmss", "yyyy/MM/dd HH:mm:ss",
+							cell.getValue().getMonitoringDateTime(), Locale.KOREA);
+					property.setValue(value);
+					return (ObservableValue<E>) property;
+				}
+			});
+		}
+
 		monitoringResultTV.getColumns().add(tc);
 	}
 
@@ -255,13 +281,14 @@ public void run(ActionEvent e) {
 
 		// Clear data
 		clearTableData(selected);
+		syncTableData(selected, 0);
 
 		Map<String, List<T>> allDataList = inquiryMonitoringHistory();
 		if (allDataList == null || allDataList.size() == 0) {
 			AlertUtils.showAlert(AlertType.INFORMATION, "조회결과 없음", "해당일자의 모니터링 기록이 없습니다.");
 			return;
 		}
-		
+
 		// Add and Sync data
 		addTableDataSet(selected, allDataList);
 		syncTableData(selected, 0);

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

@@ -143,7 +143,7 @@ public void initialize(URL location, ResourceBundle resources) {
 		archiveUsageTCM.put("가용 공간", new TypeAndFieldName(Double.class, "reclaimableSpace"));
 		archiveUsageTCM.put("사용중인 공간", new TypeAndFieldName(Double.class, "usedSpace"));
 		archiveUsageTCM.put("사용량(%)", new TypeAndFieldName(Double.class, "usedPercent"));
-		archiveUsageTCM.put("모니터링일시", new TypeAndFieldName(String.class, "dnt"));
+		archiveUsageTCM.put("모니터링일시", new TypeAndFieldName(String.class, "monitoringDateTime"));
 		initAndAddMonitoringAnchorPane(archiveUsageMAP, archiveUsageTabAP, dbComboBoxLabel, dbComboBoxItems, archiveUsageTCM);
 
 		// TableSpace Usage TableView Setting
@@ -153,7 +153,7 @@ public void initialize(URL location, ResourceBundle resources) {
 		tableSpaceUsageTCM.put("가용 공간", new TypeAndFieldName(Double.class, "freeSpace"));
 		tableSpaceUsageTCM.put("사용중인 공간", new TypeAndFieldName(Double.class, "usedSpace"));
 		tableSpaceUsageTCM.put("사용량(%)", new TypeAndFieldName(Double.class, "usedPercent"));
-		tableSpaceUsageTCM.put("모니터링일시", new TypeAndFieldName(String.class, "monitoringDate"));
+		tableSpaceUsageTCM.put("모니터링일시", new TypeAndFieldName(String.class, "monitoringDateTime"));
 		initAndAddMonitoringAnchorPane(tableSpaceUsageMAP, tableSpaceUsageTabAP, dbComboBoxLabel, dbComboBoxItems, tableSpaceUsageTCM);
 
 		// ASM Disk USage TableView Setting
@@ -165,7 +165,7 @@ public void initialize(URL location, ResourceBundle resources) {
 		asmDiskUsageTCM.put("가용 공간", new TypeAndFieldName(Double.class, "freeSpace"));
 		asmDiskUsageTCM.put("사용중인 공간", new TypeAndFieldName(Double.class, "usedSpace"));
 		asmDiskUsageTCM.put("사용량(%)", new TypeAndFieldName(Double.class, "usedPercent"));
-		asmDiskUsageTCM.put("모니터링일시", new TypeAndFieldName(String.class, "monitoringDate"));
+		asmDiskUsageTCM.put("모니터링일시", new TypeAndFieldName(String.class, "monitoringDateTime"));
 		initAndAddMonitoringAnchorPane(asmDiskUsageMAP, asmDiskUsageTabAP, dbComboBoxLabel, dbComboBoxItems, asmDiskUsageTCM);
 
 		// OS Disk Usage TableView Setting
@@ -176,7 +176,7 @@ public void initialize(URL location, ResourceBundle resources) {
 		osDiskUsageTCM.put("가용 공간", new TypeAndFieldName(Double.class, "freeSpace"));
 		osDiskUsageTCM.put("사용중인 공간", new TypeAndFieldName(Double.class, "usedSpace"));
 		osDiskUsageTCM.put("사용량(%)", new TypeAndFieldName(Double.class, "usedPercent"));
-		osDiskUsageTCM.put("모니터링일시", new TypeAndFieldName(String.class, "monitoringDate"));
+		osDiskUsageTCM.put("모니터링일시", new TypeAndFieldName(String.class, "monitoringDateTime"));
 		initAndAddMonitoringAnchorPane(osDiskUsageMAP, osDiskUsageTabAP, serverComboBoxLabel, serverComboBoxItems, osDiskUsageTCM);
 
 		// TODO TableColumn 속성을 설정하는 메서드를 따로 구분해보자. 객체를 생성해서 전달하는 방법도 고려하기