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

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

src/main/java/com/kamco/cd/kamcoback/common/api/CommonController.java

@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.common.api;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.inference.dto.LearningModelResultDto;
 import com.kamco.cd.kamcoback.inference.service.InferenceResultService;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Hidden
 @Tag(name = "공통", description = "공통")
 @RestController
 @RequiredArgsConstructor

src/main/java/com/kamco/cd/kamcoback/common/api/HelloApiController.java

@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.common.api;
 import com.kamco.cd.kamcoback.common.api.HelloDto.Res;
 import com.kamco.cd.kamcoback.common.service.ExternalJarRunner;
 import com.kamco.cd.kamcoback.common.service.HelloService;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+@Hidden
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/api/hello")

src/main/java/com/kamco/cd/kamcoback/common/api/NfsTestApiController.java

@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.common.api;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Hidden
 @Slf4j
 @RestController
 @RequestMapping("/api/nfs-test")

src/main/java/com/kamco/cd/kamcoback/common/api/SceneDemoApiController.java

@@ -4,6 +4,7 @@ import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.MapSheet;
 import com.kamco.cd.kamcoback.inference.dto.LearningModelResultDto.BatchProcessResponse;
 import com.kamco.cd.kamcoback.inference.service.InferenceResultService;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Hidden
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/demo/api/scene")

src/main/java/com/kamco/cd/kamcoback/config/resttemplate/RestTemplateConfig.java

@@ -1,6 +1,5 @@
 package com.kamco.cd.kamcoback.config.resttemplate;
 
-import java.net.Proxy;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
@@ -15,7 +14,6 @@ public class RestTemplateConfig {
   @Bean
   public RestTemplate restTemplate(RestTemplateBuilder builder) {
     SimpleClientHttpRequestFactory f = new SimpleClientHttpRequestFactory();
-    f.setProxy(Proxy.NO_PROXY); // 시스템/환경 프록시 무시
     f.setConnectTimeout(2000);
     f.setReadTimeout(3000);
 

src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiV2Controller.java

@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.inference;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto;
 import com.kamco.cd.kamcoback.inference.service.InferenceResultService;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+@Hidden
 @Tag(name = "추론관리 분석결과", description = "추론관리 분석결과")
 @RequiredArgsConstructor
 @RestController

src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java

@@ -9,6 +9,7 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.WorkHistoryDto;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.UpdateClosedRequest;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerListResponse;
 import com.kamco.cd.kamcoback.label.service.LabelAllocateService;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -126,6 +127,8 @@ public class LabelAllocateApiController {
             dto.getUuid(), dto.getLabelers(), dto.getInspectors(), compareYyyy, targetYyyy));
   }
 
+  // 같은 기능이 있어서 미사용하게 됨 -> /api/training-data/stage/label-work-mng-detail/{uuid}
+  @Hidden
   @Operation(summary = "작업현황 관리 > 변화탐지 회차 정보", description = "작업현황 관리 > 변화탐지 회차 정보")
   @ApiResponses(
       value = {

src/main/java/com/kamco/cd/kamcoback/menu/MenuApiController.java

@@ -5,6 +5,7 @@ import com.kamco.cd.kamcoback.config.api.ApiLogFunction;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.menu.dto.MenuDto;
 import com.kamco.cd.kamcoback.menu.service.MenuService;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+@Hidden
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/menu")

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

@@ -9,6 +9,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnDataGeomEntit
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
 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;
@@ -102,7 +103,9 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
                     mapSheetAnalInferenceEntity.stage))
             .from(labelingAssignmentEntity)
             .innerJoin(mapSheetAnalInferenceEntity)
-            .on(labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id))
+            .on(
+                labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
             .innerJoin(mapSheetAnalDataInferenceGeomEntity)
             .on(
                 labelingAssignmentEntity.inferenceGeomUid.eq(
@@ -124,6 +127,10 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
                 queryFactory
                     .select(labelingAssignmentEntity.assignmentUid.count())
                     .from(labelingAssignmentEntity)
+                    .innerJoin(mapSheetAnalInferenceEntity)
+                    .on(
+                        labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                        mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                     .innerJoin(mapSheetAnalDataInferenceGeomEntity)
                     .on(
                         labelingAssignmentEntity.inferenceGeomUid.eq(
@@ -621,7 +628,9 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
                 mapSheetAnalInferenceEntity.compareYyyy)
             .from(labelingAssignmentEntity)
             .innerJoin(mapSheetAnalInferenceEntity)
-            .on(labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id))
+            .on(
+                labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
             .where(
                 labelingAssignmentEntity.workerUid.eq(userId),
                 stateCondition,
@@ -674,7 +683,9 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             .select(labelingAssignmentEntity.count())
             .from(labelingAssignmentEntity)
             .innerJoin(mapSheetAnalInferenceEntity)
-            .on(mapSheetAnalInferenceEntity.id.eq(labelingAssignmentEntity.analUid))
+            .on(
+                mapSheetAnalInferenceEntity.id.eq(labelingAssignmentEntity.analUid),
+                mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
             .where(
                 labelingAssignmentEntity.workerUid.eq(userId), beforeCondition.and(stateCondition))
             .fetchOne();

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

@@ -11,6 +11,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceGeomEntity;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataLabelDto.InferenceIdInfo;
@@ -103,7 +104,9 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
                     mapSheetAnalInferenceEntity.stage))
             .from(labelingAssignmentEntity)
             .innerJoin(mapSheetAnalInferenceEntity)
-            .on(labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id))
+            .on(
+                labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
             .innerJoin(mapSheetAnalDataInferenceGeomEntity)
             .on(
                 labelingAssignmentEntity.inferenceGeomUid.eq(
@@ -127,6 +130,10 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
                 queryFactory
                     .select(labelingAssignmentEntity.assignmentUid.count())
                     .from(labelingAssignmentEntity)
+                    .innerJoin(mapSheetAnalInferenceEntity)
+                    .on(
+                        labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                        mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                     .innerJoin(mapSheetAnalDataInferenceGeomEntity)
                     .on(
                         labelingAssignmentEntity.inferenceGeomUid.eq(
@@ -650,7 +657,9 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
                 mapSheetAnalInferenceEntity.compareYyyy)
             .from(labelingAssignmentEntity)
             .innerJoin(mapSheetAnalInferenceEntity)
-            .on(labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id))
+            .on(
+                labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
             .where(
                 labelingAssignmentEntity.inspectorUid.eq(userId),
                 stateCondition,
@@ -703,7 +712,9 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
             .select(labelingAssignmentEntity.count())
             .from(labelingAssignmentEntity)
             .innerJoin(mapSheetAnalInferenceEntity)
-            .on(mapSheetAnalInferenceEntity.id.eq(labelingAssignmentEntity.analUid))
+            .on(
+                mapSheetAnalInferenceEntity.id.eq(labelingAssignmentEntity.analUid),
+                mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
             .where(
                 labelingAssignmentEntity.inspectorUid.eq(userId),
                 beforeCondition.and(stateCondition))

src/main/java/com/kamco/cd/kamcoback/scene/MapInkxMngApiController.java

@@ -7,6 +7,7 @@ import com.kamco.cd.kamcoback.config.api.ApiResponseDto.ApiResponseCode;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto.ResponseObj;
 import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto;
 import com.kamco.cd.kamcoback.scene.service.MapInkxMngService;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -32,6 +33,8 @@ public class MapInkxMngApiController {
 
   private final MapInkxMngService mapInkxMngService;
 
+  // 미사용 -> Dean이 만드신 /api/v2/scene 으로 사용
+  @Hidden
   @Operation(summary = "목록 조회", description = "도엽 목록 조회")
   @ApiResponses(
       value = {

src/main/java/com/kamco/cd/kamcoback/test/TestApiController.java

@@ -1,6 +1,7 @@
 package com.kamco.cd.kamcoback.test;
 
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Hidden
 @Tag(name = "test api", description = "test api")
 @RestController
 @RequiredArgsConstructor

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

@@ -333,6 +333,8 @@ public class TrainingDataLabelApiController {
         trainingDataLabelService.getDefaultPagingNumber(userId, size, assignmentUid));
   }
 
+  // 이번 범위에서는 새로운 폴리곤 추가하지 않는다고 하여 Hidden
+  @Hidden
   @Operation(
       summary = "새로운 polygon(들) 추가 저장",
       description = "탐지결과 외 새로운 polygon을 추가로 저장합니다. 단일 또는 여러 개를 저장할 수 있습니다.")

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

@@ -335,6 +335,8 @@ public class TrainingDataReviewApiController {
         trainingDataReviewService.getDefaultPagingNumber(userId, size, operatorUid));
   }
 
+  // 이번 범위에서는 새로운 폴리곤 추가하지 않는다고 하여 Hidden
+  @Hidden
   @Operation(
       summary = "새로운 polygon(들) 추가 저장",
       description = "탐지결과 외 새로운 polygon을 추가로 저장합니다. 단일 또는 여러 개를 저장할 수 있습니다.")