Merge pull request '데이터셋 entity 수정, 데이터셋 저장 수정' (#183) from feat/training_260324 into develop

Reviewed-on: #183

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

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());

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();