라벨링툴 count 종료된 회차는 count하지 않게 조건 추가

Dockerfile-prod

@@ -1,5 +1,6 @@
 # 1단계에서 만든 로컬 베이스 이미지를 사용
-FROM 127.0.0.1:18082/kamco-cd/base-java21-gdal:1.0
+FROM 192.168.2.73:18082/kamco-cd/base-java21-gdal:1.0
+FROM 192.168.2.73:18082/kamco-cd/base-java21-gdal:1.0
 
 # 사용자 설정 (앱 별로 다를 수 있으므로 여기에 유지)
 ARG UID=1000

docker-compose-dev.yml

@@ -15,6 +15,10 @@ services:
       - SPRING_PROFILES_ACTIVE=dev
       - TZ=Asia/Seoul
     volumes:
+      - /mnt/nfs_share/images:/app/original-images
+      - /mnt/nfs_share/model_output:/app/model-outputs
+      - /mnt/nfs_share/train_dataset:/app/train-dataset
+      - /mnt/nfs_share/tmp:/app/tmp
       - /kamco-nfs:/kamco-nfs
     networks:
       - kamco-cds

docker-compose-prod.yml

@@ -15,7 +15,11 @@ services:
       - SPRING_PROFILES_ACTIVE=dev
       - TZ=Asia/Seoul
     volumes:
-      - /data:/kamco-nfs
+      - /mnt/nfs_share/images:/app/original-images
+      - /mnt/nfs_share/model_output:/app/model-outputs
+      - /mnt/nfs_share/train_dataset:/app/train-dataset
+      - /mnt/nfs_share/tmp:/app/tmp
+      - /kamco-nfs:/kamco-nfs
     networks:
       - kamco-cds
     restart: unless-stopped

src/main/java/com/kamco/cd/kamcoback/auth/JwtAuthenticationFilter.java

@@ -18,13 +18,12 @@ import org.springframework.web.filter.OncePerRequestFilter;
 @RequiredArgsConstructor
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
-  private static final AntPathMatcher PATH_MATCHER = new AntPathMatcher();
-  private static final String[] EXCLUDE_PATHS = {
-    //    "/api/auth/signin", "/api/auth/refresh", "/api/auth/logout", "/api/members/*/password"
-    "/api/auth/signin", "/api/auth/refresh", "/api/auth/logout"
-  };
   private final JwtTokenProvider jwtTokenProvider;
   private final UserDetailsService userDetailsService;
+  private static final AntPathMatcher PATH_MATCHER = new AntPathMatcher();
+  private static final String[] EXCLUDE_PATHS = {
+    "/api/auth/signin", "/api/auth/refresh", "/api/auth/logout", "/api/members/*/password"
+  };
 
   @Override
   protected void doFilterInternal(

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

@@ -146,53 +146,4 @@ 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,8 +197,6 @@ public class ChangeDetectionDto {
     private Double afterConfidence; // 비교 신뢰도(확률)
     private String afterClass;
     private Double cdProb; // 탐지정확도
-    private UUID uuid;
-    private String resultUid;
   }
 
   @Schema(name = "PointFeature", description = "Geometry 리턴 객체")
@@ -252,21 +250,5 @@ 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,42 +89,4 @@ 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/download/DownloadAuditEventListener.java

@@ -1,92 +0,0 @@
-package com.kamco.cd.kamcoback.common.download;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.kamco.cd.kamcoback.common.download.dto.DownloadAuditEvent;
-import com.kamco.cd.kamcoback.menu.dto.MenuDto;
-import com.kamco.cd.kamcoback.menu.service.MenuService;
-import com.kamco.cd.kamcoback.postgres.entity.AuditLogEntity;
-import com.kamco.cd.kamcoback.postgres.repository.log.AuditLogRepository;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Objects;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.event.EventListener;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class DownloadAuditEventListener {
-
-  private final AuditLogRepository auditLogRepository;
-  private final MenuService menuService;
-  private final ObjectMapper objectMapper;
-
-  @Async("auditLogExecutor")
-  @Transactional(propagation = Propagation.REQUIRES_NEW)
-  @EventListener
-  public void onDownloadAudit(DownloadAuditEvent ev) {
-    try {
-      String menuUid = resolveMenuUid(ev.normalizedUri());
-      if (menuUid == null) {
-        // menuUid null 불가 -> 스킵
-        log.warn(
-            "MenuUid not resolved. skip audit. uri={}, normalized={}",
-            ev.requestUri(),
-            ev.normalizedUri());
-        return;
-      }
-
-      AuditLogEntity logEntity =
-          AuditLogEntity.forFileDownload(
-              ev.userId(), ev.requestUri(), menuUid, ev.ip(), ev.status(), ev.downloadUuid());
-
-      auditLogRepository.save(logEntity);
-
-    } catch (Exception e) {
-      // 본 요청과 분리되어야 함
-      log.warn("Download audit save failed. uri={}, err={}", ev.requestUri(), e.toString());
-    }
-  }
-
-  private String resolveMenuUid(String normalizedUri) {
-    try {
-      List<?> list = menuService.getFindAll();
-
-      List<MenuDto.Basic> basics =
-          list.stream()
-              .map(
-                  item -> {
-                    if (item instanceof LinkedHashMap<?, ?> map) {
-                      return objectMapper.convertValue(map, MenuDto.Basic.class);
-                    } else if (item instanceof MenuDto.Basic dto) {
-                      return dto;
-                    }
-                    return null;
-                  })
-              .filter(Objects::nonNull)
-              .toList();
-
-      MenuDto.Basic basic =
-          basics.stream()
-              .filter(m -> m.getMenuUrl() != null && normalizedUri.startsWith(m.getMenuUrl()))
-              .max(Comparator.comparingInt(m -> m.getMenuUrl().length()))
-              .orElse(null);
-
-      if (basic == null) return null;
-
-      String menuUidStr = basic.getMenuUid(); // ← String
-      if (menuUidStr == null || menuUidStr.isBlank()) return null;
-
-      return menuUidStr; // ← Long 변환
-
-    } catch (Exception e) {
-      return null;
-    }
-  }
-}

src/main/java/com/kamco/cd/kamcoback/common/download/DownloadExecutor.java

@@ -0,0 +1,48 @@
+package com.kamco.cd.kamcoback.common.download;
+
+import com.kamco.cd.kamcoback.common.download.dto.DownloadSpec;
+import com.kamco.cd.kamcoback.common.utils.UserUtil;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
+
+@Service
+@RequiredArgsConstructor
+public class DownloadExecutor {
+
+  private final UserUtil userUtil;
+
+  public ResponseEntity<StreamingResponseBody> stream(DownloadSpec spec) throws IOException {
+
+    if (!Files.isReadable(spec.filePath())) {
+      return ResponseEntity.notFound().build();
+    }
+
+    StreamingResponseBody body =
+        os -> {
+          try (InputStream in = Files.newInputStream(spec.filePath())) {
+            in.transferTo(os);
+            os.flush();
+          } catch (Exception e) {
+            // 고용량은 중간 끊김 흔하니까 throw 금지
+          }
+        };
+
+    String fileName =
+        spec.downloadName() != null
+            ? spec.downloadName()
+            : spec.filePath().getFileName().toString();
+
+    return ResponseEntity.ok()
+        .contentType(
+            spec.contentType() != null ? spec.contentType() : MediaType.APPLICATION_OCTET_STREAM)
+        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileName + "\"")
+        .body(body);
+  }
+}

src/main/java/com/kamco/cd/kamcoback/common/download/RangeDownloadResponder.java

@@ -1,79 +0,0 @@
-package com.kamco.cd.kamcoback.common.download;
-
-import jakarta.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.ResourceRegion;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpRange;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-
-@Component
-public class RangeDownloadResponder {
-
-  public ResponseEntity<?> buildZipResponse(
-      Path filePath, String downloadFileName, HttpServletRequest request) throws IOException {
-
-    if (!Files.isRegularFile(filePath)) {
-      return ResponseEntity.notFound().build();
-    }
-
-    long totalSize = Files.size(filePath);
-    Resource resource = new FileSystemResource(filePath);
-
-    String disposition = "attachment; filename=\"" + downloadFileName + "\"";
-    String rangeHeader = request.getHeader(HttpHeaders.RANGE);
-
-    // 🔥 공통 헤더 (여기 고정)
-    ResponseEntity.BodyBuilder base =
-        ResponseEntity.ok()
-            .contentType(MediaType.APPLICATION_OCTET_STREAM)
-            .header(HttpHeaders.CONTENT_DISPOSITION, disposition)
-            .header(HttpHeaders.ACCEPT_RANGES, "bytes")
-            .header("X-Accel-Buffering", "no");
-
-    if (rangeHeader == null || rangeHeader.isBlank()) {
-      return base.contentLength(totalSize).body(resource);
-    }
-
-    List<HttpRange> ranges;
-    try {
-      ranges = HttpRange.parseRanges(rangeHeader);
-    } catch (IllegalArgumentException ex) {
-      return ResponseEntity.status(416)
-          .header(HttpHeaders.CONTENT_RANGE, "bytes */" + totalSize)
-          .header("X-Accel-Buffering", "no")
-          .build();
-    }
-
-    HttpRange range = ranges.get(0);
-
-    long start = range.getRangeStart(totalSize);
-    long end = range.getRangeEnd(totalSize);
-
-    if (start >= totalSize) {
-      return ResponseEntity.status(416)
-          .header(HttpHeaders.CONTENT_RANGE, "bytes */" + totalSize)
-          .header("X-Accel-Buffering", "no")
-          .build();
-    }
-
-    long regionLength = end - start + 1;
-    ResourceRegion region = new ResourceRegion(resource, start, regionLength);
-
-    return ResponseEntity.status(206)
-        .contentType(MediaType.APPLICATION_OCTET_STREAM)
-        .header(HttpHeaders.CONTENT_DISPOSITION, disposition)
-        .header(HttpHeaders.ACCEPT_RANGES, "bytes")
-        .header("X-Accel-Buffering", "no")
-        .header(HttpHeaders.CONTENT_RANGE, "bytes " + start + "-" + end + "/" + totalSize)
-        .contentLength(regionLength)
-        .body(region);
-  }
-}

src/main/java/com/kamco/cd/kamcoback/common/download/dto/DownloadAuditEvent.java

@@ -1,11 +0,0 @@
-package com.kamco.cd.kamcoback.common.download.dto;
-
-import java.util.UUID;
-
-public record DownloadAuditEvent(
-    Long userId,
-    String requestUri,
-    String normalizedUri,
-    String ip,
-    int status,
-    UUID downloadUuid) {}

src/main/java/com/kamco/cd/kamcoback/common/download/dto/DownloadSpec.java

@@ -0,0 +1,12 @@
+package com.kamco.cd.kamcoback.common.download.dto;
+
+import java.nio.file.Path;
+import java.util.UUID;
+import org.springframework.http.MediaType;
+
+public record DownloadSpec(
+    UUID uuid, // 다운로드 식별(로그/정책용)
+    Path filePath, // 실제 파일 경로
+    String downloadName, // 사용자에게 보일 파일명
+    MediaType contentType // 보통 OCTET_STREAM
+    ) {}

src/main/java/com/kamco/cd/kamcoback/common/exception/CustomApiException.java

@@ -27,10 +27,4 @@ public class CustomApiException extends RuntimeException {
     this.codeName = errorCode.getCode();
     this.status = errorCode.getStatus();
   }
-
-  public CustomApiException(String codeName, HttpStatus status, Throwable cause) {
-    super(codeName, cause);
-    this.codeName = codeName;
-    this.status = status;
-  }
 }

src/main/java/com/kamco/cd/kamcoback/common/service/ExternalJarRunner.java

@@ -7,14 +7,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Log4j2
 @Component
 public class ExternalJarRunner {
-  @Value("${spring.profiles.active}")
-  private String profile;
 
   private static final long TIMEOUT_MINUTES = TimeUnit.DAYS.toMinutes(3);
 
@@ -43,7 +40,7 @@ public class ExternalJarRunner {
     if (mode != null && !mode.isEmpty()) {
       addArg(args, "converter.mode", mode);
     }
-    addArg(args, "spring.profiles.active", profile);
+
     execJar(jarPath, args);
   }
 
@@ -60,7 +57,6 @@ public class ExternalJarRunner {
     addArg(args, "upload-shp", register);
     //    addArg(args, "layer", layer);
 
-    addArg(args, "spring.profiles.active", profile);
     execJar(jarPath, args);
   }
 

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

@@ -300,12 +300,10 @@ public class FIleChecker {
                     String parentPath = path.getParent().toString();
                     String fullPath = path.toAbsolutePath().toString();
 
-                    boolean isShowHide =
+                    boolean isValid =
-                        !parentFolderNm.equals("kamco-nfs"); // 폴더 리스트에 kamco-nfs 하위만 나오도록 처리
+                        !NameValidator.containsKorean(folderNm)
-                    //              boolean isValid =
+                            && !NameValidator.containsWhitespaceRegex(folderNm)
-                    //                !NameValidator.containsKorean(folderNm)
+                            && !parentFolderNm.equals("kamco-nfs");
-                    //                  && !NameValidator.containsWhitespaceRegex(folderNm)
-                    //                  && !parentFolderNm.equals("kamco-nfs");
 
                     File file = new File(fullPath);
                     int childCnt = getChildFolderCount(file);
@@ -319,7 +317,7 @@ public class FIleChecker {
                         depth,
                         childCnt,
                         lastModified,
-                        isShowHide);
+                        isValid);
                   })
               .collect(Collectors.toList());
 

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

@@ -1,64 +1,98 @@
 package com.kamco.cd.kamcoback.config;
 
-import com.kamco.cd.kamcoback.common.download.dto.DownloadAuditEvent;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.common.utils.UserUtil;
 import com.kamco.cd.kamcoback.config.api.ApiLogFunction;
-import jakarta.servlet.DispatcherType;
+import com.kamco.cd.kamcoback.menu.dto.MenuDto;
+import com.kamco.cd.kamcoback.menu.service.MenuService;
+import com.kamco.cd.kamcoback.postgres.entity.AuditLogEntity;
+import com.kamco.cd.kamcoback.postgres.repository.log.AuditLogRepository;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
 @Slf4j
 @Component
-@RequiredArgsConstructor
 public class FileDownloadInteceptor implements HandlerInterceptor {
 
-  private final ApplicationEventPublisher publisher;
+  private final AuditLogRepository auditLogRepository;
+  private final MenuService menuService;
   private final UserUtil userUtil;
 
+  @Autowired private ObjectMapper objectMapper;
+
+  public FileDownloadInteceptor(
+      AuditLogRepository auditLogRepository, MenuService menuService, UserUtil userUtil) {
+    this.auditLogRepository = auditLogRepository;
+    this.menuService = menuService;
+    this.userUtil = userUtil;
+  }
+
   @Override
-  public void afterCompletion(
+  public boolean preHandle(
-      HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
+      HttpServletRequest request, HttpServletResponse response, Object handler) {
 
-    String uri = request.getRequestURI();
+    if (!request.getRequestURI().contains("/download")) return true;
-    if (uri == null || !uri.contains("/download")) return;
-    if (request.getDispatcherType() != DispatcherType.REQUEST) return;
 
-    Long userId;
+    if (request.getDispatcherType() != jakarta.servlet.DispatcherType.REQUEST) {
-    try {
+      return true;
-      userId = userUtil.getId();
+    }
-      if (userId == null) return; // userId null 불가면 스킵
+
-    } catch (Exception e) {
+    saveLog(request, response);
-      log.warn("Download audit userId resolve failed. uri={}, err={}", uri, e.toString());
+
+    return true;
+  }
+
+  private void saveLog(HttpServletRequest request, HttpServletResponse response) {
+    // 파일 다운로드 API만 필터링
+    if (!request.getRequestURI().contains("/download")) {
       return;
     }
 
+    Long userId = userUtil.getId();
     String ip = ApiLogFunction.getClientIp(request);
-    int status = response.getStatus();
-    String normalizedUri = uri.replace("/api", "");
 
-    UUID downloadUuid = extractUuidFromUri(uri);
+    List<?> list = menuService.getFindAll();
-    if (downloadUuid == null) {
+    List<MenuDto.Basic> result =
-      log.warn("Download UUID parse failed. uri={}", uri);
+        list.stream()
-      return; // downloadUuid null 불가 -> 스킵
+            .map(
-    }
+                item -> {
+                  if (item instanceof LinkedHashMap<?, ?> map) {
+                    return objectMapper.convertValue(map, MenuDto.Basic.class);
+                  } else if (item instanceof MenuDto.Basic dto) {
+                    return dto;
+                  } else {
+                    throw new IllegalStateException("Unsupported cache type: " + item.getClass());
+                  }
+                })
+            .toList();
 
-    publisher.publishEvent(
+    String normalizedUri = request.getRequestURI().replace("/api", "");
-        new DownloadAuditEvent(userId, uri, normalizedUri, ip, status, downloadUuid));
+    MenuDto.Basic basic =
-  }
+        result.stream()
+            .filter(
+                menu -> menu.getMenuUrl() != null && normalizedUri.startsWith(menu.getMenuUrl()))
+            .max(Comparator.comparingInt(m -> m.getMenuUrl().length()))
+            .orElse(null);
 
-  private UUID extractUuidFromUri(String uri) {
+    AuditLogEntity log =
-    try {
+        AuditLogEntity.forFileDownload(
-      String[] parts = uri.split("/");
+            userId,
-      String last = parts[parts.length - 1];
+            request.getRequestURI(),
-      return UUID.fromString(last);
+            Objects.requireNonNull(basic).getMenuUid(),
-    } catch (Exception e) {
+            ip,
-      return null;
+            response.getStatus(),
-    }
+            UUID.fromString(HeaderUtil.get(request, "kamco-download-uuid")));
+
+    auditLogRepository.save(log);
   }
 }

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

@@ -95,23 +95,23 @@ public class SecurityConfig {
                         "/api/auth/refresh",
                         "/api/auth/logout",
                         "/swagger-ui/**",
+                        "/api/members/*/password",
                         "/v3/api-docs/**",
                         "/chunk_upload_test.html",
-                        "/download_progress_test.html",
                         "/api/model/file-chunk-upload",
                         "/api/upload/file-chunk-upload",
                         "/api/upload/chunk-upload-complete",
                         "/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/members/*/password",
+                        "/api/common-code/**",
                         "/api/training-data/label/**",
                         "/api/training-data/review/**")
                     .authenticated()

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

@@ -11,6 +11,11 @@ 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;
@@ -38,6 +43,10 @@ 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 = "탐지결과 등록")
@@ -119,7 +128,7 @@ public class GukYuinApiController {
       })
   public ApiResponseDto<ChngDetectMastDto.ResultDto> selectChangeDetectionDtctIdList(
       @RequestParam(required = false) String chnDtctId) {
-    return ApiResponseDto.ok(gukYuinApiService.listChnDtctId(chnDtctId, ""));
+    return ApiResponseDto.ok(gukYuinApiService.listChnDtctId(chnDtctId));
   }
 
   @Operation(summary = "탐지결과 등록목록 조회(1건 조회)", description = "탐지결과 등록목록 조회")
@@ -183,7 +192,7 @@ public class GukYuinApiController {
       @PathVariable String chnDtctId,
       @RequestParam(defaultValue = "0") Integer pageIndex,
       @RequestParam(defaultValue = "10") Integer pageSize) {
-    return ApiResponseDto.ok(gukYuinApiService.findChnContList(chnDtctId, pageIndex, pageSize, ""));
+    return ApiResponseDto.ok(gukYuinApiService.findChnContList(chnDtctId, pageIndex, pageSize));
   }
 
   @Operation(summary = "탐지객체 조회 (탐지객체 1건 조회)", description = "탐지객체 조회 (탐지객체 1건 조회)")
@@ -263,8 +272,7 @@ public class GukYuinApiController {
   @PostMapping("/rlb/objt/{chnDtctObjtId}/lbl/{lblYn}")
   public ApiResponseDto<ChngDetectContDto.ResultLabelDto> updateChnDtctObjtLabelingYn(
       @PathVariable String chnDtctObjtId, @PathVariable String lblYn) {
-    return ApiResponseDto.ok(
+    return ApiResponseDto.ok(gukYuinApiService.updateChnDtctObjtLabelingYn(chnDtctObjtId, lblYn));
-        gukYuinApiService.updateChnDtctObjtLabelingYn(chnDtctObjtId, lblYn, ""));
   }
 
   @Operation(summary = "국유in연동 등록", description = "국유in연동 등록")
@@ -301,7 +309,7 @@ public class GukYuinApiController {
       @PathVariable String chnDtctId,
       @Parameter(description = "날짜(기본은 어제 날짜)") @RequestParam(defaultValue = "20260205")
           String yyyymmdd) {
-    return ApiResponseDto.ok(gukYuinApiService.findRlbDtctList(chnDtctId, yyyymmdd, ""));
+    return ApiResponseDto.ok(gukYuinApiService.findRlbDtctList(chnDtctId, yyyymmdd));
   }
 
   @Operation(summary = "탐지객체 적합여부 조회 (객체별 조회)", description = "탐지객체 적합여부 조회 (객체별 조회)")
@@ -322,4 +330,36 @@ 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/service/GukYuinApiService.java

@@ -259,8 +259,7 @@ public class GukYuinApiService {
   }
 
   // 탐지객체 리스트 조회
-  public ResultContDto findChnContList(
+  public ResultContDto findChnContList(String chnDtctId, Integer pageIndex, Integer pageSize) {
-      String chnDtctId, Integer pageIndex, Integer pageSize, String batchYn) {
 
     String url =
         gukyuinCdiUrl
@@ -273,7 +272,7 @@ public class GukYuinApiService {
             + "&reqIp="
             + myip
             + "&reqEpno="
-            + ("Y".equals(batchYn) ? "BATCH" : userUtil.getEmployeeNo());
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectContDto.ResultContDto> result =
         externalHttpClient.call(
@@ -335,12 +334,12 @@ public class GukYuinApiService {
   }
 
   public ChngDetectContDto.ResultLabelDto updateChnDtctObjtLabelingYn(
-      String chnDtctObjtId, String lblYn, String batchYn) {
+      String chnDtctObjtId, String lblYn) {
     String url = gukyuinCdiUrl + "/rlb/objt/" + chnDtctObjtId + "/lbl/" + lblYn;
 
     ReqInfo info = new ReqInfo();
     info.setReqIp(myip);
-    info.setReqEpno("Y".equals(batchYn) ? "BATCH" : userUtil.getEmployeeNo());
+    info.setReqEpno(userUtil.getEmployeeNo());
 
     ExternalCallResult<ChngDetectContDto.ResultLabelDto> result =
         externalHttpClient.call(
@@ -392,7 +391,7 @@ public class GukYuinApiService {
     return result.body();
   }
 
-  public ResultDto listChnDtctId(String chnDtctId, String batchYn) {
+  public ResultDto listChnDtctId(String chnDtctId) {
     String url =
         gukyuinCdiUrl
             + "/chn/mast/"
@@ -400,7 +399,7 @@ public class GukYuinApiService {
             + "?reqIp="
             + myip
             + "&reqEpno="
-            + ("Y".equals(batchYn) ? "BATCH" : userUtil.getEmployeeNo());
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -529,8 +528,7 @@ public class GukYuinApiService {
     return result.body();
   }
 
-  public ChngDetectMastDto.RlbDtctDto findRlbDtctList(
+  public ChngDetectMastDto.RlbDtctDto findRlbDtctList(String chnDtctId, String yyyymmdd) {
-      String chnDtctId, String yyyymmdd, String batchYn) {
 
     String url =
         gukyuinCdiUrl
@@ -539,7 +537,7 @@ public class GukYuinApiService {
             + "?reqIp="
             + myip
             + "&reqEpno="
-            + ("Y".equals(batchYn) ? "BATCH" : userUtil.getEmployeeNo())
+            + userUtil.getEmployeeNo()
             + "&yyyymmdd="
             + yyyymmdd;
 

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

@@ -1,6 +1,7 @@
 package com.kamco.cd.kamcoback.inference;
 
-import com.kamco.cd.kamcoback.common.download.RangeDownloadResponder;
+import com.kamco.cd.kamcoback.common.download.DownloadExecutor;
+import com.kamco.cd.kamcoback.common.download.dto.DownloadSpec;
 import com.kamco.cd.kamcoback.common.exception.CustomApiException;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto;
@@ -25,7 +26,6 @@ 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 jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -34,8 +34,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
 import org.springframework.data.domain.Page;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,9 +45,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
 @Tag(name = "추론관리", description = "추론관리 API")
-@Log4j2
 @RequestMapping("/api/inference")
 @RequiredArgsConstructor
 @RestController
@@ -56,7 +56,7 @@ public class InferenceResultApiController {
   private final InferenceResultService inferenceResultService;
   private final MapSheetMngService mapSheetMngService;
   private final ModelMngService modelMngService;
-  private final RangeDownloadResponder rangeDownloadResponder;
+  private final DownloadExecutor downloadExecutor;
 
   @Operation(summary = "추론관리 목록", description = "어드민 홈 > 추론관리 > 추론관리 > 추론관리 목록")
   @ApiResponses(
@@ -195,7 +195,7 @@ public class InferenceResultApiController {
           LocalDate endDttm,
       @Parameter(description = "키워드 (모델버전)", example = "M1.H1.E28") @RequestParam(required = false)
           String searchVal,
-      @Parameter(description = "타입", example = "G1") @RequestParam(required = false)
+      @Parameter(description = "타입", example = "M1") @RequestParam(required = false)
           String modelType,
       @RequestParam(defaultValue = "0") int page,
       @RequestParam(defaultValue = "20") int size) {
@@ -356,8 +356,9 @@ public class InferenceResultApiController {
         @ApiResponse(responseCode = "404", description = "파일 없음", content = @Content),
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
-  @GetMapping("/download/{uuid}")
+  @GetMapping(value = "/download/{uuid}")
-  public ResponseEntity<?> download(@PathVariable UUID uuid, HttpServletRequest request)
+  public ResponseEntity<StreamingResponseBody> download(
+      @Parameter(example = "69c4e56c-e0bf-4742-9225-bba9aae39052") @PathVariable UUID uuid)
       throws IOException {
 
     String path;
@@ -373,8 +374,8 @@ public class InferenceResultApiController {
 
     Path zipPath = Path.of(path);
 
-    // Range + 200/206/416 공통 처리 (추가 헤더 포함)
+    return downloadExecutor.stream(
-    return rangeDownloadResponder.buildZipResponse(zipPath, uid + ".zip", request);
+        new DownloadSpec(uuid, zipPath, uid + ".zip", MediaType.APPLICATION_OCTET_STREAM));
   }
 
   @Operation(summary = "shp 파일 다운로드 이력 조회", description = "추론관리 분석결과 shp 파일 다운로드 이력 조회")
@@ -414,7 +415,7 @@ public class InferenceResultApiController {
     downloadReq.setStartDate(strtDttm);
     downloadReq.setEndDate(endDttm);
     downloadReq.setSearchValue(searchValue);
-    downloadReq.setRequestUri("/api/inference/download/" + uuid);
+    downloadReq.setRequestUri("/api/inference/download-audit/download/" + uuid);
 
     return ApiResponseDto.ok(inferenceResultService.getDownloadAudit(searchReq, downloadReq));
   }

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

@@ -246,15 +246,15 @@ public class InferenceResultDto {
     @NotBlank
     private String title;
 
-    @Schema(description = "G1", example = "b40e0f68-c1d8-49fc-93f9-a36270093861")
+    @Schema(description = "M1", example = "b40e0f68-c1d8-49fc-93f9-a36270093861")
     @NotNull
     private UUID model1Uuid;
 
-    @Schema(description = "G2", example = "ec92b7d2-b5a3-4915-9bdf-35fb3ca8ad27")
+    @Schema(description = "M2", example = "ec92b7d2-b5a3-4915-9bdf-35fb3ca8ad27")
     @NotNull
     private UUID model2Uuid;
 
-    @Schema(description = "G3", example = "37f45782-8ccf-4cf6-911c-a055a1510d39")
+    @Schema(description = "M3", example = "37f45782-8ccf-4cf6-911c-a055a1510d39")
     @NotNull
     private UUID model3Uuid;
 
@@ -297,30 +297,6 @@ public class InferenceResultDto {
   @Schema(name = "InferenceStatusDetailDto", description = "추론(변화탐지) 진행상태")
   public static class InferenceStatusDetailDto {
 
-    @Schema(description = "모델1 사용시간 시작일시")
-    @JsonFormatDttm
-    ZonedDateTime m1ModelStartDttm;
-
-    @Schema(description = "모델2 사용시간 시작일시")
-    @JsonFormatDttm
-    ZonedDateTime m2ModelStartDttm;
-
-    @Schema(description = "모델3 사용시간 시작일시")
-    @JsonFormatDttm
-    ZonedDateTime m3ModelStartDttm;
-
-    @Schema(description = "모델1 사용시간 종료일시")
-    @JsonFormatDttm
-    ZonedDateTime m1ModelEndDttm;
-
-    @Schema(description = "모델2 사용시간 종료일시")
-    @JsonFormatDttm
-    ZonedDateTime m2ModelEndDttm;
-
-    @Schema(description = "모델3 사용시간 종료일시")
-    @JsonFormatDttm
-    ZonedDateTime m3ModelEndDttm;
-
     @Schema(description = "탐지대상 도엽수")
     private Long detectingCnt;
 
@@ -360,6 +336,30 @@ public class InferenceResultDto {
     @Schema(description = "모델3 분석 실패")
     private Integer m3FailedJobs;
 
+    @Schema(description = "모델1 사용시간 시작일시")
+    @JsonFormatDttm
+    ZonedDateTime m1ModelStartDttm;
+
+    @Schema(description = "모델2 사용시간 시작일시")
+    @JsonFormatDttm
+    ZonedDateTime m2ModelStartDttm;
+
+    @Schema(description = "모델3 사용시간 시작일시")
+    @JsonFormatDttm
+    ZonedDateTime m3ModelStartDttm;
+
+    @Schema(description = "모델1 사용시간 종료일시")
+    @JsonFormatDttm
+    ZonedDateTime m1ModelEndDttm;
+
+    @Schema(description = "모델2 사용시간 종료일시")
+    @JsonFormatDttm
+    ZonedDateTime m2ModelEndDttm;
+
+    @Schema(description = "모델3 사용시간 종료일시")
+    @JsonFormatDttm
+    ZonedDateTime m3ModelEndDttm;
+
     @Schema(description = "변화탐지 제목")
     private String title;
 
@@ -496,19 +496,19 @@ public class InferenceResultDto {
       return MapSheetScope.getDescByCode(this.mapSheetScope);
     }
 
-    @Schema(description = "G1 사용시간")
+    @Schema(description = "M1 사용시간")
     @JsonProperty("m1ElapsedTim")
     public String getM1ElapsedTime() {
       return formatElapsedTime(this.m1ModelStartDttm, this.m1ModelEndDttm);
     }
 
-    @Schema(description = "G2 사용시간")
+    @Schema(description = "M2 사용시간")
     @JsonProperty("m2ElapsedTim")
     public String getM2ElapsedTime() {
       return formatElapsedTime(this.m2ModelStartDttm, this.m2ModelEndDttm);
     }
 
-    @Schema(description = "G3 사용시간")
+    @Schema(description = "M3 사용시간")
     @JsonProperty("m3ElapsedTim")
     public String getM3ElapsedTime() {
       return formatElapsedTime(this.m3ModelStartDttm, this.m3ModelEndDttm);

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

@@ -248,7 +248,7 @@ public class InferenceResultService {
     saveInferenceAiDto.setUuid(uuid);
     saveInferenceAiDto.setBatchId(batchId);
     saveInferenceAiDto.setStatus(Status.IN_PROGRESS.getId());
-    saveInferenceAiDto.setType(ModelType.G1.getId());
+    saveInferenceAiDto.setType("M1");
     saveInferenceAiDto.setInferStartDttm(ZonedDateTime.now());
     saveInferenceAiDto.setModelComparePath(modelComparePath.getFilePath());
     saveInferenceAiDto.setModelTargetPath(modelTargetPath.getFilePath());
@@ -414,12 +414,12 @@ public class InferenceResultService {
 
     String modelType = "";
 
-    if (modelInfo.getModelType().equals(ModelType.G1.getId())) {
+    if (modelInfo.getModelType().equals(ModelType.M1.getId())) {
-      modelType = ModelType.G1.getId();
+      modelType = "G1";
-    } else if (modelInfo.getModelType().equals(ModelType.G2.getId())) {
+    } else if (modelInfo.getModelType().equals(ModelType.M2.getId())) {
-      modelType = ModelType.G2.getId();
+      modelType = "G2";
     } else {
-      modelType = ModelType.G3.getId();
+      modelType = "G3";
     }
 
     InferenceSendDto sendDto = new InferenceSendDto();

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

@@ -1,6 +1,7 @@
 package com.kamco.cd.kamcoback.label;
 
-import com.kamco.cd.kamcoback.common.download.RangeDownloadResponder;
+import com.kamco.cd.kamcoback.common.download.DownloadExecutor;
+import com.kamco.cd.kamcoback.common.download.dto.DownloadSpec;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
@@ -22,13 +23,10 @@ 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 jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 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.UUID;
 import lombok.RequiredArgsConstructor;
@@ -36,6 +34,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.coyote.BadRequestException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -44,6 +43,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
 @Slf4j
 @Tag(name = "라벨링 작업 관리", description = "라벨링 작업 배정 및 통계 조회 API")
@@ -53,7 +53,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class LabelAllocateApiController {
 
   private final LabelAllocateService labelAllocateService;
-  private final RangeDownloadResponder rangeDownloadResponder;
+  private final DownloadExecutor downloadExecutor;
 
   @Value("${file.dataset-response}")
   private String responsePath;
@@ -382,17 +382,19 @@ public class LabelAllocateApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   @GetMapping("/download/{uuid}")
-  public ResponseEntity<?> download(@PathVariable UUID uuid, HttpServletRequest request)
+  public ResponseEntity<StreamingResponseBody> download(
+      @Parameter(example = "6d8d49dc-0c9d-4124-adc7-b9ca610cc394") @PathVariable UUID uuid)
       throws IOException {
 
+    if (!labelAllocateService.isDownloadable(uuid)) {
+      throw new BadRequestException();
+    }
+
     String uid = labelAllocateService.findLearnUid(uuid);
     Path zipPath = Paths.get(responsePath).resolve(uid + ".zip");
 
-    if (!Files.isRegularFile(zipPath)) {
+    return downloadExecutor.stream(
-      throw new BadRequestException();
+        new DownloadSpec(uuid, zipPath, uid + ".zip", MediaType.APPLICATION_OCTET_STREAM));
-    }
-
-    return rangeDownloadResponder.buildZipResponse(zipPath, uid + ".zip", request);
   }
 
   @Operation(summary = "라벨 파일 다운로드 이력 조회", description = "라벨 파일 다운로드 이력 조회")
@@ -459,43 +461,4 @@ public class LabelAllocateApiController {
           UUID uuid) {
     return ApiResponseDto.ok(labelAllocateService.isDownloadable(uuid));
   }
-
-  @Operation(
-      summary = "라벨링작업 관리 > 추가 작업 배정(실태조사 추가되면)",
-      description = "라벨링작업 관리 > 추가 작업 배정(실태조사 추가되면)")
-  @ApiResponses(
-      value = {
-        @ApiResponse(
-            responseCode = "201",
-            description = "등록 성공",
-            content =
-                @Content(
-                    mediaType = "application/json",
-                    schema = @Schema(implementation = Long.class))),
-        @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
-        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
-        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-      })
-  @PostMapping("/allocate-add-stblt")
-  public ApiResponseDto<ApiResponseDto.ResponseObj> labelAllocateAddStblt(
-      @RequestBody @Valid LabelAllocateDto.AllocateAddStbltDto dto) {
-
-    return ApiResponseDto.okObject(
-        labelAllocateService.allocateAddStbltYn(
-            dto.getTotalCnt(), dto.getUuid(), dto.getLabelers(), dto.getBaseDate()));
-  }
-
-  @Operation(summary = "라벨링 추가 할당 가능한 건수", description = "라벨링 추가 할당 가능한 건수 API")
-  @ApiResponses(
-      value = {
-        @ApiResponse(responseCode = "200", description = "조회 성공"),
-        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음"),
-        @ApiResponse(responseCode = "500", description = "서버 오류")
-      })
-  @GetMapping("/allocate-add-cnt")
-  public ApiResponseDto<Long> allocateAddCnt(
-      @RequestParam UUID uuid, @RequestParam LocalDate baseDate) {
-
-    return ApiResponseDto.ok(labelAllocateService.findAllocateAddCnt(uuid, baseDate));
-  }
 }

src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java

@@ -3,7 +3,6 @@ package com.kamco.cd.kamcoback.label.dto;
 import com.kamco.cd.kamcoback.common.utils.enums.CodeExpose;
 import com.kamco.cd.kamcoback.common.utils.enums.EnumType;
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.UUID;
@@ -366,35 +365,9 @@ public class LabelAllocateDto {
   @AllArgsConstructor
   @NoArgsConstructor
   public static class InferenceLearnDto {
-
     private UUID analUuid;
     private String learnUid;
     private String analState;
     private Long analId;
   }
-
-  @Getter
-  @Setter
-  @AllArgsConstructor
-  public static class AllocateAddStbltDto {
-
-    @Schema(description = "총 잔여 건수", example = "179")
-    private Integer totalCnt;
-
-    @Schema(
-        description = "추가할당할 라벨러",
-        example =
-            """
-        [
-          "123454", "654321", "222233", "777222"
-        ]
-        """)
-    private List<String> labelers;
-
-    @Schema(description = "회차 마스터 key", example = "c0e77cc7-8c28-46ba-9ca4-11e90246ab44")
-    private UUID uuid;
-
-    @Schema(description = "기준일자", example = "2026-02-20")
-    private LocalDate baseDate;
-  }
 }

src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java

@@ -20,7 +20,6 @@ import com.kamco.cd.kamcoback.log.dto.AuditLogDto;
 import com.kamco.cd.kamcoback.log.dto.AuditLogDto.DownloadReq;
 import com.kamco.cd.kamcoback.postgres.core.AuditLogCoreService;
 import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService;
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -28,12 +27,11 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Service
-@Transactional(readOnly = true)
+@Transactional
 @RequiredArgsConstructor
 public class LabelAllocateService {
 
@@ -278,7 +276,6 @@ public class LabelAllocateService {
     return labelAllocateCoreService.findLabelingIngProcessCnt();
   }
 
-  @Transactional(propagation = Propagation.NOT_SUPPORTED)
   public String findLearnUid(UUID uuid) {
     return labelAllocateCoreService.findLearnUid(uuid);
   }
@@ -303,52 +300,4 @@ public class LabelAllocateService {
   public boolean isDownloadable(UUID uuid) {
     return labelAllocateCoreService.isDownloadable(uuid);
   }
-
-  /**
-   * 실태조사가 값 들어온 기간만큼 할당하는 로직 (최초 할당 이후 작업)
-   *
-   * @param uuid
-   * @param targetUsers
-   * @return
-   */
-  @Transactional
-  public ApiResponseDto.ResponseObj allocateAddStbltYn(
-      Integer totalCnt, UUID uuid, List<String> targetUsers, LocalDate baseDate) {
-
-    int userCount = targetUsers.size();
-    if (userCount == 0) {
-      return new ApiResponseDto.ResponseObj(ApiResponseCode.BAD_REQUEST, "추가 할당할 라벨러를 선택해주세요.");
-    }
-
-    int base = totalCnt / userCount;
-    int remainder = totalCnt % userCount;
-    Long lastId = null;
-    List<AllocateInfoDto> allIds =
-        labelAllocateCoreService.fetchNextIdsAddStbltYn(
-            uuid, baseDate, lastId, totalCnt.longValue());
-
-    // MapSheetAnalInferenceEntity analUid 가져오기
-    Long analUid = labelAllocateCoreService.findMapSheetAnalInferenceUid(uuid);
-
-    int index = 0;
-    for (int i = 0; i < userCount; i++) {
-      int assignCount = base;
-      // 마지막 사람에게 나머지 몰아주기
-      if (i == userCount - 1) {
-        assignCount += remainder;
-      }
-
-      int end = index + assignCount;
-      List<AllocateInfoDto> sub = allIds.subList(index, end);
-
-      labelAllocateCoreService.assignOwner(sub, targetUsers.get(i), analUid);
-      index = end;
-    }
-
-    return new ApiResponseDto.ResponseObj(ApiResponseCode.OK, "추가 할당이 완료되었습니다.");
-  }
-
-  public Long findAllocateAddCnt(UUID uuid, LocalDate baseDate) {
-    return labelAllocateCoreService.findAllocateAddCnt(uuid, baseDate);
-  }
 }

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

@@ -134,6 +134,7 @@ public class MapSheetMngService {
     }
 
     MngDto mngDto = mapSheetMngCoreService.findMapSheetMng(errDto.getMngYyyy());
+    String targetYearDir = mngDto.getMngPath();
 
     // 중복체크 -> 도엽50k/uuid 경로에 업로드 할 거라 overwrite 되지 않음
     //    if (!overwrite) {

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

@@ -5,6 +5,7 @@ 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;
@@ -34,6 +35,7 @@ public class MembersApiController {
 
   private final MembersService membersService;
   private final AdminService adminService;
+  private final MemberInactiveJobService memberInactiveJobService;
 
   @Operation(summary = "회원정보 목록", description = "회원정보 조회")
   @ApiResponses(
@@ -157,4 +159,13 @@ 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/model/ModelMngApiController.java

@@ -41,6 +41,21 @@ public class ModelMngApiController {
 
   private final ModelMngService modelMngService;
 
+  @Value("${file.sync-root-dir}")
+  private String syncRootDir;
+
+  @Value("${file.sync-tmp-dir}")
+  private String syncTmpDir;
+
+  @Value("${file.sync-file-extention}")
+  private String syncFileExtention;
+
+  @Value("${file.dataset-dir}")
+  private String datasetDir;
+
+  @Value("${file.dataset-tmp-dir}")
+  private String datasetTmpDir;
+
   @Value("${file.model-dir}")
   private String modelDir;
 

src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java

@@ -21,9 +21,9 @@ public class ModelMngDto {
   @Getter
   @AllArgsConstructor
   public enum ModelType implements EnumType {
-    G1("G1"),
+    M1("모델 M1"),
-    G2("G2"),
+    M2("모델 M2"),
-    G3("G3");
+    M3("모델 M3");
 
     private final String desc;
 

src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java

@@ -35,6 +35,27 @@ public class ModelMngService {
 
   private final UploadService uploadService;
 
+  @Value("${file.sync-root-dir}")
+  private String syncRootDir;
+
+  @Value("${file.sync-tmp-dir}")
+  private String syncTmpDir;
+
+  @Value("${file.sync-file-extention}")
+  private String syncFileExtention;
+
+  @Value("${file.dataset-dir}")
+  private String datasetDir;
+
+  @Value("${file.dataset-tmp-dir}")
+  private String datasetTmpDir;
+
+  @Value("${file.model-dir}")
+  private String modelDir;
+
+  @Value("${file.model-tmp-dir}")
+  private String modelTmpDir;
+
   @Value("${file.pt-path}")
   private String ptPath;
 

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

@@ -7,7 +7,6 @@ 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;
@@ -16,7 +15,6 @@ 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
@@ -98,42 +96,4 @@ 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,7 +2,6 @@ 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;
@@ -16,8 +15,8 @@ public class GukYuinLabelJobCoreService {
     this.gukYuinLabelRepository = gukYuinLabelRepository;
   }
 
-  public List<GeomUidDto> findYesterdayLabelingCompleteList(LocalDate baseDate) {
+  public List<GeomUidDto> findYesterdayLabelingCompleteList() {
-    return gukYuinLabelRepository.findYesterdayLabelingCompleteList(baseDate);
+    return gukYuinLabelRepository.findYesterdayLabelingCompleteList();
   }
 
   @Transactional

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

@@ -19,7 +19,6 @@ import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.ResultList;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.SaveInferenceAiDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultsTestingDto;
 import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListDto;
-import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelType;
 import com.kamco.cd.kamcoback.postgres.entity.InferenceResultsTestingEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapInkx5kEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceEntity;
@@ -111,7 +110,7 @@ public class InferenceResultCoreService {
 
     MapSheetLearnEntity mapSheetLearnEntity = new MapSheetLearnEntity();
     mapSheetLearnEntity.setTitle(req.getTitle());
-    mapSheetLearnEntity.setRunningModelType(ModelType.G1.getId());
+    mapSheetLearnEntity.setRunningModelType("M1");
     mapSheetLearnEntity.setM1ModelUuid(req.getModel1Uuid());
     mapSheetLearnEntity.setM2ModelUuid(req.getModel2Uuid());
     mapSheetLearnEntity.setM3ModelUuid(req.getModel3Uuid());
@@ -302,7 +301,7 @@ public class InferenceResultCoreService {
 
   private void applyModelUpdate(MapSheetLearnEntity entity, SaveInferenceAiDto request) {
     switch (request.getType()) {
-      case "G1" ->
+      case "M1" ->
           applyModelFields(
               request,
               entity::setM1ModelBatchId,
@@ -312,7 +311,7 @@ public class InferenceResultCoreService {
               entity::setM1RunningJobs,
               entity::setM1CompletedJobs,
               entity::setM1FailedJobs);
-      case "G2" ->
+      case "M2" ->
           applyModelFields(
               request,
               entity::setM2ModelBatchId,
@@ -322,7 +321,7 @@ public class InferenceResultCoreService {
               entity::setM2RunningJobs,
               entity::setM2CompletedJobs,
               entity::setM2FailedJobs);
-      case "G3" ->
+      case "M3" ->
           applyModelFields(
               request,
               entity::setM3ModelBatchId,

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

@@ -257,20 +257,16 @@ public class LabelAllocateCoreService {
 
     // 파일이 있는지만 확인
     Path path = Paths.get(responsePath).resolve(dto.getLearnUid() + ".zip");
-    if (!Files.isRegularFile(path)) {
+
-      return false; // exists 포함
+    if (!Files.exists(path) || !Files.isRegularFile(path)) {
+      // 실제 파일만 true (디렉터리는 제외)
+      return false;
     }
 
-    String state = dto.getAnalState();
+    // 다운로드 확인할 학습데이터가 라벨링중인 경우 파일 생성여부가 정상인지 확인
-    boolean isLabelingIng =
+    if (dto.getAnalState().equals(LabelMngState.ASSIGNED.getId())
-        LabelMngState.ASSIGNED.getId().equals(state) || LabelMngState.ING.getId().equals(state);
+        || dto.getAnalState().equals(LabelMngState.ING.getId())) {
-
+      return batchStepHistoryRepository.isDownloadable(dto.getAnalId());
-    if (isLabelingIng) {
-      Long analId = dto.getAnalId();
-      if (analId == null) {
-        return false;
-      }
-      return batchStepHistoryRepository.isDownloadable(analId);
     }
 
     return true;
@@ -281,13 +277,4 @@ public class LabelAllocateCoreService {
         .findLearnUid(uuid)
         .orElseThrow(() -> new CustomApiException("NOT_FOUND_DATA", HttpStatus.NOT_FOUND));
   }
-
-  public List<AllocateInfoDto> fetchNextIdsAddStbltYn(
-      UUID uuid, LocalDate baseDate, Long lastId, Long totalCnt) {
-    return labelAllocateRepository.fetchNextIdsAddStbltYn(uuid, baseDate, lastId, totalCnt);
-  }
-
-  public Long findAllocateAddCnt(UUID uuid, LocalDate baseDate) {
-    return labelAllocateRepository.findAllocateAddCnt(uuid, baseDate);
-  }
 }

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

@@ -283,19 +283,11 @@ public class MapSheetMngCoreService {
 
     // 4) 파일 생성
     try {
-      log.info("create Directories outputPath: {}", outputPath);
-      log.info(
-          "activeEnv={}, inferenceDir={}, targetDir={}, filename={}",
-          activeEnv,
-          inferenceDir,
-          targetDir,
-          filename);
-      log.info("outputPath={}, parent={}", outputPath.toAbsolutePath(), outputPath.getParent());
       Files.createDirectories(outputPath.getParent());
 
       new GeoJsonFileWriter()
           .exportToFile(sceneInference, "scene_inference_" + yyyy, 5186, outputPath.toString());
-      log.info("GeoJsonFileWriter: {}", "scene_inference_" + yyyy);
+
       Scene scene = new Scene();
       scene.setFeatures(sceneInference);
       scene.setFilePath(outputPath.toString());
@@ -305,7 +297,7 @@ public class MapSheetMngCoreService {
     } catch (IOException e) {
       log.error(
           "FAIL_CREATE_MAP_SHEET_FILE: yyyy={}, isAll={}, path={}", yyyy, isAll, outputPath, e);
-      throw new CustomApiException("INTERNAL_SERVER_ERROR", HttpStatus.INTERNAL_SERVER_ERROR, e);
+      throw new CustomApiException("FAIL_CREATE_MAP_SHEET_FILE", HttpStatus.INTERNAL_SERVER_ERROR);
     }
   }
 

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

@@ -6,7 +6,6 @@ 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;
@@ -68,10 +67,9 @@ public class MapSheetMngFileJobCoreService {
     return mapSheetMngFileJobRepository.findNotYetMapSheetMng();
   }
 
-  public Long findByHstMapSheetBeforeYyyyListCount(
+  public Long findByHstMapSheetBeforeYyyyListCount(int strtYyyy, int endYyyy, String mapSheetNum) {
-      int mngYyyy, int strtYyyy, int endYyyy, String mapSheetNum) {
     return mapSheetMngFileJobRepository.findByHstMapSheetBeforeYyyyListCount(
-        mngYyyy, strtYyyy, endYyyy, mapSheetNum);
+        strtYyyy, endYyyy, mapSheetNum);
   }
 
   public void updateException5kMapSheet(String mapSheetNum, CommonUseStatus commonUseStatus) {
@@ -81,16 +79,4 @@ 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,7 +3,6 @@ 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;
@@ -15,8 +14,8 @@ public class TrainingDataLabelJobCoreService {
 
   private final TrainingDataLabelJobRepository trainingDataLabelJobRepository;
 
-  public List<Tasks> findCompletedYesterdayUnassigned(LocalDate baseDate) {
+  public List<Tasks> findCompletedYesterdayUnassigned() {
-    return trainingDataLabelJobRepository.findCompletedYesterdayUnassigned(baseDate);
+    return trainingDataLabelJobRepository.findCompletedYesterdayUnassigned();
   }
 
   public void assignReviewerBatch(List<UUID> assignmentUids, String reviewerId) {

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

@@ -4,7 +4,6 @@ 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;
@@ -16,13 +15,12 @@ public class TrainingDataReviewJobCoreService {
   private final TrainingDataReviewJobRepository trainingDataReviewJobRepository;
 
   public List<CompleteLabelData> findCompletedYesterdayLabelingList(
-      Long analUid, String mapSheetNum, LocalDate baseDate) {
+      Long analUid, String mapSheetNum) {
-    return trainingDataReviewJobRepository.findCompletedYesterdayLabelingList(
+    return trainingDataReviewJobRepository.findCompletedYesterdayLabelingList(analUid, mapSheetNum);
-        analUid, mapSheetNum, baseDate);
   }
 
-  public List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid, LocalDate baseDate) {
+  public List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid) {
-    return trainingDataReviewJobRepository.findCompletedAnalMapSheetList(analUid, baseDate);
+    return trainingDataReviewJobRepository.findCompletedAnalMapSheetList(analUid);
   }
 
   public List<AnalCntInfo> findAnalCntInfoList() {

src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearn5kRepositoryImpl.java

@@ -35,17 +35,17 @@ public class MapSheetLearn5kRepositoryImpl implements MapSheetLearn5kRepositoryC
     final StringPath errorMsgPath;
 
     switch (type) {
-      case "G1" -> {
+      case "M1" -> {
         failPath = mapSheetLearn5kEntity.isM1Fail;
         jobIdPath = mapSheetLearn5kEntity.m1JobId;
         errorMsgPath = mapSheetLearn5kEntity.m1ErrorMessage;
       }
-      case "G2" -> {
+      case "M2" -> {
         failPath = mapSheetLearn5kEntity.isM2Fail;
         jobIdPath = mapSheetLearn5kEntity.m2JobId;
         errorMsgPath = mapSheetLearn5kEntity.m2ErrorMessage;
       }
-      case "G3" -> {
+      case "M3" -> {
         failPath = mapSheetLearn5kEntity.isM3Fail;
         jobIdPath = mapSheetLearn5kEntity.m3JobId;
         errorMsgPath = mapSheetLearn5kEntity.m3ErrorMessage;
@@ -85,15 +85,15 @@ public class MapSheetLearn5kRepositoryImpl implements MapSheetLearn5kRepositoryC
     final StringPath errorMsgPath;
 
     switch (type) {
-      case "G1" -> {
+      case "M1" -> {
         failPath = mapSheetLearn5kEntity.isM1Fail;
         jobIdPath = mapSheetLearn5kEntity.m1JobId;
       }
-      case "G2" -> {
+      case "M2" -> {
         failPath = mapSheetLearn5kEntity.isM2Fail;
         jobIdPath = mapSheetLearn5kEntity.m2JobId;
       }
-      case "G3" -> {
+      case "M3" -> {
         failPath = mapSheetLearn5kEntity.isM3Fail;
         jobIdPath = mapSheetLearn5kEntity.m3JobId;
       }
@@ -135,15 +135,15 @@ public class MapSheetLearn5kRepositoryImpl implements MapSheetLearn5kRepositoryC
     BooleanPath failPath;
 
     switch (type) {
-      case "G1" -> {
+      case "M1" -> {
         jobIdPath = mapSheetLearn5kEntity.m1JobId;
         failPath = mapSheetLearn5kEntity.isM1Fail;
       }
-      case "G2" -> {
+      case "M2" -> {
         jobIdPath = mapSheetLearn5kEntity.m2JobId;
         failPath = mapSheetLearn5kEntity.isM2Fail;
       }
-      case "G3" -> {
+      case "M3" -> {
         jobIdPath = mapSheetLearn5kEntity.m3JobId;
         failPath = mapSheetLearn5kEntity.isM3Fail;
       }
@@ -180,13 +180,13 @@ public class MapSheetLearn5kRepositoryImpl implements MapSheetLearn5kRepositoryC
     BooleanPath failPath;
 
     switch (type) {
-      case "G1" -> {
+      case "M1" -> {
         jobIdPath = mapSheetLearn5kEntity.m1JobId;
       }
-      case "G2" -> {
+      case "M2" -> {
         jobIdPath = mapSheetLearn5kEntity.m2JobId;
       }
-      case "G3" -> {
+      case "M3" -> {
         jobIdPath = mapSheetLearn5kEntity.m3JobId;
       }
       default -> {

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

@@ -4,7 +4,6 @@ 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 {
@@ -29,18 +28,4 @@ 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,7 +8,6 @@ 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;
@@ -17,14 +16,11 @@ 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;
@@ -34,13 +30,10 @@ 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 {
 
@@ -233,9 +226,7 @@ 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))
@@ -270,9 +261,7 @@ 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);
@@ -382,275 +371,4 @@ 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,12 +1,11 @@
 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(LocalDate baseDate);
+  List<GeomUidDto> findYesterdayLabelingCompleteList();
 
   void updateAnalDataInferenceGeomSendDttm(Long geoUid);
 }

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

@@ -13,7 +13,6 @@ 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;
@@ -28,21 +27,22 @@ public class GukYuinLabelJobRepositoryImpl implements GukYuinLabelJobRepositoryC
   @PersistenceContext private EntityManager em;
 
   @Override
-  public List<GeomUidDto> findYesterdayLabelingCompleteList(LocalDate baseDate) {
+  public List<GeomUidDto> findYesterdayLabelingCompleteList() {
     ZoneId zone = ZoneId.of("Asia/Seoul");
+    ZonedDateTime todayStart = ZonedDateTime.now(zone).toLocalDate().atStartOfDay(zone);
+    ZonedDateTime tomorrowStart = todayStart.plusDays(1);
+    ZonedDateTime yesterdayStart = todayStart.minusDays(1);
 
-    // baseDate가 null이면 기존처럼 "어제"로 처리
+    //    BooleanExpression isYesterday =
-    LocalDate targetDate =
+    //        labelingAssignmentEntity
-        (baseDate != null) ? baseDate : ZonedDateTime.now(zone).toLocalDate().minusDays(1);
+    //            .inspectStatDttm
-
+    //            .goe(yesterdayStart)
-    ZonedDateTime targetStart = targetDate.atStartOfDay(zone);
+    //            .and(labelingAssignmentEntity.inspectStatDttm.lt(todayStart));
-    ZonedDateTime nextStart = targetStart.plusDays(1);
+    BooleanExpression isYesterday =
-
-    BooleanExpression inTargetDay =
         labelingAssignmentEntity
             .inspectStatDttm
-            .goe(targetStart)
+            .goe(todayStart)
-            .and(labelingAssignmentEntity.inspectStatDttm.lt(nextStart));
+            .and(labelingAssignmentEntity.inspectStatDttm.lt(tomorrowStart));
 
     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()), inTargetDay)
+        .where(labelingAssignmentEntity.inspectState.eq(InspectState.COMPLETE.getId()), isYesterday)
         .fetch();
   }
 

src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryCustom.java

@@ -110,9 +110,4 @@ public interface LabelAllocateRepositoryCustom {
   InferenceLearnDto findLabelingIngProcessId(UUID uuid);
 
   Optional<String> findLearnUid(UUID uuid);
-
-  List<AllocateInfoDto> fetchNextIdsAddStbltYn(
-      UUID uuid, LocalDate baseDate, Long lastId, Long totalCnt);
-
-  Long findAllocateAddCnt(UUID uuid, LocalDate baseDate);
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java

@@ -1856,56 +1856,4 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
             .where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
             .fetchOne());
   }
-
-  @Override
-  public List<AllocateInfoDto> fetchNextIdsAddStbltYn(
-      UUID uuid, LocalDate baseDate, Long lastId, Long totalCnt) {
-    ZoneId zone = ZoneId.of("Asia/Seoul"); // 기준 타임존 명확히
-    ZonedDateTime nextDayStart = baseDate.plusDays(1).atStartOfDay(zone);
-
-    return queryFactory
-        .select(
-            Projections.constructor(
-                AllocateInfoDto.class,
-                mapSheetAnalDataInferenceGeomEntity.geoUid,
-                mapSheetAnalDataInferenceGeomEntity.mapSheetNum,
-                mapSheetAnalDataInferenceGeomEntity.pnu))
-        .from(mapSheetAnalInferenceEntity)
-        .innerJoin(mapSheetAnalDataInferenceEntity)
-        .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
-        .innerJoin(mapSheetAnalDataInferenceGeomEntity)
-        .on(
-            mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
-            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
-            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()),
-            mapSheetAnalDataInferenceGeomEntity.fitStateDttm.lt(nextDayStart),
-            mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
-        .where(
-            mapSheetAnalInferenceEntity.uuid.eq(uuid),
-            lastId == null ? null : mapSheetAnalDataInferenceGeomEntity.geoUid.gt(lastId))
-        .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc())
-        .limit(totalCnt)
-        .fetch();
-  }
-
-  @Override
-  public Long findAllocateAddCnt(UUID uuid, LocalDate baseDate) {
-    ZoneId zone = ZoneId.of("Asia/Seoul"); // 기준 타임존 명확히
-    ZonedDateTime nextDayStart = baseDate.plusDays(1).atStartOfDay(zone);
-
-    return queryFactory
-        .select(mapSheetAnalDataInferenceGeomEntity.geoUid.count())
-        .from(mapSheetAnalInferenceEntity)
-        .innerJoin(mapSheetAnalDataInferenceEntity)
-        .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
-        .innerJoin(mapSheetAnalDataInferenceGeomEntity)
-        .on(
-            mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
-            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
-            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()),
-            mapSheetAnalDataInferenceGeomEntity.fitStateDttm.lt(nextDayStart),
-            mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
-        .where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
-        .fetchOne();
-  }
 }

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.url,
                     mapSheetMngTileEntity.tag,
+                    mapSheetMngTileEntity.url,
                     mapSheetMngTileEntity.minLon,
                     mapSheetMngTileEntity.minLat,
                     mapSheetMngTileEntity.maxLon,
@@ -168,8 +168,8 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                 Projections.constructor(
                     LayerDto.TileUrlDto.class,
                     mapSheetMngTileEntity.mngYyyy,
-                    mapSheetMngTileEntity.url,
                     mapSheetMngTileEntity.tag,
+                    mapSheetMngTileEntity.url,
                     mapSheetMngTileEntity.minLon,
                     mapSheetMngTileEntity.minLat,
                     mapSheetMngTileEntity.maxLon,
@@ -202,8 +202,8 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
             Projections.constructor(
                 LayerDto.TileUrlDto.class,
                 mapSheetMngTileEntity.mngYyyy,
-                mapSheetMngTileEntity.url,
                 mapSheetMngTileEntity.tag,
+                mapSheetMngTileEntity.url,
                 mapSheetMngTileEntity.minLon,
                 mapSheetMngTileEntity.minLat,
                 mapSheetMngTileEntity.maxLon,

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

@@ -1,14 +1,10 @@
 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,10 +1,7 @@
 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;
@@ -29,52 +26,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,
-          mng_yyyy,
+          MIN(mng_yyyy::int) AS min_y,
-          yn
+          MAX(mng_yyyy::int) AS max_y
-        FROM src
+        FROM tb_map_sheet_mng_files
-        ON CONFLICT (map_sheet_num, mng_yyyy)
+        GROUP BY map_sheet_num
-        DO UPDATE SET
+      ),
-          yn = EXCLUDED.yn,
+      years AS (
-          updated_dttm = now()
+        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()
+      """;
 
     em.createNativeQuery(sql).executeUpdate();
   }
@@ -101,13 +98,4 @@ 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,12 +20,7 @@ public interface MapSheetMngFileJobRepositoryCustom {
 
   public Integer findNotYetMapSheetMng();
 
-  public Long findByHstMapSheetBeforeYyyyListCount(
+  public Long findByHstMapSheetBeforeYyyyListCount(int strtYyyy, int endYyyy, String mapSheetNum);
-      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,8 +233,7 @@ public class MapSheetMngFileJobRepositoryImpl extends QuerydslRepositorySupport
   }
 
   @Override
-  public Long findByHstMapSheetBeforeYyyyListCount(
+  public Long findByHstMapSheetBeforeYyyyListCount(int strtYyyy, int endYyyy, String mapSheetNum) {
-      int mngYyyy, int strtYyyy, int endYyyy, String mapSheetNum) {
 
     Long countQuery =
         queryFactory
@@ -245,8 +244,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
@@ -267,26 +266,4 @@ 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,13 +2,12 @@ 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(LocalDate baseDate);
+  List<Tasks> findCompletedYesterdayUnassigned();
 
   List<InspectorPendingDto> findInspectorPendingByRound(Long analUid);
 

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

@@ -14,7 +14,6 @@ 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;
@@ -35,23 +34,16 @@ public class TrainingDataLabelJobRepositoryImpl extends QuerydslRepositorySuppor
   }
 
   @Override
-  public List<Tasks> findCompletedYesterdayUnassigned(LocalDate baseDate) {
+  public List<Tasks> findCompletedYesterdayUnassigned() {
     ZoneId zone = ZoneId.of("Asia/Seoul");
-
+    ZonedDateTime todayStart = ZonedDateTime.now(zone).toLocalDate().atStartOfDay(zone);
-    // baseDate가 null이면 "어제"를 타겟으로, 아니면 baseDate
+    ZonedDateTime yesterdayStart = todayStart.minusDays(1);
-    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(baseStart));
+            .and(labelingAssignmentEntity.workStatDttm.lt(todayStart));
 
     return queryFactory
         .select(

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

@@ -3,15 +3,13 @@ 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(
+  List<CompleteLabelData> findCompletedYesterdayLabelingList(Long analUid, String mapSheetNum);
-      Long analUid, String mapSheetNum, LocalDate baseDate);
 
-  List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid, LocalDate baseDate);
+  List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid);
 
   List<AnalCntInfo> findAnalCntInfoList();
 

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

@@ -7,7 +7,6 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapShe
 
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
-import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelType;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalCntInfo;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalMapSheetList;
@@ -41,13 +40,12 @@ public class TrainingDataReviewJobRepositoryImpl extends QuerydslRepositorySuppo
 
   @Override
   public List<CompleteLabelData> findCompletedYesterdayLabelingList(
-      Long analUid, String mapSheetNum, LocalDate baseDate) {
+      Long analUid, String mapSheetNum) {
     ZoneId zoneId = ZoneId.of("Asia/Seoul");
 
-    // baseDate가 null이면 기존처럼 오늘 기준
+    // 오늘 날짜 (시간 없음)
-    LocalDate targetDate = (baseDate != null) ? baseDate : LocalDate.now(zoneId);
+    LocalDate today = LocalDate.now(zoneId);
-
+    ZonedDateTime end = today.atStartOfDay(zoneId); // 오늘 00:00
-    ZonedDateTime end = targetDate.plusDays(1).atStartOfDay(zoneId);
 
     return queryFactory
         .select(
@@ -60,10 +58,10 @@ public class TrainingDataReviewJobRepositoryImpl extends QuerydslRepositorySuppo
                     Properties.class,
                     new CaseBuilder()
                         .when(mapSheetLearnDataGeomEntity.classAfterCd.in("building", "container"))
-                        .then(ModelType.G1.getId())
+                        .then("M1")
                         .when(mapSheetLearnDataGeomEntity.classAfterCd.eq("waste"))
-                        .then(ModelType.G2.getId())
+                        .then("M2")
-                        .otherwise(ModelType.G3.getId()),
+                        .otherwise("M3"),
                     mapSheetLearnDataGeomEntity.classBeforeCd,
                     mapSheetLearnDataGeomEntity.classAfterCd)))
         .from(labelingAssignmentEntity)
@@ -78,13 +76,10 @@ public class TrainingDataReviewJobRepositoryImpl extends QuerydslRepositorySuppo
   }
 
   @Override
-  public List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid, LocalDate baseDate) {
+  public List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid) {
     ZoneId zoneId = ZoneId.of("Asia/Seoul");
-
+    LocalDate today = LocalDate.now(zoneId);
-    // baseDate가 null이면 기존처럼 오늘 기준
+    ZonedDateTime end = today.atStartOfDay(zoneId); // 오늘 00:00
-    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/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java

@@ -120,7 +120,6 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             .orderBy(
                 mapSheetAnalInferenceEntity.targetYyyy.asc(),
                 mapSheetAnalInferenceEntity.compareYyyy.asc(),
-                labelingAssignmentEntity.assignGroupId.asc(),
                 labelingAssignmentEntity.createdDate.asc(),
                 labelingAssignmentEntity.inferenceGeomUid.asc())
             .fetch();
@@ -307,6 +306,10 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             queryFactory
                 .select(labelingAssignmentEntity.count())
                 .from(labelingAssignmentEntity)
+                .innerJoin(mapSheetAnalInferenceEntity)
+                .on(
+                    labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                    mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                 .where(labelingAssignmentEntity.workerUid.eq(userId))
                 .fetchOne();
 
@@ -327,6 +330,10 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             queryFactory
                 .select(labelingAssignmentEntity.count())
                 .from(labelingAssignmentEntity)
+                .innerJoin(mapSheetAnalInferenceEntity)
+                .on(
+                    labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                    mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                 .where(
                     labelingAssignmentEntity.workerUid.eq(userId),
                     labelingAssignmentEntity.workState.eq("ASSIGNED"))
@@ -355,6 +362,10 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             queryFactory
                 .select(labelingAssignmentEntity.count())
                 .from(labelingAssignmentEntity)
+                .innerJoin(mapSheetAnalInferenceEntity)
+                .on(
+                    labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                    mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                 .where(
                     labelingAssignmentEntity.workerUid.eq(userId),
                     labelingAssignmentEntity.workState.in(
@@ -642,7 +653,6 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
         queryFactory
             .select(
                 labelingAssignmentEntity.assignmentUid,
-                labelingAssignmentEntity.assignGroupId,
                 labelingAssignmentEntity.createdDate,
                 labelingAssignmentEntity.inferenceGeomUid,
                 mapSheetAnalInferenceEntity.targetYyyy,
@@ -661,7 +671,6 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             .orderBy(
                 mapSheetAnalInferenceEntity.targetYyyy.asc(),
                 mapSheetAnalInferenceEntity.compareYyyy.asc(),
-                labelingAssignmentEntity.assignGroupId.asc(),
                 labelingAssignmentEntity.createdDate.asc(),
                 labelingAssignmentEntity.inferenceGeomUid.asc())
             .limit(1)
@@ -676,7 +685,6 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
     Long inferenceGeomUid = firstAssigned.get(labelingAssignmentEntity.inferenceGeomUid);
     Integer targetYyyy = firstAssigned.get(mapSheetAnalInferenceEntity.targetYyyy);
     Integer compareYyyy = firstAssigned.get(mapSheetAnalInferenceEntity.compareYyyy);
-    String assignGroupId = firstAssigned.get(labelingAssignmentEntity.assignGroupId);
 
     BooleanExpression beforeCondition =
         mapSheetAnalInferenceEntity
@@ -692,20 +700,12 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
                     .targetYyyy
                     .eq(targetYyyy)
                     .and(mapSheetAnalInferenceEntity.compareYyyy.eq(compareYyyy))
-                    .and(labelingAssignmentEntity.assignGroupId.lt(assignGroupId)))
-            .or(
-                mapSheetAnalInferenceEntity
-                    .targetYyyy
-                    .eq(targetYyyy)
-                    .and(mapSheetAnalInferenceEntity.compareYyyy.eq(compareYyyy))
-                    .and(labelingAssignmentEntity.assignGroupId.eq(assignGroupId))
                     .and(labelingAssignmentEntity.createdDate.lt(createdDttm)))
             .or(
                 mapSheetAnalInferenceEntity
                     .targetYyyy
                     .eq(targetYyyy)
                     .and(mapSheetAnalInferenceEntity.compareYyyy.eq(compareYyyy))
-                    .and(labelingAssignmentEntity.assignGroupId.eq(assignGroupId))
                     .and(labelingAssignmentEntity.createdDate.eq(createdDttm))
                     .and(labelingAssignmentEntity.inferenceGeomUid.lt(inferenceGeomUid)));
 

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

@@ -314,6 +314,10 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
             queryFactory
                 .select(labelingAssignmentEntity.count())
                 .from(labelingAssignmentEntity)
+                .innerJoin(mapSheetAnalInferenceEntity)
+                .on(
+                    labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                    mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                 .where(labelingAssignmentEntity.inspectorUid.eq(userId))
                 .fetchOne();
 
@@ -334,6 +338,10 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
             queryFactory
                 .select(labelingAssignmentEntity.count())
                 .from(labelingAssignmentEntity)
+                .innerJoin(mapSheetAnalInferenceEntity)
+                .on(
+                    labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                    mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                 .where(
                     labelingAssignmentEntity.inspectorUid.eq(userId),
                     labelingAssignmentEntity.inspectState.eq("UNCONFIRM"))
@@ -362,6 +370,10 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
             queryFactory
                 .select(labelingAssignmentEntity.count())
                 .from(labelingAssignmentEntity)
+                .innerJoin(mapSheetAnalInferenceEntity)
+                .on(
+                    labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
+                    mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                 .where(
                     labelingAssignmentEntity.inspectorUid.eq(userId),
                     labelingAssignmentEntity.inspectState.in("COMPLETE", "EXCEPT"),

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

@@ -4,7 +4,6 @@ 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;
@@ -18,8 +17,6 @@ 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

@@ -1,120 +0,0 @@
-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/TRAINING_DATA_GEOJSON_QUERY.sql

@@ -60,10 +60,10 @@ select msldge1_0.geo_uid,
        st_asgeojson(msldge1_0.geom),
        case
          when (msldge1_0.class_after_cd in ('building', 'container'))
-           then cast('G1' as varchar)
+           then cast('M1' as varchar)
          when (msldge1_0.class_after_cd = 'waste')
-           then cast('G2' as varchar)
+           then cast('M2' as varchar)
-         else 'G3'
+         else 'M3'
          end,
        msldge1_0.class_before_cd,
        msldge1_0.class_after_cd

src/main/java/com/kamco/cd/kamcoback/scheduler/config/AsyncConfig.java

@@ -20,15 +20,4 @@ public class AsyncConfig {
     ex.initialize();
     return ex;
   }
-
-  @Bean(name = "auditLogExecutor")
-  public Executor auditLogExecutor() {
-    ThreadPoolTaskExecutor exec = new ThreadPoolTaskExecutor();
-    exec.setCorePoolSize(2);
-    exec.setMaxPoolSize(8);
-    exec.setQueueCapacity(2000);
-    exec.setThreadNamePrefix("auditlog-");
-    exec.initialize();
-    return exec;
-  }
 }

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

@@ -40,7 +40,6 @@ public class MapSheetMngDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class MngDto {
-
     private int rowNum;
     private int mngYyyy;
     private String mngState;
@@ -62,7 +61,6 @@ public class MapSheetMngDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class MngHstDto {
-
     private long hstUid;
     private int mngYyyy;
     private String mapSheetNum;
@@ -88,7 +86,6 @@ public class MapSheetMngDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class MngFileAddReq {
-
     private int mngYyyy;
     private String mapSheetNum;
     private String refMapSheetNum;
@@ -106,7 +103,6 @@ public class MapSheetMngDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class MngFilesDto {
-
     private long fileUid;
     private int mngYyyy;
     private String mapSheetNum;
@@ -136,19 +132,7 @@ 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,25 +31,21 @@ public class GukYuinApiLabelJobService {
     return "local".equalsIgnoreCase(profile);
   }
 
-  //  @Scheduled(cron = "0 0 2 * * *")
-  public void runTask() {
-    findLabelingCompleteSend(null);
-  }
-
   /** 어제 라벨링 검수 완료된 것 -> 국유인에 전송 */
-  public void findLabelingCompleteSend(LocalDate baseDate) {
+  @Scheduled(cron = "0 0 2 * * *")
-    //    if (isLocalProfile()) {
+  public void findLabelingCompleteSend() {
-    //      return;
+    if (isLocalProfile()) {
-    //    }
+      return;
+    }
 
-    List<GeomUidDto> list = gukYuinLabelJobCoreService.findYesterdayLabelingCompleteList(baseDate);
+    List<GeomUidDto> list = gukYuinLabelJobCoreService.findYesterdayLabelingCompleteList();
     if (list.isEmpty()) {
       return;
     }
 
     for (GeomUidDto gto : list) {
       ChngDetectContDto.ResultLabelDto dto =
-          gukYuinApiService.updateChnDtctObjtLabelingYn(gto.getResultUid(), "Y", "Y");
+          gukYuinApiService.updateChnDtctObjtLabelingYn(gto.getResultUid(), "Y");
       if (dto.getSuccess()) {
         // inference_geom 에 label_send_dttm 업데이트 하기
         gukYuinLabelJobCoreService.updateAnalDataInferenceGeomSendDttm(gto.getGeoUid());

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

@@ -12,6 +12,7 @@ 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
@@ -35,11 +36,11 @@ public class GukYuinApiPnuJobService {
   }
 
   /** 국유인 등록 완료 후, 탐지객체 조회해서 PNU 업데이트 하는 스케줄링 하루 1번 새벽 1시에 실행 */
-  //  @Scheduled(cron = "0 0 1 * * *")
+  @Scheduled(cron = "0 0 1 * * *")
   public void findGukYuinContListPnuUpdate() {
-    //    if (isLocalProfile()) {
+    if (isLocalProfile()) {
-    //      return;
+      return;
-    //    }
+    }
 
     List<LearnKeyDto> list =
         gukYuinPnuJobCoreService.findGukyuinApplyStatusUidList(
@@ -62,7 +63,7 @@ public class GukYuinApiPnuJobService {
   }
 
   private void processUid(String chnDtctId, String uid) {
-    ResultDto result = gukYuinApiService.listChnDtctId(chnDtctId, "Y");
+    ResultDto result = gukYuinApiService.listChnDtctId(chnDtctId);
     if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
       return;
     }
@@ -84,7 +85,7 @@ public class GukYuinApiPnuJobService {
   }
 
   private void processPage(String uid, int page, int pageSize) {
-    ResultContDto resContList = gukYuinApiService.findChnContList(uid, page, pageSize, "Y");
+    ResultContDto resContList = gukYuinApiService.findChnContList(uid, page, pageSize);
 
     if (resContList.getResult() == null || resContList.getResult().isEmpty()) {
       return; // 외부 API 이상 방어

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

@@ -9,6 +9,7 @@ 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
@@ -32,11 +33,11 @@ public class GukYuinApiStatusJobService {
   }
 
   /** 국유인 연동 후, 100% 되었는지 확인하는 스케줄링 매 10분마다 호출 */
-  //  @Scheduled(cron = "0 0/10 * * * *")
+  @Scheduled(cron = "0 0/10 * * * *")
   public void findGukYuinMastCompleteYn() {
-    //    if (isLocalProfile()) {
+    if (isLocalProfile()) {
-    //      return;
+      return;
-    //    }
+    }
 
     List<LearnKeyDto> list =
         gukYuinJobCoreService.findGukyuinApplyStatusUidList(
@@ -47,7 +48,7 @@ public class GukYuinApiStatusJobService {
 
     for (LearnKeyDto dto : list) {
       try {
-        ChngDetectMastDto.ResultDto result = gukYuinApiService.listChnDtctId(dto.getUid(), "Y");
+        ChngDetectMastDto.ResultDto result = gukYuinApiService.listChnDtctId(dto.getUid());
 
         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/GukYuinApiStbltJobService.java

@@ -16,6 +16,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.stereotype.Service;
 
 @Log4j2
@@ -38,16 +39,12 @@ public class GukYuinApiStbltJobService {
     return "local".equalsIgnoreCase(profile);
   }
 
-  //  @Scheduled(cron = "0 0 3 * * *")
-  public void runTask() {
-    findGukYuinEligibleForSurvey(null);
-  }
-
   /** 국유인 연동 후, 실태조사 적합여부 확인하여 update */
-  public void findGukYuinEligibleForSurvey(LocalDate baseDate) {
+  @Scheduled(cron = "0 0 3 * * *")
-    //    if (isLocalProfile()) {
+  public void findGukYuinEligibleForSurvey() {
-    //      return;
+    if (isLocalProfile()) {
-    //    }
+      return;
+    }
 
     List<LearnKeyDto> list =
         gukYuinStbltJobCoreService.findGukYuinEligibleForSurveyList(
@@ -58,16 +55,11 @@ public class GukYuinApiStbltJobService {
 
     for (LearnKeyDto dto : list) {
       try {
-        String targetDate =
+        String yesterday =
             LocalDate.now(ZoneId.of("Asia/Seoul"))
                 .minusDays(1)
                 .format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-
+        RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), yesterday);
-        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

@@ -11,7 +11,6 @@ import com.kamco.cd.kamcoback.inference.dto.InferenceProgressDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.SaveInferenceAiDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Status;
 import com.kamco.cd.kamcoback.inference.dto.InferenceSendDto;
-import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelType;
 import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService;
 import com.kamco.cd.kamcoback.scheduler.dto.BatchStatusDto;
 import com.kamco.cd.kamcoback.scheduler.dto.JobStatusDto;
@@ -123,7 +122,7 @@ public class MapSheetInferenceJobService {
    * @return
    */
   private Long resolveBatchId(InferenceBatchSheet sheet) {
-    // G3 > G2 > G1
+    // M3 > M2 > M1
     if (sheet.getM3BatchId() != null) {
       return sheet.getM3BatchId();
     }
@@ -217,12 +216,12 @@ public class MapSheetInferenceJobService {
     updateProcessingEndTimeByModel(job, sheet.getUuid(), now, currentType);
 
     // M3이면 전체 종료
-    if (ModelType.G3.getId().equals(currentType)) {
+    if ("M3".equals(currentType)) {
       endAll(sheet, now);
       return;
     }
 
-    // 다음 모델 실행 (G1->G2, G2->G3)
+    // 다음 모델 실행 (M1->M2, M2->M3)
     String nextType = nextModelType(currentType);
     UUID nextModelUuid = resolveModelUuid(sheet, nextType);
 
@@ -241,7 +240,7 @@ public class MapSheetInferenceJobService {
     save.setUuid(sheet.getUuid());
     save.setStatus(Status.END.getId());
     save.setInferEndDttm(now);
-    save.setType(ModelType.G3.getId()); // 마지막 모델 기준
+    save.setType("M3"); // 마지막 모델 기준
     inferenceResultCoreService.update(save);
 
     // 추론 종료일때 geom 데이터 저장
@@ -267,11 +266,11 @@ public class MapSheetInferenceJobService {
    * @return
    */
   private String nextModelType(String currentType) {
-    if (ModelType.G1.getId().equals(currentType)) {
+    if ("M1".equals(currentType)) {
-      return ModelType.G2.getId();
+      return "M2";
     }
-    if (ModelType.G2.getId().equals(currentType)) {
+    if ("M2".equals(currentType)) {
-      return ModelType.G3.getId();
+      return "M3";
     }
     throw new IllegalArgumentException("Unknown runningModelType: " + currentType);
   }
@@ -284,13 +283,13 @@ public class MapSheetInferenceJobService {
    * @return
    */
   private UUID resolveModelUuid(InferenceBatchSheet sheet, String type) {
-    if (ModelType.G1.getId().equals(type)) {
+    if ("M1".equals(type)) {
       return sheet.getM1ModelUuid();
     }
-    if (ModelType.G2.getId().equals(type)) {
+    if ("M2".equals(type)) {
       return sheet.getM2ModelUuid();
     }
-    if (ModelType.G3.getId().equals(type)) {
+    if ("M3".equals(type)) {
       return sheet.getM3ModelUuid();
     }
     throw new IllegalArgumentException("Unknown type: " + type);
@@ -333,6 +332,9 @@ public class MapSheetInferenceJobService {
     InferenceProgressDto progressDto =
         inferenceResultCoreService.getInferenceAiResultById(id, modelUuid);
 
+    // ai 에 맞는 모델 명으로 변경
+    String inferenceType = modelToInferenceType(type);
+
     InferenceSendDto.pred_requests_areas predRequestsAreas =
         new InferenceSendDto.pred_requests_areas();
     predRequestsAreas.setInput1_year(progressDto.getPred_requests_areas().getInput1_year());
@@ -353,7 +355,7 @@ public class MapSheetInferenceJobService {
     m.setCls_model_path(
         Paths.get(progressDto.getCdModelClsPath(), progressDto.getCdModelClsFileName()).toString());
     m.setCls_model_version(progressDto.getClsModelVersion());
-    m.setCd_model_type(type);
+    m.setCd_model_type(inferenceType);
     m.setPriority(progressDto.getPriority());
 
     //    log.info("InferenceSendDto={}", m);
@@ -370,6 +372,25 @@ public class MapSheetInferenceJobService {
     inferenceResultCoreService.update(saveInferenceAiDto);
   }
 
+  /**
+   * ai 에 맞는 모델 명으로 변경
+   *
+   * @param type 모델 타입
+   * @return String
+   */
+  private String modelToInferenceType(String type) {
+    if ("M1".equals(type)) {
+      return "G1";
+    }
+    if ("M2".equals(type)) {
+      return "G2";
+    }
+    if ("M3".equals(type)) {
+      return "G3";
+    }
+    throw new IllegalArgumentException("Unknown type: " + type);
+  }
+
   /**
    * api 호출
    *

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

@@ -11,7 +11,6 @@ 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;
@@ -64,18 +63,9 @@ public class MapSheetMngFileJobService {
 
     for (MngHstDto item : mapSheetFileNotYetList) {
 
-      // mng_yyyy 가 완전 최초로 등록되는 것인지 확인
-      Long mngCnt = mapSheetMngFileJobCoreService.findMngYyyyCnt(item.getMngYyyy());
-
       // 5K도엽 자동추론제외
-      Long exceptCheckCnt = 0L;
+      Long exceptCheckCnt =
-
+          this.mapSheetAutoExceptionUpdate(item.getMngYyyy(), item.getMapSheetNum());
-      if (mngCnt == 0) { // 최초 등록이면 도엽의 추론제외여부를 확인
-        exceptCheckCnt =
-            mapSheetMngFileJobCoreService.findMapSheetUseExceptCnt(item.getMapSheetNum());
-      } else { // 등록된 영상 년도가 있으면 자동추론제외 확인
-        exceptCheckCnt = this.mapSheetAutoExceptionUpdate(item.getMngYyyy(), item.getMapSheetNum());
-      }
 
       // 도엽별 파일 체크 진행중으로 변경
       item.setDataState("PROCESSING");
@@ -222,26 +212,28 @@ public class MapSheetMngFileJobService {
     return notyetCnt;
   }
 
-  public Long mapSheetAutoExceptionUpdate(Integer mngYyyy, String mapSheetNum) {
+  public Long mapSheetAutoExceptionUpdate(int mngYyyy, String mapSheetNum) {
 
-    // tb_year 에 있는 년도 min,max 가져오기
+    // 2025년 이전 파일싱크는 무조건 이전3년이 존재하지 않으므로 자동추론제외를 진행하지 않는다.(전년도 파일이 무조건 존재하는 것으로 리턴)
-    YearMinMax yearInfo = mapSheetMngFileJobCoreService.findYearMinMaxInfo();
+    //    if (syncAutoExceptionStartYear > mngYyyy) {
-    int strtYyyy = yearInfo.getMinYyyy();
+    //      return 1L;
-    int endYyyy = yearInfo.getMaxYyyy();
+    //    }
 
-    // tb_map_sheet_mng_hst 에 도엽 정보가 하나라도 DONE 인 게 있는지 count 가져오기
+    //    int strtYyyy = mngYyyy - syncAutoExceptionBeforeYearCnt + 1;
+    int strtYyyy = 2020;
+    int endYyyy = mngYyyy;
+
+    // 본년도+이전년도가 3개년인 도엽 확인 -> 2020년도부터 현재까지
     Long beforeCnt =
         mapSheetMngFileJobCoreService.findByHstMapSheetBeforeYyyyListCount(
-            mngYyyy, strtYyyy, endYyyy, mapSheetNum);
+            strtYyyy, endYyyy, mapSheetNum);
 
     if (beforeCnt == 0) {
-      System.out.println("beforeCnt: 0, mapSheetAutoExceptionUpdate inference == 자동추론제외");
+      System.out.println("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,7 +4,6 @@ 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;
@@ -14,7 +13,7 @@ import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -23,7 +22,6 @@ import org.springframework.stereotype.Service;
 public class TrainingDataLabelJobService {
 
   private final TrainingDataLabelJobCoreService trainingDataLabelJobCoreService;
-  private final ApplicationContext applicationContext;
 
   @Value("${spring.profiles.active}")
   private String profile;
@@ -32,24 +30,16 @@ public class TrainingDataLabelJobService {
     return "local".equalsIgnoreCase(profile);
   }
 
-  //  @Scheduled(cron = "0 0 0 * * *")
-  public void runTask() {
-    // 프록시를 통해 호출해야 @Transactional이 적용됨
-    applicationContext
-        .getBean(TrainingDataLabelJobService.class)
-        .assignReviewerYesterdayLabelComplete(null);
-  }
-
   @Transactional
-  public void assignReviewerYesterdayLabelComplete(LocalDate baseDate) {
+  @Scheduled(cron = "0 0 0 * * *")
+  public void assignReviewerYesterdayLabelComplete() {
 
-    //    if (isLocalProfile()) {
+    if (isLocalProfile()) {
-    //      return;
+      return;
-    //    }
+    }
 
     try {
-      List<Tasks> tasks =
+      List<Tasks> tasks = trainingDataLabelJobCoreService.findCompletedYesterdayUnassigned();
-          trainingDataLabelJobCoreService.findCompletedYesterdayUnassigned(baseDate);
 
       if (tasks.isEmpty()) {
         return;
@@ -98,7 +88,6 @@ 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
@@ -39,16 +39,12 @@ public class TrainingDataReviewJobService {
   }
 
   @Transactional
-  //  @Scheduled(cron = "0 0 2 * * *")
+  @Scheduled(cron = "0 0 2 * * *")
-  public void runTask() {
+  public void exportGeojsonLabelingGeom() {
-    exportGeojsonLabelingGeom(null);
-  }
 
-  public void exportGeojsonLabelingGeom(LocalDate baseDate) {
+    if (isLocalProfile()) {
-
+      return;
-    //    if (isLocalProfile()) {
+    }
-    //      return;
-    //    }
 
     // 1) 경로/파일명 결정
     String targetDir =
@@ -66,8 +62,7 @@ public class TrainingDataReviewJobService {
 
       // 3) 회차 + 어제까지 검수 완료된 총 데이터의 도엽별 목록 가져오기
       List<AnalMapSheetList> analMapList =
-          trainingDataReviewJobCoreService.findCompletedAnalMapSheetList(
+          trainingDataReviewJobCoreService.findCompletedAnalMapSheetList(info.getAnalUid());
-              info.getAnalUid(), baseDate);
 
       if (analMapList.isEmpty()) {
         continue;
@@ -77,7 +72,7 @@ public class TrainingDataReviewJobService {
         // 4) 도엽별 geom 데이터 가지고 와서 geojson 만들기
         List<CompleteLabelData> completeList =
             trainingDataReviewJobCoreService.findCompletedYesterdayLabelingList(
-                info.getAnalUid(), mapSheet.getMapSheetNum(), baseDate);
+                info.getAnalUid(), mapSheet.getMapSheetNum());
 
         if (!completeList.isEmpty()) {
 

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

@@ -3,6 +3,8 @@ 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;
@@ -31,6 +33,8 @@ 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(
@@ -554,4 +558,20 @@ 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/java/com/kamco/cd/kamcoback/upload/UploadApiController.java

@@ -29,12 +29,27 @@ public class UploadApiController {
 
   private final UploadService uploadService;
 
+  @Value("${file.sync-root-dir}")
+  private String syncRootDir;
+
+  @Value("${file.sync-tmp-dir}")
+  private String syncTmpDir;
+
+  @Value("${file.sync-file-extention}")
+  private String syncFileExtention;
+
   @Value("${file.dataset-dir}")
   private String datasetDir;
 
   @Value("${file.dataset-tmp-dir}")
   private String datasetTmpDir;
 
+  @Value("${file.model-dir}")
+  private String modelDir;
+
+  @Value("${file.model-tmp-dir}")
+  private String modelTmpDir;
+
   /*
     @Operation(summary = "데이터셋 대용량 업로드 세션 시작", description = "데이터셋 대용량 파일 업로드 세션을 시작합니다.")
     @ApiResponses(

src/main/resources/application-dev.yml

@@ -16,10 +16,6 @@ spring:
         format_sql: true                  # ⚠️ 선택 - SQL 포맷팅 (가독성)
         jdbc:
           batch_size: 1000           # ✅ 추가 (JDBC batch)
-    open-in-view: false
-  mvc:
-    async:
-      request-timeout: 300s   # 5분 (예: 30s, 120s, 10m 등도 가능)
 
   datasource:
     url: jdbc:postgresql://192.168.2.127:15432/kamco_cds
@@ -87,25 +83,24 @@ mapsheet:
   upload:
     skipGdalValidation: true
   shp:
-    baseurl: /app/tmp/detect/result  #현재사용안함
+    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-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: D:/kamco-nfs/dataset/
-  dataset-dir: /kamco-nfs/model_output/export/        # 마운트경로 AI 추론결과
+  dataset-dir: /kamco-nfs/dataset/export/
   dataset-tmp-dir: ${file.dataset-dir}tmp/
 
   #model-dir: D:/kamco-nfs/ckpt/model/
-  model-dir: /kamco-nfs/ckpt/model/                   # 학습서버에서 트레이닝한 모델업로드경로
+  model-dir: /kamco-nfs/ckpt/model/
   model-tmp-dir: ${file.model-dir}tmp/
   model-file-extention: pth,json,py
 
@@ -117,8 +112,8 @@ file:
 inference:
   url: http://192.168.2.183:8000/jobs
   batch-url: http://192.168.2.183:8000/batches
-  geojson-dir: /kamco-nfs/requests/                   # 추론실행을 위한 파일생성경로
+  geojson-dir: /kamco-nfs/requests/
-  jar-path: /kamco-nfs/repo/jar/shp-exporter.jar
+  jar-path: /kamco-nfs/dataset/shp/shp-exporter.jar
   inference-server-name: server1,server2,server3,server4
 
 gukyuin:
@@ -127,12 +122,10 @@ gukyuin:
   cdi: ${gukyuin.url}/api/kcd/cdi
 
 training-data:
-  geojson-dir: /kamco-nfs/dataset/request/
+  geojson-dir: /kamco-nfs/model_output/labeling/
 
 layer:
   geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
   wms-path: geoserver/cd
   wmts-path: geoserver/cd/gwc/service
   workspace: cd
-
-

src/main/resources/application-prod.yml

@@ -16,44 +16,14 @@ spring:
         format_sql: true                  # ⚠️ 선택 - SQL 포맷팅 (가독성)
         jdbc:
           batch_size: 1000           # ✅ 추가 (JDBC batch)
-    open-in-view: false
-  mvc:
-    async:
-      request-timeout: 300s   # 5분 (예: 30s, 120s, 10m 등도 가능)
 
   datasource:
-    url: jdbc:postgresql://127.0.0.1:15432/kamco_cds
+    url: jdbc:postgresql://10.100.0.10:25432/temp
-    #url: jdbc:postgresql://localhost:15432/kamco_cds
+    username: temp
-    username: kamco_cds
+    password: temp123!
-    password: kamco_cds_Q!W@E#R$
     hikari:
       minimum-idle: 10
       maximum-pool-size: 20
-      connection-timeout: 60000        # 60초 연결 타임아웃
-      idle-timeout: 300000            # 5분 유휴 타임아웃
-      max-lifetime: 1800000           # 30분 최대 수명
-      leak-detection-threshold: 60000  # 연결 누수 감지
-
-  transaction:
-    default-timeout: 300              # 5분 트랜잭션 타임아웃
-
-  data:
-    redis:
-      host: 127.0.0.1
-      port: 16379
-      password: kamco
-
-  servlet:
-    multipart:
-      enabled: true
-      max-file-size: 4GB
-      max-request-size: 4GB
-      file-size-threshold: 10MB
-
-server:
-  tomcat:
-    max-swallow-size: 4GB
-    max-http-form-post-size: 4GB
 
 jwt:
   secret: "kamco_token_9b71e778-19a3-4c1d-97bf-2d687de17d5b"
@@ -64,39 +34,28 @@ token:
   refresh-cookie-name: kamco   # 개발용 쿠키 이름
   refresh-cookie-secure: true   # 로컬 http 테스트면 false
 
-logging:
-  level:
-    root: INFO
-    org.springframework.web: DEBUG
-    org.springframework.security: DEBUG
-
-    # 헬스체크 노이즈 핵심만 다운
-    org.springframework.security.web.FilterChainProxy: INFO
-    org.springframework.security.web.authentication.AnonymousAuthenticationFilter: INFO
-    org.springframework.security.web.authentication.Http403ForbiddenEntryPoint: INFO
-    org.springframework.web.servlet.DispatcherServlet: INFO
-
-
 mapsheet:
   upload:
     skipGdalValidation: true
   shp:
-    baseurl: /app/detect/result #현재사용안함
+    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-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: D:/kamco-nfs/model_output/ #변경 model_output
+  #dataset-dir: D:/kamco-nfs/dataset/
-  dataset-dir: /kamco-nfs/model_output/export/  # 마운트경로 AI 추론결과
+  dataset-dir: /kamco-nfs/dataset/export/
   dataset-tmp-dir: ${file.dataset-dir}tmp/
 
   #model-dir: D:/kamco-nfs/ckpt/model/
-  model-dir: /kamco-nfs/ckpt/model/             # 학습서버에서 트레이닝한 모델업로드경로
+  model-dir: /kamco-nfs/ckpt/model/
   model-tmp-dir: ${file.model-dir}tmp/
   model-file-extention: pth,json,py
 
@@ -106,18 +65,19 @@ file:
   dataset-response: /kamco-nfs/dataset/response/
 
 inference:
-  url: http://127.0.0.1:8000/jobs
+  url: http://192.168.2.183:8000/jobs
-  batch-url: http://127.0.0.1:8000/batches
+  batch-url: http://192.168.2.183:8000/batches
-  geojson-dir: /kamco-nfs/requests/                 # 학습서버에서 트레이닝한 모델업로드경로
+  geojson-dir: /kamco-nfs/requests/
-  jar-path: /kamco-nfs/repo/jar/shp-exporter.jar    # 추론실행을 위한 파일생성경로
+  jar-path: /kamco-nfs/dataset/shp/shp-exporter.jar
   inference-server-name: server1,server2,server3,server4
 
 gukyuin:
-  url: http://127.0.0.1:5301
+  #url:  http://localhost:8080
+  url: http://192.168.2.129:5301
   cdi: ${gukyuin.url}/api/kcd/cdi
 
 training-data:
-  geojson-dir: /kamco-nfs/dataset/request/
+  geojson-dir: /kamco-nfs/model_output/labeling/
 
 layer:
   geoserver-url: https://kamco.geo-dev.gs.dabeeo.com

src/main/resources/static/download_progress_test.html

@@ -1,83 +0,0 @@
-<!doctype html>
-<html lang="ko">
-<head>
-  <meta charset="utf-8" />
-  <title>라벨 ZIP 다운로드</title>
-</head>
-<body>
-<h3>라벨 ZIP 다운로드</h3>
-
-UUID:
-<input id="uuid" value="6d8d49dc-0c9d-4124-adc7-b9ca610cc394" />
-<br><br>
-
-JWT Token:
-<input id="token" style="width:600px;" placeholder="Bearer 토큰 붙여넣기" />
-<br><br>
-
-<button onclick="download()">다운로드</button>
-
-<br><br>
-<progress id="bar" value="0" max="100" style="width:400px;"></progress>
-<div id="status"></div>
-
-<script>
-  async function download() {
-    const uuid = document.getElementById("uuid").value.trim();
-    const token = document.getElementById("token").value.trim();
-
-    if (!uuid) {
-      alert("UUID 입력하세요");
-      return;
-    }
-
-    if (!token) {
-      alert("토큰 입력하세요");
-      return;
-    }
-
-    const url = `/api/training-data/stage/download/${uuid}`;
-
-    const res = await fetch(url, {
-      headers: {
-        "Authorization": token.startsWith("Bearer ")
-          ? token
-          : `Bearer ${token}`,
-        "kamco-download-uuid": uuid
-      }
-    });
-
-    if (!res.ok) {
-      document.getElementById("status").innerText =
-        "실패: " + res.status;
-      return;
-    }
-
-    const total = parseInt(res.headers.get("Content-Length") || "0", 10);
-    const reader = res.body.getReader();
-    const chunks = [];
-    let received = 0;
-
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-      chunks.push(value);
-      received += value.length;
-
-      if (total) {
-        document.getElementById("bar").value =
-          (received / total) * 100;
-      }
-    }
-
-    const blob = new Blob(chunks);
-    const a = document.createElement("a");
-    a.href = URL.createObjectURL(blob);
-    a.download = uuid + ".zip";
-    a.click();
-
-    document.getElementById("status").innerText = "완료 ✅";
-  }
-</script>
-</body>
-</html>