변화탐지 pnu로도 조회 가능하게 하기

restTemplate read timeout, connect timeout 늘리기
좌표계 5179 추가
2026-03-04 08:04:04 +09:00 · 2026-03-03 17:07:19 +09:00 · 2026-03-03 15:03:44 +09:00 · 2026-03-03 14:23:24 +09:00 · 2026-02-28 00:34:35 +09:00 · 2026-02-27 22:53:07 +09:00
10 changed files with 86 additions and 38 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/changedetection/ChangeDetectionApiController.java
+++ b/src/main/java/com/kamco/cd/kamcoback/changedetection/ChangeDetectionApiController.java
@@ -163,13 +163,13 @@ public class ChangeDetectionApiController {
          @RequestParam
          String chnDtctId,
      @Parameter(description = "polygon 32자 uid", example = "3B1A7E5F895A4D9698489540EE1BBE1E")
-          @RequestParam
+          @RequestParam(required = false)
          String cdObjectId,
      @Parameter(
              description = "polygon 32자 uids",
              example =
                  "3B1A7E5F895A4D9698489540EE1BBE1E,3B221A2AF9614647A0903A972D56C574,3B22686A7ACE44FC9CB20F1B4FA6DEFD,3B376D94A183479BB5FBE3D7166E6E1A")
-          @RequestParam
+          @RequestParam(required = false)
          List<String> cdObjectIds,
      @Parameter(description = "pnu") @RequestParam(required = false) String pnu) {
    return ApiResponseDto.ok(
@@ -183,13 +183,13 @@ public class ChangeDetectionApiController {
          @RequestParam
          String chnDtctId,
      @Parameter(description = "polygon 32자 uid", example = "3B1A7E5F895A4D9698489540EE1BBE1E")
-          @RequestParam
+          @RequestParam(required = false)
          String cdObjectId,
      @Parameter(
              description = "polygon 32자 uids",
              example =
                  "3B1A7E5F895A4D9698489540EE1BBE1E,3B221A2AF9614647A0903A972D56C574,3B22686A7ACE44FC9CB20F1B4FA6DEFD,3B376D94A183479BB5FBE3D7166E6E1A")
-          @RequestParam
+          @RequestParam(required = false)
          List<String> cdObjectIds,
      @Parameter(description = "pnu") @RequestParam(required = false) String pnu) {
    return ApiResponseDto.ok(
--- a/src/main/java/com/kamco/cd/kamcoback/changedetection/service/ChangeDetectionService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/changedetection/service/ChangeDetectionService.java
@@ -101,7 +101,7 @@ public class ChangeDetectionService {
   */
  public ChangeDetectionDto.PolygonFeatureList getPolygonListByCd(
      String chnDtctId, String cdObjectId, List<String> cdObjectIds, String pnu) {
-    return changeDetectionCoreService.getPolygonListByCd(chnDtctId, cdObjectId, cdObjectIds);
+    return changeDetectionCoreService.getPolygonListByCd(chnDtctId, cdObjectId, cdObjectIds, pnu);
  }

  /**
@@ -115,7 +115,7 @@ public class ChangeDetectionService {
   */
  public ChangeDetectionDto.PointFeatureList getPointListByCd(
      String chnDtctId, String cdObjectId, List<String> cdObjectIds, String pnu) {
-    return changeDetectionCoreService.getPointListByCd(chnDtctId, cdObjectId, cdObjectIds);
+    return changeDetectionCoreService.getPointListByCd(chnDtctId, cdObjectId, cdObjectIds, pnu);
  }

  /**
--- a/src/main/java/com/kamco/cd/kamcoback/common/enums/CrsType.java
+++ b/src/main/java/com/kamco/cd/kamcoback/common/enums/CrsType.java
@@ -11,7 +11,8 @@ import lombok.Getter;
 public enum CrsType implements EnumType {
  EPSG_3857("Web Mercator, 웹지도 미터(EPSG:900913 동일)"),
  EPSG_4326("WGS84 위경도, GeoJSON/OSM 기본"),
-  EPSG_5186("Korea 2000 중부 TM, 한국 SHP");
+  EPSG_5186("5186::Korea 2000 중부 TM, 한국 SHP"),
+  EPSG_5179("5179::Korea 2000 중부 TM, 한국 SHP");

  private final String desc;

--- a/src/main/java/com/kamco/cd/kamcoback/config/resttemplate/RestTemplateConfig.java
+++ b/src/main/java/com/kamco/cd/kamcoback/config/resttemplate/RestTemplateConfig.java
@@ -16,12 +16,12 @@ public class RestTemplateConfig {
  @Bean
  @Primary
  public RestTemplate restTemplate(RestTemplateBuilder builder) {
-    return build(builder, 2000, 3000);
+    return build(builder, 20000, 60000);
  }

  @Bean("restTemplateLong")
  public RestTemplate restTemplateLong(RestTemplateBuilder builder) {
-    return build(builder, 2000, 60000);
+    return build(builder, 20000, 60000);
  }

  private RestTemplate build(RestTemplateBuilder builder, int connectTimeoutMs, int readTimeoutMs) {
--- a/src/main/java/com/kamco/cd/kamcoback/gukyuin/service/GukYuinApiService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/gukyuin/service/GukYuinApiService.java
@@ -69,7 +69,7 @@ public class GukYuinApiService {
  @Value("${file.nfs}")
  private String nfs;

-  @Value("${file.output-dir}")
+  @Value("${file.output-dir}") // 국유인 반영 파일 경로
  private String outputDir;

  @Value("${file.dataset-dir}")
--- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
@@ -359,7 +359,12 @@ public class MapSheetMngService {

  public FoldersDto getFolderAll(SrchFoldersDto srchDto) {

-    String dirPath = syncRootDir + srchDto.getDirPath();
+    // "경로중복"
+    String dirPath =
+        (srchDto.getDirPath() == null || srchDto.getDirPath().isEmpty())
+            ? syncRootDir
+            : srchDto.getDirPath();
+    // String dirPath = syncRootDir + srchDto.getDirPath();

    log.info("[FIND_FOLDER] DIR : {}", dirPath);
    List<FIleChecker.Folder> folderList =
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/ChangeDetectionCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/ChangeDetectionCoreService.java
@@ -108,8 +108,8 @@ public class ChangeDetectionCoreService {
   * @return
   */
  public ChangeDetectionDto.PolygonFeatureList getPolygonListByCd(
-      String chnDtctId, String cdObjectId, List<String> cdObjectIds) {
-    return changeDetectionRepository.getPolygonListByCd(chnDtctId, cdObjectId, cdObjectIds);
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds, String pnu) {
+    return changeDetectionRepository.getPolygonListByCd(chnDtctId, cdObjectId, cdObjectIds, pnu);
  }

  /**
@@ -121,8 +121,8 @@ public class ChangeDetectionCoreService {
   * @return
   */
  public ChangeDetectionDto.PointFeatureList getPointListByCd(
-      String chnDtctId, String cdObjectId, List<String> cdObjectIds) {
-    return changeDetectionRepository.getPointListByCd(chnDtctId, cdObjectId, cdObjectIds);
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds, String pnu) {
+    return changeDetectionRepository.getPointListByCd(chnDtctId, cdObjectId, cdObjectIds, pnu);
  }

  /**
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryCustom.java
@@ -31,10 +31,10 @@ public interface ChangeDetectionRepositoryCustom {
  List<MapSheetList> getChangeDetectionMapSheet50kList(UUID uuid);

  ChangeDetectionDto.PolygonFeatureList getPolygonListByCd(
-      String chnDtctId, String cdObjectId, List<String> cdObjectIds);
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds, String pnu);

  ChangeDetectionDto.PointFeatureList getPointListByCd(
-      String chnDtctId, String cdObjectId, List<String> cdObjectIds);
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds, String pnu);

  ChangeDetectionDto.PolygonFeatureList getSelectedChangeDetectionPolygonListByPnu(
      String chnDtctId, String pnu);
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java
@@ -18,7 +18,9 @@ import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.DetectSearc
 import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.MapScaleType;
 import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.MapSheetList;
 import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.PointFeatureList;
+import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.PointQueryData;
 import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.PolygonFeatureList;
+import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.PolygonQueryData;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Status;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceGeomEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity;
@@ -31,6 +33,7 @@ import com.querydsl.core.types.dsl.CaseBuilder;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringExpression;
 import com.querydsl.jpa.JPAExpressions;
+import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import java.util.Objects;
@@ -391,16 +394,23 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport

  @Override
  public PolygonFeatureList getPolygonListByCd(
-      String chnDtctId, String cdObjectId, List<String> cdObjectIds) {
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds, String pnu) {
    BooleanBuilder builder = new BooleanBuilder();
    builder.and(mapSheetLearnEntity.uid.eq(chnDtctId));
-    builder.and(
-        mapSheetAnalDataInferenceGeomEntity
-            .resultUid
-            .eq(chnDtctId)
-            .or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds)));

-    List<ChangeDetectionDto.PolygonQueryData> list =
+    // pnu가 들어온 경우
+    boolean hasPnu = pnu != null && !pnu.isBlank();
+
+    if (!hasPnu) {
+      builder.and(
+          mapSheetAnalDataInferenceGeomEntity
+              .resultUid
+              .eq(chnDtctId)
+              .or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds)));
+    }
+
+    //    List<ChangeDetectionDto.PolygonQueryData> list =
+    JPAQuery<PolygonQueryData> query =
        queryFactory
            .select(
                Projections.constructor(
@@ -425,10 +435,22 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
            .innerJoin(mapSheetAnalInferenceEntity)
            .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
            .innerJoin(mapSheetLearnEntity)
-            .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId))
-            .where(builder)
-            .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc())
-            .fetch();
+            .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId));
+    //            .where(builder)
+    //            .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc());
+    //        .fetch();
+
+    // 🔥 pnu 조건이면 tb_pnu join 추가
+    if (hasPnu) {
+      query
+          .innerJoin(pnuEntity)
+          .on(pnuEntity.geo.geoUid.eq(mapSheetAnalDataInferenceGeomEntity.geoUid));
+
+      builder.and(pnuEntity.pnu.eq(pnu));
+    }
+
+    List<ChangeDetectionDto.PolygonQueryData> list =
+        query.where(builder).orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc()).fetch();

    ObjectMapper mapper = new ObjectMapper();
    List<ChangeDetectionDto.PolygonFeature> result =
@@ -470,16 +492,23 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport

  @Override
  public PointFeatureList getPointListByCd(
-      String chnDtctId, String cdObjectId, List<String> cdObjectIds) {
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds, String pnu) {
    BooleanBuilder builder = new BooleanBuilder();
    builder.and(mapSheetLearnEntity.uid.eq(chnDtctId));
-    builder.and(
-        mapSheetAnalDataInferenceGeomEntity
-            .resultUid
-            .eq(chnDtctId)
-            .or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds)));

-    List<ChangeDetectionDto.PointQueryData> list =
+    // pnu가 들어온 경우
+    boolean hasPnu = pnu != null && !pnu.isBlank();
+
+    if (!hasPnu) {
+      builder.and(
+          mapSheetAnalDataInferenceGeomEntity
+              .resultUid
+              .eq(chnDtctId)
+              .or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds)));
+    }
+
+    //    List<ChangeDetectionDto.PointQueryData> list =
+    JPAQuery<PointQueryData> query =
        queryFactory
            .select(
                Projections.constructor(
@@ -498,9 +527,21 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
            .innerJoin(mapSheetAnalInferenceEntity)
            .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
            .innerJoin(mapSheetLearnEntity)
-            .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId))
-            .where(builder)
-            .fetch();
+            .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId));
+    //        .where(builder)
+    //        .fetch();
+
+    // 🔥 pnu 조건이면 tb_pnu join 추가
+    if (hasPnu) {
+      query
+          .innerJoin(pnuEntity)
+          .on(pnuEntity.geo.geoUid.eq(mapSheetAnalDataInferenceGeomEntity.geoUid));
+
+      builder.and(pnuEntity.pnu.eq(pnu));
+    }
+
+    List<ChangeDetectionDto.PointQueryData> list =
+        query.where(builder).orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc()).fetch();

    ObjectMapper mapper = new ObjectMapper();
    List<ChangeDetectionDto.PointFeature> result =
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -88,6 +88,7 @@ file:
  nfs: /data
  pt-path: ${file.nfs}/ckpt/model/v6-cls-checkpoints/
  pt-FileName: yolov8_6th-6m.pt
+  output-dir: /kamco-nfs/dataset/export/

 inference:
  nfs: /data
Author	SHA1	Message	Date
gayoun.park	4d1ea53d8f	변화탐지 pnu로도 조회 가능하게 하기	2026-03-04 08:04:04 +09:00
gayoun.park	278d5d20e8	restTemplate read timeout, connect timeout 늘리기	2026-03-03 17:07:19 +09:00
gayoun.park	4d9fa2d6a5	좌표계 5179 추가	2026-03-03 15:03:44 +09:00
gayoun.park	e28e5ba371	국유인 반영 파일 경로 수정	2026-03-03 14:23:24 +09:00
Gina(박가연)	22cc996399	Merge pull request 'feat/infer_dev_260211' (#126 ) from feat/infer_dev_260211 into develop Reviewed-on: #126	2026-02-28 00:34:35 +09:00
Gina(박가연)	060a0db126	Merge pull request 'feat/infer_dev_260211' (#125 ) from feat/infer_dev_260211 into develop Reviewed-on: #125	2026-02-27 22:53:07 +09:00
Gina(박가연)	2b28241110	Merge pull request '국유인 연동 전 파일 경로 확인 log 추가' (#124 ) from feat/infer_dev_260211 into develop Reviewed-on: #124	2026-02-27 19:41:26 +09:00
teddy	972cf808a9	Merge pull request '학습데이터 관리 목록 순서 변경, 주석추가' (#123 ) from feat/infer_dev_260211 into develop Reviewed-on: #123	2026-02-27 18:54:29 +09:00
Gina(박가연)	c3c194c067	Merge pull request '국유인 실태조사 bulk 확인' (#122 ) from feat/infer_dev_260211 into develop Reviewed-on: #122	2026-02-27 17:02:22 +09:00
Gina(박가연)	53ce735bca	Merge pull request '국유인 체크 url 수정' (#121 ) from feat/infer_dev_260211 into develop Reviewed-on: #121	2026-02-27 16:24:11 +09:00
Gina(박가연)	9f6dc2b3c6	Merge pull request '국유인 연동 url 수정' (#120 ) from feat/infer_dev_260211 into develop Reviewed-on: #120	2026-02-27 16:01:32 +09:00
Gina(박가연)	ca631d5d58	Merge pull request '변화지도 도엽 목록에 도엽별bbox 추가' (#119 ) from feat/infer_dev_260211 into develop Reviewed-on: #119	2026-02-27 15:31:52 +09:00
Gina(박가연)	3aed3cf1ec	Merge pull request 'feat/infer_dev_260211' (#118 ) from feat/infer_dev_260211 into develop Reviewed-on: #118	2026-02-27 15:14:37 +09:00
Gina(박가연)	a7108c44f4	Merge pull request '비밀번호 변경 security 설정 수정' (#117 ) from feat/infer_dev_260211 into develop Reviewed-on: #117	2026-02-27 14:00:11 +09:00
teddy	9cb3a100aa	Merge pull request '주석 추가, 패스워드변경 권한 수정' (#116 ) from feat/infer_dev_260211 into develop Reviewed-on: #116	2026-02-27 13:41:32 +09:00
Gina(박가연)	9d36208845	Merge pull request '국유인 반영 부분 막기 해제' (#115 ) from feat/infer_dev_260211 into develop Reviewed-on: #115	2026-02-27 11:41:57 +09:00
teddy	369f303f6c	Merge pull request 'feat/infer_dev_260211' (#114 ) from feat/infer_dev_260211 into develop Reviewed-on: #114	2026-02-27 10:09:04 +09:00
teddy	f4cbb48aa2	Merge pull request '추론 수정' (#113 ) from feat/infer_dev_260211 into develop Reviewed-on: #113	2026-02-27 09:15:56 +09:00
teddy	6e4682dad6	Merge pull request '추론 수정' (#112 ) from feat/infer_dev_260211 into develop Reviewed-on: #112	2026-02-27 08:29:22 +09:00
teddy	5ba7f9ccfc	Merge pull request '추론 수정' (#111 ) from feat/infer_dev_260211 into develop Reviewed-on: #111	2026-02-27 00:03:26 +09:00
teddy	fab5b02211	Merge pull request '추론 수정' (#110 ) from feat/infer_dev_260211 into develop Reviewed-on: #110	2026-02-26 23:55:53 +09:00
teddy	a4b1db462b	Merge pull request '추론 수정' (#109 ) from feat/infer_dev_260211 into develop Reviewed-on: #109	2026-02-26 23:42:09 +09:00
teddy	a1be4e9faf	Merge pull request '추론 수정' (#108 ) from feat/infer_dev_260211 into develop Reviewed-on: #108	2026-02-26 23:18:50 +09:00
dean[백병남]	a21df9d018	중복 경고	2026-02-26 18:38:56 +09:00
dean[백병남]	85cad2dd28	중복 경고	2026-02-26 18:34:29 +09:00
dean[백병남]	7b8bf8726b	중복 경고	2026-02-26 18:29:03 +09:00
dean[백병남]	c841d460aa	중복 경고	2026-02-26 18:26:40 +09:00
teddy	3a8ac3a24f	Merge pull request 'ensureAccepted 함수 InferenceCommonService 생성후 공통으로 생성' (#107 ) from feat/infer_dev_260211 into develop Reviewed-on: #107	2026-02-26 16:56:04 +09:00