Set default monitoring result unit in Setting Menu (file size and rounding digits)

Author: Dokyeongyun

config/common.properties

@@ -1,3 +1,4 @@
+
 # DB Setting Contents
 db.setting.contents=host,sid,user,password,port,driver,url
 db.setting.oracle.driver.combo=thin
@@ -10,3 +11,8 @@ db.monitoring.contents=Archive Usage,TableSpace Usage,ASM Disk Usage
 
 # Server monitoring Contents
 server.monitoring.contents=OS Disk Usage,Alert Log
+
+unit.filesize=GB
+
+unit.rounding=2
+

pom.xml

@@ -80,13 +80,6 @@
 		    <version>30.1.1-jre</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/com.opencsv/opencsv -->
-		<dependency>
-		    <groupId>com.opencsv</groupId>
-		    <artifactId>opencsv</artifactId>
-		    <version>5.4</version>
-		</dependency>
-		
 		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
 		<dependency>
 		    <groupId>org.apache.poi</groupId>

src/main/java/root/applications/Application.java

@@ -14,7 +14,7 @@
 import root.core.repository.constracts.DBCheckRepository;
 import root.core.repository.constracts.ServerCheckRepository;
 import root.core.repository.implement.DBCheckRepositoryImpl;
-import root.core.repository.implement.ReportRepositoryImpl;
+import root.core.repository.implement.ReportFileRepo;
 import root.core.repository.implement.ServerCheckRepositoryImpl;
 import root.core.usecase.constracts.DBCheckUsecase;
 import root.core.usecase.constracts.ServerCheckUsecase;
@@ -36,7 +36,7 @@ public static void main(String[] args) {
     			PropertiesUtils.loadAppConfiguration(lastUsePropertiesFile, "connInfoConfig");
     			PropertiesUtils.loadAppConfiguration(propertiesFilePath);
     			PropertiesUtils.loadCombinedConfiguration();
-    			PropertiesUtils.loadAppConfiguration(".\\config\\connectioninfo\\connection.properties", "connInfoConfig");
+    			PropertiesUtils.loadAppConfiguration(".\\config\\connectioninfo\\test.properties", "connInfoConfig");
     		}catch(Exception e) {
     			System.out.println("configuration loading error\n"+e+"\n");
     			return;
@@ -50,7 +50,7 @@ public static void main(String[] args) {
     		}
 
     		if("on".equals(serverMonitoring)) {
-    			serverMonitoring();
+    		//	serverMonitoring();
     		}
 
     	} catch (Exception e) {
@@ -72,7 +72,7 @@ public static void dbMonitoring() {
 			AbstractDatabase db = new JdbcDatabase(jdbc);
 			db.init();
 			DBCheckRepository repo = new DBCheckRepositoryImpl(db);
-			DBCheckUsecase usecase = new DBCheckUsecaseImpl(repo, ReportRepositoryImpl.getInstance());
+			DBCheckUsecase usecase = new DBCheckUsecaseImpl(repo, ReportFileRepo.getInstance());
 			DBCheckBatch dbBatch = new DBCheckBatch(usecase);
 			dbBatch.startBatchArchiveUsageCheck();
 			dbBatch.startBatchTableSpaceUsageCheck();

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

@@ -19,13 +19,19 @@ public interface PropertyRepository {
 	void saveDBConnectionInfo(String filePath, Map<String, JdbcConnectionInfo> config);
 
 	void saveServerConnectionInfo(String filePath, Map<String, JschConnectionInfo> config);
+	
+	void saveCommonConfig(Map<String, Object> values);
 
 	boolean loadConnectionInfoConfig(String filePath);
 
 	boolean loadMonitoringInfoConfig(String filePath);
 
 	String[] getConnectionInfoFileNames();
 
+	String getCommonResource(String key);
+
+	int getIntegerCommonResource(String key);
+
 	String[] getCommonResources(String key);
 
 	String[] getDBMonitoringContents();

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

@@ -148,8 +148,8 @@ public List<ASMDiskUsage> checkASMDiskUsage() {
 		sb.append("     	TYPE \"Type\", ");
 		sb.append("         TOTAL_MB * 1024 * 1024 \"Tot_RAW(B)\", ");
 		sb.append("         CASE WHEN TYPE='EXTERN' THEN TOTAL_MB * 1024 * 1024 ");
-		sb.append("              WHEN TYPE='NORMAL' THEN (TOTAL_MB-REQUIRED_MIRROR_FREE_MB)/2 ");
-		sb.append("              WHEN TYPE='HIGH' THEN (TOTAL_MB-REQUIRED_MIRROR_FREE_MB)/3 ");
+		sb.append("              WHEN TYPE='NORMAL' THEN (TOTAL_MB-REQUIRED_MIRROR_FREE_MB)/2 * 1024 * 1024 ");
+		sb.append("              WHEN TYPE='HIGH' THEN (TOTAL_MB-REQUIRED_MIRROR_FREE_MB)/3 * 1024 * 1024 ");
 		sb.append(" 	    ELSE 0 END AS \"Tot_Usable(B)\", ");
 		sb.append(" 	    CASE WHEN TYPE='EXTERN' THEN COLD_USED_MB * 1024 * 1024 ");
 		sb.append(" 		 	 WHEN TYPE='NORMAL' THEN COLD_USED_MB/2 * 1024 * 1024 ");

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

@@ -191,6 +191,15 @@ public void saveServerConnectionInfo(String filePath, Map<String, JschConnection
 			log.error("[" + filePath + "] 파일 저장에 실패했습니다.");
 		}
 	}
+
+	@Override
+	public void saveCommonConfig(Map<String, Object> values) {
+		PropertiesConfiguration config = PropertiesUtils.getConfig("commonConfig");
+		for (String key : values.keySet()) {
+			config.setProperty(key, values.get(key));
+		}
+		PropertiesUtils.save("./config/common.properties", config);
+	}
 
 	/**
 	 * 접속정보 프로퍼티 파일을 Load한다.
@@ -234,7 +243,23 @@ public String[] getConnectionInfoFileNames() {
 	}
 
 	/**
-	 * DB에 연결하여 모니터링할 내용을 반환한다.
+	 * commons.properties에서 값을 읽어 반환한다.
+	 */
+	@Override
+	public String getCommonResource(String key) {
+		return PropertiesUtils.combinedConfig.getString(key);
+	}
+	
+	/**
+	 * commons.properties에서 값을 읽어 반환한다.
+	 */
+	@Override
+	public int getIntegerCommonResource(String key) {
+		return PropertiesUtils.combinedConfig.getInt(key);
+	}
+	
+	/**
+	 * commons.properties에서 값을 읽어 반환한다.
 	 */
 	@Override
 	public String[] getCommonResources(String key) {

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

@@ -51,6 +51,7 @@
 import root.javafx.CustomView.ServerConnInfoControl;
 import root.utils.AlertUtils;
 import root.utils.PropertiesUtils;
+import root.utils.UnitUtils.FileSize;
 
 public class SettingMenuController implements Initializable {
 	private static Logger logger = Logger.getLogger(SettingMenuController.class);
@@ -85,6 +86,12 @@ public class SettingMenuController implements Initializable {
 
 	@FXML
 	JFXComboBox<String> monitoringPresetComboBox; // 모니터링여부 설정 Preset ComboBox
+	
+	@FXML
+	JFXComboBox<FileSize> fileSizeCB;
+	
+	@FXML
+	JFXComboBox<Integer> roundingDigitsCB;
 
 	/* Common Data */
 	String[] dbMonitorings;
@@ -117,6 +124,26 @@ public void initialize(URL location, ResourceBundle resources) {
 			setVisible(noConnInfoConfigAP, true);
 			setVisible(noMonitoringConfigAP, true);
 		}
+		
+		this.fileSizeCB.getItems().addAll(FileSize.values());
+		FileSize fileSize = FileSize.valueOf(propertyRepository.getCommonResource("unit.filesize"));
+		this.fileSizeCB.getSelectionModel().select(fileSize);
+		
+		fileSizeCB.getSelectionModel().selectedItemProperty().addListener((options, oldValue, newValue) -> {
+			Map<String, Object> map = new HashMap<>();
+			map.put("unit.filesize", newValue);
+			propertyRepository.saveCommonConfig(map);
+		});
+		
+		this.roundingDigitsCB.getItems().addAll(List.of(1, 2, 3, 4, 5));
+		int roundingDigits = propertyRepository.getIntegerCommonResource("unit.rounding");
+		this.roundingDigitsCB.getSelectionModel().select(Integer.valueOf(roundingDigits));
+		
+		roundingDigitsCB.getSelectionModel().selectedItemProperty().addListener((options, oldValue, newValue) -> {
+			Map<String, Object> map = new HashMap<>();
+			map.put("unit.rounding", newValue);
+			propertyRepository.saveCommonConfig(map);
+		});
 	}
 
 	/**

src/main/java/root/javafx/CustomView/MonitoringAnchorPane.java

@@ -24,6 +24,8 @@
 import javafx.scene.layout.AnchorPane;
 import root.core.domain.ArchiveUsage;
 import root.core.domain.MonitoringResult;
+import root.core.repository.constracts.PropertyRepository;
+import root.core.repository.implement.PropertyRepositoryImpl;
 import root.core.repository.implement.ReportFileRepo;
 import root.core.usecase.constracts.ReportUsecase;
 import root.core.usecase.implement.ReportUsecaseImpl;
@@ -35,6 +37,8 @@ public class MonitoringAnchorPane<T extends MonitoringResult> extends AnchorPane
 
 	private ReportUsecase reportUsecase;
 
+	private PropertyRepository propertyRepo = PropertyRepositoryImpl.getInstance();
+	
 	@FXML
 	Label label;
 
@@ -79,10 +83,12 @@ public MonitoringAnchorPane(Class<T> clazz) {
 			this.inquiryDatePicker.setValue(LocalDate.now().minusDays(1));
 
 			this.unitComboBox.getItems().addAll(FileSize.values());
-			this.unitComboBox.getSelectionModel().select(FileSize.GB);
+			FileSize defaultFileSizeUnit = FileSize.valueOf(propertyRepo.getCommonResource("unit.filesize"));
+			this.unitComboBox.getSelectionModel().select(defaultFileSizeUnit);
 
 			this.roundComboBox.getItems().addAll(List.of(1, 2, 3, 4, 5));
-			this.roundComboBox.getSelectionModel().select(Integer.valueOf(2));
+			int defaultRoundingDigits = propertyRepo.getIntegerCommonResource("unit.rounding");
+			this.roundComboBox.getSelectionModel().select(Integer.valueOf(defaultRoundingDigits));
 		} catch (IOException e) {
 		}
 	}

src/main/java/root/utils/DBManageExcel.java

@@ -26,7 +26,7 @@ public static void createMonthlyReportInExcel(int year, int month) {
 		OutputStream fos;
 		try {
 			String filePath = "./report/";
-			String fileName = "DB관리대장_종합_"+year+"."+month;
+			String fileName = "DB관리대장_종합_"+year+"."+DateUtils.getTwoDigitDate(month);
 			String extension = ".xlsx";
 			fos = new FileOutputStream(filePath + fileName + extension);