Skip to content

Commit f44aa35

Browse files
DokyeongyunDokyeongyun
authored
Merge pull request #150 from Dokyeongyun/ft-220206-changeReportFileFormat
Ft 220206 change report file format
2 parents 7a04b14 + d96886b commit f44aa35

20 files changed

+894
-256
lines changed

‎src/main/java/root/core/domain/ASMDiskUsage.java‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,42 @@
11
package root.core.domain;
22

3-
import lombok.AllArgsConstructor;
3+
import java.util.Date;
4+
45
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
57
import lombok.NoArgsConstructor;
68

7-
@AllArgsConstructor
89
@NoArgsConstructor
10+
@EqualsAndHashCode(callSuper = false)
911
@Data
10-
public class ASMDiskUsage {
12+
public class ASMDiskUsage extends MonitoringResult {
13+
14+
public ASMDiskUsage(Date monitoringDate, String asmDiskGroupName, String asmDiskGroupType, double totalRawSpace,
15+
double totalFreeSpace, double freeSpace, double usedSpace, double usedPercent, String resultMsg) {
16+
super(monitoringDate);
17+
this.asmDiskGroupName = asmDiskGroupName;
18+
this.asmDiskGroupType = asmDiskGroupType;
19+
this.totalRawSpace = totalRawSpace;
20+
this.totalFreeSpace = totalFreeSpace;
21+
this.freeSpace = freeSpace;
22+
this.usedSpace = usedSpace;
23+
this.usedPercent = usedPercent;
24+
this.resultMsg = resultMsg;
25+
}
26+
27+
public ASMDiskUsage(String monitoringDate, String monitoringTime, String asmDiskGroupName, String asmDiskGroupType,
28+
double totalRawSpace, double totalFreeSpace, double freeSpace, double usedSpace, double usedPercent,
29+
String resultMsg) {
30+
super(monitoringDate, monitoringTime);
31+
this.asmDiskGroupName = asmDiskGroupName;
32+
this.asmDiskGroupType = asmDiskGroupType;
33+
this.totalRawSpace = totalRawSpace;
34+
this.totalFreeSpace = totalFreeSpace;
35+
this.freeSpace = freeSpace;
36+
this.usedSpace = usedSpace;
37+
this.usedPercent = usedPercent;
38+
this.resultMsg = resultMsg;
39+
}
1140

1241
private String asmDiskGroupName;
1342

‎src/main/java/root/core/domain/ArchiveUsage.java‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,42 @@
11
package root.core.domain;
22

3-
import com.opencsv.bean.CsvBindByName;
3+
import java.util.Date;
44

5-
import lombok.AllArgsConstructor;
65
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
77
import lombok.NoArgsConstructor;
88

9-
@AllArgsConstructor
109
@NoArgsConstructor
10+
@EqualsAndHashCode(callSuper = false)
1111
@Data
12-
public class ArchiveUsage {
12+
public class ArchiveUsage extends MonitoringResult {
13+
14+
public ArchiveUsage(Date monitoringDate, String archiveName, int numberOfFiles, double totalSpace,
15+
double reclaimableSpace, double usedSpace, double usedPercent, String dnt) {
16+
super(monitoringDate);
17+
this.archiveName = archiveName;
18+
this.numberOfFiles = numberOfFiles;
19+
this.totalSpace = totalSpace;
20+
this.reclaimableSpace = reclaimableSpace;
21+
this.usedSpace = usedSpace;
22+
this.usedPercent = usedPercent;
23+
this.dnt = dnt;
24+
}
25+
26+
public ArchiveUsage(String monitoringDate, String monitoringTime, String archiveName, int numberOfFiles,
27+
double totalSpace, double reclaimableSpace, double usedSpace, double usedPercent, String dnt) {
28+
super(monitoringDate, monitoringTime);
29+
this.archiveName = archiveName;
30+
this.numberOfFiles = numberOfFiles;
31+
this.totalSpace = totalSpace;
32+
this.reclaimableSpace = reclaimableSpace;
33+
this.usedSpace = usedSpace;
34+
this.usedPercent = usedPercent;
35+
this.dnt = dnt;
36+
}
1337

14-
@CsvBindByName(column = "NAME")
1538
private String archiveName;
1639

17-
@CsvBindByName(column = "NumberOfFiles")
1840
private int numberOfFiles;
1941

2042
private double totalSpace;

‎src/main/java/root/core/domain/MonitoringResult.java‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
11
package root.core.domain;
22

3-
import java.text.SimpleDateFormat;
43
import java.util.Date;
5-
import java.util.List;
64

75
import lombok.AllArgsConstructor;
86
import lombok.Data;
7+
import lombok.NoArgsConstructor;
98
import root.utils.DateUtils;
109

10+
@NoArgsConstructor
1111
@AllArgsConstructor
1212
@Data
13-
public class MonitoringResult<T> {
14-
private Date monitoringDate;
15-
private List<T> monitoringResults;
13+
public class MonitoringResult {
1614

17-
public MonitoringResult(List<T> monitoringResults) {
18-
this.monitoringDate = new Date();
19-
this.monitoringResults = monitoringResults;
20-
}
21-
22-
public String getMonitoringDay() {
23-
if(monitoringDate == null) {
24-
return null;
25-
}
26-
27-
return DateUtils.format(monitoringDate, "yyyyMMdd");
28-
}
29-
30-
public String getMonitoringTime() {
31-
if(monitoringDate == null) {
32-
return null;
33-
}
15+
private String monitoringDate;
16+
17+
private String monitoringTime;
3418

35-
return DateUtils.format(monitoringDate, "HHmmss");
19+
public MonitoringResult(Date date) {
20+
this.monitoringDate = DateUtils.format(date, "yyyyMMdd");
21+
this.monitoringTime = DateUtils.format(date, "HHmmss");
3622
}
37-
}
23+
}

‎src/main/java/root/core/domain/OSDiskUsage.java‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
package root.core.domain;
22

3-
import lombok.AllArgsConstructor;
43
import lombok.Data;
4+
import lombok.EqualsAndHashCode;
55
import lombok.NoArgsConstructor;
66

7-
@AllArgsConstructor
87
@NoArgsConstructor
8+
@EqualsAndHashCode(callSuper = false)
99
@Data
10-
public class OSDiskUsage {
10+
public class OSDiskUsage extends MonitoringResult {
11+
12+
public OSDiskUsage(String monitoringDate, String monitoringTime, String fileSystem, String mountedOn,
13+
double totalSpace, double freeSpace, double usedSpace, double usedPercent) {
14+
super(monitoringDate, monitoringTime);
15+
this.fileSystem = fileSystem;
16+
this.mountedOn = mountedOn;
17+
this.totalSpace = totalSpace;
18+
this.freeSpace = freeSpace;
19+
this.usedSpace = usedSpace;
20+
this.usedPercent = usedPercent;
21+
}
1122

1223
private String fileSystem;
1324

‎src/main/java/root/core/domain/TableSpaceUsage.java‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,35 @@
11
package root.core.domain;
22

3-
import lombok.AllArgsConstructor;
3+
import java.util.Date;
4+
45
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
57
import lombok.NoArgsConstructor;
68

7-
@AllArgsConstructor
89
@NoArgsConstructor
10+
@EqualsAndHashCode(callSuper = false)
911
@Data
10-
public class TableSpaceUsage {
12+
public class TableSpaceUsage extends MonitoringResult {
13+
14+
public TableSpaceUsage(Date monitoringDate, String tableSpaceName, double totalSpace,
15+
double freeSpace, double usedSpace, double usedPercent) {
16+
super(monitoringDate);
17+
this.tableSpaceName = tableSpaceName;
18+
this.totalSpace = totalSpace;
19+
this.freeSpace = freeSpace;
20+
this.usedSpace = usedSpace;
21+
this.usedPercent = usedPercent;
22+
}
23+
24+
public TableSpaceUsage(String monitoringDate, String monitoringTime, String tableSpaceName, double totalSpace,
25+
double freeSpace, double usedSpace, double usedPercent) {
26+
super(monitoringDate, monitoringTime);
27+
this.tableSpaceName = tableSpaceName;
28+
this.totalSpace = totalSpace;
29+
this.freeSpace = freeSpace;
30+
this.usedSpace = usedSpace;
31+
this.usedPercent = usedPercent;
32+
}
1133

1234
private String tableSpaceName;
1335

‎src/main/java/root/core/repository/constracts/DBCheckRepository.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
package root.core.repository.constracts;
22

3+
import java.util.List;
4+
35
import root.core.domain.ASMDiskUsage;
46
import root.core.domain.ArchiveUsage;
5-
import root.core.domain.MonitoringResult;
67
import root.core.domain.TableSpaceUsage;
78

89
public interface DBCheckRepository {
910
String getDBName();
10-
11+
1112
Object getTran();
13+
1214
void endTran(Object conn);
13-
14-
MonitoringResult<ArchiveUsage> checkArchiveUsage();
15-
MonitoringResult<TableSpaceUsage> checkTableSpaceUsage();
16-
MonitoringResult<ASMDiskUsage> checkASMDiskUsage();
15+
16+
List<ArchiveUsage> checkArchiveUsage();
17+
18+
List<TableSpaceUsage> checkTableSpaceUsage();
19+
20+
List<ASMDiskUsage> checkASMDiskUsage();
1721
}

‎src/main/java/root/core/repository/constracts/ReportRepository.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
package root.core.repository.constracts;
22

3-
import root.core.domain.MonitoringResult;
3+
import java.io.File;
4+
import java.util.List;
45

56
public interface ReportRepository {
67

7-
void writeReportFile(String filePath, String fileName, String fileExtension, MonitoringResult<?> monitoringResult);
8+
<T> void writeReportFile(String filePath, String fileName, String fileExtension, List<T> monitoringResult,
9+
Class<T> clazz);
10+
11+
List<String> getReportHeaders(File reportFile);
12+
13+
String getReportContentsInCsv(File reportFile);
814
}

‎src/main/java/root/core/repository/constracts/ServerCheckRepository.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package root.core.repository.constracts;
22

3+
import java.util.List;
4+
35
import com.jcraft.jsch.Session;
46

57
import root.core.domain.AlertLog;
68
import root.core.domain.AlertLogCommand;
79
import root.core.domain.AlertLogCommandPeriod;
8-
import root.core.domain.MonitoringResult;
910
import root.core.domain.OSDiskUsage;
1011

1112
public interface ServerCheckRepository {
@@ -23,5 +24,5 @@ public interface ServerCheckRepository {
2324

2425
AlertLog checkAlertLogDuringPeriod(AlertLogCommandPeriod alc);
2526

26-
MonitoringResult<OSDiskUsage> checkOSDiskUsage();
27+
List<OSDiskUsage> checkOSDiskUsage();
2728
}

0 commit comments

Comments
 (0)