From 5546e8ef89bf9910afec51843af0f96b9f0ebd9f Mon Sep 17 00:00:00 2001 From: teddy Date: Thu, 2 Apr 2026 18:42:25 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EC=85=8B=20entity?= =?UTF-8?q?=20=EC=88=98=EC=A0=95,=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EC=85=8B?= =?UTF-8?q?=20=EC=A0=80=EC=9E=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kamco/cd/training/model/dto/ModelTrainMngDto.java | 9 +++++---- .../training/postgres/core/ModelTrainMngCoreService.java | 2 ++ .../cd/training/postgres/entity/ModelDatasetEntity.java | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/kamco/cd/training/model/dto/ModelTrainMngDto.java b/src/main/java/com/kamco/cd/training/model/dto/ModelTrainMngDto.java index 42bc485..4bfd8bf 100644 --- a/src/main/java/com/kamco/cd/training/model/dto/ModelTrainMngDto.java +++ b/src/main/java/com/kamco/cd/training/model/dto/ModelTrainMngDto.java @@ -139,7 +139,7 @@ public class ModelTrainMngDto { public static class AddReq { @NotNull - @Schema(description = "모델 종류 G1, G2, G3", example = "G1") + @Schema(description = "모델 종류 G1, G2, G3, G4", example = "G1") private String modelNo; @NotNull @@ -197,10 +197,11 @@ public class ModelTrainMngDto { @Schema(description = "폐기물", example = "0") private Long wasteCnt; - @Schema( - description = "도로, 비닐하우스, 밭, 과수원, 초지, 숲, 물, 모재/자갈, 토분(무덤), 일반토지, 태양광, 기타", - example = "0") + @Schema(description = "도로, 비닐하우스, 밭, 과수원, 초지, 숲, 물, 모재/자갈, 토분(무덤), 일반토지, 기타", example = "0") private Long LandCoverCnt; + + @Schema(description = "태양광", example = "0") + private Long solar; } @Getter diff --git a/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java index 3dc9b25..66fc838 100644 --- a/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java +++ b/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java @@ -154,6 +154,8 @@ public class ModelTrainMngCoreService { datasetEntity.setWasteCnt(dataset.getSummary().getWasteCnt()); } else if (addReq.getModelNo().equals(ModelType.G3.getId())) { datasetEntity.setLandCoverCnt(dataset.getSummary().getLandCoverCnt()); + } else if (addReq.getModelNo().equals(ModelType.G4.getId())) { + datasetEntity.setSolarCnt(dataset.getSummary().getSolar()); } datasetEntity.setCreatedUid(userUtil.getId()); diff --git a/src/main/java/com/kamco/cd/training/postgres/entity/ModelDatasetEntity.java b/src/main/java/com/kamco/cd/training/postgres/entity/ModelDatasetEntity.java index 0385a72..526f04a 100644 --- a/src/main/java/com/kamco/cd/training/postgres/entity/ModelDatasetEntity.java +++ b/src/main/java/com/kamco/cd/training/postgres/entity/ModelDatasetEntity.java @@ -43,6 +43,9 @@ public class ModelDatasetEntity { @Column(name = "land_cover_cnt") private Long landCoverCnt; + @Column(name = "solar_cnt") + private Long solarCnt; + @ColumnDefault("now()") @Column(name = "created_dttm") private ZonedDateTime createdDttm = ZonedDateTime.now();