전이학습 상세 수정
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package com.kamco.cd.training.dataset.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.kamco.cd.training.common.enums.LearnDataRegister;
|
||||
import com.kamco.cd.training.common.enums.LearnDataType;
|
||||
import com.kamco.cd.training.common.enums.ModelType;
|
||||
@@ -234,7 +233,6 @@ public class DatasetDto {
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
public static class SelectDataSet {
|
||||
|
||||
private String modelNo; // G1, G2, G3 모델 타입
|
||||
@@ -317,6 +315,183 @@ public class DatasetDto {
|
||||
}
|
||||
}
|
||||
|
||||
@Schema(name = "SelectTransferDataSet", description = "전이학습 데이터셋 선택 리스트")
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
public static class SelectTransferDataSet {
|
||||
|
||||
private String modelNo; // G1, G2, G3 모델 타입
|
||||
private Long datasetId;
|
||||
private UUID uuid;
|
||||
private String dataType;
|
||||
private String title;
|
||||
private Long roundNo;
|
||||
private Integer compareYyyy;
|
||||
private Integer targetYyyy;
|
||||
private String memo;
|
||||
@JsonIgnore private Long classCount;
|
||||
private Integer buildingCnt;
|
||||
private Integer containerCnt;
|
||||
private String dataTypeName;
|
||||
|
||||
private Long wasteCnt;
|
||||
private Long landCoverCnt;
|
||||
|
||||
private String beforeModelNo; // G1, G2, G3 모델 타입
|
||||
private Long beforeDatasetId;
|
||||
private UUID beforeUuid;
|
||||
private String beforeDataType;
|
||||
private String beforeTitle;
|
||||
private Long beforeRoundNo;
|
||||
private Integer beforeCompareYyyy;
|
||||
private Integer beforeTargetYyyy;
|
||||
private String beforeMemo;
|
||||
|
||||
@JsonIgnore private Long beforeClassCount;
|
||||
|
||||
private Integer beforeBuildingCnt;
|
||||
private Integer beforeContainerCnt;
|
||||
private String beforeDataTypeName;
|
||||
|
||||
private Long beforeWasteCnt;
|
||||
private Long beforeLandCoverCnt;
|
||||
|
||||
public SelectTransferDataSet(
|
||||
// 현재
|
||||
String modelNo,
|
||||
Long datasetId,
|
||||
UUID uuid,
|
||||
String dataType,
|
||||
String title,
|
||||
Long roundNo,
|
||||
Integer compareYyyy,
|
||||
Integer targetYyyy,
|
||||
String memo,
|
||||
Long classCount,
|
||||
|
||||
// 이전(before)
|
||||
String beforeModelNo,
|
||||
Long beforeDatasetId,
|
||||
UUID beforeUuid,
|
||||
String beforeDataType,
|
||||
String beforeTitle,
|
||||
Long beforeRoundNo,
|
||||
Integer beforeCompareYyyy,
|
||||
Integer beforeTargetYyyy,
|
||||
String beforeMemo,
|
||||
Long beforeClassCount) {
|
||||
// 현재
|
||||
this.modelNo = modelNo;
|
||||
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.classCount = classCount;
|
||||
|
||||
if (modelNo != null && modelNo.equals(ModelType.G2.getId())) {
|
||||
this.wasteCnt = classCount;
|
||||
} else if (modelNo != null && modelNo.equals(ModelType.G3.getId())) {
|
||||
this.landCoverCnt = classCount;
|
||||
}
|
||||
|
||||
// 이전(before)
|
||||
this.beforeModelNo = beforeModelNo;
|
||||
this.beforeDatasetId = beforeDatasetId;
|
||||
this.beforeUuid = beforeUuid;
|
||||
this.beforeDataType = beforeDataType;
|
||||
this.beforeDataTypeName = getDataTypeName(beforeDataType);
|
||||
this.beforeTitle = beforeTitle;
|
||||
this.beforeRoundNo = beforeRoundNo;
|
||||
this.beforeCompareYyyy = beforeCompareYyyy;
|
||||
this.beforeTargetYyyy = beforeTargetYyyy;
|
||||
this.beforeMemo = beforeMemo;
|
||||
this.beforeClassCount = beforeClassCount;
|
||||
|
||||
if (beforeModelNo != null && beforeModelNo.equals(ModelType.G2.getId())) {
|
||||
this.beforeWasteCnt = beforeClassCount;
|
||||
} else if (beforeModelNo != null && beforeModelNo.equals(ModelType.G3.getId())) {
|
||||
this.beforeLandCoverCnt = beforeClassCount;
|
||||
}
|
||||
}
|
||||
|
||||
public SelectTransferDataSet(
|
||||
// 현재
|
||||
String modelNo,
|
||||
Long datasetId,
|
||||
UUID uuid,
|
||||
String dataType,
|
||||
String title,
|
||||
Long roundNo,
|
||||
Integer compareYyyy,
|
||||
Integer targetYyyy,
|
||||
String memo,
|
||||
Integer buildingCnt,
|
||||
Integer containerCnt,
|
||||
|
||||
// 이전(before)
|
||||
String beforeModelNo,
|
||||
Long beforeDatasetId,
|
||||
UUID beforeUuid,
|
||||
String beforeDataType,
|
||||
String beforeTitle,
|
||||
Long beforeRoundNo,
|
||||
Integer beforeCompareYyyy,
|
||||
Integer beforeTargetYyyy,
|
||||
String beforeMemo,
|
||||
Integer beforeBuildingCnt,
|
||||
Integer beforeContainerCnt) {
|
||||
// 현재
|
||||
this.modelNo = modelNo;
|
||||
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.buildingCnt = buildingCnt;
|
||||
this.containerCnt = containerCnt;
|
||||
|
||||
// 이전(before)
|
||||
this.beforeModelNo = beforeModelNo;
|
||||
this.beforeDatasetId = beforeDatasetId;
|
||||
this.beforeUuid = beforeUuid;
|
||||
this.beforeDataType = beforeDataType;
|
||||
this.beforeDataTypeName = getDataTypeName(beforeDataType);
|
||||
this.beforeTitle = beforeTitle;
|
||||
this.beforeRoundNo = beforeRoundNo;
|
||||
this.beforeCompareYyyy = beforeCompareYyyy;
|
||||
this.beforeTargetYyyy = beforeTargetYyyy;
|
||||
this.beforeMemo = beforeMemo;
|
||||
this.beforeBuildingCnt = beforeBuildingCnt;
|
||||
this.beforeContainerCnt = beforeContainerCnt;
|
||||
}
|
||||
|
||||
public String getDataTypeName(String groupTitleCd) {
|
||||
LearnDataType type = Enums.fromId(LearnDataType.class, groupTitleCd);
|
||||
return type == null ? null : type.getText();
|
||||
}
|
||||
|
||||
public String getYear() {
|
||||
return this.compareYyyy + "-" + this.targetYyyy;
|
||||
}
|
||||
|
||||
public String getBeforeYear() {
|
||||
if (this.beforeCompareYyyy == null || this.beforeTargetYyyy == null) {
|
||||
return null;
|
||||
}
|
||||
return this.beforeCompareYyyy + "-" + this.beforeTargetYyyy;
|
||||
}
|
||||
}
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
|
||||
Reference in New Issue
Block a user