데이터셋 entity 수정, 데이터셋 저장 수정 #183
@@ -139,7 +139,7 @@ public class ModelTrainMngDto {
|
|||||||
public static class AddReq {
|
public static class AddReq {
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@Schema(description = "모델 종류 G1, G2, G3", example = "G1")
|
@Schema(description = "모델 종류 G1, G2, G3, G4", example = "G1")
|
||||||
private String modelNo;
|
private String modelNo;
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@@ -197,10 +197,11 @@ public class ModelTrainMngDto {
|
|||||||
@Schema(description = "폐기물", example = "0")
|
@Schema(description = "폐기물", example = "0")
|
||||||
private Long wasteCnt;
|
private Long wasteCnt;
|
||||||
|
|
||||||
@Schema(
|
@Schema(description = "도로, 비닐하우스, 밭, 과수원, 초지, 숲, 물, 모재/자갈, 토분(무덤), 일반토지, 기타", example = "0")
|
||||||
description = "도로, 비닐하우스, 밭, 과수원, 초지, 숲, 물, 모재/자갈, 토분(무덤), 일반토지, 태양광, 기타",
|
|
||||||
example = "0")
|
|
||||||
private Long LandCoverCnt;
|
private Long LandCoverCnt;
|
||||||
|
|
||||||
|
@Schema(description = "태양광", example = "0")
|
||||||
|
private Long solar;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
|
|||||||
@@ -154,6 +154,8 @@ public class ModelTrainMngCoreService {
|
|||||||
datasetEntity.setWasteCnt(dataset.getSummary().getWasteCnt());
|
datasetEntity.setWasteCnt(dataset.getSummary().getWasteCnt());
|
||||||
} else if (addReq.getModelNo().equals(ModelType.G3.getId())) {
|
} else if (addReq.getModelNo().equals(ModelType.G3.getId())) {
|
||||||
datasetEntity.setLandCoverCnt(dataset.getSummary().getLandCoverCnt());
|
datasetEntity.setLandCoverCnt(dataset.getSummary().getLandCoverCnt());
|
||||||
|
} else if (addReq.getModelNo().equals(ModelType.G4.getId())) {
|
||||||
|
datasetEntity.setSolarCnt(dataset.getSummary().getSolar());
|
||||||
}
|
}
|
||||||
|
|
||||||
datasetEntity.setCreatedUid(userUtil.getId());
|
datasetEntity.setCreatedUid(userUtil.getId());
|
||||||
|
|||||||
@@ -43,6 +43,9 @@ public class ModelDatasetEntity {
|
|||||||
@Column(name = "land_cover_cnt")
|
@Column(name = "land_cover_cnt")
|
||||||
private Long landCoverCnt;
|
private Long landCoverCnt;
|
||||||
|
|
||||||
|
@Column(name = "solar_cnt")
|
||||||
|
private Long solarCnt;
|
||||||
|
|
||||||
@ColumnDefault("now()")
|
@ColumnDefault("now()")
|
||||||
@Column(name = "created_dttm")
|
@Column(name = "created_dttm")
|
||||||
private ZonedDateTime createdDttm = ZonedDateTime.now();
|
private ZonedDateTime createdDttm = ZonedDateTime.now();
|
||||||
|
|||||||
Reference in New Issue
Block a user