Merge pull request 'feat/infer_dev_260107' (#233) from feat/infer_dev_260107 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/233

src/main/java/com/kamco/cd/kamcoback/postgres/core/TrainingDataLabelCoreService.java

@@ -4,7 +4,7 @@ import com.kamco.cd.kamcoback.postgres.repository.trainingdata.TrainingDataLabel
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.DefaultPaging;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.DetailRes;
-import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.GeoFeatureRequest.Properties;
+import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelFeatureRequest.LabelProperties;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelingGeometryInfo;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelingListDto;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.SummaryRes;
@@ -42,7 +42,7 @@ public class TrainingDataLabelCoreService {
   }
 
   public void updateLabelingPolygonClass(
-      Long inferenceGeomUid, Geometry geometry, Properties properties, String status) {
+      Long inferenceGeomUid, Geometry geometry, LabelProperties properties, String status) {
     trainingDataLabelRepository.updateLabelingPolygonClass(
         inferenceGeomUid, geometry, properties, status);
   }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryCustom.java

@@ -3,7 +3,7 @@ package com.kamco.cd.kamcoback.postgres.repository.trainingdata;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.DefaultPaging;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.DetailRes;
-import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.GeoFeatureRequest.Properties;
+import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelFeatureRequest.LabelProperties;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelingGeometryInfo;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelingListDto;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.SummaryRes;
@@ -25,7 +25,7 @@ public interface TrainingDataLabelRepositoryCustom {
   void updateLabelingSkipState(Long inferenceGeomUid, String status);
 
   void updateLabelingPolygonClass(
-      Long inferenceGeomUid, Geometry geometry, Properties properties, String status);
+      Long inferenceGeomUid, Geometry geometry, LabelProperties properties, String status);
 
   SummaryRes getSummary(String userId);
 

src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java

@@ -11,15 +11,16 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceGeomEntity;
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnDataGeomEntity;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.ChangeDetectionInfo;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.ClassificationInfo;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.DefaultPaging;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.DetailRes;
-import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.GeoFeatureRequest.Properties;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.InferenceDataGeometry;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.InferenceDataGeometry.InferenceProperties;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.InspectionResultInfo;
+import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelFeatureRequest.LabelProperties;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelingGeometryInfo;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelingListDto;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LearnDataGeometry;
@@ -204,7 +205,7 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
 
   @Override
   public void updateLabelingPolygonClass(
-      Long inferenceGeomUid, Geometry geometry, Properties properties, String status) {
+      Long inferenceGeomUid, Geometry geometry, LabelProperties properties, String status) {
     // inference_geom 테이블에 상태 업데이트
     queryFactory
         .update(mapSheetAnalDataInferenceGeomEntity)
@@ -225,6 +226,13 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
           "MapSheetAnalDataInferenceGeomEntity not found for analUid: ");
     }
 
+    MapSheetLearnDataGeomEntity learnEntity =
+        queryFactory
+            .selectFrom(mapSheetLearnDataGeomEntity)
+            .where(mapSheetLearnDataGeomEntity.geoUid.eq(inferenceGeomUid))
+            .fetchOne();
+
+    if (Objects.isNull(learnEntity)) {
       // learn_data_geom 에 insert
       queryFactory
           .insert(mapSheetLearnDataGeomEntity)
@@ -247,6 +255,16 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
               ZonedDateTime.now(),
               ZonedDateTime.now())
           .execute();
+    } else {
+      queryFactory
+          .update(mapSheetLearnDataGeomEntity)
+          .set(mapSheetLearnDataGeomEntity.geom, geometry)
+          .set(mapSheetLearnDataGeomEntity.classAfterCd, properties.getAfterClass().toLowerCase())
+          .set(mapSheetLearnDataGeomEntity.classBeforeCd, properties.getBeforeClass().toLowerCase())
+          .set(mapSheetLearnDataGeomEntity.modifiedDate, ZonedDateTime.now())
+          .where(mapSheetLearnDataGeomEntity.geoUid.eq(inferenceGeomUid))
+          .execute();
+    }
   }
 
   @Override

src/main/java/com/kamco/cd/kamcoback/trainingdata/TrainingDataLabelApiController.java

@@ -89,7 +89,7 @@ public class TrainingDataLabelApiController {
       })
   @PostMapping
   public ApiResponseDto<ResponseObj> saveLabelingFeature(
-      @RequestBody TrainingDataLabelDto.GeoFeatureRequest request) {
+      @RequestBody TrainingDataLabelDto.LabelFeatureRequest request) {
     return ApiResponseDto.okObject(trainingDataLabelService.saveLabelingFeature(request));
   }
 

src/main/java/com/kamco/cd/kamcoback/trainingdata/TrainingDataReviewApiController.java

@@ -49,7 +49,7 @@ public class TrainingDataReviewApiController {
   public ApiResponseDto<Page<ReviewListDto>> findReviewAssignedList(
       @RequestParam(defaultValue = "0") int page,
       @RequestParam(defaultValue = "20") int size,
-      @RequestParam(defaultValue = "01022223333") String userId) {
+      @RequestParam(defaultValue = "K20251212001") String userId) {
     TrainingDataReviewDto.searchReq searchReq = new TrainingDataReviewDto.searchReq(page, size, "");
     return ApiResponseDto.ok(trainingDataReviewService.findReviewAssignedList(searchReq, userId));
   }
@@ -111,7 +111,7 @@ public class TrainingDataReviewApiController {
       @io.swagger.v3.oas.annotations.Parameter(
               description = "검수자 사번",
               required = true,
-              example = "01022223333")
+              example = "K20251212001")
           @RequestParam
           String userId) {
     try {
@@ -301,8 +301,8 @@ public class TrainingDataReviewApiController {
       @io.swagger.v3.oas.annotations.Parameter(
               description = "검수 작업 ID (UUID)",
               required = true,
-              example = "4f9ebc8b-6635-4177-b42f-7efc9c7b4c02")
+              example = "da9d026c-a67a-4d2d-a05a-6cc924372795")
-          @RequestParam(defaultValue = "4f9ebc8b-6635-4177-b42f-7efc9c7b4c02")
+          @RequestParam(defaultValue = "da9d026c-a67a-4d2d-a05a-6cc924372795")
           java.util.UUID operatorUid) {
     return ApiResponseDto.ok(trainingDataReviewService.getDetail(operatorUid));
   }
@@ -323,10 +323,10 @@ public class TrainingDataReviewApiController {
       })
   @GetMapping("/default-page")
   public ApiResponseDto<TrainingDataReviewDto.DefaultPaging> getDefaultPagingNumber(
-      @Parameter(description = "사번", example = "01022223333") @RequestParam String userId,
+      @Parameter(description = "사번", example = "K20251212001") @RequestParam String userId,
       @Parameter(description = "페이징 사이즈", example = "20") @RequestParam(defaultValue = "20")
           Integer size,
-      @Parameter(description = "개별 UUID", example = "79bcdbbe-6ed4-4caa-b4a4-22f3cf2f9d25")
+      @Parameter(description = "개별 UUID", example = "da9d026c-a67a-4d2d-a05a-6cc924372795")
           @RequestParam(required = false)
           String operatorUid) {
     return ApiResponseDto.ok(

src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataLabelDto.java

@@ -96,12 +96,12 @@ public class TrainingDataLabelDto {
     }
   }
 
-  @Schema(name = "GeoFeatureRequest", description = "polygon 저장")
+  @Schema(name = "LabelFeatureRequest", description = "polygon 저장")
   @Getter
   @Setter
   @NoArgsConstructor
   @AllArgsConstructor
-  public static class GeoFeatureRequest {
+  public static class LabelFeatureRequest {
 
     @Schema(description = "assignmentUid", example = "4f9ebc8b-6635-4177-b42f-7efc9c7b4c02")
     private String assignmentUid;
@@ -148,10 +148,10 @@ public class TrainingDataLabelDto {
           """)
     private Geometry geometry;
 
-    private Properties properties;
+    private LabelProperties properties;
 
     @Getter
-    public static class Properties {
+    public static class LabelProperties {
 
       @Schema(description = "beforeClass", example = "WASTE")
       private String beforeClass;

src/main/java/com/kamco/cd/kamcoback/trainingdata/service/TrainingDataLabelService.java

@@ -6,7 +6,7 @@ import com.kamco.cd.kamcoback.postgres.core.TrainingDataLabelCoreService;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.DefaultPaging;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.DetailRes;
-import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.GeoFeatureRequest;
+import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelFeatureRequest;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelingGeometryInfo;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.LabelingListDto;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.SummaryRes;
@@ -36,7 +36,7 @@ public class TrainingDataLabelService {
   }
 
   @Transactional
-  public ResponseObj saveLabelingFeature(GeoFeatureRequest request) {
+  public ResponseObj saveLabelingFeature(LabelFeatureRequest request) {
     String status = "";
     String assignmentUid = request.getAssignmentUid();
     Long inferenceGeomUid =