Merge branch 'develop' of https://github.com/Dokyeongyun/DBMonitoring into fx-220306-osDiskMonitoring

Author: Dokyeongyun

src/main/java/root/applications/Program.java

@@ -1,48 +1,51 @@
 package root.applications;
 
-import java.io.File;
-
 import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.text.Font;
 import javafx.stage.Stage;
 import root.core.repository.constracts.PropertyRepository;
 import root.core.repository.implement.PropertyRepositoryImpl;
+import root.javafx.Controller.HomeController;
+import root.javafx.Controller.LeftMenuController;
+import root.javafx.DI.DependencyInjection;
 
 public class Program extends Application {
 
+	public static Stage stage;
+	
 	PropertyRepository propRepo = PropertyRepositoryImpl.getInstance();
 
 	@Override
 	public void start(Stage primaryStage) throws Exception {
 
+		stage = primaryStage;
+
+		setUpDependecyInjector();
+
 		// configuration load
 		propRepo.loadCombinedConfiguration();
 
 		// fxml load
 		System.setProperty("prism.lcdtext", "false"); // ¾ÈƼ¾Ù¸®¾î½Ì (Font ºÎµå·´°Ô)
 
-		String[] fontFiles = new File("./src/main/resources/font").list();
-		for(String font : fontFiles) {
-			Font.loadFont(getClass().getResourceAsStream("./src/main/resources/font/" + font), 10);
-		}
-
-		FXMLLoader homeloader = new FXMLLoader();
-		homeloader.setLocation(getClass().getResource("/fxml/Home.fxml"));
-		AnchorPane homePane = homeloader.load();
-
-		Scene scene = new Scene(homePane, 1200, 650);
-		scene.getStylesheets().add(getClass().getResource("/css/javaFx.css").toExternalForm());
-
+		Parent root = DependencyInjection.load("/fxml/Home.fxml");
 		primaryStage.setTitle("DB Monitoring Window Program");
-		primaryStage.setScene(scene);
+		primaryStage.setScene(new Scene(root, 1200, 650));
 		primaryStage.show();
-
 	}
 
 	public static void main(String[] args) {
+		if(System.getProperty("resourceBaseDir") == null) {
+			System.setProperty("resourceBaseDir", "");	
+		}
+
 		launch(args);
 	}
+
+	private void setUpDependecyInjector() {
+		// save the factory in the injector
+		DependencyInjection.addInjectionMethod(HomeController.class, param -> {return new HomeController();});
+		DependencyInjection.addInjectionMethod(LeftMenuController.class, param -> {return new LeftMenuController();});
+	}
 }

src/main/java/root/core/batch/DBCheckBatch.java

@@ -12,7 +12,7 @@ public DBCheckBatch(DBCheckUsecase dbCheckUsecase) {
 	public void startBatchArchiveUsageCheck() {
 		try {
 			this.dbCheckUsecase.printArchiveUsageCheck();
-			this.dbCheckUsecase.writeExcelArchiveUsageCheck();
+		//	this.dbCheckUsecase.writeExcelArchiveUsageCheck();
 			this.dbCheckUsecase.writeCsvArchiveUsage();
 		}catch(Exception e) {
 			e.printStackTrace();

src/main/java/root/core/domain/MonitoringYN.java

@@ -0,0 +1,32 @@
+package root.core.domain;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import root.core.domain.enums.MonitoringType;
+
+@AllArgsConstructor
+@Data
+public class MonitoringYN {
+
+	private String monitoringAlias;
+	private List<MonitoringTypeAndYN> monitoringTypeList;
+
+	public MonitoringYN(String monitoringAlias) {
+		this.monitoringAlias = monitoringAlias;
+	}
+
+	public List<MonitoringType> getDistinctMonitoringTypes() {
+		return monitoringTypeList.stream().map(type -> type.getMonitoringType()).distinct()
+				.collect(Collectors.toList());
+	}
+
+	@AllArgsConstructor
+	@Data
+	public static class MonitoringTypeAndYN {
+		private MonitoringType monitoringType;
+		private boolean isMonitoring;
+	}
+}

src/main/java/root/core/domain/enums/MonitoringType.java

@@ -0,0 +1,18 @@
+package root.core.domain.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum MonitoringType {
+
+	ARCHIVE("DB", "Archive"), TABLE_SPACE("DB", "TableSpace"), ASM_DISK("DB", "ASM Disk"), OS_DISK("SERVER", "OS Disk"),
+	ALERT_LOG("SERVER", "Alert Log");
+
+	private String category;
+	private String name;
+
+	MonitoringType(String category, String name) {
+		this.category = category;
+		this.name = name;
+	}
+}

src/main/java/root/core/domain/enums/RoundingDigits.java

@@ -0,0 +1,37 @@
+package root.core.domain.enums;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import lombok.Getter;
+
+@Getter
+public enum RoundingDigits {
+
+	ONE(1), TWO(2), THREE(3), FOUR(4), FIVE(5);
+
+	private int digits;
+
+	private RoundingDigits(int digits) {
+		this.digits = digits;
+	}
+
+	private static final Map<Integer, RoundingDigits> roundingDigitsMap = Collections.unmodifiableMap(
+			Stream.of(values()).collect(Collectors.toMap(RoundingDigits::getDigits, Function.identity())));
+
+	public static RoundingDigits find(final int digits) {
+		return Optional.ofNullable(roundingDigitsMap.get(digits)).orElse(TWO);
+	}
+
+	public static RoundingDigits find(final String digits) {
+		try {
+			return find(Integer.parseInt(digits));
+		} catch (NumberFormatException e) {
+			return TWO;
+		}
+	}
+}

src/main/java/root/core/repository/constracts/PropertyRepository.java

@@ -51,6 +51,8 @@ public interface PropertyRepository {
 
 	String getLastUseMonitoringPresetName();
 
+	String getLastUseMonitoringPresetName(String filePath);
+
 	String[] getMonitoringDBNames();
 
 	String[] getMonitoringServerNames();
@@ -64,4 +66,6 @@ public interface PropertyRepository {
 	JschConnectionInfo getJschConnectionInfo(String serverName);
 
 	AlertLogCommand getAlertLogCommand(String serverName);
+	
+	String getMonitoringConfigResource(String key);
 }

src/main/java/root/core/repository/implement/PropertyRepositoryImpl.java

@@ -424,6 +424,17 @@ public Map<String, String> getMonitoringPresetMap() {
 	public String getLastUseMonitoringPresetName() {
 		return connInfoConfig.subset("monitoring.setting.preset.lastuse").getString("");
 	}
+	
+	/**
+	 * 최근 사용한 Monitoring Preset 이름을 반환한다. 단, 최근 사용한 Preset이 없을 때, NULL을 반환한다.
+	 * 
+	 * @return
+	 */
+	@Override
+	public String getLastUseMonitoringPresetName(String filePath) {
+		load(filePath);
+		return connInfoConfig.subset("monitoring.setting.preset.lastuse").getString("");
+	}
 
 	/**
 	 * 모니터링할 DB명 배열을 반환한다.
@@ -535,4 +546,9 @@ public AlertLogCommand getAlertLogCommand(String serverName) {
 				alertLogDateFormatRegex);
 		return alc;
 	}
+
+	@Override
+	public String getMonitoringConfigResource(String key) {
+		return monitoringConfig.getString(key);
+	}
 }

src/main/java/root/core/service/contracts/PropertyService.java

@@ -5,22 +5,98 @@
 
 import root.core.domain.JdbcConnectionInfo;
 import root.core.domain.JschConnectionInfo;
+import root.core.domain.MonitoringYN;
+import root.core.domain.enums.RoundingDigits;
+import root.core.domain.enums.UsageUIType;
+import root.utils.UnitUtils.FileSize;
 
 public interface PropertyService {
 
+	/**
+	 * 접속정보 설정파일을 Load 한다.
+	 * 
+	 * @param filePath
+	 */
+	void loadConnectionInfoConfig(String filePath);
+
+	/**
+	 * 모니터링 접속정보 설정파일의 경로를 반환한다.
+	 * 
+	 * @return
+	 */
+	List<String> getConnectionInfoList();
+
+	/**
+	 * 최근 사용된 접속정보 설정파일의 경로를 반환한다.
+	 * 
+	 * @return
+	 */
+	String getLastUseConnectionInfoFilePath();
+
+	/**
+	 * 모니터링 여부 설정파일을 Load 한다.
+	 * 
+	 * @param filePath
+	 */
+	void loadMonitoringInfoConfig(String filePath);
+
+	/**
+	 * 최근 사용된 모니터링 여부 Preset 설정파일의 Preset명을 반환한다.
+	 * 
+	 * @return
+	 */
+	String getLastUsePresetFileName(String filePath);
+
+	/**
+	 * 모니터링여부 Preset 설정파일을 읽어 DB 모니터링 여부 리스트를 반환한다.
+	 * 
+	 * @param presetConfigFileName
+	 * @return
+	 */
+	List<MonitoringYN> getDBMonitoringYnList(String presetConfigFileName);
+
+	/**
+	 * 모니터링여부 Preset 설정파일을 읽어 Server 모니터링 여부 리스트를 반환한다.
+	 * 
+	 * @param presetConfigFileName
+	 * @return
+	 */
+	List<MonitoringYN> getServerMonitoringYnList(String presetConfigFileName);
+
 	Map<String, String> getMonitoringPresetMap();
 
 	List<String> getMonitoringPresetFilePathList();
 
 	List<String> getMonitoringPresetNameList();
 
 	String getMonitoringPresetFilePath(String presetName);
-	
+
 	List<String> getMonitoringDBNameList();
 
 	List<String> getMonitoringServerNameList();
-	
+
 	List<JdbcConnectionInfo> getJdbcConnInfoList(List<String> dbNames);
 
 	List<JschConnectionInfo> getJschConnInfoList(List<String> serverNames);
+
+	/**
+	 * 기본값으로 설정된 FileSize 단위를 반환한다.
+	 * 
+	 * @return
+	 */
+	FileSize getDefaultFileSizeUnit();
+
+	/**
+	 * 기본값으로 설정된 반올림 자릿수를 반환한다.
+	 * 
+	 * @return
+	 */
+	RoundingDigits getDefaultRoundingDigits();
+
+	/**
+	 * 기본값으로 설정된 사용량 컬럼 UI 타입을 반환한다.
+	 * 
+	 * @return
+	 */
+	UsageUIType getDefaultUsageUIType();
 }