데이터셋 조회 class count integer -> Long 로 변경
This commit is contained in:
@@ -248,13 +248,13 @@ public class DatasetDto {
|
||||
private Integer targetYyyy;
|
||||
private String memo;
|
||||
@JsonIgnore private Long classCount;
|
||||
private Integer buildingCnt;
|
||||
private Integer containerCnt;
|
||||
private Long buildingCnt;
|
||||
private Long containerCnt;
|
||||
private String dataTypeName;
|
||||
|
||||
private Long wasteCnt;
|
||||
private Long landCoverCnt;
|
||||
private Integer solarPanelCnt;
|
||||
private Long solarPanelCnt;
|
||||
|
||||
public SelectDataSet(
|
||||
String modelNo,
|
||||
@@ -267,6 +267,7 @@ public class DatasetDto {
|
||||
Integer targetYyyy,
|
||||
String memo,
|
||||
Long classCount) {
|
||||
this.modelNo = modelNo;
|
||||
this.datasetId = datasetId;
|
||||
this.uuid = uuid;
|
||||
this.dataType = dataType;
|
||||
@@ -281,6 +282,8 @@ public class DatasetDto {
|
||||
this.wasteCnt = classCount;
|
||||
} else if (modelNo.equals(ModelType.G3.getId())) {
|
||||
this.landCoverCnt = classCount;
|
||||
} else if (modelNo.equals(ModelType.G4.getId())) {
|
||||
this.solarPanelCnt = classCount;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -294,8 +297,9 @@ public class DatasetDto {
|
||||
Integer compareYyyy,
|
||||
Integer targetYyyy,
|
||||
String memo,
|
||||
Integer buildingCnt,
|
||||
Integer containerCnt) {
|
||||
Long buildingCnt,
|
||||
Long containerCnt) {
|
||||
this.modelNo = modelNo;
|
||||
this.datasetId = datasetId;
|
||||
this.uuid = uuid;
|
||||
this.dataType = dataType;
|
||||
@@ -309,29 +313,6 @@ public class DatasetDto {
|
||||
this.containerCnt = containerCnt;
|
||||
}
|
||||
|
||||
public SelectDataSet(
|
||||
String modelNo,
|
||||
Long datasetId,
|
||||
UUID uuid,
|
||||
String dataType,
|
||||
String title,
|
||||
Long roundNo,
|
||||
Integer compareYyyy,
|
||||
Integer targetYyyy,
|
||||
String memo,
|
||||
Integer solarPanelCnt) {
|
||||
this.datasetId = datasetId;
|
||||
this.uuid = uuid;
|
||||
this.dataType = dataType;
|
||||
this.dataTypeName = getDataTypeName(dataType);
|
||||
this.title = title;
|
||||
this.roundNo = roundNo;
|
||||
this.compareYyyy = compareYyyy;
|
||||
this.targetYyyy = targetYyyy;
|
||||
this.memo = memo;
|
||||
this.solarPanelCnt = solarPanelCnt;
|
||||
}
|
||||
|
||||
public String getDataTypeName(String groupTitleCd) {
|
||||
LearnDataType type = Enums.fromId(LearnDataType.class, groupTitleCd);
|
||||
return type == null ? null : type.getText();
|
||||
|
||||
Reference in New Issue
Block a user