merge develop

Reviewed-on: #100
Co-authored-by: dean[백병남] <byungnam.baek@dabeeo.com>
Co-committed-by: dean[백병남] <byungnam.baek@dabeeo.com>

docker-compose-dev.yml

@@ -15,7 +15,7 @@ services:
       - SPRING_PROFILES_ACTIVE=dev
       - TZ=Asia/Seoul
     volumes:
-      - /kamco-nfs:/kamco-nfs
+      - /data:/kamco-nfs
     networks:
       - kamco-cds
     restart: unless-stopped

docker-compose-prod.yml

@@ -21,13 +21,7 @@ services:
       start_period: 10s
 
   kamco-cd-api:
-    build:
-      context: .
-      dockerfile: Dockerfile-prod
-      args:
-        UID: 1000        # manager01 UID
-        GID: 1000        # manager01 GID
-    image: kamco-cd-api:${IMAGE_TAG:-latest}
+    image: kamco-api-app:260219
     container_name: kamco-cd-api
     user: "1000:1000"
     environment:

src/main/java/com/kamco/cd/kamcoback/changedetection/ChangeDetectionApiController.java

@@ -146,4 +146,53 @@ public class ChangeDetectionApiController {
     return ApiResponseDto.ok(
         changeDetectionService.getChangeDetectionPointList(type, scale, uuid, mapSheetNum));
   }
+
+  @Operation(summary = "선택 변화탐지 결과 uuid 조회", description = "선택 변화탐지 결과 uuid 조회")
+  @GetMapping("/selected/uuid")
+  public ApiResponseDto<UUID> getChnDtctIdUuid(
+      @Parameter(description = "회차 32자 uid", example = "98ABAA1FC4394F11885C302C19AE5E81")
+          @RequestParam
+          String chnDtctId) {
+    return ApiResponseDto.ok(changeDetectionService.getLearnUuid(chnDtctId));
+  }
+
+  @Operation(summary = "선택 변화탐지 결과 Polygon", description = "선택 변화탐지 결과 Polygon")
+  @GetMapping("/selected/polygon")
+  public ApiResponseDto<ChangeDetectionDto.PolygonFeatureList> getCdPolygonList(
+      @Parameter(description = "회차 32자 uid", example = "98ABAA1FC4394F11885C302C19AE5E81")
+          @RequestParam
+          String chnDtctId,
+      @Parameter(description = "polygon 32자 uid", example = "3B1A7E5F895A4D9698489540EE1BBE1E")
+          @RequestParam
+          String cdObjectId,
+      @Parameter(
+              description = "polygon 32자 uids",
+              example =
+                  "3B1A7E5F895A4D9698489540EE1BBE1E,3B221A2AF9614647A0903A972D56C574,3B22686A7ACE44FC9CB20F1B4FA6DEFD,3B376D94A183479BB5FBE3D7166E6E1A")
+          @RequestParam
+          List<String> cdObjectIds,
+      @Parameter(description = "pnu") @RequestParam(required = false) String pnu) {
+    return ApiResponseDto.ok(
+        changeDetectionService.getPolygonListByCd(chnDtctId, cdObjectId, cdObjectIds, pnu));
+  }
+
+  @Operation(summary = "선택 변화탐지 결과 Point", description = "선택 변화탐지 결과 Point")
+  @GetMapping("/selected/point")
+  public ApiResponseDto<ChangeDetectionDto.PointFeatureList> getCdPointList(
+      @Parameter(description = "회차 32자 uid", example = "98ABAA1FC4394F11885C302C19AE5E81")
+          @RequestParam
+          String chnDtctId,
+      @Parameter(description = "polygon 32자 uid", example = "3B1A7E5F895A4D9698489540EE1BBE1E")
+          @RequestParam
+          String cdObjectId,
+      @Parameter(
+              description = "polygon 32자 uids",
+              example =
+                  "3B1A7E5F895A4D9698489540EE1BBE1E,3B221A2AF9614647A0903A972D56C574,3B22686A7ACE44FC9CB20F1B4FA6DEFD,3B376D94A183479BB5FBE3D7166E6E1A")
+          @RequestParam
+          List<String> cdObjectIds,
+      @Parameter(description = "pnu") @RequestParam(required = false) String pnu) {
+    return ApiResponseDto.ok(
+        changeDetectionService.getPointListByCd(chnDtctId, cdObjectId, cdObjectIds, pnu));
+  }
 }

src/main/java/com/kamco/cd/kamcoback/changedetection/dto/ChangeDetectionDto.java

@@ -197,6 +197,8 @@ public class ChangeDetectionDto {
     private Double afterConfidence; // 비교 신뢰도(확률)
     private String afterClass;
     private Double cdProb; // 탐지정확도
+    private UUID uuid;
+    private String resultUid;
   }
 
   @Schema(name = "PointFeature", description = "Geometry 리턴 객체")
@@ -250,5 +252,21 @@ public class ChangeDetectionDto {
     private Double afterConfidence; // 비교 신뢰도(확률)
     private String afterClass; // 비교 분류
     private Double cdProb; // 탐지 정확도
+    private UUID uuid;
+    private String uid;
+  }
+
+  @Schema(name = "ChangeDetectionMapDto", description = "변화지도 팝업 검색조건")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class ChangeDetectionMapDto {
+    private Integer compareYyyy;
+    private Integer targetYyyy;
+    private String cdObjectId;
+    private List<String> cdObjectIds;
+    private String chnDtctId;
+    private String pnu;
   }
 }

src/main/java/com/kamco/cd/kamcoback/changedetection/service/ChangeDetectionService.java

@@ -89,4 +89,42 @@ public class ChangeDetectionService {
       default -> throw new IllegalArgumentException("Unsupported type: " + type);
     }
   }
+
+  /**
+   * 선택 폴리곤 정보 조회
+   *
+   * @param chnDtctId
+   * @param cdObjectId
+   * @param cdObjectIds
+   * @param pnu
+   * @return
+   */
+  public ChangeDetectionDto.PolygonFeatureList getPolygonListByCd(
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds, String pnu) {
+    return changeDetectionCoreService.getPolygonListByCd(chnDtctId, cdObjectId, cdObjectIds);
+  }
+
+  /**
+   * 선택 Point 조회
+   *
+   * @param chnDtctId
+   * @param cdObjectId
+   * @param cdObjectIds
+   * @param pnu
+   * @return
+   */
+  public ChangeDetectionDto.PointFeatureList getPointListByCd(
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds, String pnu) {
+    return changeDetectionCoreService.getPointListByCd(chnDtctId, cdObjectId, cdObjectIds);
+  }
+
+  /**
+   * Learn uuid 조회
+   *
+   * @param chnDtctId
+   * @return uuid
+   */
+  public UUID getLearnUuid(String chnDtctId) {
+    return changeDetectionCoreService.getLearnUuid(chnDtctId);
+  }
 }

src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java

@@ -279,18 +279,28 @@ public class FIleChecker {
     return true;
   }
 
-  public static List<Folder> getFolderAll(String dirPath, String sortType, int maxDepth) {
+  // kamco-nfs를 확인하는곳이 있어서 파라미터 추가 사용용도확인후 처리
+  public static List<Folder> getFolderAll(
+      String dirPath, String sortType, int maxDepth, String nfsRootDir) {
 
     Path startPath = Paths.get(dirPath);
 
     List<Folder> folderList = List.of();
 
-    try (Stream<Path> stream = Files.walk(startPath, maxDepth)) {
+    log.info("[FIND_FOLDER] DIR : {} {} {} {}", dirPath, sortType, maxDepth, startPath);
 
+    int childDirCount = getChildFolderCount(startPath.toFile());
+    log.info("[FIND_FOLDER] START_PATH_CHILD_DIR_COUNT : {}", childDirCount);
+
+    try (Stream<Path> stream = Files.walk(startPath, maxDepth)) {
       folderList =
           stream
               .filter(Files::isDirectory)
-              .filter(p -> !p.toString().equals(dirPath))
+              .filter(
+                  p ->
+                      !p.toAbsolutePath()
+                          .normalize()
+                          .equals(startPath.toAbsolutePath().normalize()))
               .map(
                   path -> {
                     int depth = path.getNameCount();
@@ -300,13 +310,12 @@ public class FIleChecker {
                     String parentPath = path.getParent().toString();
                     String fullPath = path.toAbsolutePath().toString();
 
+                    // 이것이 필요한건가?
+                    //                    boolean isShowHide =
+                    //                      !parentFolderNm.equals("kamco-nfs"); // 폴더 리스트에
+                    // kamco-nfs 하위만 나오도록 처리
                     boolean isShowHide =
-                        !parentFolderNm.equals("kamco-nfs"); // 폴더 리스트에 kamco-nfs 하위만 나오도록 처리
-                    //              boolean isValid =
-                    //                !NameValidator.containsKorean(folderNm)
-                    //                  && !NameValidator.containsWhitespaceRegex(folderNm)
-                    //                  && !parentFolderNm.equals("kamco-nfs");
-
+                        !parentFolderNm.equals(nfsRootDir); // 폴더 리스트에 nfsRootDir 하위만 나오도록 처리
                     File file = new File(fullPath);
                     int childCnt = getChildFolderCount(file);
                     String lastModified = getLastModified(file);
@@ -354,24 +363,8 @@ public class FIleChecker {
     return folderList;
   }
 
-  public static List<Folder> getFolderAll(String dirPath) {
-    return getFolderAll(dirPath, "name", 1);
-  }
-
-  public static List<Folder> getFolderAll(String dirPath, String sortType) {
-    return getFolderAll(dirPath, sortType, 1);
-  }
-
-  public static int getChildFolderCount(String dirPath) {
-    File directory = new File(dirPath);
-    File[] childFolders = directory.listFiles(File::isDirectory);
-
-    int childCnt = 0;
-    if (childFolders != null) {
-      childCnt = childFolders.length;
-    }
-
-    return childCnt;
+  public static List<Folder> getFolderAll(String dirPath, String nfsRootDir) {
+    return getFolderAll(dirPath, "name", 1, nfsRootDir);
   }
 
   public static int getChildFolderCount(File directory) {
@@ -385,11 +378,6 @@ public class FIleChecker {
     return childCnt;
   }
 
-  public static String getLastModified(String dirPath) {
-    File file = new File(dirPath);
-    return dttmFormat.format(new Date(file.lastModified()));
-  }
-
   public static String getLastModified(File file) {
     return dttmFormat.format(new Date(file.lastModified()));
   }

src/main/java/com/kamco/cd/kamcoback/config/OpenApiConfig.java

@@ -24,7 +24,7 @@ public class OpenApiConfig {
   @Value("${swagger.dev-url:https://kamco.dev-api.gs.dabeeo.com}")
   private String devUrl;
 
-  @Value("${swagger.prod-url:https://api.kamco.com}")
+  @Value("${swagger.prod-url:https://aicd-api.e-kamco.com:12013}")
   private String prodUrl;
 
   @Bean
@@ -51,9 +51,9 @@ public class OpenApiConfig {
       servers.add(new Server().url("http://localhost:" + serverPort).description("로컬 서버"));
       //      servers.add(new Server().url(prodUrl).description("운영 서버"));
     } else if ("prod".equals(profile)) {
-      //      servers.add(new Server().url(prodUrl).description("운영 서버"));
+      servers.add(new Server().url(prodUrl).description("운영 서버"));
       servers.add(new Server().url("http://localhost:" + serverPort).description("로컬 서버"));
-      servers.add(new Server().url(devUrl).description("개발 서버"));
+
     } else {
       servers.add(new Server().url("http://localhost:" + serverPort).description("로컬 서버"));
       servers.add(new Server().url(devUrl).description("개발 서버"));

src/main/java/com/kamco/cd/kamcoback/config/SecurityConfig.java

@@ -104,14 +104,13 @@ public class SecurityConfig {
                         "/api/change-detection/**",
                         "/api/layer/map/**",
                         "/api/layer/tile-url",
-                        "/api/layer/tile-url-year")
+                        "/api/layer/tile-url-year",
+                        "/api/common-code/clazz")
                     .permitAll()
-
                     // 로그인한 사용자만 가능 IAM
                     .requestMatchers(
                         "/api/user/**",
                         "/api/my/menus",
-                        "/api/common-code/**",
                         "/api/members/*/password",
                         "/api/training-data/label/**",
                         "/api/training-data/review/**")

src/main/java/com/kamco/cd/kamcoback/gukyuin/GukYuinApiController.java

@@ -11,11 +11,6 @@ import com.kamco.cd.kamcoback.gukyuin.dto.DetectMastDto.Basic;
 import com.kamco.cd.kamcoback.gukyuin.dto.DetectMastDto.DetectMastReq;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkableRes;
 import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
-import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiLabelJobService;
-import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiPnuJobService;
-import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiStatusJobService;
-import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiStbltJobService;
-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;
@@ -43,10 +38,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class GukYuinApiController {
 
   private final GukYuinApiService gukYuinApiService;
-  private final GukYuinApiPnuJobService gukYuinApiPnuJobService;
-  private final GukYuinApiStatusJobService gukYuinApiStatusJobService;
-  private final GukYuinApiLabelJobService gukYuinApiLabelJobService;
-  private final GukYuinApiStbltJobService gukYuinApiStbltJobService;
 
   /** 탐지결과 등록 */
   @Operation(summary = "탐지결과 등록", description = "탐지결과 등록")
@@ -331,36 +322,4 @@ public class GukYuinApiController {
       @PathVariable String chnDtctObjtId) {
     return ApiResponseDto.ok(gukYuinApiService.findRlbDtctObject(chnDtctObjtId));
   }
-
-  @Hidden
-  @Operation(summary = "job test pnu", description = "job test pnu")
-  @GetMapping("/job-test/pnu")
-  public ApiResponseDto<Void> findGukYuinContListPnuUpdate() {
-    gukYuinApiPnuJobService.findGukYuinContListPnuUpdate();
-    return ApiResponseDto.ok(null);
-  }
-
-  @Hidden
-  @Operation(summary = "job test status", description = "job test status")
-  @GetMapping("/job-test/status")
-  public ApiResponseDto<Void> findGukYuinMastCompleteYn() {
-    gukYuinApiStatusJobService.findGukYuinMastCompleteYn();
-    return ApiResponseDto.ok(null);
-  }
-
-  @Hidden
-  @Operation(summary = "job test label", description = "job test label")
-  @GetMapping("/job-test/label")
-  public ApiResponseDto<Void> findLabelingCompleteSend() {
-    gukYuinApiLabelJobService.findLabelingCompleteSend();
-    return ApiResponseDto.ok(null);
-  }
-
-  @Hidden
-  @Operation(summary = "job test stblt", description = "job test stblt")
-  @GetMapping("/job-test/stblt")
-  public ApiResponseDto<Void> findGukYuinEligibleForSurvey() {
-    gukYuinApiStbltJobService.findGukYuinEligibleForSurvey();
-    return ApiResponseDto.ok(null);
-  }
 }

src/main/java/com/kamco/cd/kamcoback/gukyuin/dto/ChngDetectMastDto.java

@@ -83,7 +83,7 @@ public class ChngDetectMastDto {
 
     @Schema(
         description = "탐지결과 절대경로명 /kamco_nas/export/{chnDtctId}",
-        example = "/kamco-nfs/dataset/export/D5F192EC76D34F6592035BE63A84F591")
+        example = "{file.nfs}/dataset/export/D5F192EC76D34F6592035BE63A84F591")
     private String pathNm;
 
     @Schema(description = "사원번호", example = "123456")

src/main/java/com/kamco/cd/kamcoback/gukyuin/service/GukYuinApiService.java

@@ -66,8 +66,11 @@ public class GukYuinApiService {
   @Value("${gukyuin.cdi}")
   private String gukyuinCdiUrl;
 
-  @Value("${file.dataset-dir}")
-  private String datasetDir;
+  @Value("${file.nfs}")
+  private String nfs;
+
+  //  @Value("${file.dataset-dir}")
+  //  private String datasetDir;
 
   @Transactional
   public ChngDetectMastDto.RegistResDto regist(
@@ -453,7 +456,10 @@ public class GukYuinApiService {
       return new ResponseObj(ApiResponseCode.DUPLICATE_DATA, "이미 국유인 연동을 한 회차입니다.");
     }
 
-    if (!Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid()))) {
+    //    String kamconfsDatasetExportPathfsDatasetExportPath = "/kamco-nfs/dataset/export/";
+    String kamconfsDatasetExportPathfsDatasetExportPath =
+        String.format("%s%s", nfs, "/dataset/export/");
+    if (!Files.isDirectory(Path.of(kamconfsDatasetExportPathfsDatasetExportPath + info.getUid()))) {
       return new ResponseObj(
           ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다.");
     }
@@ -468,7 +474,7 @@ public class GukYuinApiService {
     reqDto.setCrtrYr(String.valueOf(info.getTargetYyyy()));
     reqDto.setChnDtctSno(String.valueOf(maxStage + 1));
     reqDto.setChnDtctId(info.getUid());
-    reqDto.setPathNm("/kamco-nfs/dataset/export/" + info.getUid());
+    reqDto.setPathNm(kamconfsDatasetExportPathfsDatasetExportPath + info.getUid());
 
     // 1회차를 종료 상태로 처리하고 2회차를 보내야 함
     // 추론(learn), 학습데이터(inference) 둘 다 종료 처리

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

@@ -151,7 +151,7 @@ public class InferenceResultApiController {
           @RequestBody
           @Valid
           InferenceResultDto.RegReq req) {
-    UUID uuid = inferenceResultService.saveInferenceInfo(req);
+    UUID uuid = inferenceResultService.run(req);
     return ApiResponseDto.ok(uuid);
   }
 

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

@@ -0,0 +1,57 @@
+package com.kamco.cd.kamcoback.inference;
+
+import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
+import com.kamco.cd.kamcoback.inference.service.InferenceRunService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "추론 실행", description = "추론 실행")
+@Log4j2
+@RequestMapping("/api/inference/run")
+@RequiredArgsConstructor
+@RestController
+public class InferenceRunController {
+
+  private final InferenceRunService inferenceRunService;
+
+  @Operation(summary = "추론 진행 여부 확인", description = "어드민 홈 > 추론관리 > 추론관리 > 추론관리 목록")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "검색 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema =
+                        @Schema(
+                            description = "진행 여부 (UUID 있으면 진행중)",
+                            type = "UUID",
+                            example = "44709877-2e27-4fc5-bacb-8e0328c69b64"))),
+        @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @GetMapping
+  public ApiResponseDto<Void> getProcessing(
+      @Parameter(description = "비교년도", example = "2021") @RequestParam(required = false)
+          Integer compareYear,
+      @Parameter(description = "기준년도", example = "2022") @RequestParam(required = false)
+          Integer targetYear,
+      @Parameter(description = "모델 uuid") @RequestParam(required = false) UUID modelUuid) {
+
+    inferenceRunService.run(compareYear, targetYear, modelUuid);
+    return ApiResponseDto.ok(null);
+  }
+}

src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultsTestingDto.java

@@ -1,10 +1,12 @@
 package com.kamco.cd.kamcoback.inference.dto;
 
 import com.kamco.cd.kamcoback.postgres.entity.InferenceResultsTestingEntity;
+import java.time.ZonedDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.locationtech.jts.geom.Geometry;
 
 public class InferenceResultsTestingDto {
 
@@ -22,4 +24,31 @@ public class InferenceResultsTestingDto {
       return new ShpDto(e.getBatchId(), e.getUid(), e.getMapId());
     }
   }
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  public static class Basic {
+    private Double probability;
+    private Long beforeYear;
+    private Long afterYear;
+    private String mapId;
+    private String modelVersion;
+    private String clsModelPath;
+    private String clsModelVersion;
+    private String cdModelType;
+    private Long id;
+    private String modelName;
+    private Long batchId;
+    private Double area;
+    private String beforeC;
+    private Double beforeP;
+    private String afterC;
+    private Double afterP;
+    private Long seq;
+    private ZonedDateTime createdDate;
+    private String uid;
+    private Geometry geometry;
+  }
 }

src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java

@@ -5,8 +5,10 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
 
 /** AI API 추론 실행 DTO */
+@Slf4j
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceManualApiController.java

@@ -0,0 +1,10 @@
+package com.kamco.cd.kamcoback.inference.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/inference/manual")
+public class InferenceManualApiController {}

src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceManualService.java

@@ -0,0 +1,22 @@
+package com.kamco.cd.kamcoback.inference.service;
+
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultsTestingDto;
+import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class InferenceManualService {
+  private final InferenceResultCoreService inferenceResultCoreService;
+
+  public void getResultsTesting(List<Long> batchIds) {
+    List<InferenceResultsTestingDto.Basic> resultList =
+        inferenceResultCoreService.getInferenceResults(batchIds);
+
+    if (resultList.isEmpty()) {}
+
+    for (InferenceResultsTestingDto.Basic result : resultList) {}
+  }
+}

src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java

@@ -45,6 +45,7 @@ import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -116,6 +117,124 @@ public class InferenceResultService {
     return dto.getUuid();
   }
 
+  @Transactional
+  public UUID run(InferenceResultDto.RegReq req) {
+    List<MngListDto> targetDtoList = mapSheetMngCoreService.getHstMapSheetList(req);
+    List<String> compareList = mapSheetMngCoreService.getMapSheetMngHst(req.getCompareYyyy());
+    List<String> targetList =
+        mapSheetMngCoreService.getHstMapSheetList(req).stream()
+            .map(MngListDto::getMapSheetNum)
+            .filter(Objects::nonNull)
+            .distinct()
+            .toList();
+
+    log.info(
+        "hst list count compareList = {}, targetList = {}", compareList.size(), targetList.size());
+
+    Set<String> compareSet = new HashSet<>(compareList);
+    Set<String> targetSet = new HashSet<>(targetList);
+
+    long intersectionCount =
+        targetSet.stream()
+            .distinct()
+            .filter(compareSet::contains)
+            .count(); // compare와 target에 공통으로 존재하는 도협 수
+
+    long excludedTargetCount =
+        targetSet.stream()
+            .distinct()
+            .filter(s -> !compareSet.contains(s))
+            .count(); // target 에만 존재하는 도협 수 (compare 에는 없음)
+
+    long onlyCompareCount =
+        compareSet.stream()
+            .distinct()
+            .filter(s -> !targetSet.contains(s))
+            .count(); // compare 에만 존재하는 도협 수 (target 에는 없음)
+
+    log.info(
+        """
+    ===== MapSheet Year Comparison =====
+    target Total: {}
+    compare Total: {}
+    Intersection: {}
+    target Only (Excluded from compare): {}
+    compare Only: {}
+    ====================================
+    """,
+        targetSet.size(),
+        compareSet.size(),
+        intersectionCount,
+        excludedTargetCount,
+        onlyCompareCount);
+
+    List<String> filteredTargetList =
+        targetSet.stream() // target 기준으로
+            .filter(compareSet::contains) // compare에 있는 도협만 남김
+            .toList();
+
+    Scene modelComparePath =
+        getSceneInference(req.getCompareYyyy().toString(), filteredTargetList, "", "");
+
+    Scene modelTargetPath =
+        getSceneInference(req.getTargetYyyy().toString(), filteredTargetList, "", "");
+
+    // 작은 쪽 기준으로 탐지건수/파일생성 리스트 결정
+    List<ImageFeature> imageFeatureList;
+    if (modelComparePath.getFeatures().size() <= modelTargetPath.getFeatures().size()) {
+      imageFeatureList = modelComparePath.getFeatures();
+    } else {
+      imageFeatureList = modelTargetPath.getFeatures();
+    }
+
+    // imageFeatureList 기준 sceneId Set
+    Set<String> sceneIdSet =
+        imageFeatureList.stream()
+            .map(ImageFeature::getSceneId)
+            .filter(Objects::nonNull)
+            .collect(Collectors.toSet());
+
+    // targetList(List<MngListDto>) 리턴용으로 필터링
+    List<MngListDto> newTargetList =
+        targetDtoList.stream()
+            .filter(m -> m.getMapSheetNum() != null)
+            .filter(m -> sceneIdSet.contains(m.getMapSheetNum()))
+            .toList();
+
+    // 목록 및 추론 대상 도엽정보 저장
+    UUID uuid = inferenceResultCoreService.saveInferenceInfo(req, newTargetList);
+
+    // ai 서버에 전달할 파라미터 생성
+    pred_requests_areas predRequestsAreas = new pred_requests_areas();
+    predRequestsAreas.setInput1_year(req.getCompareYyyy());
+    predRequestsAreas.setInput2_year(req.getTargetYyyy());
+    predRequestsAreas.setInput1_scene_path(modelComparePath.getFilePath());
+    predRequestsAreas.setInput2_scene_path(modelTargetPath.getFilePath());
+
+    InferenceSendDto m1 = this.getModelInfo(req.getModel1Uuid());
+    m1.setPred_requests_areas(predRequestsAreas);
+
+    log.info("[INFERENCE] Start m1 = {}", m1);
+    m1.setPred_requests_areas(predRequestsAreas);
+
+    // ai 추론 실행 api 호출
+    Long batchId = ensureAccepted(m1);
+
+    // ai 추론 실행후 응답값 update
+    SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
+    saveInferenceAiDto.setUuid(uuid);
+    saveInferenceAiDto.setBatchId(batchId);
+    saveInferenceAiDto.setStatus(Status.IN_PROGRESS.getId());
+    saveInferenceAiDto.setType(ModelType.G1.getId());
+    saveInferenceAiDto.setInferStartDttm(ZonedDateTime.now());
+    saveInferenceAiDto.setModelComparePath(modelComparePath.getFilePath());
+    saveInferenceAiDto.setModelTargetPath(modelTargetPath.getFilePath());
+    saveInferenceAiDto.setModelStartDttm(ZonedDateTime.now());
+    inferenceResultCoreService.update(saveInferenceAiDto);
+
+    return uuid;
+  }
+
   /**
    * 변화탐지 실행 정보 생성
    *
@@ -146,31 +265,31 @@ public class InferenceResultService {
 
     List<TotalListDto> totalNumList = new ArrayList<>();
 
-    if (DetectOption.EXCL.getId().equals(req.getDetectOption())) {
-      // "추론제외" 일때 전년도 이전 값이 있어도 전년도 도엽이 없으면 비교 안함
-      for (MngListCompareDto dto : compareList) {
-        if (Objects.equals(dto.getBeforeYear(), req.getCompareYyyy())) {
-          TotalListDto totalDto = new TotalListDto();
-          totalDto.setBeforeYear(dto.getBeforeYear() == null ? 0 : dto.getBeforeYear());
-          totalDto.setMapSheetNum(dto.getMapSheetNum());
-          totalNumList.add(totalDto);
-        }
-      }
-    } else if (DetectOption.PREV.getId().equals(req.getDetectOption())) {
-      // "이전 년도 도엽 사용" 이면 전년도 이전 도엽도 사용
-      for (MngListCompareDto dto : compareList) {
-        if (dto.getBeforeYear() != 0) {
-          TotalListDto totalDto = new TotalListDto();
-          totalDto.setBeforeYear(dto.getBeforeYear() == null ? 0 : dto.getBeforeYear());
-          totalDto.setMapSheetNum(dto.getMapSheetNum());
-          totalNumList.add(totalDto);
-        }
-      }
-    }
-
-    if (totalNumList.isEmpty()) {
-      throw new CustomApiException("NOT_FOUND_COMPARE_YEAR", HttpStatus.NOT_FOUND);
-    }
+    //    if (DetectOption.EXCL.getId().equals(req.getDetectOption())) {
+    //      // "추론제외" 일때 전년도 이전 값이 있어도 전년도 도엽이 없으면 비교 안함
+    //      for (MngListCompareDto dto : compareList) {
+    //        if (Objects.equals(dto.getBeforeYear(), req.getCompareYyyy())) {
+    //          TotalListDto totalDto = new TotalListDto();
+    //          totalDto.setBeforeYear(dto.getBeforeYear() == null ? 0 : dto.getBeforeYear());
+    //          totalDto.setMapSheetNum(dto.getMapSheetNum());
+    //          totalNumList.add(totalDto);
+    //        }
+    //      }
+    //    } else if (DetectOption.PREV.getId().equals(req.getDetectOption())) {
+    //      // "이전 년도 도엽 사용" 이면 전년도 이전 도엽도 사용
+    //      for (MngListCompareDto dto : compareList) {
+    //        if (dto.getBeforeYear() != 0) {
+    //          TotalListDto totalDto = new TotalListDto();
+    //          totalDto.setBeforeYear(dto.getBeforeYear() == null ? 0 : dto.getBeforeYear());
+    //          totalDto.setMapSheetNum(dto.getMapSheetNum());
+    //          totalNumList.add(totalDto);
+    //        }
+    //      }
+    //    }
+    //
+    //    if (totalNumList.isEmpty()) {
+    //      throw new CustomApiException("NOT_FOUND_COMPARE_YEAR", HttpStatus.NOT_FOUND);
+    //    }
 
     // 사용할 영상파일 년도 기록 및 추론에 포함되는지 설정
     for (MngListDto target : targetList) {
@@ -238,6 +357,8 @@ public class InferenceResultService {
     predRequestsAreas.setInput2_scene_path(modelTargetPath.getFilePath());
 
     InferenceSendDto m1 = this.getModelInfo(req.getModel1Uuid());
+
+    log.info("[INFERENCE] Start m1 = {}", m1);
     m1.setPred_requests_areas(predRequestsAreas);
 
     // ai 추론 실행 api 호출
@@ -325,6 +446,7 @@ public class InferenceResultService {
    *
    * @param dto
    */
+  // 같은함수가 왜 두개지
   private Long ensureAccepted(InferenceSendDto dto) {
 
     if (dto == null) {
@@ -332,6 +454,14 @@ public class InferenceResultService {
       throw new CustomApiException("BAD_REQUEST", HttpStatus.BAD_REQUEST);
     }
 
+    // [중복]운영환경일때 경로수정 dean 260226
+    if (profile != null && profile.equals("prod")) {
+      log.info("========================================================");
+      log.info("[CHANGE INFERENCE] profile = {}  Inforence req", profile);
+      log.info("========================================================");
+      log.info("");
+    }
+
     // 1) 요청 로그
     try {
       log.debug("Inference request dto={}", objectMapper.writeValueAsString(dto));
@@ -340,13 +470,15 @@ public class InferenceResultService {
     }
 
     // 2) local 환경 임시 처리
-    if ("local".equals(profile)) {
-      if (dto.getPred_requests_areas() == null) {
-        throw new IllegalStateException("pred_requests_areas is null");
-      }
-      dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson");
-      dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson");
-    }
+    //    if ("local".equals(profile)) {
+    //      if (dto.getPred_requests_areas() == null) {
+    //        throw new IllegalStateException("pred_requests_areas is null");
+    //      }
+    //
+    // dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson");
+    //
+    // dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson");
+    //    }
 
     // 3) HTTP 호출
     HttpHeaders headers = new HttpHeaders();
@@ -429,7 +561,8 @@ public class InferenceResultService {
     sendDto.setCls_model_path(cdClsModelPath);
     sendDto.setCls_model_version(modelInfo.getModelVer());
     sendDto.setCd_model_type(modelType);
-    sendDto.setPriority(modelInfo.getPriority());
+    sendDto.setPriority(5d);
+    log.info("[Inference Send]SendDto={}", sendDto);
     return sendDto;
   }
 

src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceRunService.java

@@ -0,0 +1,224 @@
+package com.kamco.cd.kamcoback.inference.service;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.kamco.cd.kamcoback.common.exception.CustomApiException;
+import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.Scene;
+import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient;
+import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult;
+import com.kamco.cd.kamcoback.inference.dto.InferenceSendDto;
+import com.kamco.cd.kamcoback.inference.dto.InferenceSendDto.pred_requests_areas;
+import com.kamco.cd.kamcoback.model.dto.ModelMngDto.Basic;
+import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelType;
+import com.kamco.cd.kamcoback.postgres.core.MapSheetMngCoreService;
+import com.kamco.cd.kamcoback.postgres.core.ModelMngCoreService;
+import java.nio.file.Paths;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+
+@Service
+@Log4j2
+@RequiredArgsConstructor
+public class InferenceRunService {
+  private final ExternalHttpClient externalHttpClient;
+  private final MapSheetMngCoreService mapSheetMngCoreService;
+  private final ModelMngCoreService modelMngCoreService;
+  private final ObjectMapper objectMapper;
+
+  @Value("${spring.profiles.active}")
+  private String profile;
+
+  @Value("${inference.url}")
+  private String inferenceUrl;
+
+  // TODO 이거 쓰는건가?
+  public void run(Integer compareYear, Integer targetYear, UUID modelUuid) {
+
+    List<String> compareList = mapSheetMngCoreService.getMapSheetMngHst(compareYear);
+    List<String> targetList = mapSheetMngCoreService.getMapSheetMngHst(targetYear);
+
+    log.info(
+        "hst list count compareList = {}, targetList = {}", compareList.size(), targetList.size());
+
+    Set<String> compareSet = new HashSet<>(compareList);
+    Set<String> targetSet = new HashSet<>(targetList);
+
+    long intersectionCount =
+        targetSet.stream()
+            .distinct()
+            .filter(compareSet::contains)
+            .count(); // compare와 target에 공통으로 존재하는 도협 수
+
+    long excludedTargetCount =
+        targetSet.stream()
+            .distinct()
+            .filter(s -> !compareSet.contains(s))
+            .count(); // target 에만 존재하는 도협 수 (compare 에는 없음)
+
+    long onlyCompareCount =
+        compareSet.stream()
+            .distinct()
+            .filter(s -> !targetSet.contains(s))
+            .count(); // compare 에만 존재하는 도협 수 (target 에는 없음)
+
+    log.info(
+        """
+      ===== MapSheet Year Comparison =====
+      target Total: {}
+      compare Total: {}
+      Intersection: {}
+      target Only (Excluded from compare): {}
+      compare Only: {}
+      ====================================
+      """,
+        targetSet.size(),
+        compareSet.size(),
+        intersectionCount,
+        excludedTargetCount,
+        onlyCompareCount);
+
+    List<String> filteredTargetList =
+        targetSet.stream() // target 기준으로
+            .filter(compareSet::contains) // compare에 있는 도협만 남김
+            .toList();
+
+    Scene modelComparePath = getSceneInference(compareYear.toString(), filteredTargetList, "", "");
+
+    Scene modelTargetPath = getSceneInference(targetYear.toString(), filteredTargetList, "", "");
+
+    // ai 서버에 전달할 파라미터 생성
+    pred_requests_areas predRequestsAreas = new pred_requests_areas();
+    predRequestsAreas.setInput1_year(compareYear);
+    predRequestsAreas.setInput2_year(targetYear);
+    predRequestsAreas.setInput1_scene_path(modelComparePath.getFilePath());
+    predRequestsAreas.setInput2_scene_path(modelTargetPath.getFilePath());
+
+    InferenceSendDto m1 = this.getModelInfo(modelUuid);
+    m1.setPred_requests_areas(predRequestsAreas);
+
+    // ai 추론 실행 api 호출
+    Long batchId = ensureAccepted(m1);
+  }
+
+  private Scene getSceneInference(
+      String yyyy, List<String> mapSheetNums, String mapSheetScope, String detectOption) {
+    return mapSheetMngCoreService.getSceneInference(
+        yyyy, mapSheetNums, mapSheetScope, detectOption);
+  }
+
+  /**
+   * 추론 AI API 호출
+   *
+   * @param dto
+   */
+  private Long ensureAccepted(InferenceSendDto dto) {
+
+    if (dto == null) {
+      log.warn("not InferenceSendDto dto");
+      throw new CustomApiException("BAD_REQUEST", HttpStatus.BAD_REQUEST);
+    }
+
+    // 1) 요청 로그
+    try {
+      log.info("Inference request dto={}", objectMapper.writeValueAsString(dto));
+    } catch (JsonProcessingException e) {
+      log.warn("Failed to serialize inference dto", e);
+    }
+
+    // 3) HTTP 호출
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(MediaType.APPLICATION_JSON);
+    headers.setAccept(List.of(MediaType.APPLICATION_JSON));
+
+    ExternalCallResult<String> result =
+        externalHttpClient.call(inferenceUrl, HttpMethod.POST, dto, headers, String.class);
+
+    if (result.statusCode() < 200 || result.statusCode() >= 300) {
+      log.error("Inference API failed. status={}, body={}", result.statusCode(), result.body());
+      throw new CustomApiException("BAD_GATEWAY", HttpStatus.BAD_GATEWAY);
+    }
+
+    // 4) 응답 파싱
+    try {
+      List<Map<String, Object>> list =
+          objectMapper.readValue(result.body(), new TypeReference<>() {});
+
+      if (list.isEmpty()) {
+        throw new IllegalStateException("Inference response is empty");
+      }
+
+      Object batchIdObj = list.get(0).get("batch_id");
+      if (batchIdObj == null) {
+        throw new IllegalStateException("batch_id not found in response");
+      }
+
+      return Long.valueOf(batchIdObj.toString());
+
+    } catch (Exception e) {
+      log.error("Failed to parse inference response. body={}", result.body(), e);
+      throw new CustomApiException("INVALID_INFERENCE_RESPONSE", HttpStatus.BAD_GATEWAY);
+    }
+  }
+
+  /**
+   * 모델정보 조회 dto 생성 후 반환
+   *
+   * @param uuid
+   * @return
+   */
+  private InferenceSendDto getModelInfo(UUID uuid) {
+
+    Basic modelInfo = modelMngCoreService.findByModelUuid(uuid);
+
+    String cdModelPath = "";
+    String cdModelConfigPath = "";
+    String cdClsModelPath = "";
+
+    if (modelInfo.getCdModelPath() != null && modelInfo.getCdModelFileName() != null) {
+      cdModelPath =
+          Paths.get(modelInfo.getCdModelPath(), modelInfo.getCdModelFileName()).toString();
+    }
+
+    if (modelInfo.getCdModelConfig() != null && modelInfo.getCdModelConfigFileName() != null) {
+      cdModelConfigPath =
+          Paths.get(modelInfo.getCdModelConfig(), modelInfo.getCdModelConfigFileName()).toString();
+    }
+
+    if (modelInfo.getClsModelPath() != null && modelInfo.getClsModelFileName() != null) {
+      cdClsModelPath =
+          Paths.get(modelInfo.getClsModelPath(), modelInfo.getClsModelFileName()).toString();
+    }
+
+    String modelType = "";
+
+    if (modelInfo.getModelType().equals(ModelType.G1.getId())) {
+      modelType = ModelType.G1.getId();
+    } else if (modelInfo.getModelType().equals(ModelType.G2.getId())) {
+      modelType = ModelType.G2.getId();
+    } else {
+      modelType = ModelType.G3.getId();
+    }
+
+    InferenceSendDto sendDto = new InferenceSendDto();
+    sendDto.setModel_version(modelInfo.getModelVer());
+    sendDto.setCd_model_path(cdModelPath);
+    sendDto.setCd_model_config(cdModelConfigPath);
+    sendDto.setCls_model_path(cdClsModelPath);
+    sendDto.setCls_model_version(modelInfo.getModelVer());
+    sendDto.setCd_model_type(modelType);
+    sendDto.setPriority(5.0);
+    return sendDto;
+  }
+}

src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java

@@ -47,6 +47,9 @@ public class MapSheetMngService {
   private final UploadService uploadService;
   private final UserUtil userUtil = new UserUtil();
 
+  @Value("${file.root}")
+  private String nfsRootDir;
+
   @Value("${file.sync-root-dir}")
   private String syncRootDir;
 
@@ -111,7 +114,6 @@ public class MapSheetMngService {
   public DmlReturn uploadPair(
       MultipartFile tfwFile, String tifFile, Long hstUid, Long tifFileSize) {
 
-    String rootPath = syncRootDir;
     String tmpPath = syncTmpDir;
 
     DmlReturn dmlReturn = new DmlReturn("success", "UPLOAD COMPLETE");
@@ -133,6 +135,7 @@ public class MapSheetMngService {
       return dmlReturn;
     }
 
+    // TODO 삭제?
     MngDto mngDto = mapSheetMngCoreService.findMapSheetMng(errDto.getMngYyyy());
 
     // 중복체크 -> 도엽50k/uuid 경로에 업로드 할 거라 overwrite 되지 않음
@@ -336,12 +339,11 @@ public class MapSheetMngService {
 
   public FoldersDto getFolderAll(SrchFoldersDto srchDto) {
 
-    Path startPath = Paths.get(syncRootDir + srchDto.getDirPath());
     String dirPath = syncRootDir + srchDto.getDirPath();
-    String sortType = "name desc";
 
+    log.info("[FIND_FOLDER] DIR : {}", dirPath);
     List<FIleChecker.Folder> folderList =
-        FIleChecker.getFolderAll(dirPath).stream()
+        FIleChecker.getFolderAll(dirPath, nfsRootDir).stream()
             .filter(dir -> dir.getIsValid().equals(true))
             .toList();
 

src/main/java/com/kamco/cd/kamcoback/members/MembersApiController.java

@@ -5,7 +5,6 @@ import com.kamco.cd.kamcoback.members.dto.MembersDto;
 import com.kamco.cd.kamcoback.members.dto.MembersDto.Basic;
 import com.kamco.cd.kamcoback.members.service.AdminService;
 import com.kamco.cd.kamcoback.members.service.MembersService;
-import com.kamco.cd.kamcoback.scheduler.service.MemberInactiveJobService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -35,7 +34,6 @@ public class MembersApiController {
 
   private final MembersService membersService;
   private final AdminService adminService;
-  private final MemberInactiveJobService memberInactiveJobService;
 
   @Operation(summary = "회원정보 목록", description = "회원정보 조회")
   @ApiResponses(
@@ -159,13 +157,4 @@ public class MembersApiController {
           String employeeNo) {
     return ApiResponseDto.ok(adminService.existsByEmployeeNo(employeeNo));
   }
-
-  @Operation(
-      summary = "라벨러/검수자 최종로그인 28일 경과 이후 사용중지(스케줄링 실행)",
-      description = "라벨러/검수자 최종로그인 28일 경과 이후 사용중지 처리")
-  @GetMapping("/member-inactive-job")
-  public ApiResponseDto<Void> memberInactiveJob() {
-    memberInactiveJobService.memberActive28daysToInactive();
-    return ApiResponseDto.ok(null);
-  }
 }

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

@@ -7,6 +7,7 @@ import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto;
 import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.MapScaleType;
 import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.MapSheetList;
 import com.kamco.cd.kamcoback.common.enums.DetectionClassification;
+import com.kamco.cd.kamcoback.common.exception.CustomApiException;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceGeomEntity;
 import com.kamco.cd.kamcoback.postgres.repository.changedetection.ChangeDetectionRepository;
 import java.util.List;
@@ -15,6 +16,7 @@ import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.Point;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -96,4 +98,42 @@ public class ChangeDetectionCoreService {
   public List<MapSheetList> getChangeDetectionMapSheet50kList(UUID uuid) {
     return changeDetectionRepository.getChangeDetectionMapSheet50kList(uuid);
   }
+
+  /**
+   * 선택 폴리곤 조회 by object id
+   *
+   * @param chnDtctId 회차 uid 32자
+   * @param cdObjectId geo object uid 32자
+   * @param cdObjectIds geo object uids 32자
+   * @return
+   */
+  public ChangeDetectionDto.PolygonFeatureList getPolygonListByCd(
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds) {
+    return changeDetectionRepository.getPolygonListByCd(chnDtctId, cdObjectId, cdObjectIds);
+  }
+
+  /**
+   * 선택 Point 조회 by object id
+   *
+   * @param chnDtctId 회차 uid 32자
+   * @param cdObjectId geo object uid 32자
+   * @param cdObjectIds geo object uids 32자
+   * @return
+   */
+  public ChangeDetectionDto.PointFeatureList getPointListByCd(
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds) {
+    return changeDetectionRepository.getPointListByCd(chnDtctId, cdObjectId, cdObjectIds);
+  }
+
+  /**
+   * learn uuid 조회
+   *
+   * @param chnDtctId
+   * @return
+   */
+  public UUID getLearnUuid(String chnDtctId) {
+    return changeDetectionRepository
+        .getLearnUuid(chnDtctId)
+        .orElseThrow(() -> new CustomApiException("NOT_FOUND_DATA", HttpStatus.NOT_FOUND));
+  }
 }

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

@@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.postgres.core;
 
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
 import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinLabelJobRepository;
+import java.time.LocalDate;
 import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,8 +16,8 @@ public class GukYuinLabelJobCoreService {
     this.gukYuinLabelRepository = gukYuinLabelRepository;
   }
 
-  public List<GeomUidDto> findYesterdayLabelingCompleteList() {
-    return gukYuinLabelRepository.findYesterdayLabelingCompleteList();
+  public List<GeomUidDto> findYesterdayLabelingCompleteList(LocalDate baseDate) {
+    return gukYuinLabelRepository.findYesterdayLabelingCompleteList(baseDate);
   }
 
   @Transactional

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

@@ -498,15 +498,16 @@ public class InferenceResultCoreService {
   }
 
   /**
-   * 추론 결과 shp파일 생성위해서 조회
+   * 추론 결과 조회
    *
    * @param batchIds
    * @return
    */
-  public List<InferenceResultsTestingDto.ShpDto> getInferenceResults(List<Long> batchIds) {
+  public List<InferenceResultsTestingDto.Basic> getInferenceResults(List<Long> batchIds) {
     List<InferenceResultsTestingEntity> list =
         inferenceResultsTestingRepository.getInferenceResultList(batchIds);
-    return list.stream().map(InferenceResultsTestingDto.ShpDto::fromEntity).toList();
+
+    return list.stream().map(InferenceResultsTestingEntity::toDto).toList();
   }
 
   public Long getInferenceResultCnt(List<Long> batchIds) {

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

@@ -342,4 +342,9 @@ public class MapSheetMngCoreService {
   public List<MngListCompareDto> getByHstMapSheetCompareList(int mngYyyy, List<String> mapId) {
     return mapSheetMngYearRepository.findByHstMapSheetCompareList(mngYyyy, mapId);
   }
+
+  public List<String> getMapSheetMngHst(Integer year) {
+    List<MapSheetMngHstEntity> entity = mapSheetMngRepository.getMapSheetMngHst(year);
+    return entity.stream().map(MapSheetMngHstEntity::getMapSheetNum).toList();
+  }
 }

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

@@ -6,6 +6,7 @@ import com.kamco.cd.kamcoback.postgres.repository.mapsheet.MapSheetMngYearReposi
 import com.kamco.cd.kamcoback.postgres.repository.scheduler.MapSheetMngFileJobRepository;
 import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto;
 import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngHstDto;
+import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.YearMinMax;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -67,9 +68,10 @@ public class MapSheetMngFileJobCoreService {
     return mapSheetMngFileJobRepository.findNotYetMapSheetMng();
   }
 
-  public Long findByHstMapSheetBeforeYyyyListCount(int strtYyyy, int endYyyy, String mapSheetNum) {
+  public Long findByHstMapSheetBeforeYyyyListCount(
+      int mngYyyy, int strtYyyy, int endYyyy, String mapSheetNum) {
     return mapSheetMngFileJobRepository.findByHstMapSheetBeforeYyyyListCount(
-        strtYyyy, endYyyy, mapSheetNum);
+        mngYyyy, strtYyyy, endYyyy, mapSheetNum);
   }
 
   public void updateException5kMapSheet(String mapSheetNum, CommonUseStatus commonUseStatus) {
@@ -79,4 +81,16 @@ public class MapSheetMngFileJobCoreService {
   public void saveSheetMngYear() {
     mapSheetMngYearRepository.saveFileInfo();
   }
+
+  public YearMinMax findYearMinMaxInfo() {
+    return mapSheetMngYearRepository.findYearMinMaxInfo();
+  }
+
+  public Long findMngYyyyCnt(Integer mngYyyy) {
+    return mapSheetMngFileJobRepository.findMngYyyyCnt(mngYyyy);
+  }
+
+  public Long findMapSheetUseExceptCnt(String mapSheetNum) {
+    return mapSheetMngFileJobRepository.findMapSheetUseExceptCnt(mapSheetNum);
+  }
 }

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

@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.postgres.core;
 import com.kamco.cd.kamcoback.postgres.repository.scheduler.TrainingDataLabelJobRepository;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.InspectorPendingDto;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.Tasks;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
@@ -14,8 +15,8 @@ public class TrainingDataLabelJobCoreService {
 
   private final TrainingDataLabelJobRepository trainingDataLabelJobRepository;
 
-  public List<Tasks> findCompletedYesterdayUnassigned() {
-    return trainingDataLabelJobRepository.findCompletedYesterdayUnassigned();
+  public List<Tasks> findCompletedYesterdayUnassigned(LocalDate baseDate) {
+    return trainingDataLabelJobRepository.findCompletedYesterdayUnassigned(baseDate);
   }
 
   public void assignReviewerBatch(List<UUID> assignmentUids, String reviewerId) {

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

@@ -4,6 +4,7 @@ import com.kamco.cd.kamcoback.postgres.repository.scheduler.TrainingDataReviewJo
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalCntInfo;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalMapSheetList;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.CompleteLabelData;
+import java.time.LocalDate;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -15,12 +16,13 @@ public class TrainingDataReviewJobCoreService {
   private final TrainingDataReviewJobRepository trainingDataReviewJobRepository;
 
   public List<CompleteLabelData> findCompletedYesterdayLabelingList(
-      Long analUid, String mapSheetNum) {
-    return trainingDataReviewJobRepository.findCompletedYesterdayLabelingList(analUid, mapSheetNum);
+      Long analUid, String mapSheetNum, LocalDate baseDate) {
+    return trainingDataReviewJobRepository.findCompletedYesterdayLabelingList(
+        analUid, mapSheetNum, baseDate);
   }
 
-  public List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid) {
-    return trainingDataReviewJobRepository.findCompletedAnalMapSheetList(analUid);
+  public List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid, LocalDate baseDate) {
+    return trainingDataReviewJobRepository.findCompletedAnalMapSheetList(analUid, baseDate);
   }
 
   public List<AnalCntInfo> findAnalCntInfoList() {

src/main/java/com/kamco/cd/kamcoback/postgres/entity/InferenceResultsTestingEntity.java

@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultsTestingDto;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -84,4 +85,28 @@ public class InferenceResultsTestingEntity {
 
   @Column(name = "geometry", columnDefinition = "geometry")
   private Geometry geometry;
+
+  public InferenceResultsTestingDto.Basic toDto() {
+    return new InferenceResultsTestingDto.Basic(
+        this.probability,
+        this.beforeYear,
+        this.afterYear,
+        this.mapId,
+        this.modelVersion,
+        this.clsModelPath,
+        this.clsModelVersion,
+        this.cdModelType,
+        this.id,
+        this.modelName,
+        this.batchId,
+        this.area,
+        this.beforeC,
+        this.beforeP,
+        this.afterC,
+        this.afterP,
+        this.seq,
+        this.createdDate,
+        this.uid,
+        this.geometry);
+  }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryCustom.java

@@ -4,6 +4,7 @@ import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto;
 import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.MapScaleType;
 import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.MapSheetList;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 public interface ChangeDetectionRepositoryCustom {
@@ -28,4 +29,18 @@ public interface ChangeDetectionRepositoryCustom {
   List<ChangeDetectionDto.MapSheetList> getChangeDetectionMapSheetList(UUID uuid);
 
   List<MapSheetList> getChangeDetectionMapSheet50kList(UUID uuid);
+
+  ChangeDetectionDto.PolygonFeatureList getPolygonListByCd(
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds);
+
+  ChangeDetectionDto.PointFeatureList getPointListByCd(
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds);
+
+  ChangeDetectionDto.PolygonFeatureList getSelectedChangeDetectionPolygonListByPnu(
+      String chnDtctId, String pnu);
+
+  ChangeDetectionDto.PointFeatureList getSelectedChangeDetectionPointListByPnu(
+      String chnDtctId, String pnu);
+
+  Optional<UUID> getLearnUuid(String chnDtctId);
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java

@@ -8,6 +8,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceG
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalSttcEntity.mapSheetAnalSttcEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -16,11 +17,14 @@ import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto;
 import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.DetectSearchType;
 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.PolygonFeatureList;
 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;
 import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity;
+import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.CaseBuilder;
@@ -30,10 +34,13 @@ import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
     implements ChangeDetectionRepositoryCustom {
 
@@ -226,7 +233,9 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
                     mapSheetAnalDataInferenceGeomEntity.targetYyyy,
                     mapSheetAnalDataInferenceGeomEntity.classAfterProb,
                     mapSheetAnalDataInferenceGeomEntity.classAfterCd.toUpperCase(),
-                    mapSheetAnalDataInferenceGeomEntity.cdProb))
+                    mapSheetAnalDataInferenceGeomEntity.cdProb,
+                    mapSheetAnalDataInferenceGeomEntity.uuid,
+                    mapSheetAnalDataInferenceGeomEntity.resultUid))
             .from(mapSheetAnalDataInferenceGeomEntity)
             .innerJoin(mapSheetAnalDataInferenceEntity)
             .on(mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id))
@@ -261,7 +270,9 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
                           data.getAfterYear(),
                           data.getAfterConfidence(),
                           data.getAfterClass(),
-                          data.getCdProb());
+                          data.getCdProb(),
+                          data.getUuid(),
+                          data.getResultUid());
 
                   return new ChangeDetectionDto.PolygonFeature(
                       data.getType(), jsonNode, properties);
@@ -371,4 +382,275 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
                 "{0} || {1}", imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
         .otherwise("");
   }
+
+  @Override
+  public PolygonFeatureList getPolygonListByCd(
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds) {
+    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 =
+        queryFactory
+            .select(
+                Projections.constructor(
+                    ChangeDetectionDto.PolygonQueryData.class,
+                    Expressions.stringTemplate("{0}", "Feature"),
+                    Expressions.stringTemplate(
+                        "ST_AsGeoJSON({0})", mapSheetAnalDataInferenceGeomEntity.geom),
+                    mapSheetAnalDataInferenceGeomEntity.geoUid,
+                    mapSheetAnalDataInferenceGeomEntity.area,
+                    mapSheetAnalDataInferenceGeomEntity.compareYyyy,
+                    mapSheetAnalDataInferenceGeomEntity.classBeforeProb,
+                    mapSheetAnalDataInferenceGeomEntity.classBeforeCd.toUpperCase(),
+                    mapSheetAnalDataInferenceGeomEntity.targetYyyy,
+                    mapSheetAnalDataInferenceGeomEntity.classAfterProb,
+                    mapSheetAnalDataInferenceGeomEntity.classAfterCd.toUpperCase(),
+                    mapSheetAnalDataInferenceGeomEntity.cdProb,
+                    mapSheetAnalDataInferenceGeomEntity.uuid,
+                    mapSheetAnalDataInferenceGeomEntity.resultUid))
+            .from(mapSheetAnalDataInferenceGeomEntity)
+            .innerJoin(mapSheetAnalDataInferenceEntity)
+            .on(mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id))
+            .innerJoin(mapSheetAnalInferenceEntity)
+            .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
+            .innerJoin(mapSheetLearnEntity)
+            .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId))
+            .where(builder)
+            .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc())
+            .fetch();
+
+    ObjectMapper mapper = new ObjectMapper();
+    List<ChangeDetectionDto.PolygonFeature> result =
+        list.stream()
+            .map(
+                data -> {
+                  String geoJson = data.getGeometry();
+                  JsonNode jsonNode;
+                  try {
+                    jsonNode = mapper.readTree(geoJson);
+                  } catch (JsonProcessingException e) {
+                    throw new RuntimeException(e);
+                  }
+
+                  ChangeDetectionDto.PolygonProperties properties =
+                      new ChangeDetectionDto.PolygonProperties(
+                          data.getGeoUid(),
+                          data.getArea(),
+                          data.getBeforeYear(),
+                          data.getBeforeConfidence(),
+                          data.getBeforeClass(),
+                          data.getAfterYear(),
+                          data.getAfterConfidence(),
+                          data.getAfterClass(),
+                          data.getCdProb(),
+                          data.getUuid(),
+                          data.getResultUid());
+
+                  return new ChangeDetectionDto.PolygonFeature(
+                      data.getType(), jsonNode, properties);
+                })
+            .collect(Collectors.toList());
+
+    ChangeDetectionDto.PolygonFeatureList polygonList = new ChangeDetectionDto.PolygonFeatureList();
+    polygonList.setType("FeatureCollection");
+    polygonList.setFeatures(result);
+    return polygonList;
+  }
+
+  @Override
+  public PointFeatureList getPointListByCd(
+      String chnDtctId, String cdObjectId, List<String> cdObjectIds) {
+    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 =
+        queryFactory
+            .select(
+                Projections.constructor(
+                    ChangeDetectionDto.PointQueryData.class,
+                    Expressions.stringTemplate("{0}", "Feature"),
+                    Expressions.stringTemplate(
+                        "ST_AsGeoJSON({0})",
+                        mapSheetAnalDataInferenceGeomEntity.geomCenter), // point
+                    Projections.constructor(
+                        ChangeDetectionDto.PointProperties.class,
+                        mapSheetAnalDataInferenceGeomEntity.geoUid,
+                        mapSheetAnalDataInferenceGeomEntity.classAfterCd.toUpperCase())))
+            .from(mapSheetAnalDataInferenceGeomEntity)
+            .innerJoin(mapSheetAnalDataInferenceEntity)
+            .on(mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id))
+            .innerJoin(mapSheetAnalInferenceEntity)
+            .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
+            .innerJoin(mapSheetLearnEntity)
+            .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId))
+            .where(builder)
+            .fetch();
+
+    ObjectMapper mapper = new ObjectMapper();
+    List<ChangeDetectionDto.PointFeature> result =
+        list.stream()
+            .map(
+                data -> {
+                  String geoJson = data.getGeometry();
+                  JsonNode jsonNode;
+                  try {
+                    jsonNode = mapper.readTree(geoJson);
+                  } catch (JsonProcessingException e) {
+                    throw new RuntimeException(e);
+                  }
+
+                  return new ChangeDetectionDto.PointFeature(
+                      data.getType(), jsonNode, data.getProperties());
+                })
+            .collect(Collectors.toList());
+
+    return new ChangeDetectionDto.PointFeatureList("FeatureCollection", result);
+  }
+
+  @Override
+  public PolygonFeatureList getSelectedChangeDetectionPolygonListByPnu(
+      String chnDtctId, String pnu) {
+    BooleanBuilder builder = new BooleanBuilder();
+    builder.and(mapSheetLearnEntity.uid.eq(chnDtctId));
+    builder.and(pnuEntity.pnu.eq(pnu));
+
+    List<ChangeDetectionDto.PolygonQueryData> list =
+        queryFactory
+            .select(
+                Projections.constructor(
+                    ChangeDetectionDto.PolygonQueryData.class,
+                    Expressions.stringTemplate("{0}", "Feature"),
+                    Expressions.stringTemplate(
+                        "ST_AsGeoJSON({0})", mapSheetAnalDataInferenceGeomEntity.geom),
+                    mapSheetAnalDataInferenceGeomEntity.geoUid,
+                    mapSheetAnalDataInferenceGeomEntity.area,
+                    mapSheetAnalDataInferenceGeomEntity.compareYyyy,
+                    mapSheetAnalDataInferenceGeomEntity.classBeforeProb,
+                    mapSheetAnalDataInferenceGeomEntity.classBeforeCd.toUpperCase(),
+                    mapSheetAnalDataInferenceGeomEntity.targetYyyy,
+                    mapSheetAnalDataInferenceGeomEntity.classAfterProb,
+                    mapSheetAnalDataInferenceGeomEntity.classAfterCd.toUpperCase(),
+                    mapSheetAnalDataInferenceGeomEntity.cdProb))
+            .from(mapSheetAnalDataInferenceGeomEntity)
+            .innerJoin(mapSheetAnalDataInferenceEntity)
+            .on(mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id))
+            .innerJoin(mapSheetAnalInferenceEntity)
+            .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
+            .innerJoin(mapSheetLearnEntity)
+            .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId))
+            .innerJoin(pnuEntity.geo, mapSheetAnalDataInferenceGeomEntity)
+            .where(builder)
+            .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc())
+            .fetch();
+
+    ObjectMapper mapper = new ObjectMapper();
+    List<ChangeDetectionDto.PolygonFeature> result =
+        list.stream()
+            .map(
+                data -> {
+                  String geoJson = data.getGeometry();
+                  JsonNode jsonNode;
+                  try {
+                    jsonNode = mapper.readTree(geoJson);
+                  } catch (JsonProcessingException e) {
+                    throw new RuntimeException(e);
+                  }
+
+                  ChangeDetectionDto.PolygonProperties properties =
+                      new ChangeDetectionDto.PolygonProperties(
+                          data.getGeoUid(),
+                          data.getArea(),
+                          data.getBeforeYear(),
+                          data.getBeforeConfidence(),
+                          data.getBeforeClass(),
+                          data.getAfterYear(),
+                          data.getAfterConfidence(),
+                          data.getAfterClass(),
+                          data.getCdProb(),
+                          data.getUuid(),
+                          data.getResultUid());
+
+                  return new ChangeDetectionDto.PolygonFeature(
+                      data.getType(), jsonNode, properties);
+                })
+            .collect(Collectors.toList());
+
+    ChangeDetectionDto.PolygonFeatureList polygonList = new ChangeDetectionDto.PolygonFeatureList();
+    polygonList.setType("FeatureCollection");
+    polygonList.setFeatures(result);
+    return polygonList;
+  }
+
+  @Override
+  public PointFeatureList getSelectedChangeDetectionPointListByPnu(String chnDtctId, String pnu) {
+    BooleanBuilder builder = new BooleanBuilder();
+    builder.and(mapSheetLearnEntity.uid.eq(chnDtctId));
+    builder.and(pnuEntity.pnu.eq(pnu));
+
+    List<ChangeDetectionDto.PointQueryData> list =
+        queryFactory
+            .select(
+                Projections.constructor(
+                    ChangeDetectionDto.PointQueryData.class,
+                    Expressions.stringTemplate("{0}", "Feature"),
+                    Expressions.stringTemplate(
+                        "ST_AsGeoJSON({0})",
+                        mapSheetAnalDataInferenceGeomEntity.geomCenter), // point
+                    Projections.constructor(
+                        ChangeDetectionDto.PointProperties.class,
+                        mapSheetAnalDataInferenceGeomEntity.geoUid,
+                        mapSheetAnalDataInferenceGeomEntity.classAfterCd.toUpperCase())))
+            .from(mapSheetAnalDataInferenceGeomEntity)
+            .innerJoin(mapSheetAnalDataInferenceEntity)
+            .on(mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id))
+            .innerJoin(mapSheetAnalInferenceEntity)
+            .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
+            .innerJoin(mapSheetLearnEntity)
+            .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId))
+            .innerJoin(pnuEntity.geo, mapSheetAnalDataInferenceGeomEntity)
+            .where(builder)
+            .fetch();
+
+    ObjectMapper mapper = new ObjectMapper();
+    List<ChangeDetectionDto.PointFeature> result =
+        list.stream()
+            .map(
+                data -> {
+                  String geoJson = data.getGeometry();
+                  JsonNode jsonNode;
+                  try {
+                    jsonNode = mapper.readTree(geoJson);
+                  } catch (JsonProcessingException e) {
+                    throw new RuntimeException(e);
+                  }
+
+                  return new ChangeDetectionDto.PointFeature(
+                      data.getType(), jsonNode, data.getProperties());
+                })
+            .collect(Collectors.toList());
+
+    return new ChangeDetectionDto.PointFeatureList("FeatureCollection", result);
+  }
+
+  @Override
+  public Optional<UUID> getLearnUuid(String chnDtctId) {
+    return Optional.ofNullable(
+        queryFactory
+            .select(mapSheetAnalInferenceEntity.uuid)
+            .from(mapSheetLearnEntity)
+            .innerJoin(mapSheetAnalInferenceEntity)
+            .on(mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id))
+            .where(mapSheetLearnEntity.uid.eq(chnDtctId))
+            .fetchOne());
+  }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinLabelJobRepositoryCustom.java

@@ -1,11 +1,12 @@
 package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
 
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
+import java.time.LocalDate;
 import java.util.List;
 
 public interface GukYuinLabelJobRepositoryCustom {
 
-  List<GeomUidDto> findYesterdayLabelingCompleteList();
+  List<GeomUidDto> findYesterdayLabelingCompleteList(LocalDate baseDate);
 
   void updateAnalDataInferenceGeomSendDttm(Long geoUid);
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinLabelJobRepositoryImpl.java

@@ -13,6 +13,7 @@ import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
+import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
@@ -27,22 +28,21 @@ public class GukYuinLabelJobRepositoryImpl implements GukYuinLabelJobRepositoryC
   @PersistenceContext private EntityManager em;
 
   @Override
-  public List<GeomUidDto> findYesterdayLabelingCompleteList() {
+  public List<GeomUidDto> findYesterdayLabelingCompleteList(LocalDate baseDate) {
     ZoneId zone = ZoneId.of("Asia/Seoul");
-    ZonedDateTime todayStart = ZonedDateTime.now(zone).toLocalDate().atStartOfDay(zone);
-    ZonedDateTime tomorrowStart = todayStart.plusDays(1);
-    ZonedDateTime yesterdayStart = todayStart.minusDays(1);
 
-    //    BooleanExpression isYesterday =
-    //        labelingAssignmentEntity
-    //            .inspectStatDttm
-    //            .goe(yesterdayStart)
-    //            .and(labelingAssignmentEntity.inspectStatDttm.lt(todayStart));
-    BooleanExpression isYesterday =
+    // baseDate가 null이면 기존처럼 "어제"로 처리
+    LocalDate targetDate =
+        (baseDate != null) ? baseDate : ZonedDateTime.now(zone).toLocalDate().minusDays(1);
+
+    ZonedDateTime targetStart = targetDate.atStartOfDay(zone);
+    ZonedDateTime nextStart = targetStart.plusDays(1);
+
+    BooleanExpression inTargetDay =
         labelingAssignmentEntity
             .inspectStatDttm
-            .goe(todayStart)
-            .and(labelingAssignmentEntity.inspectStatDttm.lt(tomorrowStart));
+            .goe(targetStart)
+            .and(labelingAssignmentEntity.inspectStatDttm.lt(nextStart));
 
     return queryFactory
         .select(
@@ -62,7 +62,7 @@ public class GukYuinLabelJobRepositoryImpl implements GukYuinLabelJobRepositoryC
             mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id),
             mapSheetLearnEntity.applyStatus.in(
                 GukYuinStatus.GUK_COMPLETED.getId(), GukYuinStatus.PNU_COMPLETED.getId()))
-        .where(labelingAssignmentEntity.inspectState.eq(InspectState.COMPLETE.getId()), isYesterday)
+        .where(labelingAssignmentEntity.inspectState.eq(InspectState.COMPLETE.getId()), inTargetDay)
         .fetch();
   }
 

src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepositoryImpl.java

@@ -142,8 +142,8 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                 Projections.constructor(
                     LayerDto.TileUrlDto.class,
                     mapSheetMngTileEntity.mngYyyy,
-                    mapSheetMngTileEntity.tag,
                     mapSheetMngTileEntity.url,
+                    mapSheetMngTileEntity.tag,
                     mapSheetMngTileEntity.minLon,
                     mapSheetMngTileEntity.minLat,
                     mapSheetMngTileEntity.maxLon,
@@ -168,8 +168,8 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                 Projections.constructor(
                     LayerDto.TileUrlDto.class,
                     mapSheetMngTileEntity.mngYyyy,
-                    mapSheetMngTileEntity.tag,
                     mapSheetMngTileEntity.url,
+                    mapSheetMngTileEntity.tag,
                     mapSheetMngTileEntity.minLon,
                     mapSheetMngTileEntity.minLat,
                     mapSheetMngTileEntity.maxLon,
@@ -202,8 +202,8 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
             Projections.constructor(
                 LayerDto.TileUrlDto.class,
                 mapSheetMngTileEntity.mngYyyy,
-                mapSheetMngTileEntity.tag,
                 mapSheetMngTileEntity.url,
+                mapSheetMngTileEntity.tag,
                 mapSheetMngTileEntity.minLon,
                 mapSheetMngTileEntity.minLat,
                 mapSheetMngTileEntity.maxLon,

src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryCustom.java

@@ -80,4 +80,6 @@ public interface MapSheetMngRepositoryCustom {
   void updateMapSheetMngHstUploadId(Long hstUid, UUID uuid, String uploadId);
 
   void insertMapSheetMngTile(@Valid AddReq addReq);
+
+  List<MapSheetMngHstEntity> getMapSheetMngHst(Integer year);
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java

@@ -1099,4 +1099,24 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
                 "{0} like '%" + searchReq.getSearchValue() + "%'",
                 mapSheetMngHstEntity.mapSheetNum));
   }
+
+  @Override
+  public List<MapSheetMngHstEntity> getMapSheetMngHst(Integer year) {
+    return queryFactory
+        .select(mapSheetMngHstEntity)
+        .from(mapSheetMngHstEntity)
+        .innerJoin(mapSheetMngFileEntity)
+        .on(mapSheetMngFileEntity.hstUid.eq(mapSheetMngHstEntity.hstUid))
+        .where(
+            mapSheetMngHstEntity
+                .mngYyyy
+                .eq(year)
+                .and(
+                    mapSheetMngHstEntity
+                        .syncState
+                        .eq("DONE")
+                        .or(mapSheetMngHstEntity.syncCheckState.eq("DONE")))
+                .and(mapSheetMngFileEntity.fileExt.eq("tif")))
+        .fetch();
+  }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngYearRepositoryCustom.java

@@ -1,10 +1,14 @@
 package com.kamco.cd.kamcoback.postgres.repository.mapsheet;
 
 import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListCompareDto;
+import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.YearMinMax;
 import java.util.List;
 
 public interface MapSheetMngYearRepositoryCustom {
+
   void saveFileInfo();
 
   List<MngListCompareDto> findByHstMapSheetCompareList(int mngYyyy, List<String> mapIds);
+
+  YearMinMax findYearMinMaxInfo();
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngYearRepositoryImpl.java

@@ -1,7 +1,10 @@
 package com.kamco.cd.kamcoback.postgres.repository.mapsheet;
 
+import static com.kamco.cd.kamcoback.postgres.entity.QYearEntity.yearEntity;
+
 import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListCompareDto;
 import com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngYearYnEntity;
+import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.YearMinMax;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringExpression;
@@ -26,52 +29,52 @@ public class MapSheetMngYearRepositoryImpl implements MapSheetMngYearRepositoryC
 
     String sql =
         """
-      WITH bounds AS (
+        WITH bounds AS (
+          SELECT
+            map_sheet_num,
+            MIN(mng_yyyy::int) AS min_y,
+            MAX(mng_yyyy::int) AS max_y
+          FROM tb_map_sheet_mng_files
+          GROUP BY map_sheet_num
+        ),
+        years AS (
+          SELECT
+            b.map_sheet_num,
+            gs.y AS mng_yyyy
+          FROM bounds b
+          CROSS JOIN LATERAL generate_series(b.min_y, b.max_y) AS gs(y)
+        ),
+        exist AS (
+          SELECT DISTINCT
+            map_sheet_num,
+            mng_yyyy::int AS mng_yyyy
+          FROM tb_map_sheet_mng_files
+        ),
+        src AS (
+          SELECT
+            y.map_sheet_num,
+            y.mng_yyyy,
+            CASE
+              WHEN e.map_sheet_num IS NULL THEN 'N'
+              ELSE 'Y'
+            END AS yn
+          FROM years y
+          LEFT JOIN exist e
+            ON e.map_sheet_num = y.map_sheet_num
+           AND e.mng_yyyy     = y.mng_yyyy
+        )
+        INSERT INTO tb_map_sheet_mng_year_yn
+          (map_sheet_num, mng_yyyy, yn)
         SELECT
           map_sheet_num,
-          MIN(mng_yyyy::int) AS min_y,
-          MAX(mng_yyyy::int) AS max_y
-        FROM tb_map_sheet_mng_files
-        GROUP BY map_sheet_num
-      ),
-      years AS (
-        SELECT
-          b.map_sheet_num,
-          gs.y AS mng_yyyy
-        FROM bounds b
-        CROSS JOIN LATERAL generate_series(b.min_y, b.max_y) AS gs(y)
-      ),
-      exist AS (
-        SELECT DISTINCT
-          map_sheet_num,
-          mng_yyyy::int AS mng_yyyy
-        FROM tb_map_sheet_mng_files
-      ),
-      src AS (
-        SELECT
-          y.map_sheet_num,
-          y.mng_yyyy,
-          CASE
-            WHEN e.map_sheet_num IS NULL THEN 'N'
-            ELSE 'Y'
-          END AS yn
-        FROM years y
-        LEFT JOIN exist e
-          ON e.map_sheet_num = y.map_sheet_num
-         AND e.mng_yyyy     = y.mng_yyyy
-      )
-      INSERT INTO tb_map_sheet_mng_year_yn
-        (map_sheet_num, mng_yyyy, yn)
-      SELECT
-        map_sheet_num,
-        mng_yyyy,
-        yn
-      FROM src
-      ON CONFLICT (map_sheet_num, mng_yyyy)
-      DO UPDATE SET
-        yn = EXCLUDED.yn,
-        updated_dttm = now()
-      """;
+          mng_yyyy,
+          yn
+        FROM src
+        ON CONFLICT (map_sheet_num, mng_yyyy)
+        DO UPDATE SET
+          yn = EXCLUDED.yn,
+          updated_dttm = now()
+        """;
 
     em.createNativeQuery(sql).executeUpdate();
   }
@@ -98,4 +101,13 @@ public class MapSheetMngYearRepositoryImpl implements MapSheetMngYearRepositoryC
         .groupBy(y.id.mapSheetNum)
         .fetch();
   }
+
+  @Override
+  public YearMinMax findYearMinMaxInfo() {
+    return queryFactory
+        .select(
+            Projections.constructor(YearMinMax.class, yearEntity.yyyy.min(), yearEntity.yyyy.max()))
+        .from(yearEntity)
+        .fetchOne();
+  }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/MapSheetMngFileJobRepositoryCustom.java

@@ -20,7 +20,12 @@ public interface MapSheetMngFileJobRepositoryCustom {
 
   public Integer findNotYetMapSheetMng();
 
-  public Long findByHstMapSheetBeforeYyyyListCount(int strtYyyy, int endYyyy, String mapSheetNum);
+  public Long findByHstMapSheetBeforeYyyyListCount(
+      int mngYyyy, int strtYyyy, int endYyyy, String mapSheetNum);
 
   public void updateException5kMapSheet(String mapSheetNum, CommonUseStatus commonUseStatus);
+
+  Long findMngYyyyCnt(Integer mngYyyy);
+
+  Long findMapSheetUseExceptCnt(String mapSheetNum);
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/MapSheetMngFileJobRepositoryImpl.java

@@ -233,7 +233,8 @@ public class MapSheetMngFileJobRepositoryImpl extends QuerydslRepositorySupport
   }
 
   @Override
-  public Long findByHstMapSheetBeforeYyyyListCount(int strtYyyy, int endYyyy, String mapSheetNum) {
+  public Long findByHstMapSheetBeforeYyyyListCount(
+      int mngYyyy, int strtYyyy, int endYyyy, String mapSheetNum) {
 
     Long countQuery =
         queryFactory
@@ -244,8 +245,8 @@ public class MapSheetMngFileJobRepositoryImpl extends QuerydslRepositorySupport
                     .mngYyyy
                     .goe(strtYyyy)
                     .and(mapSheetMngHstEntity.mngYyyy.loe(endYyyy))
+                    .and(mapSheetMngHstEntity.mngYyyy.ne(mngYyyy))
                     .and(mapSheetMngHstEntity.mapSheetNum.eq(mapSheetNum))
-                    .and(mapSheetMngHstEntity.useInference.eq("USE"))
                     .and(
                         mapSheetMngHstEntity
                             .syncState
@@ -266,4 +267,26 @@ public class MapSheetMngFileJobRepositoryImpl extends QuerydslRepositorySupport
             .where(mapInkx5kEntity.mapidcdNo.eq(mapSheetNum))
             .execute();
   }
+
+  @Override
+  public Long findMngYyyyCnt(Integer mngYyyy) {
+    return queryFactory
+        .select(mapSheetMngEntity.mngYyyy.count())
+        .from(mapSheetMngEntity)
+        .where(mapSheetMngEntity.mngYyyy.ne(mngYyyy))
+        .fetchOne();
+  }
+
+  @Override
+  public Long findMapSheetUseExceptCnt(String mapSheetNum) {
+    return queryFactory
+        .select(
+            new CaseBuilder()
+                .when(mapInkx5kEntity.useInference.eq(CommonUseStatus.USE))
+                .then(1L)
+                .otherwise(0L))
+        .from(mapInkx5kEntity)
+        .where(mapInkx5kEntity.mapidcdNo.eq(mapSheetNum))
+        .fetchOne();
+  }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/TrainingDataLabelJobRepositoryCustom.java

@@ -2,12 +2,13 @@ package com.kamco.cd.kamcoback.postgres.repository.scheduler;
 
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.InspectorPendingDto;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.Tasks;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.UUID;
 
 public interface TrainingDataLabelJobRepositoryCustom {
 
-  List<Tasks> findCompletedYesterdayUnassigned();
+  List<Tasks> findCompletedYesterdayUnassigned(LocalDate baseDate);
 
   List<InspectorPendingDto> findInspectorPendingByRound(Long analUid);
 

src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/TrainingDataLabelJobRepositoryImpl.java

@@ -14,6 +14,7 @@ import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
@@ -34,16 +35,23 @@ public class TrainingDataLabelJobRepositoryImpl extends QuerydslRepositorySuppor
   }
 
   @Override
-  public List<Tasks> findCompletedYesterdayUnassigned() {
+  public List<Tasks> findCompletedYesterdayUnassigned(LocalDate baseDate) {
     ZoneId zone = ZoneId.of("Asia/Seoul");
-    ZonedDateTime todayStart = ZonedDateTime.now(zone).toLocalDate().atStartOfDay(zone);
-    ZonedDateTime yesterdayStart = todayStart.minusDays(1);
+
+    // baseDate가 null이면 "어제"를 타겟으로, 아니면 baseDate
+    LocalDate targetDate = (baseDate != null) ? baseDate : LocalDate.now(zone).minusDays(1);
+
+    // end: targetDate + 1일 00:00
+    ZonedDateTime baseStart = targetDate.plusDays(1).atStartOfDay(zone);
+
+    // start: targetDate 00:00
+    ZonedDateTime yesterdayStart = baseStart.minusDays(1);
 
     BooleanExpression isYesterday =
         labelingAssignmentEntity
             .workStatDttm
             .goe(yesterdayStart)
-            .and(labelingAssignmentEntity.workStatDttm.lt(todayStart));
+            .and(labelingAssignmentEntity.workStatDttm.lt(baseStart));
 
     return queryFactory
         .select(

src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/TrainingDataReviewJobRepositoryCustom.java

@@ -3,13 +3,15 @@ package com.kamco.cd.kamcoback.postgres.repository.scheduler;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalCntInfo;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalMapSheetList;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.CompleteLabelData;
+import java.time.LocalDate;
 import java.util.List;
 
 public interface TrainingDataReviewJobRepositoryCustom {
 
-  List<CompleteLabelData> findCompletedYesterdayLabelingList(Long analUid, String mapSheetNum);
+  List<CompleteLabelData> findCompletedYesterdayLabelingList(
+      Long analUid, String mapSheetNum, LocalDate baseDate);
 
-  List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid);
+  List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid, LocalDate baseDate);
 
   List<AnalCntInfo> findAnalCntInfoList();
 

src/main/java/com/kamco/cd/kamcoback/postgres/repository/scheduler/TrainingDataReviewJobRepositoryImpl.java

@@ -41,12 +41,13 @@ public class TrainingDataReviewJobRepositoryImpl extends QuerydslRepositorySuppo
 
   @Override
   public List<CompleteLabelData> findCompletedYesterdayLabelingList(
-      Long analUid, String mapSheetNum) {
+      Long analUid, String mapSheetNum, LocalDate baseDate) {
     ZoneId zoneId = ZoneId.of("Asia/Seoul");
 
-    // 오늘 날짜 (시간 없음)
-    LocalDate today = LocalDate.now(zoneId);
-    ZonedDateTime end = today.atStartOfDay(zoneId); // 오늘 00:00
+    // baseDate가 null이면 기존처럼 오늘 기준
+    LocalDate targetDate = (baseDate != null) ? baseDate : LocalDate.now(zoneId);
+
+    ZonedDateTime end = targetDate.plusDays(1).atStartOfDay(zoneId);
 
     return queryFactory
         .select(
@@ -77,10 +78,13 @@ public class TrainingDataReviewJobRepositoryImpl extends QuerydslRepositorySuppo
   }
 
   @Override
-  public List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid) {
+  public List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid, LocalDate baseDate) {
     ZoneId zoneId = ZoneId.of("Asia/Seoul");
-    LocalDate today = LocalDate.now(zoneId);
-    ZonedDateTime end = today.atStartOfDay(zoneId); // 오늘 00:00
+
+    // baseDate가 null이면 기존처럼 오늘 기준
+    LocalDate targetDate = (baseDate != null) ? baseDate : LocalDate.now(zoneId);
+
+    ZonedDateTime end = targetDate.plusDays(1).atStartOfDay(zoneId);
 
     return queryFactory
         .select(

src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobApiController.java

@@ -4,6 +4,7 @@ import com.kamco.cd.kamcoback.code.dto.CommonCodeDto;
 import com.kamco.cd.kamcoback.code.service.CommonCodeService;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.scheduler.service.MapSheetInferenceJobService;
+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;
@@ -17,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+/** SchedulerApiController로 다 옮김 */
+@Hidden
 @Tag(name = "스캐쥴러 API", description = "스캐쥴러 API")
 @RestController
 @RequiredArgsConstructor

src/main/java/com/kamco/cd/kamcoback/scheduler/SchedulerApiController.java

@@ -0,0 +1,120 @@
+package com.kamco.cd.kamcoback.scheduler;
+
+import com.kamco.cd.kamcoback.code.dto.CommonCodeDto;
+import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
+import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiLabelJobService;
+import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiPnuJobService;
+import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiStatusJobService;
+import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiStbltJobService;
+import com.kamco.cd.kamcoback.scheduler.service.MemberInactiveJobService;
+import com.kamco.cd.kamcoback.scheduler.service.TrainingDataLabelJobService;
+import com.kamco.cd.kamcoback.scheduler.service.TrainingDataReviewJobService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.time.LocalDate;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "스케줄링 수동 호출 테스트", description = "스케줄링 수동 호출 테스트 API")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/schedule")
+public class SchedulerApiController {
+
+  private final GukYuinApiPnuJobService gukYuinApiPnuJobService;
+  private final GukYuinApiStatusJobService gukYuinApiStatusJobService;
+  private final GukYuinApiLabelJobService gukYuinApiLabelJobService;
+  private final GukYuinApiStbltJobService gukYuinApiStbltJobService;
+  private final TrainingDataLabelJobService trainingDataLabelJobService;
+  private final TrainingDataReviewJobService trainingDataReviewJobService;
+  private final MemberInactiveJobService memberInactiveJobService;
+  private final MapSheetMngFileJobController mapSheetMngFileJobController;
+
+  @Operation(summary = "국유인 탐지객체 조회 PNU 업데이트 스케줄링", description = "국유인 탐지객체 조회 PNU 업데이트 스케줄링")
+  @GetMapping("/gukyuin/pnu")
+  public ApiResponseDto<Void> findGukYuinContListPnuUpdate() {
+    gukYuinApiPnuJobService.findGukYuinContListPnuUpdate();
+    return ApiResponseDto.ok(null);
+  }
+
+  @Operation(summary = "국유인 등록 상태 체크 스케줄링", description = "국유인 등록 상태 체크 스케줄링")
+  @GetMapping("/gukyuin/status")
+  public ApiResponseDto<Void> findGukYuinMastCompleteYn() {
+    gukYuinApiStatusJobService.findGukYuinMastCompleteYn();
+    return ApiResponseDto.ok(null);
+  }
+
+  @Operation(summary = "국유인 라벨 완료 전송 스케줄링", description = "국유인 라벨 완료 전송 스케줄링")
+  @GetMapping("/gukyuin/label")
+  public ApiResponseDto<Void> findLabelingCompleteSend(
+      @RequestParam(required = false) LocalDate baseDate) {
+    gukYuinApiLabelJobService.findLabelingCompleteSend(baseDate);
+    return ApiResponseDto.ok(null);
+  }
+
+  @Operation(summary = "국유인 실태조사 적합여부 업데이트 스케줄링", description = "국유인 실태조사 적합여부 업데이트 스케줄링")
+  @GetMapping("/gukyuin/stblt")
+  public ApiResponseDto<Void> findGukYuinEligibleForSurvey(
+      @RequestParam(required = false) LocalDate baseDate) {
+    gukYuinApiStbltJobService.findGukYuinEligibleForSurvey(baseDate);
+    return ApiResponseDto.ok(null);
+  }
+
+  @Operation(
+      summary = "라벨완료 -> 검수할당 스케줄링",
+      description = "스케줄링이 실패한 경우 수동 호출하는 API, 어제 라벨링 완료된 것을 해당 검수자들에게 할당함")
+  @GetMapping("/label-to-review")
+  public ApiResponseDto<Void> runTrainingReviewSchedule(
+      @RequestParam(required = false) LocalDate baseDate) {
+    trainingDataLabelJobService.assignReviewerYesterdayLabelComplete(baseDate);
+    return ApiResponseDto.ok(null);
+  }
+
+  @Operation(summary = "검수완료된 라벨링 geojson 생성 스케줄링", description = "검수완료된 라벨링 geojson 생성")
+  @GetMapping("/review-to-geojson")
+  public ApiResponseDto<Long> runExportGeojsonLabelingGeom(
+      @RequestParam(required = false) LocalDate baseDate) {
+    trainingDataReviewJobService.exportGeojsonLabelingGeom(baseDate);
+    return ApiResponseDto.ok(0L);
+  }
+
+  @Operation(
+      summary = "라벨러/검수자 최종로그인 28일 경과 이후 사용중지 스케줄링",
+      description = "라벨러/검수자 최종로그인 28일 경과 이후 사용중지 처리")
+  @GetMapping("/member-inactive-job")
+  public ApiResponseDto<Void> memberInactiveJob() {
+    memberInactiveJobService.memberActive28daysToInactive();
+    return ApiResponseDto.ok(null);
+  }
+
+  @Operation(summary = "영상관리 파일 싱크 스캐쥴러 Start/Stop", description = "영상관리 파일 싱크 스캐쥴러 Start/Stop API")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "조회 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = CommonCodeDto.Basic.class))),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @PutMapping("/mng-sync-job")
+  public ApiResponseDto<String> mngSyncOnOff(
+      @RequestParam boolean jobStart, @RequestParam int pageSize) {
+
+    mapSheetMngFileJobController.setSchedulerEnabled(jobStart);
+    mapSheetMngFileJobController.setMngSyncPageSize(pageSize);
+
+    return ApiResponseDto.createOK("OK");
+  }
+}

src/main/java/com/kamco/cd/kamcoback/scheduler/dto/MapSheetMngDto.java

@@ -40,6 +40,7 @@ public class MapSheetMngDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class MngDto {
+
     private int rowNum;
     private int mngYyyy;
     private String mngState;
@@ -61,6 +62,7 @@ public class MapSheetMngDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class MngHstDto {
+
     private long hstUid;
     private int mngYyyy;
     private String mapSheetNum;
@@ -86,6 +88,7 @@ public class MapSheetMngDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class MngFileAddReq {
+
     private int mngYyyy;
     private String mapSheetNum;
     private String refMapSheetNum;
@@ -103,6 +106,7 @@ public class MapSheetMngDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class MngFilesDto {
+
     private long fileUid;
     private int mngYyyy;
     private String mapSheetNum;
@@ -132,7 +136,19 @@ public class MapSheetMngDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class DmlReturn {
+
     private String flag;
     private String message;
   }
+
+  @Schema(name = "MngYyyyDto", description = "년도 값")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class YearMinMax {
+
+    private Integer minYyyy;
+    private Integer maxYyyy;
+  }
 }

src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiLabelJobService.java

@@ -4,11 +4,11 @@ import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
 import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
 import com.kamco.cd.kamcoback.postgres.core.GukYuinLabelJobCoreService;
+import java.time.LocalDate;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -31,14 +31,18 @@ public class GukYuinApiLabelJobService {
     return "local".equalsIgnoreCase(profile);
   }
 
-  /** 어제 라벨링 검수 완료된 것 -> 국유인에 전송 */
-  @Scheduled(cron = "0 0 2 * * *")
-  public void findLabelingCompleteSend() {
-    if (isLocalProfile()) {
-      return;
-    }
+  //  @Scheduled(cron = "0 0 2 * * *")
+  public void runTask() {
+    findLabelingCompleteSend(null);
+  }
 
-    List<GeomUidDto> list = gukYuinLabelJobCoreService.findYesterdayLabelingCompleteList();
+  /** 어제 라벨링 검수 완료된 것 -> 국유인에 전송 */
+  public void findLabelingCompleteSend(LocalDate baseDate) {
+    //    if (isLocalProfile()) {
+    //      return;
+    //    }
+
+    List<GeomUidDto> list = gukYuinLabelJobCoreService.findYesterdayLabelingCompleteList(baseDate);
     if (list.isEmpty()) {
       return;
     }

src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiPnuJobService.java

@@ -12,7 +12,6 @@ import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -36,11 +35,11 @@ public class GukYuinApiPnuJobService {
   }
 
   /** 국유인 등록 완료 후, 탐지객체 조회해서 PNU 업데이트 하는 스케줄링 하루 1번 새벽 1시에 실행 */
-  @Scheduled(cron = "0 0 1 * * *")
+  //  @Scheduled(cron = "0 0 1 * * *")
   public void findGukYuinContListPnuUpdate() {
-    if (isLocalProfile()) {
-      return;
-    }
+    //    if (isLocalProfile()) {
+    //      return;
+    //    }
 
     List<LearnKeyDto> list =
         gukYuinPnuJobCoreService.findGukyuinApplyStatusUidList(

src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStatusJobService.java

@@ -9,7 +9,6 @@ import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -33,11 +32,11 @@ public class GukYuinApiStatusJobService {
   }
 
   /** 국유인 연동 후, 100% 되었는지 확인하는 스케줄링 매 10분마다 호출 */
-  @Scheduled(cron = "0 0/10 * * * *")
+  //  @Scheduled(cron = "0 0/10 * * * *")
   public void findGukYuinMastCompleteYn() {
-    if (isLocalProfile()) {
-      return;
-    }
+    //    if (isLocalProfile()) {
+    //      return;
+    //    }
 
     List<LearnKeyDto> list =
         gukYuinJobCoreService.findGukyuinApplyStatusUidList(

src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStbltJobService.java

@@ -16,7 +16,6 @@ import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -39,12 +38,16 @@ public class GukYuinApiStbltJobService {
     return "local".equalsIgnoreCase(profile);
   }
 
+  //  @Scheduled(cron = "0 0 3 * * *")
+  public void runTask() {
+    findGukYuinEligibleForSurvey(null);
+  }
+
   /** 국유인 연동 후, 실태조사 적합여부 확인하여 update */
-  @Scheduled(cron = "0 0 3 * * *")
-  public void findGukYuinEligibleForSurvey() {
-    if (isLocalProfile()) {
-      return;
-    }
+  public void findGukYuinEligibleForSurvey(LocalDate baseDate) {
+    //    if (isLocalProfile()) {
+    //      return;
+    //    }
 
     List<LearnKeyDto> list =
         gukYuinStbltJobCoreService.findGukYuinEligibleForSurveyList(
@@ -55,11 +58,16 @@ public class GukYuinApiStbltJobService {
 
     for (LearnKeyDto dto : list) {
       try {
-        String yesterday =
+        String targetDate =
             LocalDate.now(ZoneId.of("Asia/Seoul"))
                 .minusDays(1)
                 .format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-        RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), yesterday, "Y");
+
+        if (baseDate != null) { // 파라미터가 있으면
+          targetDate = baseDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        }
+
+        RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), targetDate, "Y");
 
         if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
           log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId());

src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java

@@ -354,9 +354,8 @@ public class MapSheetInferenceJobService {
         Paths.get(progressDto.getCdModelClsPath(), progressDto.getCdModelClsFileName()).toString());
     m.setCls_model_version(progressDto.getClsModelVersion());
     m.setCd_model_type(type);
-    m.setPriority(progressDto.getPriority());
-
-    //    log.info("InferenceSendDto={}", m);
+    m.setPriority(5d);
+    log.info("[BEFORE INFERENCE] BEFORE SendDto={}", m);
     // 추론 실행 api 호출
     Long batchId = ensureAccepted(m);
 
@@ -376,6 +375,7 @@ public class MapSheetInferenceJobService {
    * @param dto
    * @return
    */
+  // 같은함수가 왜 두개지
   private Long ensureAccepted(InferenceSendDto dto) {
     if (dto == null) {
       log.warn("not InferenceSendDto dto");
@@ -383,22 +383,28 @@ public class MapSheetInferenceJobService {
     }
 
     // 1) 요청 로그
-    log.info("Inference request dto={}", dto);
-
+    log.info("");
+    log.info("========================================================");
+    log.info("[SEND INFERENCE] Inference request dto= {}", dto);
+    log.info("========================================================");
+    log.info("");
     // 2) local 환경 임시 처리
-    if ("local".equals(profile)) {
-      if (dto.getPred_requests_areas() == null) {
-        throw new IllegalStateException("pred_requests_areas is null");
-      }
-      dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson");
-      dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson");
-    }
+    //    if ("local".equals(profile)) {
+    //      if (dto.getPred_requests_areas() == null) {
+    //        throw new IllegalStateException("pred_requests_areas is null");
+    //      }
+    //
+    // dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson");
+    //
+    // dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson");
+    //    }
 
     // 3) HTTP 호출
     HttpHeaders headers = new HttpHeaders();
     headers.setContentType(MediaType.APPLICATION_JSON);
     headers.setAccept(List.of(MediaType.APPLICATION_JSON));
 
+    // TODO 어떤 URL로 어떤파리티러로 요청한 로딩해야지
     ExternalCallResult<String> result =
         externalHttpClient.call(inferenceUrl, HttpMethod.POST, dto, headers, String.class);
 
@@ -413,6 +419,7 @@ public class MapSheetInferenceJobService {
           objectMapper.readValue(result.body(), new TypeReference<>() {});
 
       if (list.isEmpty()) {
+        // 어떤 URL로 어떤파리티러로 요청한 정보를 봐야 재현을 할듯하지요
         throw new IllegalStateException("Inference response is empty");
       }
 

src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetMngFileJobService.java

@@ -11,6 +11,7 @@ import com.kamco.cd.kamcoback.scheduler.dto.FileDto.SrchFilesDepthDto;
 import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.DmlReturn;
 import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngFileAddReq;
 import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngHstDto;
+import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.YearMinMax;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -63,9 +64,18 @@ public class MapSheetMngFileJobService {
 
     for (MngHstDto item : mapSheetFileNotYetList) {
 
+      // mng_yyyy 가 완전 최초로 등록되는 것인지 확인
+      Long mngCnt = mapSheetMngFileJobCoreService.findMngYyyyCnt(item.getMngYyyy());
+
       // 5K도엽 자동추론제외
-      Long exceptCheckCnt =
-          this.mapSheetAutoExceptionUpdate(item.getMngYyyy(), item.getMapSheetNum());
+      Long exceptCheckCnt = 0L;
+
+      if (mngCnt == 0) { // 최초 등록이면 도엽의 추론제외여부를 확인
+        exceptCheckCnt =
+            mapSheetMngFileJobCoreService.findMapSheetUseExceptCnt(item.getMapSheetNum());
+      } else { // 등록된 영상 년도가 있으면 자동추론제외 확인
+        exceptCheckCnt = this.mapSheetAutoExceptionUpdate(item.getMngYyyy(), item.getMapSheetNum());
+      }
 
       // 도엽별 파일 체크 진행중으로 변경
       item.setDataState("PROCESSING");
@@ -212,28 +222,26 @@ public class MapSheetMngFileJobService {
     return notyetCnt;
   }
 
-  public Long mapSheetAutoExceptionUpdate(int mngYyyy, String mapSheetNum) {
+  public Long mapSheetAutoExceptionUpdate(Integer mngYyyy, String mapSheetNum) {
 
-    // 2025년 이전 파일싱크는 무조건 이전3년이 존재하지 않으므로 자동추론제외를 진행하지 않는다.(전년도 파일이 무조건 존재하는 것으로 리턴)
-    //    if (syncAutoExceptionStartYear > mngYyyy) {
-    //      return 1L;
-    //    }
+    // tb_year 에 있는 년도 min,max 가져오기
+    YearMinMax yearInfo = mapSheetMngFileJobCoreService.findYearMinMaxInfo();
+    int strtYyyy = yearInfo.getMinYyyy();
+    int endYyyy = yearInfo.getMaxYyyy();
 
-    //    int strtYyyy = mngYyyy - syncAutoExceptionBeforeYearCnt + 1;
-    int strtYyyy = 2020;
-    int endYyyy = mngYyyy;
-
-    // 본년도+이전년도가 3개년인 도엽 확인 -> 2020년도부터 현재까지
+    // tb_map_sheet_mng_hst 에 도엽 정보가 하나라도 DONE 인 게 있는지 count 가져오기
     Long beforeCnt =
         mapSheetMngFileJobCoreService.findByHstMapSheetBeforeYyyyListCount(
-            strtYyyy, endYyyy, mapSheetNum);
+            mngYyyy, strtYyyy, endYyyy, mapSheetNum);
 
     if (beforeCnt == 0) {
-      System.out.println("mapSheetAutoExceptionUpdate inference == 자동추론제외");
+      System.out.println("beforeCnt: 0, mapSheetAutoExceptionUpdate inference == 자동추론제외");
       mapSheetMngFileJobCoreService.updateException5kMapSheet(
           mapSheetNum, CommonUseStatus.AUTO_EXCEPT);
     } else {
       // 하나라도 있으면 USE
+      System.out.println(
+          "beforeCnt: " + beforeCnt + ", mapSheetAutoExceptionUpdate inference == 자동추론제외 해제");
       mapSheetMngFileJobCoreService.updateException5kMapSheet(mapSheetNum, CommonUseStatus.USE);
     }
 

src/main/java/com/kamco/cd/kamcoback/scheduler/service/TrainingDataLabelJobService.java

@@ -4,6 +4,7 @@ import com.kamco.cd.kamcoback.postgres.core.TrainingDataLabelJobCoreService;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.InspectorPendingDto;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.Tasks;
 import jakarta.transaction.Transactional;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -13,7 +14,7 @@ import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -22,6 +23,7 @@ import org.springframework.stereotype.Service;
 public class TrainingDataLabelJobService {
 
   private final TrainingDataLabelJobCoreService trainingDataLabelJobCoreService;
+  private final ApplicationContext applicationContext;
 
   @Value("${spring.profiles.active}")
   private String profile;
@@ -30,16 +32,24 @@ public class TrainingDataLabelJobService {
     return "local".equalsIgnoreCase(profile);
   }
 
-  @Transactional
-  @Scheduled(cron = "0 0 0 * * *")
-  public void assignReviewerYesterdayLabelComplete() {
+  //  @Scheduled(cron = "0 0 0 * * *")
+  public void runTask() {
+    // 프록시를 통해 호출해야 @Transactional이 적용됨
+    applicationContext
+        .getBean(TrainingDataLabelJobService.class)
+        .assignReviewerYesterdayLabelComplete(null);
+  }
 
-    if (isLocalProfile()) {
-      return;
-    }
+  @Transactional
+  public void assignReviewerYesterdayLabelComplete(LocalDate baseDate) {
+
+    //    if (isLocalProfile()) {
+    //      return;
+    //    }
 
     try {
-      List<Tasks> tasks = trainingDataLabelJobCoreService.findCompletedYesterdayUnassigned();
+      List<Tasks> tasks =
+          trainingDataLabelJobCoreService.findCompletedYesterdayUnassigned(baseDate);
 
       if (tasks.isEmpty()) {
         return;
@@ -88,6 +98,7 @@ public class TrainingDataLabelJobService {
       }
     } catch (Exception e) {
       log.error("배치 처리 중 예외", e);
+      throw e;
     }
   }
 

src/main/java/com/kamco/cd/kamcoback/scheduler/service/TrainingDataReviewJobService.java

@@ -13,12 +13,12 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -31,7 +31,7 @@ public class TrainingDataReviewJobService {
   @Value("${spring.profiles.active}")
   private String profile;
 
-  @Value("${training-data.geojson-dir}")
+  @Value("${file.training-data.geojson-dir}")
   private String trainingDataDir;
 
   private boolean isLocalProfile() {
@@ -39,12 +39,16 @@ public class TrainingDataReviewJobService {
   }
 
   @Transactional
-  @Scheduled(cron = "0 0 2 * * *")
-  public void exportGeojsonLabelingGeom() {
+  //  @Scheduled(cron = "0 0 2 * * *")
+  public void runTask() {
+    exportGeojsonLabelingGeom(null);
+  }
 
-    if (isLocalProfile()) {
-      return;
-    }
+  public void exportGeojsonLabelingGeom(LocalDate baseDate) {
+
+    //    if (isLocalProfile()) {
+    //      return;
+    //    }
 
     // 1) 경로/파일명 결정
     String targetDir =
@@ -62,7 +66,8 @@ public class TrainingDataReviewJobService {
 
       // 3) 회차 + 어제까지 검수 완료된 총 데이터의 도엽별 목록 가져오기
       List<AnalMapSheetList> analMapList =
-          trainingDataReviewJobCoreService.findCompletedAnalMapSheetList(info.getAnalUid());
+          trainingDataReviewJobCoreService.findCompletedAnalMapSheetList(
+              info.getAnalUid(), baseDate);
 
       if (analMapList.isEmpty()) {
         continue;
@@ -72,7 +77,7 @@ public class TrainingDataReviewJobService {
         // 4) 도엽별 geom 데이터 가지고 와서 geojson 만들기
         List<CompleteLabelData> completeList =
             trainingDataReviewJobCoreService.findCompletedYesterdayLabelingList(
-                info.getAnalUid(), mapSheet.getMapSheetNum());
+                info.getAnalUid(), mapSheet.getMapSheetNum(), baseDate);
 
         if (!completeList.isEmpty()) {
 

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

@@ -3,8 +3,6 @@ package com.kamco.cd.kamcoback.trainingdata;
 import com.kamco.cd.kamcoback.code.dto.CommonCodeDto;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto.ResponseObj;
-import com.kamco.cd.kamcoback.scheduler.service.TrainingDataLabelJobService;
-import com.kamco.cd.kamcoback.scheduler.service.TrainingDataReviewJobService;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.ReviewGeometryInfo;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.ReviewListDto;
@@ -33,8 +31,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class TrainingDataReviewApiController {
 
   private final TrainingDataReviewService trainingDataReviewService;
-  private final TrainingDataLabelJobService trainingDataLabelJobService;
-  private final TrainingDataReviewJobService trainingDataReviewJobService;
 
   @Operation(summary = "목록 조회", description = "검수 할당 목록 조회")
   @ApiResponses(
@@ -558,20 +554,4 @@ public class TrainingDataReviewApiController {
     return ApiResponseDto.ok(
         trainingDataReviewService.getCogImageUrl(mapSheetNum, beforeYear, afterYear));
   }
-
-  @Operation(
-      summary = "검수할당 스케줄링(수동 호출)",
-      description = "스케줄링이 실패한 경우 수동 호출하는 API, 어제 라벨링 완료된 것을 해당 검수자들에게 할당함")
-  @GetMapping("/run-schedule")
-  public ApiResponseDto<Void> runTrainingReviewSchedule() {
-    trainingDataLabelJobService.assignReviewerYesterdayLabelComplete();
-    return ApiResponseDto.ok(null);
-  }
-
-  @Operation(summary = "검수완료된 라벨링 geojson 생성(스케줄링 수동 호출)", description = "검수완료된 라벨링 geojson 생성")
-  @GetMapping("/run-label-geojson")
-  public ApiResponseDto<Long> runExportGeojsonLabelingGeom() {
-    trainingDataReviewJobService.exportGeojsonLabelingGeom();
-    return ApiResponseDto.ok(0L);
-  }
 }

src/main/resources/application-dev.yml

@@ -89,36 +89,17 @@ mapsheet:
   shp:
     baseurl: /app/tmp/detect/result  #현재사용안함
 
-
-
 file:
-  #sync-root-dir: D:/kamco-nfs/images/
-  sync-root-dir: /kamco-nfs/images/
-  sync-tmp-dir: /kamco-nfs/requests/temp              # image upload temp dir
-  #sync-tmp-dir: ${file.sync-root-dir}/tmp
-  sync-file-extention: tfw,tif
-  sync-auto-exception-start-year: 2024
-  sync-auto-exception-before-year-cnt: 3
-
-  #dataset-dir: D:/kamco-nfs/model_output/
-  dataset-dir: /kamco-nfs/model_output/export/        # 마운트경로 AI 추론결과
-  dataset-tmp-dir: ${file.dataset-dir}tmp/
-
-  #model-dir: D:/kamco-nfs/ckpt/model/
-  model-dir: /kamco-nfs/ckpt/model/                   # 학습서버에서 트레이닝한 모델업로드경로
-  model-tmp-dir: ${file.model-dir}tmp/
-  model-file-extention: pth,json,py
-
-  pt-path: /kamco-nfs/ckpt/model/v6-cls-checkpoints/
+  root: kamco-nfs
+  nfs: /kamco-nfs
+  pt-path: ${file.nfs}/ckpt/model/v6-cls-checkpoints/
   pt-FileName: yolov8_6th-6m.pt
 
-  dataset-response: /kamco-nfs/dataset/response/
-
 inference:
+  nfs: /kamco-nfs
   url: http://192.168.2.183:8000/jobs
   batch-url: http://192.168.2.183:8000/batches
-  geojson-dir: /kamco-nfs/requests/                   # 추론실행을 위한 파일생성경로
-  jar-path: /kamco-nfs/repo/jar/shp-exporter.jar
+  jar-path: ${inference.nfs}/repo/jar/shp-exporter.jar
   inference-server-name: server1,server2,server3,server4
 
 gukyuin:
@@ -126,9 +107,6 @@ gukyuin:
   url: http://192.168.2.129:5301
   cdi: ${gukyuin.url}/api/kcd/cdi
 
-training-data:
-  geojson-dir: /kamco-nfs/dataset/request/
-
 layer:
   geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
   wms-path: geoserver/cd

src/main/resources/application-local.yml

@@ -67,33 +67,17 @@ mapsheet:
   shp:
     baseurl: /Users/bokmin/detect/result
 
-
-
 file:
-  sync-root-dir: C:/Users/gypark/kamco-nfs/images/
-  #sync-root-dir: /kamco-nfs/images/
-  sync-tmp-dir: ${file.sync-root-dir}/tmp/
-  sync-file-extention: tfw,tif
-  sync-auto-exception-start-year: 2025
-  sync-auto-exception-before-year-cnt: 3
-
-  dataset-dir: C:/Users/gypark/kamco-nfs/dataset/
-  #dataset-dir: /kamco-nfs/dataset/export/
-  dataset-tmp-dir: ${file.dataset-dir}tmp/
-
-  model-dir: C:/Users/gypark/kamco-nfs/ckpt/model/
-  #model-dir: /kamco-nfs/ckpt/model/
-  model-tmp-dir: ${file.model-dir}tmp/
-  model-file-extention: pth,json,py
-
-  pt-path: /kamco-nfs/ckpt/classification/
+  root: kamco-nfs
+  nfs: C:/Users/gypark/kamco-nfs
+  pt-path: ${file.nfs}/ckpt/classification/
   pt-FileName: v5-best.pt
 
 inference:
+  nfs: C:/Users/gyparkkamco-nfs
   url: http://10.100.0.11:8000/jobs
   batch-url: http://10.100.0.11:8000/batches
-  geojson-dir: /kamco-nfs/requests/
-  jar-path: jar/makeshp-1.0.0.jar
+  jar-path: jar/shp-exporter.jar
   inference-server-name: server1,server2,server3,server4
 
 gukyuin:
@@ -101,10 +85,8 @@ gukyuin:
   url: http://192.168.2.129:5301
   cdi: ${gukyuin.url}/api/kcd/cdi
 
-training-data:
-  geojson-dir: /kamco-nfs/model_output/labeling/
-
 layer:
   geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
-  path: /geoserver/cd/gwc/service/
+  wms-path: geoserver/cd
+  wmts-path: geoserver/cd/gwc/service
   workspace: cd

src/main/resources/application-prod.yml

@@ -84,39 +84,23 @@ mapsheet:
     baseurl: /app/detect/result #현재사용안함
 
 file:
-  #sync-root-dir: D:/kamco-nfs/images/
-  sync-root-dir: /kamco-nfs/images/
-  sync-tmp-dir: ${file.sync-root-dir}/tmp       # image upload temp dir
-  sync-file-extention: tfw,tif
-  sync-auto-exception-start-year: 2025
-  sync-auto-exception-before-year-cnt: 3
-
-  #dataset-dir: D:/kamco-nfs/model_output/ #변경 model_output
-  dataset-dir: /kamco-nfs/model_output/export/  # 마운트경로 AI 추론결과
-  dataset-tmp-dir: ${file.dataset-dir}tmp/
-
-  #model-dir: D:/kamco-nfs/ckpt/model/
-  model-dir: /kamco-nfs/ckpt/model/             # 학습서버에서 트레이닝한 모델업로드경로
-  model-tmp-dir: ${file.model-dir}tmp/
-  model-file-extention: pth,json,py
-
-  pt-path: /kamco-nfs/ckpt/v6-cls-checkpoints/
+  root: data
+  nfs: /data
+  pt-path: ${file.nfs}/ckpt/model/v6-cls-checkpoints/
   pt-FileName: yolov8_6th-6m.pt
-  dataset-response: /kamco-nfs/dataset/response/
 
 inference:
-  url: http://127.0.0.1:8000/jobs
-  batch-url: http://127.0.0.1:8000/batches
-  geojson-dir: /kamco-nfs/requests/                 # 학습서버에서 트레이닝한 모델업로드경로
-  jar-path: /kamco-nfs/repo/jar/shp-exporter.jar    # 추론실행을 위한 파일생성경로
+  nfs: /data
+  url: http://172.16.4.56:8000/jobs
+  batch-url: http://172.16.4.56:8000/batches
+  jar-path: ${inference.nfs}/repo/jar/shp-exporter.jar
   inference-server-name: server1,server2,server3,server4
 
 gukyuin:
   url: http://127.0.0.1:5301
   cdi: ${gukyuin.url}/api/kcd/cdi
 
-training-data:
-  geojson-dir: /kamco-nfs/dataset/request/
+
 
 layer:
   geoserver-url: https://kamco.geo-dev.gs.dabeeo.com

src/main/resources/application.yml

@@ -67,3 +67,22 @@ management:
         include:
           - "health"
 
+file:
+  root: kamco-nfs
+  nfs: /kamco-nfs
+  sync-root-dir: ${file.nfs}/images/
+  sync-tmp-dir: ${file.nfs}/requests/temp              # image upload temp dir
+  sync-file-extention: tfw,tif
+  dataset-dir: ${file.nfs}/model_output/export/        # 마운트경로 AI 추론결과
+  dataset-tmp-dir: ${file.dataset-dir}tmp/
+  model-dir: ${file.nfs}/ckpt/model/                   # 학습서버에서 트레이닝한 모델업로드경로
+  model-tmp-dir: ${file.model-dir}tmp/
+  model-file-extention: pth,json,py
+  pt-path: ${file.nfs}/ckpt/model/v6-cls-checkpoints/
+  dataset-response: ${file.nfs}/dataset/response/
+  training-data:
+    geojson-dir: ${file.nfs}/dataset/request/
+inference:
+  nfs: /kamco-nfs
+  geojson-dir: ${inference.nfs}/requests/                   # 추론실행을 위한 파일생성경로
+  jar-path: ${inference.nfs}/repo/jar/shp-exporter.jar