diff --git a/src/main/java/com/kamco/cd/training/model/dto/ModelTrainDetailDto.java b/src/main/java/com/kamco/cd/training/model/dto/ModelTrainDetailDto.java index da17594..41ec17e 100644 --- a/src/main/java/com/kamco/cd/training/model/dto/ModelTrainDetailDto.java +++ b/src/main/java/com/kamco/cd/training/model/dto/ModelTrainDetailDto.java @@ -142,6 +142,9 @@ public class ModelTrainDetailDto { @JsonInclude(JsonInclude.Include.NON_NULL) private Long landCoverCnt; + @JsonInclude(JsonInclude.Include.NON_NULL) + private Long solarPanelCnt; + public MappingDataset( Long modelId, Long datasetId, @@ -152,7 +155,8 @@ public class ModelTrainDetailDto { Long buildingCnt, Long containerCnt, Long wasteCnt, - Long landCoverCnt) { + Long landCoverCnt, + Long solarPanelCnt) { this.modelId = modelId; this.datasetId = datasetId; this.dataType = dataType; @@ -163,6 +167,7 @@ public class ModelTrainDetailDto { this.containerCnt = containerCnt; this.wasteCnt = wasteCnt; this.landCoverCnt = landCoverCnt; + this.solarPanelCnt = solarPanelCnt; this.dataTypeName = getDataTypeName(this.dataType); } diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDetailRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDetailRepositoryImpl.java index abe7f81..34cef08 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDetailRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDetailRepositoryImpl.java @@ -157,7 +157,8 @@ public class ModelDetailRepositoryImpl implements ModelDetailRepositoryCustom { modelDatasetEntity.buildingCnt, modelDatasetEntity.containerCnt, modelDatasetEntity.wasteCnt, - modelDatasetEntity.landCoverCnt)) + modelDatasetEntity.landCoverCnt, + modelDatasetEntity.solarCnt)) .from(modelMasterEntity) .innerJoin(modelDatasetEntity) .on(modelMasterEntity.id.eq(modelDatasetEntity.model.id))