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

Reviewed-on: #54

Dockerfile-prod

@@ -0,0 +1,24 @@
+# 1단계에서 만든 로컬 베이스 이미지를 사용
+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
+ARG GID=1000
+
+RUN groupadd -g ${GID} kcomu \
+ && useradd -u ${UID} -g ${GID} -m kcomu
+
+USER kcomu
+
+# 작업 디렉토리 설정
+WORKDIR /app
+
+# JAR 파일 복사 (Jenkins에서 빌드된 ROOT.jar)
+COPY build/libs/ROOT.jar app.jar
+
+# 포트 노출
+EXPOSE 8080
+# 애플리케이션 실행
+# dev 프로파일로 실행
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "app.jar"]

docker-compose-prod.yml

@@ -0,0 +1,35 @@
+services:
+  kamco-changedetection-api:
+    build:
+      context: .
+      dockerfile: Dockerfile-prod
+      args:
+        UID: 1000        # manager01 UID
+        GID: 1000        # manager01 GID
+    image: kamco-changedetection-api:${IMAGE_TAG:-latest}
+    container_name: kamco-changedetection-api
+    user: "1000:1000"
+    ports:
+      - "7100:8080"
+    environment:
+      - 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
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:8080/monitor/health" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 40s
+
+networks:
+  kamco-cds:
+    external: true

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/DownloadPaths.java

@@ -0,0 +1,19 @@
+package com.kamco.cd.kamcoback.common.download;
+
+import org.springframework.util.AntPathMatcher;
+
+public final class DownloadPaths {
+  private DownloadPaths() {}
+
+  public static final String[] PATTERNS = {
+    "/api/inference/download/**", "/api/training-data/stage/download/**"
+  };
+
+  public static boolean matches(String uri) {
+    AntPathMatcher m = new AntPathMatcher();
+    for (String p : PATTERNS) {
+      if (m.match(p, uri)) return true;
+    }
+    return false;
+  }
+}

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/enums/CrsType.java

@@ -9,9 +9,9 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum CrsType implements EnumType {
-  EPSG_3857("korea 2000, 미터단위"),
+  EPSG_3857("Web Mercator, 웹지도 미터(EPSG:900913 동일)"),
-  EPSG_4326("geojson, osm기본"),
+  EPSG_4326("WGS84 위경도, GeoJSON/OSM 기본"),
-  EPSG_5186("google, EPSG:900913동일");
+  EPSG_5186("Korea 2000 중부 TM, 한국 SHP");
 
   private final String desc;
 

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

@@ -1,8 +1,8 @@
 package com.kamco.cd.kamcoback.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.kamco.cd.kamcoback.auth.CustomUserDetails;
 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 com.kamco.cd.kamcoback.menu.dto.MenuDto;
 import com.kamco.cd.kamcoback.menu.service.MenuService;
@@ -17,7 +17,6 @@ import java.util.Objects;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
@@ -27,24 +26,39 @@ public class FileDownloadInteceptor implements HandlerInterceptor {
 
   private final AuditLogRepository auditLogRepository;
   private final MenuService menuService;
+  private final UserUtil userUtil;
 
   @Autowired private ObjectMapper objectMapper;
 
-  public FileDownloadInteceptor(AuditLogRepository auditLogRepository, MenuService menuService) {
+  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) {
 
+    if (!request.getRequestURI().contains("/download")) return true;
+
+    if (request.getDispatcherType() != jakarta.servlet.DispatcherType.REQUEST) {
+      return true;
+    }
+
+    saveLog(request, response);
+
+    return true;
+  }
+
+  private void saveLog(HttpServletRequest request, HttpServletResponse response) {
     // 파일 다운로드 API만 필터링
     if (!request.getRequestURI().contains("/download")) {
       return;
     }
 
-    Long userId = extractUserId(request);
+    Long userId = userUtil.getId();
     String ip = ApiLogFunction.getClientIp(request);
 
     List<?> list = menuService.getFindAll();
@@ -81,12 +95,4 @@ public class FileDownloadInteceptor implements HandlerInterceptor {
 
     auditLogRepository.save(log);
   }
-
-  private Long extractUserId(HttpServletRequest request) {
-    if (request.getUserPrincipal() instanceof UsernamePasswordAuthenticationToken auth
-        && auth.getPrincipal() instanceof CustomUserDetails userDetails) {
-      return userDetails.getMember().getId();
-    }
-    return null;
-  }
 }

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

@@ -3,6 +3,8 @@ package com.kamco.cd.kamcoback.config;
 import com.kamco.cd.kamcoback.auth.CustomAuthenticationProvider;
 import com.kamco.cd.kamcoback.auth.JwtAuthenticationFilter;
 import com.kamco.cd.kamcoback.auth.MenuAuthorizationManager;
+import com.kamco.cd.kamcoback.common.download.DownloadPaths;
+import jakarta.servlet.DispatcherType;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
@@ -44,9 +46,11 @@ public class SecurityConfig {
         .authorizeHttpRequests(
             auth ->
                 auth
+
                     // .requestMatchers("/chunk_upload_test.html").authenticated()
                     .requestMatchers("/monitor/health", "/monitor/health/**")
                     .permitAll()
+
                     // 맵시트 영역 전체 허용 (우선순위 최상단)
                     .requestMatchers("/api/mapsheet/**")
                     .permitAll()
@@ -67,13 +71,25 @@ public class SecurityConfig {
                     .requestMatchers("/api/test/review")
                     .hasAnyRole("ADMIN", "REVIEWER")
 
+                    // ASYNC/ERROR 재디스패치는 막지 않기 (다운로드/스트리밍에서 필수)
+                    .dispatcherTypeMatchers(DispatcherType.ASYNC, DispatcherType.ERROR)
+                    .permitAll()
+
+                    // 다운로드는 인증 필요
+                    .requestMatchers(HttpMethod.GET, DownloadPaths.PATTERNS)
+                    .authenticated()
+
                     // 메뉴 등록 ADMIN만 가능
                     .requestMatchers(HttpMethod.POST, "/api/menu/auth")
                     .hasAnyRole("ADMIN")
+
+                    // 에러 경로는 항상 허용 (이미 있지만 유지)
                     .requestMatchers("/error")
                     .permitAll()
+
+                    // preflight 허용
                     .requestMatchers(HttpMethod.OPTIONS, "/**")
-                    .permitAll() // preflight 허용
+                    .permitAll()
                     .requestMatchers(
                         "/api/auth/signin",
                         "/api/auth/refresh",
@@ -86,8 +102,11 @@ public class SecurityConfig {
                         "/api/upload/file-chunk-upload",
                         "/api/upload/chunk-upload-complete",
                         "/api/change-detection/**",
-                        "/api/layer/map/**")
+                        "/api/layer/map/**",
+                        "/api/layer/tile-url",
+                        "/api/layer/tile-url-year")
                     .permitAll()
+
                     // 로그인한 사용자만 가능 IAM
                     .requestMatchers(
                         "/api/user/**",
@@ -96,16 +115,11 @@ public class SecurityConfig {
                         "/api/training-data/label/**",
                         "/api/training-data/review/**")
                     .authenticated()
-                    .anyRequest()
-                    .access(menuAuthorizationManager)
 
-            //                    .authenticated()
+                    // 나머지는 메뉴권한
-            )
+                    .anyRequest()
-        .addFilterBefore(
+                    .access(menuAuthorizationManager))
-            jwtAuthenticationFilter,
+        .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
-            UsernamePasswordAuthenticationFilter
-                .class) // 요청 들어오면 먼저 JWT 토큰 검사 후 security context 에 사용자 정보 저장.
-    ;
 
     return http.build();
   }
@@ -116,23 +130,18 @@ public class SecurityConfig {
     return configuration.getAuthenticationManager();
   }
 
-  /**
+  /** CORS 설정 */
-   * CORS 설정
-   *
-   * @return
-   */
   @Bean
   public CorsConfigurationSource corsConfigurationSource() {
-    CorsConfiguration config = new CorsConfiguration(); // CORS 객체 생성
+    CorsConfiguration config = new CorsConfiguration();
-    config.setAllowedOriginPatterns(List.of("*")); // 도메인 허용
+    config.setAllowedOriginPatterns(List.of("*"));
     config.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
-    config.setAllowedHeaders(List.of("*")); // 헤더요청 Authorization, Content-Type, X-Custom-Header
+    config.setAllowedHeaders(List.of("*"));
-    config.setAllowCredentials(true); // 쿠키, Authorization 헤더, Bearer Token 등 자격증명 포함 요청을 허용할지 설정
+    config.setAllowCredentials(true);
     config.setExposedHeaders(List.of("Content-Disposition"));
 
     UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-    /** "/**" → 모든 API 경로에 대해 이 CORS 규칙을 적용 /api/** 같이 특정 경로만 지정 가능. */
+    source.registerCorsConfiguration("/**", config);
-    source.registerCorsConfiguration("/**", config); // CORS 정책을 등록
     return source;
   }
 

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

@@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.kamco.cd.kamcoback.common.download.DownloadPaths;
 import com.kamco.cd.kamcoback.common.utils.geometry.GeometryDeserializer;
 import com.kamco.cd.kamcoback.common.utils.geometry.GeometrySerializer;
 import org.locationtech.jts.geom.Geometry;
@@ -39,9 +40,6 @@ public class WebConfig implements WebMvcConfigurer {
 
   @Override
   public void addInterceptors(InterceptorRegistry registry) {
-    registry
+    registry.addInterceptor(fileDownloadInteceptor).addPathPatterns(DownloadPaths.PATTERNS);
-        .addInterceptor(fileDownloadInteceptor)
-        .addPathPatterns("/api/inference/download/**") // 추론 파일 다운로드
-        .addPathPatterns("/api/training-data/stage/download/**"); // 학습데이터 다운로드
   }
 }

src/main/java/com/kamco/cd/kamcoback/config/api/ApiLogFilter.java

@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.config.api;
 
+import com.kamco.cd.kamcoback.common.download.DownloadPaths;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -16,6 +17,14 @@ public class ApiLogFilter extends OncePerRequestFilter {
   protected void doFilterInternal(
       HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
       throws ServletException, IOException {
+
+    String uri = request.getRequestURI();
+
+    if (DownloadPaths.matches(uri)) {
+      filterChain.doFilter(request, response);
+      return;
+    }
+
     ContentCachingRequestWrapper wrappedRequest = new ContentCachingRequestWrapper(request);
 
     ContentCachingResponseWrapper wrappedResponse = new ContentCachingResponseWrapper(response);

src/main/java/com/kamco/cd/kamcoback/config/swagger/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.kamco.cd.kamcoback.config;
+package com.kamco.cd.kamcoback.config.swagger;
 
 import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
 import io.swagger.v3.oas.annotations.security.SecurityScheme;

src/main/java/com/kamco/cd/kamcoback/config/swagger/SwaggerUiAutoAuthConfig.java

@@ -0,0 +1,97 @@
+package com.kamco.cd.kamcoback.config.swagger;
+
+import jakarta.servlet.http.HttpServletRequest;
+import java.nio.charset.StandardCharsets;
+import org.springdoc.core.properties.SwaggerUiConfigProperties;
+import org.springdoc.core.properties.SwaggerUiOAuthProperties;
+import org.springdoc.core.providers.ObjectMapperProvider;
+import org.springdoc.webmvc.ui.SwaggerIndexPageTransformer;
+import org.springdoc.webmvc.ui.SwaggerIndexTransformer;
+import org.springdoc.webmvc.ui.SwaggerWelcomeCommon;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.io.Resource;
+import org.springframework.web.servlet.resource.ResourceTransformerChain;
+import org.springframework.web.servlet.resource.TransformedResource;
+
+@Profile({"local", "dev"})
+@Configuration
+public class SwaggerUiAutoAuthConfig {
+
+  @Bean
+  @Primary
+  public SwaggerIndexTransformer swaggerIndexTransformer(
+      SwaggerUiConfigProperties swaggerUiConfigProperties,
+      SwaggerUiOAuthProperties swaggerUiOAuthProperties,
+      SwaggerWelcomeCommon swaggerWelcomeCommon,
+      ObjectMapperProvider objectMapperProvider) {
+
+    SwaggerIndexPageTransformer delegate =
+        new SwaggerIndexPageTransformer(
+            swaggerUiConfigProperties,
+            swaggerUiOAuthProperties,
+            swaggerWelcomeCommon,
+            objectMapperProvider);
+
+    return new SwaggerIndexTransformer() {
+      private static final String TOKEN_KEY = "SWAGGER_ACCESS_TOKEN";
+
+      @Override
+      public Resource transform(
+          HttpServletRequest request, Resource resource, ResourceTransformerChain chain) {
+        try {
+          // 1) springdoc 기본 변환 먼저 적용
+          Resource transformed = delegate.transform(request, resource, chain);
+
+          String html =
+              new String(transformed.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
+
+          String loginPathContains = "/api/auth/signin";
+
+          String inject =
+              """
+                      tagsSorter: (a, b) => {
+                              const TOP = '인증(Auth)';
+                              if (a === TOP && b !== TOP) return -1;
+                              if (b === TOP && a !== TOP) return 1;
+                              return a.localeCompare(b);
+                            },
+                    requestInterceptor: (req) => {
+                      const token = localStorage.getItem('%s');
+                      if (token) {
+                        req.headers = req.headers || {};
+                        req.headers['Authorization'] = 'Bearer ' + token;
+                      }
+                      return req;
+                    },
+                    responseInterceptor: async (res) => {
+                      try {
+                        const isLogin = (res?.url?.includes('%s') && res?.status === 200);
+                        if (isLogin) {
+                          const text = (typeof res.data === 'string') ? res.data : JSON.stringify(res.data);
+                          const json = JSON.parse(text);
+                          const token = json?.data?.accessToken;
+
+                          if (token) {
+                            localStorage.setItem('%s', token);
+                          }
+                        }
+                      } catch (e) {}
+                      return res;
+                    },
+                  """
+                  .formatted(TOKEN_KEY, loginPathContains, TOKEN_KEY);
+
+          html = html.replace("SwaggerUIBundle({", "SwaggerUIBundle({\n" + inject);
+
+          return new TransformedResource(transformed, html.getBytes(StandardCharsets.UTF_8));
+        } catch (Exception e) {
+          // 실패 시 원본 반환(문서 깨짐 방지)
+          return resource;
+        }
+      }
+    };
+  }
+}

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

@@ -7,11 +7,15 @@ import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ChnDetectMastReqDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ChngDetectMastSearchDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LabelSendDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResReturn;
 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;
@@ -39,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 = "탐지결과 등록")
@@ -74,7 +82,7 @@ public class GukYuinApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   @PostMapping("/chn/mast/remove")
-  public ApiResponseDto<ResReturn> remove(
+  public ApiResponseDto<ChngDetectMastDto.RemoveResDto> remove(
       @RequestBody @Valid ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
     return ApiResponseDto.ok(gukYuinApiService.remove(chnDetectMastReq));
   }
@@ -187,6 +195,29 @@ public class GukYuinApiController {
     return ApiResponseDto.ok(gukYuinApiService.findChnContList(chnDtctId, pageIndex, pageSize));
   }
 
+  @Operation(summary = "탐지객체 조회 (탐지객체 1건 조회)", description = "탐지객체 조회 (탐지객체 1건 조회)")
+  @GetMapping("/chn/cont/{chnDtctId}/objt/{chnDtctObjtId}")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "목록 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Basic.class))),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  public ApiResponseDto<ChngDetectContDto.ResultContDto> findChnPnuToContObject(
+      @PathVariable String chnDtctId,
+      @PathVariable String chnDtctObjtId,
+      @RequestParam(defaultValue = "0") Integer pageIndex,
+      @RequestParam(defaultValue = "10") Integer pageSize) {
+    return ApiResponseDto.ok(
+        gukYuinApiService.findChnPnuToContObject(chnDtctId, chnDtctObjtId, pageIndex, pageSize));
+  }
+
   @Operation(summary = "탐지객체 조회 (PNU에 해당하는 탐지객체)", description = "탐지객체 조회 (PNU에 해당하는 탐지객체)")
   @GetMapping("/chn/cont/{chnDtctId}/pnu/{pnu}")
   @ApiResponses(
@@ -239,7 +270,7 @@ public class GukYuinApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   @PostMapping("/rlb/objt/{chnDtctObjtId}/lbl/{lblYn}")
-  public ApiResponseDto<ResReturn> updateChnDtctObjtLabelingYn(
+  public ApiResponseDto<ChngDetectContDto.ResultLabelDto> updateChnDtctObjtLabelingYn(
       @PathVariable String chnDtctObjtId, @PathVariable String lblYn) {
     return ApiResponseDto.ok(gukYuinApiService.updateChnDtctObjtLabelingYn(chnDtctObjtId, lblYn));
   }
@@ -250,7 +281,7 @@ public class GukYuinApiController {
       @Parameter(description = "uuid", example = "7a593d0e-76a8-4b50-8978-9af1fbe871af")
           @PathVariable
           UUID uuid) {
-    return ApiResponseDto.ok(gukYuinApiService.connectChnMastRegist(uuid));
+    return ApiResponseDto.okObject(gukYuinApiService.connectChnMastRegist(uuid));
   }
 
   @Operation(summary = "라벨 전송 완료 리스트", description = "라벨 전송 완료 리스트")
@@ -259,4 +290,76 @@ public class GukYuinApiController {
       @Parameter(description = "어제 날짜", example = "2026-01-29") LocalDate yesterday) {
     return ApiResponseDto.ok(gukYuinApiService.findLabelingCompleteSendList(yesterday));
   }
+
+  @Operation(summary = "탐지객체 적합여부 조회 (리스트조회)", description = "탐지객체 적합여부 조회 (리스트조회)")
+  @GetMapping("/rlb/dtct/{chnDtctId}")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "목록 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Basic.class))),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  public ApiResponseDto<ChngDetectMastDto.RlbDtctDto> findRlbDtctList(
+      @PathVariable String chnDtctId,
+      @Parameter(description = "날짜(기본은 어제 날짜)") @RequestParam(defaultValue = "20260205")
+          String yyyymmdd) {
+    return ApiResponseDto.ok(gukYuinApiService.findRlbDtctList(chnDtctId, yyyymmdd));
+  }
+
+  @Operation(summary = "탐지객체 적합여부 조회 (객체별 조회)", description = "탐지객체 적합여부 조회 (객체별 조회)")
+  @GetMapping("/rlb/objt/{chnDtctObjtId}")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "목록 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Basic.class))),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  public ApiResponseDto<ChngDetectMastDto.RlbDtctDto> findRlbDtctObject(
+      @PathVariable String chnDtctObjtId) {
+    return ApiResponseDto.ok(gukYuinApiService.findRlbDtctObject(chnDtctObjtId));
+  }
+
+  @Hidden
+  @Operation(summary = "job test pnu", description = "job test pnu")
+  @GetMapping("/job-test/pnu")
+  public ApiResponseDto<Void> findGukYuinContListPnuUpdate() {
+    gukYuinApiPnuJobService.findGukYuinContListPnuUpdate();
+    return ApiResponseDto.ok(null);
+  }
+
+  @Hidden
+  @Operation(summary = "job test status", description = "job test status")
+  @GetMapping("/job-test/status")
+  public ApiResponseDto<Void> findGukYuinMastCompleteYn() {
+    gukYuinApiStatusJobService.findGukYuinMastCompleteYn();
+    return ApiResponseDto.ok(null);
+  }
+
+  @Hidden
+  @Operation(summary = "job test label", description = "job test label")
+  @GetMapping("/job-test/label")
+  public ApiResponseDto<Void> findLabelingCompleteSend() {
+    gukYuinApiLabelJobService.findLabelingCompleteSend();
+    return ApiResponseDto.ok(null);
+  }
+
+  @Hidden
+  @Operation(summary = "job test stblt", description = "job test stblt")
+  @GetMapping("/job-test/stblt")
+  public ApiResponseDto<Void> findGukYuinEligibleForSurvey() {
+    gukYuinApiStbltJobService.findGukYuinEligibleForSurvey();
+    return ApiResponseDto.ok(null);
+  }
 }

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

@@ -114,4 +114,38 @@ public class ChngDetectContDto {
     private List<DtoPnuDetectMpng> result;
     private Boolean success;
   }
+
+  @Schema(name = "ResultLabelDto", description = "ResultLabelDto list 리턴 형태")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class ResultLabelDto {
+
+    private Integer code;
+    private String message;
+    private DtoPnuDetectMpng result;
+    private Boolean success;
+  }
+
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class ReqInfo {
+
+    private String reqIp;
+    private String reqEpno;
+  }
+
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class StbltResult {
+
+    private String stbltYn;
+    private String incyCd;
+    private String incyCmnt;
+  }
 }

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

@@ -216,4 +216,89 @@ public class ChngDetectMastDto {
     private ZonedDateTime reviewerWorkDttm;
     private ZonedDateTime labelSendDttm;
   }
+
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class ErrorResDto {
+
+    private String timestamp;
+    private Integer status;
+    private String error;
+    private String path;
+  }
+
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class RlbDtctDto {
+
+    private Integer code;
+    private String message;
+    private List<RlbDtctMastDto> result;
+    private Boolean success;
+  }
+
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class RlbDtctMastDto {
+
+    private String pnuDtctId; // PNU탐지ID
+    private String pnu; // PNU코드(19자리)
+    private String lrmSyncYmd; // 지적도동기화일자(YYYYMMDD)
+    private String pnuSyncYmd; // PNU동기화일자(YYYYMMDD)
+    private String mpqdNo; // 도곽번호
+    private String cprsYr; // 비교년도
+    private String crtrYr; // 기준년도
+    private String chnDtctSno; // 회차, 변화탐지순번
+    private String chnDtctId; // 변화탐지ID(UUID)
+
+    private String chnDtctMstId; // 변화탐지마스터ID
+    private String chnDtctObjtId; // 변화탐지객체ID
+    private String chnDtctContId; // 변화탐지내용ID
+    private String chnCd; // 변화코드
+    private String chnDtctProb; // 변화탐지정확도(0~1)
+
+    private String bfClsCd; // 이전분류코드
+    private String bfClsProb; // 이전분류정확도(0~1)
+    private String afClsCd; // 이후분류코드
+    private String afClsProb; // 이후분류정확도(0~1)
+
+    private String pnuSqms; // PNU면적(㎡)
+    private String pnuDtctSqms; // PNU탐지면적(㎡)
+    private String chnDtctSqms; // 변화탐지면적(㎡)
+    private String stbltYn; // 적합여부(Y/N) - 안정성 (Y:부적합, N:적합)
+    private String incyCd; // 부적합코드
+    private String incyRsnCont; // 부적합사유내용
+    private String lockYn; // 잠금여부(Y/N)
+    private String lblYn; // 라벨여부(Y/N)
+    private String chgYn; // 변경여부(Y/N)
+    private String rsatctNo; // 부동산등기번호
+    private String rmk; // 비고
+
+    private String crtDt; // 생성일시
+    private String crtEpno; // 생성사원번호
+    private String crtIp; // 생성사원아이피
+    private String chgDt; // 변경일시
+    private String chgEpno; // 변경자사번
+    private String chgIp; // 변경자IP
+    private String delYn; // 삭제여부
+  }
+
+  @Schema(name = "RemoveResDto", description = "remove 후 리턴 형태")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class RemoveResDto {
+
+    private Integer code;
+    private String message;
+    private Boolean result;
+    private Boolean success;
+  }
 }

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

@@ -59,6 +59,11 @@ public class GukYuinDto {
     private Integer stage;
     private String uid;
     private String applyStatus;
+    private Boolean applyYn;
+
+    public Boolean getApplyYn() {
+      return this.applyYn != null && this.applyYn;
+    }
   }
 
   @Getter

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

@@ -12,6 +12,7 @@ public enum GukYuinStatus implements EnumType {
   GUK_COMPLETED("국유인 매핑 완료"),
   PNU_COMPLETED("PNU 싱크 완료"),
   PNU_FAILED("PNU 싱크 중 에러"),
+  END("종료"),
   CANCELED("취소");
 
   private final String desc;

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

@@ -1,5 +1,7 @@
 package com.kamco.cd.kamcoback.gukyuin.service;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.kamco.cd.kamcoback.common.utils.NetUtils;
 import com.kamco.cd.kamcoback.common.utils.UserUtil;
 import com.kamco.cd.kamcoback.config.api.ApiLogFunction;
@@ -9,13 +11,15 @@ import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient;
 import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ContBasic;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ReqInfo;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ResultContDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ResultPnuDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ChnDetectMastReqDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ErrorResDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LabelSendDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResReturn;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResultDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkFacts;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkFailCode;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkableRes;
@@ -25,6 +29,8 @@ import com.kamco.cd.kamcoback.log.dto.EventType;
 import com.kamco.cd.kamcoback.postgres.core.GukYuinCoreService;
 import com.kamco.cd.kamcoback.postgres.entity.AuditLogEntity;
 import com.kamco.cd.kamcoback.postgres.repository.log.AuditLogRepository;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.UUID;
@@ -48,6 +54,8 @@ public class GukYuinApiService {
 
   private final UserUtil userUtil;
   private final AuditLogRepository auditLogRepository;
+  private final ObjectMapper objectMapper;
+  private final String myip = netUtils.getLocalIP();
 
   @Value("${spring.profiles.active:local}")
   private String profile;
@@ -58,13 +66,15 @@ public class GukYuinApiService {
   @Value("${gukyuin.cdi}")
   private String gukyuinCdiUrl;
 
+  @Value("${file.dataset-dir}")
+  private String datasetDir;
+
   @Transactional
   public ChngDetectMastDto.RegistResDto regist(
       ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
 
     String url = gukyuinCdiUrl + "/chn/mast/regist";
 
-    String myip = netUtils.getLocalIP();
     chnDetectMastReq.setReqIp(myip);
     chnDetectMastReq.setReqEpno(userUtil.getEmployeeNo());
 
@@ -77,15 +87,36 @@ public class GukYuinApiService {
             ChngDetectMastDto.RegistResDto.class);
 
     ChngDetectMastDto.RegistResDto resultBody = result.body();
-    Boolean success = false;
+    boolean success = false;
-    if (resultBody != null) {
+    if (resultBody != null && resultBody.getSuccess() != null) {
       ChngDetectMastDto.Basic registRes = resultBody.getResult();
+
+      success = resultBody.getSuccess();
+
+      // 이미 등록한 경우에는 result가 없음
+      if (resultBody.getResult() == null) {
+        return resultBody;
+      }
+
       // 추론 회차에 applyStatus, applyStatusDttm 업데이트
       gukyuinCoreService.updateGukYuinMastRegResult(registRes);
 
       // anal_inference 에도 국유인 반영여부, applyDttm 업데이트
       gukyuinCoreService.updateAnalInferenceApplyDttm(registRes);
-      success = resultBody.getSuccess();
+    } else {
+      String errBody = result.errBody();
+      ErrorResDto error = null;
+      try {
+        error = objectMapper.readValue(errBody, ErrorResDto.class);
+        return new ChngDetectMastDto.RegistResDto(error.getStatus(), error.getError(), null, false);
+      } catch (JsonProcessingException e) {
+        log.error("에러 응답 파싱 실패. rawBody={}", errBody, e);
+        return new ChngDetectMastDto.RegistResDto(
+            result.statusCode(), // HTTP status
+            errBody, // 원문 그대로
+            null,
+            false);
+      }
     }
 
     this.insertGukyuinAuditLog(
@@ -95,27 +126,35 @@ public class GukYuinApiService {
         url.replace(gukyuinUrl, ""),
         chnDetectMastReq,
         success);
+
     return resultBody;
   }
 
   @Transactional
-  public ResReturn remove(ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
+  public ChngDetectMastDto.RemoveResDto remove(
+      ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
     String url = gukyuinCdiUrl + "/chn/mast/remove";
 
-    String myip = netUtils.getLocalIP();
     chnDetectMastReq.setReqIp(myip);
     chnDetectMastReq.setReqEpno(userUtil.getEmployeeNo());
 
-    ExternalCallResult<ChngDetectMastDto.Basic> result =
+    boolean success = false;
+    ExternalCallResult<ChngDetectMastDto.RemoveResDto> result =
         externalHttpClient.call(
             url,
             HttpMethod.POST,
             chnDetectMastReq,
             netUtils.jsonHeaders(),
-            ChngDetectMastDto.Basic.class);
+            ChngDetectMastDto.RemoveResDto.class);
 
-    ChngDetectMastDto.Basic resultBody = result.body();
+    ChngDetectMastDto.RemoveResDto resultBody = result.body();
-    gukyuinCoreService.updateGukYuinMastRegRemove(resultBody);
+    if (resultBody != null && resultBody.getSuccess() != null) {
+
+      success = resultBody.getSuccess();
+      if (resultBody.getSuccess()) {
+        gukyuinCoreService.updateGukYuinMastRegRemove(chnDetectMastReq.getChnDtctId());
+      }
+    }
 
     this.insertGukyuinAuditLog(
         EventType.REMOVE.getId(),
@@ -123,14 +162,22 @@ public class GukYuinApiService {
         userUtil.getId(),
         url.replace(gukyuinUrl, ""),
         chnDetectMastReq,
-        true); // TODO : successFail 여부
+        success);
-    return new ResReturn("success", "탐지결과 삭제 되었습니다.");
+
+    return resultBody;
   }
 
   // 등록목록 1개 확인
   public ChngDetectMastDto.ResultDto detail(String chnDtctMstId) {
 
-    String url = gukyuinCdiUrl + "/chn/mast/list/" + chnDtctMstId;
+    String url =
+        gukyuinCdiUrl
+            + "/chn/mast/list/"
+            + chnDtctMstId
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -149,9 +196,15 @@ public class GukYuinApiService {
   // 등록목록 비교년도,기준년도,차수 조합해서 n개 확인
   public ChngDetectMastDto.ResultDto listYearStage(
       ChngDetectMastDto.ChngDetectMastSearchDto searchDto) {
-
     String queryString = netUtils.dtoToQueryString(searchDto, null);
-    String url = gukyuinCdiUrl + "/chn/mast" + queryString;
+    String url =
+        gukyuinCdiUrl
+            + "/chn/mast"
+            + queryString
+            + "&reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -215,7 +268,11 @@ public class GukYuinApiService {
             + "?pageIndex="
             + pageIndex
             + "&pageSize="
-            + pageSize;
+            + pageSize
+            + "&reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectContDto.ResultContDto> result =
         externalHttpClient.call(
@@ -227,21 +284,11 @@ public class GukYuinApiService {
 
     List<ContBasic> contList = result.body().getResult();
     if (contList == null || contList.isEmpty()) {
-      return new ResultContDto();
+      return new ResultContDto(
-    }
+          result.body().getCode(),
-
+          result.body().getMessage(),
-    for (ContBasic cont : contList) {
+          result.body().getResult(),
-      String[] pnuList = cont.getPnuList();
+          result.body().getSuccess());
-      long pnuCnt = pnuList == null ? 0 : pnuList.length;
-      if (cont.getChnDtctObjtId() != null) {
-        gukyuinCoreService.updateInferenceGeomDataPnuCnt(cont.getChnDtctObjtId(), pnuCnt);
-
-        if (pnuCnt > 0) {
-          Long geoUid =
-              gukyuinCoreService.findMapSheetAnalDataInferenceGeomUid(cont.getChnDtctObjtId());
-          gukyuinCoreService.insertGeoUidPnuData(geoUid, pnuList);
-        }
-      }
     }
 
     this.insertGukyuinAuditLog(
@@ -256,7 +303,16 @@ public class GukYuinApiService {
   }
 
   public ResultPnuDto findPnuObjMgmtList(String chnDtctId, String chnDtctObjtId) {
-    String url = gukyuinCdiUrl + "/chn/pnu/" + chnDtctId + "/objt/" + chnDtctObjtId;
+    String url =
+        gukyuinCdiUrl
+            + "/chn/pnu/"
+            + chnDtctId
+            + "/objt/"
+            + chnDtctObjtId
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectContDto.ResultPnuDto> result =
         externalHttpClient.call(
@@ -277,18 +333,21 @@ public class GukYuinApiService {
     return result.body();
   }
 
-  public ResReturn updateChnDtctObjtLabelingYn(String chnDtctObjtId, String lblYn) {
+  public ChngDetectContDto.ResultLabelDto updateChnDtctObjtLabelingYn(
+      String chnDtctObjtId, String lblYn) {
     String url = gukyuinCdiUrl + "/rlb/objt/" + chnDtctObjtId + "/lbl/" + lblYn;
 
-    ExternalCallResult<ChngDetectContDto.ResultPnuDto> result =
+    ReqInfo info = new ReqInfo();
+    info.setReqIp(myip);
+    info.setReqEpno(userUtil.getEmployeeNo());
+
+    ExternalCallResult<ChngDetectContDto.ResultLabelDto> result =
         externalHttpClient.call(
             url,
             HttpMethod.POST,
-            null,
+            info,
             netUtils.jsonHeaders(),
-            ChngDetectContDto.ResultPnuDto.class);
+            ChngDetectContDto.ResultLabelDto.class);
-
-    ChngDetectContDto.ResultPnuDto dto = result.body();
 
     this.insertGukyuinAuditLog(
         EventType.MODIFIED.getId(),
@@ -298,11 +357,21 @@ public class GukYuinApiService {
         null,
         result.body().getSuccess());
 
-    return new ResReturn(dto.getCode() > 200000 ? "fail" : "success", dto.getMessage());
+    return result.body();
   }
 
   public ResultContDto findChnPnuToContList(String chnDtctId, String pnu) {
-    String url = gukyuinCdiUrl + "/chn/cont/" + chnDtctId + "/pnu/" + pnu;
+
+    String url =
+        gukyuinCdiUrl
+            + "/chn/cont/"
+            + chnDtctId
+            + "/pnu/"
+            + pnu
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectContDto.ResultContDto> result =
         externalHttpClient.call(
@@ -323,7 +392,14 @@ public class GukYuinApiService {
   }
 
   public ResultDto listChnDtctId(String chnDtctId) {
-    String url = gukyuinCdiUrl + "/chn/mast/" + chnDtctId;
+    String url =
+        gukyuinCdiUrl
+            + "/chn/mast/"
+            + chnDtctId
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -372,11 +448,14 @@ public class GukYuinApiService {
   public ResponseObj connectChnMastRegist(UUID uuid) {
     // uuid로 추론 회차 조회
     LearnInfo info = gukyuinCoreService.findMapSheetLearnInfo(uuid);
-    //    if (info.getApplyStatus() != null &&
+    if (info.getApplyYn() != null && info.getApplyYn()) {
-    // !info.getApplyStatus().equals(GukYuinStatus.PENDING.getId()))
+      return new ResponseObj(ApiResponseCode.DUPLICATE_DATA, "이미 국유인 연동을 한 회차입니다.");
-    // {
+    }
-    //      return new ResponseObj(ApiResponseCode.DUPLICATE_DATA, "이미 국유인 연동을 한 추론 회차입니다.");
+
-    //    }
+    if (!Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid()))) {
+      return new ResponseObj(
+          ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다.");
+    }
 
     // 비교년도,기준년도로 전송한 데이터 있는지 확인 후 회차 번호 생성
     Integer maxStage =
@@ -390,13 +469,113 @@ public class GukYuinApiService {
     reqDto.setChnDtctId(info.getUid());
     reqDto.setPathNm("/kamco-nfs/dataset/export/" + info.getUid());
 
-    // 국유인 /chn/mast/regist 전송
+    // 1회차를 종료 상태로 처리하고 2회차를 보내야 함
-    this.regist(reqDto);
+    // 추론(learn), 학습데이터(inference) 둘 다 종료 처리
+    if (maxStage > 0) {
+      Long learnId =
+          gukyuinCoreService.findMapSheetLearnInfoByYyyy(
+              info.getCompareYyyy(), info.getTargetYyyy(), maxStage);
+      gukyuinCoreService.updateMapSheetLearnGukyuinEndStatus(learnId);
+      gukyuinCoreService.updateMapSheetInferenceLabelEndStatus(learnId);
+    }
 
-    return new ResponseObj(ApiResponseCode.OK, "");
+    // 국유인 /chn/mast/regist 전송
+    ChngDetectMastDto.RegistResDto result = this.regist(reqDto);
+    if (result.getSuccess()) {
+      return new ResponseObj(ApiResponseCode.OK, "연동되었습니다.");
+    } else {
+      return new ResponseObj(ApiResponseCode.INTERNAL_SERVER_ERROR, result.getMessage());
+    }
   }
 
   public List<LabelSendDto> findLabelingCompleteSendList(LocalDate yesterday) {
     return gukyuinCoreService.findLabelingCompleteSendList(yesterday);
   }
+
+  public ResultContDto findChnPnuToContObject(
+      String chnDtctId, String chnDtctObjtId, Integer pageIndex, Integer pageSize) {
+
+    String url =
+        gukyuinCdiUrl
+            + "/chn/cont/"
+            + chnDtctId
+            + "/chnDtctObjtId/"
+            + chnDtctObjtId
+            + "?pageIndex="
+            + pageIndex
+            + "&pageSize="
+            + pageSize
+            + "&reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
+
+    ExternalCallResult<ChngDetectContDto.ResultContDto> result =
+        externalHttpClient.call(
+            url,
+            HttpMethod.GET,
+            null,
+            netUtils.jsonHeaders(),
+            ChngDetectContDto.ResultContDto.class);
+
+    this.insertGukyuinAuditLog(
+        EventType.DETAIL.getId(),
+        netUtils.getLocalIP(),
+        userUtil.getId(),
+        url.replace(gukyuinUrl, ""),
+        null,
+        result.body() != null && result.body().getSuccess());
+    return result.body();
+  }
+
+  public ChngDetectMastDto.RlbDtctDto findRlbDtctList(String chnDtctId, String yyyymmdd) {
+
+    String url =
+        gukyuinCdiUrl
+            + "/rlb/dtct/"
+            + chnDtctId
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo()
+            + "&yyyymmdd="
+            + yyyymmdd;
+
+    ExternalCallResult<ChngDetectMastDto.RlbDtctDto> result =
+        externalHttpClient.call(
+            url, HttpMethod.GET, null, netUtils.jsonHeaders(), ChngDetectMastDto.RlbDtctDto.class);
+
+    this.insertGukyuinAuditLog(
+        EventType.LIST.getId(),
+        netUtils.getLocalIP(),
+        userUtil.getId(),
+        url.replace(gukyuinUrl, ""),
+        null,
+        result.body() != null && result.body().getSuccess());
+    return result.body();
+  }
+
+  public RlbDtctDto findRlbDtctObject(String chnDtctObjtId) {
+    String url =
+        gukyuinCdiUrl
+            + "/rlb/objt/"
+            + chnDtctObjtId
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
+
+    ExternalCallResult<ChngDetectMastDto.RlbDtctDto> result =
+        externalHttpClient.call(
+            url, HttpMethod.GET, null, netUtils.jsonHeaders(), ChngDetectMastDto.RlbDtctDto.class);
+
+    this.insertGukyuinAuditLog(
+        EventType.DETAIL.getId(),
+        netUtils.getLocalIP(),
+        userUtil.getId(),
+        url.replace(gukyuinUrl, ""),
+        null,
+        result.body() != null && result.body().getSuccess());
+    return result.body();
+  }
 }

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

@@ -1,5 +1,7 @@
 package com.kamco.cd.kamcoback.inference;
 
+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;
@@ -17,6 +19,7 @@ import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
 import com.kamco.cd.kamcoback.model.service.ModelMngService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -25,17 +28,13 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
 import org.springframework.data.domain.Page;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -46,6 +45,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;
 
 @Tag(name = "추론관리", description = "추론관리 API")
 @RequestMapping("/api/inference")
@@ -56,6 +56,7 @@ public class InferenceResultApiController {
   private final InferenceResultService inferenceResultService;
   private final MapSheetMngService mapSheetMngService;
   private final ModelMngService modelMngService;
+  private final DownloadExecutor downloadExecutor;
 
   @Operation(summary = "추론관리 목록", description = "어드민 홈 > 추론관리 > 추론관리 > 추론관리 목록")
   @ApiResponses(
@@ -328,7 +329,21 @@ public class InferenceResultApiController {
     return ApiResponseDto.ok(geomList);
   }
 
-  @Operation(summary = "shp 파일 다운로드", description = "추론관리 분석결과 shp 파일 다운로드")
+  @Operation(
+      summary = "shp 파일 다운로드",
+      description = "추론관리 분석결과 shp 파일 다운로드",
+      parameters = {
+        @Parameter(
+            name = "kamco-download-uuid",
+            in = ParameterIn.HEADER,
+            required = true,
+            description = "다운로드 요청 UUID",
+            schema =
+                @Schema(
+                    type = "string",
+                    format = "uuid",
+                    example = "69c4e56c-e0bf-4742-9225-bba9aae39052"))
+      })
   @ApiResponses(
       value = {
         @ApiResponse(
@@ -341,15 +356,14 @@ public class InferenceResultApiController {
         @ApiResponse(responseCode = "404", description = "파일 없음", content = @Content),
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
-  @GetMapping(value = "/download/{uuid}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+  @GetMapping(value = "/download/{uuid}")
-  public ResponseEntity<Resource> downloadShp(
+  public ResponseEntity<StreamingResponseBody> download(
-      @Parameter(description = "uuid", example = "0192efc6-9ec2-43ee-9a90-5b73e763c09f")
+      @Parameter(example = "69c4e56c-e0bf-4742-9225-bba9aae39052") @PathVariable UUID uuid)
-          @PathVariable
-          UUID uuid)
       throws IOException {
 
     String path;
     String uid;
+
     try {
       Map<String, Object> map = inferenceResultService.shpDownloadPath(uuid);
       path = String.valueOf(map.get("path"));
@@ -360,24 +374,11 @@ public class InferenceResultApiController {
 
     Path zipPath = Path.of(path);
 
-    if (!Files.exists(zipPath) || !Files.isReadable(zipPath)) {
+    return downloadExecutor.stream(
-      return ResponseEntity.notFound().build();
+        new DownloadSpec(uuid, zipPath, uid + ".zip", MediaType.APPLICATION_OCTET_STREAM));
-    }
-
-    FileSystemResource resource = new FileSystemResource(zipPath);
-
-    String filename = uid + ".zip";
-
-    long fileSize = Files.size(zipPath);
-
-    return ResponseEntity.ok()
-        .contentType(MediaType.APPLICATION_OCTET_STREAM)
-        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"")
-        .contentLength(fileSize)
-        .body(resource);
   }
 
-  @Operation(summary = "shp 파일 다운로드 이력", description = "추론관리 분석결과 shp 파일 다운로드 이력")
+  @Operation(summary = "shp 파일 다운로드 이력 조회", description = "추론관리 분석결과 shp 파일 다운로드 이력 조회")
   @GetMapping(value = "/download-audit/{uuid}")
   @ApiResponses(
       value = {
@@ -392,19 +393,20 @@ public class InferenceResultApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   public ApiResponseDto<Page<AuditLogDto.DownloadRes>> downloadAudit(
-      @Parameter(description = "UUID", example = "0192efc6-9ec2-43ee-9a90-5b73e763c09f")
+      @Parameter(description = "UUID", example = "69c4e56c-e0bf-4742-9225-bba9aae39052")
           @PathVariable
           UUID uuid,
       @Parameter(description = "다운로드일 시작", example = "2025-01-01") @RequestParam(required = false)
           LocalDate strtDttm,
-      @Parameter(description = "다운로드일 종료", example = "2026-01-01") @RequestParam(required = false)
+      @Parameter(description = "다운로드일 종료", example = "2026-04-01") @RequestParam(required = false)
           LocalDate endDttm,
-      @Parameter(description = "키워드", example = "관리자") @RequestParam(required = false)
+      @Parameter(description = "키워드", example = "") @RequestParam(required = false)
           String searchValue,
       @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
           int page,
       @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
           int size) {
+
     AuditLogDto.searchReq searchReq = new searchReq();
     searchReq.setPage(page);
     searchReq.setSize(size);
@@ -413,8 +415,7 @@ public class InferenceResultApiController {
     downloadReq.setStartDate(strtDttm);
     downloadReq.setEndDate(endDttm);
     downloadReq.setSearchValue(searchValue);
-    downloadReq.setMenuId("22");
+    downloadReq.setRequestUri("/api/inference/download-audit/download/" + uuid);
-    downloadReq.setRequestUri("/api/inference/download-audit");
 
     return ApiResponseDto.ok(inferenceResultService.getDownloadAudit(searchReq, downloadReq));
   }

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

@@ -534,6 +534,10 @@ public class InferenceDetailDto {
         throw new RuntimeException(e);
       }
     }
+
+    public Boolean getApplyYn() {
+      return this.applyYn != null && this.applyYn;
+    }
   }
 
   @Getter

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

@@ -1,5 +1,7 @@
 package com.kamco.cd.kamcoback.label;
 
+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;
@@ -9,25 +11,39 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.WorkHistoryDto;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.UpdateClosedRequest;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerListResponse;
 import com.kamco.cd.kamcoback.label.service.LabelAllocateService;
+import com.kamco.cd.kamcoback.log.dto.AuditLogDto;
+import com.kamco.cd.kamcoback.log.dto.AuditLogDto.DownloadReq;
+import com.kamco.cd.kamcoback.log.dto.AuditLogDto.searchReq;
 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.enums.ParameterIn;
 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 jakarta.validation.Valid;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 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;
 import org.springframework.web.bind.annotation.PostMapping;
 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")
@@ -37,6 +53,10 @@ import org.springframework.web.bind.annotation.RestController;
 public class LabelAllocateApiController {
 
   private final LabelAllocateService labelAllocateService;
+  private final DownloadExecutor downloadExecutor;
+
+  @Value("${file.dataset-response}")
+  private String responsePath;
 
   @Operation(summary = "배정 가능한 사용자 목록 조회", description = "라벨링 작업 배정을 위한 활성 상태의 사용자 목록을 조회합니다.")
   @ApiResponses(
@@ -333,4 +353,112 @@ public class LabelAllocateApiController {
   public ApiResponseDto<Long> labelingIngProcessCnt() {
     return ApiResponseDto.ok(labelAllocateService.findLabelingIngProcessCnt());
   }
+
+  @Operation(
+      summary = "라벨 파일 다운로드",
+      description = "라벨 파일 다운로드",
+      parameters = {
+        @Parameter(
+            name = "kamco-download-uuid",
+            in = ParameterIn.HEADER,
+            required = true,
+            description = "다운로드 요청 UUID",
+            schema =
+                @Schema(
+                    type = "string",
+                    format = "uuid",
+                    example = "6d8d49dc-0c9d-4124-adc7-b9ca610cc394"))
+      })
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "라벨 zip파일 다운로드",
+            content =
+                @Content(
+                    mediaType = "application/octet-stream",
+                    schema = @Schema(type = "string", format = "binary"))),
+        @ApiResponse(responseCode = "404", description = "파일 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @GetMapping("/download/{uuid}")
+  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");
+
+    return downloadExecutor.stream(
+        new DownloadSpec(uuid, zipPath, uid + ".zip", MediaType.APPLICATION_OCTET_STREAM));
+  }
+
+  @Operation(summary = "라벨 파일 다운로드 이력 조회", description = "라벨 파일 다운로드 이력 조회")
+  @GetMapping(value = "/download-audit/{uuid}")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "검색 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Page.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  public ApiResponseDto<Page<AuditLogDto.DownloadRes>> downloadAudit(
+      @Parameter(description = "UUID", example = "6d8d49dc-0c9d-4124-adc7-b9ca610cc394")
+          @PathVariable
+          UUID uuid,
+      //    @Parameter(description = "다운로드일 시작", example = "2025-01-01") @RequestParam(required =
+      // false)
+      //    LocalDate strtDttm,
+      //    @Parameter(description = "다운로드일 종료", example = "2026-04-01") @RequestParam(required =
+      // false)
+      //    LocalDate endDttm,
+      //    @Parameter(description = "키워드", example = "") @RequestParam(required = false)
+      //    String searchValue,
+      @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
+          int page,
+      @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
+          int size) {
+
+    AuditLogDto.searchReq searchReq = new searchReq();
+    searchReq.setPage(page);
+    searchReq.setSize(size);
+    DownloadReq downloadReq = new DownloadReq();
+    downloadReq.setUuid(uuid);
+    //    downloadReq.setStartDate(strtDttm);
+    //    downloadReq.setEndDate(endDttm);
+    //    downloadReq.setSearchValue(searchValue);
+    downloadReq.setRequestUri("/api/training-data/stage/download/" + uuid);
+
+    return ApiResponseDto.ok(labelAllocateService.getDownloadAudit(searchReq, downloadReq));
+  }
+
+  @Operation(summary = "다운로드 가능여부 조회", description = "다운로드 가능여부 조회 API")
+  @GetMapping(value = "/download-check/{uuid}")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "검색 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Page.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  public ApiResponseDto<Boolean> isDownloadable(
+      @Parameter(description = "UUID", example = "6d8d49dc-0c9d-4124-adc7-b9ca610cc394")
+          @PathVariable
+          UUID uuid) {
+    return ApiResponseDto.ok(labelAllocateService.isDownloadable(uuid));
+  }
 }

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

@@ -359,4 +359,15 @@ public class LabelAllocateDto {
     @Schema(description = "작업기간 종료일")
     private ZonedDateTime projectCloseDttm;
   }
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  public static class InferenceLearnDto {
+    private UUID analUuid;
+    private String learnUid;
+    private String analState;
+    private Long analId;
+  }
 }

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

@@ -16,10 +16,14 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.searchReq;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerListResponse;
+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.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
@@ -28,13 +32,11 @@ import org.springframework.transaction.annotation.Transactional;
 @Slf4j
 @Service
 @Transactional
+@RequiredArgsConstructor
 public class LabelAllocateService {
 
   private final LabelAllocateCoreService labelAllocateCoreService;
-
+  private final AuditLogCoreService auditLogCoreService;
-  public LabelAllocateService(LabelAllocateCoreService labelAllocateCoreService) {
-    this.labelAllocateCoreService = labelAllocateCoreService;
-  }
 
   /**
    * 도엽 기준 asc sorting 해서 할당 수만큼 배정하는 로직
@@ -273,4 +275,29 @@ public class LabelAllocateService {
   public Long findLabelingIngProcessCnt() {
     return labelAllocateCoreService.findLabelingIngProcessCnt();
   }
+
+  public String findLearnUid(UUID uuid) {
+    return labelAllocateCoreService.findLearnUid(uuid);
+  }
+
+  /**
+   * 다운로드 이력 조회
+   *
+   * @param searchReq 페이징
+   * @param downloadReq 조회조건
+   */
+  public Page<AuditLogDto.DownloadRes> getDownloadAudit(
+      AuditLogDto.searchReq searchReq, DownloadReq downloadReq) {
+    return auditLogCoreService.findLogByAccount(searchReq, downloadReq);
+  }
+
+  /**
+   * 다운로드 가능 여부 조회
+   *
+   * @param uuid
+   * @return
+   */
+  public boolean isDownloadable(UUID uuid) {
+    return labelAllocateCoreService.isDownloadable(uuid);
+  }
 }

src/main/java/com/kamco/cd/kamcoback/layer/dto/LayerDto.java

@@ -17,6 +17,11 @@ import lombok.Setter;
 
 public class LayerDto {
 
+  public enum MapType {
+    CHANGE_MAP,
+    LABELING_MAP
+  }
+
   @Getter
   @Setter
   @AllArgsConstructor
@@ -26,6 +31,9 @@ public class LayerDto {
     @Schema(description = "uuid")
     private UUID uuid;
 
+    @Schema(description = "레이어명")
+    private String layerName;
+
     @Schema(example = "WMTS", description = "유형 (TILE/GEOJSON/WMTS/WMS)")
     private String layerType;
 
@@ -58,6 +66,9 @@ public class LayerDto {
     @Schema(description = "uuid")
     private UUID uuid;
 
+    @Schema(description = "레이어명")
+    private String layerName;
+
     @Schema(description = "유형 (TILE/GEOJSON/WMTS/WMS)")
     private String layerType;
 
@@ -114,6 +125,9 @@ public class LayerDto {
   @Schema(name = "LayerAddReq")
   public static class AddReq {
 
+    @Schema(description = "레이어명")
+    private String layerName;
+
     @Schema(description = "title WMS, WMTS 선택한 tile")
     private String title;
 
@@ -210,6 +224,9 @@ public class LayerDto {
   @Schema(name = "LayerMapDto")
   public static class LayerMapDto {
 
+    @Schema(description = "레이어명")
+    private String layerName;
+
     @Schema(example = "WMTS", description = "유형 (TILE/GEOJSON/WMTS/WMS)")
     private String layerType;
 
@@ -259,7 +276,11 @@ public class LayerDto {
     @Schema(description = "rawJson")
     private JsonNode rawJson;
 
+    @Schema(description = "crs")
+    private String crs;
+
     public LayerMapDto(
+        String layerName,
         String layerType,
         String tag,
         Long sortOrder,
@@ -272,7 +293,9 @@ public class LayerDto {
         Short maxZoom,
         String bboxGeometry,
         UUID uuid,
-        String rawJsonString) {
+        String rawJsonString,
+        String crs) {
+      this.layerName = layerName;
       this.layerType = layerType;
       this.tag = tag;
       this.sortOrder = sortOrder;
@@ -308,6 +331,7 @@ public class LayerDto {
 
       this.rawJson = rawJson;
       this.bbox = geoJson;
+      this.crs = crs;
     }
 
     @JsonProperty("workspace")
@@ -354,6 +378,8 @@ public class LayerDto {
 
     @JsonIgnore private String bboxGeometry;
 
+    private String crs;
+
     public TileUrlDto(
         Integer mngYyyy,
         String url,
@@ -364,7 +390,8 @@ public class LayerDto {
         BigDecimal maxLat,
         Short minZoom,
         Short maxZoom,
-        String bboxGeometry) {
+        String bboxGeometry,
+        String crs) {
       this.mngYyyy = mngYyyy;
       this.url = url;
       this.tag = tag;
@@ -388,6 +415,7 @@ public class LayerDto {
       }
 
       this.bbox = geoJson;
+      this.crs = crs;
     }
   }
 
@@ -408,15 +436,11 @@ public class LayerDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class IsMapYn {
+
     @Schema(description = "CHANGE_MAP(변화지도), LABELING_MAP(라벨링지도)", example = "CHANGE_MAP")
     private String mapType;
 
     @Schema(description = "노출여부 true, false", example = "true")
     private Boolean isMapYn;
   }
-
-  public enum MapType {
-    CHANGE_MAP,
-    LABELING_MAP
-  }
 }

src/main/java/com/kamco/cd/kamcoback/layer/dto/WmsDto.java

@@ -26,5 +26,6 @@ public class WmsDto {
     private String title;
     private String description;
     private String tag;
+    private String layerName;
   }
 }

src/main/java/com/kamco/cd/kamcoback/layer/dto/WmtsDto.java

@@ -26,5 +26,6 @@ public class WmtsDto {
     private String title;
     private String description;
     private String tag;
+    private String layerName;
   }
 }

src/main/java/com/kamco/cd/kamcoback/layer/service/LayerService.java

@@ -9,7 +9,6 @@ import com.kamco.cd.kamcoback.layer.dto.LayerDto.LayerMapDto;
 import com.kamco.cd.kamcoback.layer.dto.LayerDto.OrderReq;
 import com.kamco.cd.kamcoback.layer.dto.LayerDto.TileUrlDto;
 import com.kamco.cd.kamcoback.layer.dto.WmsDto.WmsAddDto;
-import com.kamco.cd.kamcoback.layer.dto.WmsDto.WmsAddReqDto;
 import com.kamco.cd.kamcoback.layer.dto.WmsLayerInfo;
 import com.kamco.cd.kamcoback.layer.dto.WmtsDto.WmtsAddDto;
 import com.kamco.cd.kamcoback.layer.dto.WmtsLayerInfo;
@@ -34,8 +33,11 @@ public class LayerService {
   @Value("${layer.geoserver-url}")
   private String geoserverUrl;
 
-  @Value("${layer.path}")
+  @Value("${layer.wms-path}")
-  private String geoserverPath;
+  private String wmsPath;
+
+  @Value("${layer.wmts-path}")
+  private String wmtsPath;
 
   /**
    * 지도 레이어 관리 목록
@@ -76,6 +78,7 @@ public class LayerService {
         addDto.setDescription(dto.getDescription());
         addDto.setTitle(dto.getTitle());
         addDto.setTag(dto.getTag());
+        addDto.setLayerName(dto.getLayerName());
         return mapLayerCoreService.saveWmts(addDto);
       }
 
@@ -86,6 +89,7 @@ public class LayerService {
         addDto.setDescription(dto.getDescription());
         addDto.setTitle(dto.getTitle());
         addDto.setTag(dto.getTag());
+        addDto.setLayerName(dto.getLayerName());
         return mapLayerCoreService.saveWms(addDto);
       }
 
@@ -162,34 +166,21 @@ public class LayerService {
     return wmsService.getTile();
   }
 
-  /**
-   * wms 저장
-   *
-   * @param dto
-   * @return
-   */
-  @Transactional
-  public UUID saveWms(WmsAddReqDto dto) {
-    // 선택한 tile 상세정보 조회
-    WmsLayerInfo info = wmsService.getDetail(dto.getTitle());
-    WmsAddDto addDto = new WmsAddDto();
-    addDto.setWmsLayerInfo(info);
-    addDto.setDescription(dto.getDescription());
-    addDto.setTitle(dto.getTitle());
-    addDto.setTag(dto.getTag());
-    return mapLayerCoreService.saveWms(addDto);
-  }
-
   public List<LayerMapDto> findLayerMapList(String type) {
     List<LayerMapDto> layerMapDtoList = mapLayerCoreService.findLayerMapList(type);
     layerMapDtoList.forEach(
         dto -> {
-          if (dto.getLayerType().equals("WMS") || dto.getLayerType().equals("WMTS")) {
+          if (dto.getLayerType().equals("WMS")) {
+            dto.setUrl(
+                String.format(
+                    "%s/%s/%s",
+                    trimSlash(geoserverUrl), trimSlash(wmsPath), dto.getLayerType().toLowerCase()));
+          } else if (dto.getLayerType().equals("WMTS")) {
             dto.setUrl(
                 String.format(
                     "%s/%s/%s",
                     trimSlash(geoserverUrl),
-                    trimSlash(geoserverPath),
+                    trimSlash(wmtsPath),
                     dto.getLayerType().toLowerCase()));
           }
         });

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

@@ -184,11 +184,14 @@ public class MapSheetMngDto {
     }
 
     public long getSyncErrorTotCnt() {
-      return this.syncNotPaireCnt + this.syncDuplicateCnt + this.syncFaultCnt;
+      return this.syncNotPaireCnt + this.syncDuplicateCnt + this.syncFaultCnt + this.syncNoFileCnt;
     }
 
     public long getSyncErrorExecTotCnt() {
-      return this.syncNotPaireExecCnt + this.syncDuplicateExecCnt + this.syncFaultExecCnt;
+      return this.syncNotPaireExecCnt
+          + this.syncDuplicateExecCnt
+          + this.syncFaultExecCnt
+          + this.syncNoFileExecCnt;
     }
 
     public String getMngState() {

src/main/java/com/kamco/cd/kamcoback/members/dto/MembersDto.java

@@ -111,8 +111,8 @@ public class MembersDto {
     @EnumValid(enumClass = RoleType.class, message = "userRole은 ADMIN, LABELER, REVIEWER 만 가능합니다.")
     private String userRole;
 
-    @Schema(description = "사번", example = "K20251212001")
+    @Schema(description = "사번", example = "123456")
-    @Size(max = 50)
+    @Size(max = 6)
     private String employeeNo;
 
     @Schema(description = "이름", example = "홍길동")

src/main/java/com/kamco/cd/kamcoback/members/dto/SignInRequest.java

@@ -11,7 +11,7 @@ import lombok.ToString;
 @ToString(exclude = "password")
 public class SignInRequest {
 
-  @Schema(description = "사용자 ID", example = "1234567")
+  @Schema(description = "사용자 ID", example = "123456")
   private String username;
 
   @Schema(description = "비밀번호", example = "qwe123!@#")

src/main/java/com/kamco/cd/kamcoback/menu/service/MenuService.java

@@ -9,8 +9,10 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
+@Transactional(readOnly = true)
 @RequiredArgsConstructor
 public class MenuService {
 

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

@@ -33,8 +33,8 @@ public class GukYuinCoreService {
     gukYuinRepository.updateGukYuinMastRegResult(resultBody);
   }
 
-  public void updateGukYuinMastRegRemove(Basic resultBody) {
+  public void updateGukYuinMastRegRemove(String chnDtctId) {
-    gukYuinRepository.updateGukYuinMastRegRemove(resultBody);
+    gukYuinRepository.updateGukYuinMastRegRemove(chnDtctId);
   }
 
   public void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt) {
@@ -45,8 +45,8 @@ public class GukYuinCoreService {
     return gukYuinRepository.findMapSheetAnalDataInferenceGeomUid(chnDtctObjtId);
   }
 
-  public void insertGeoUidPnuData(Long geoUid, String[] pnuList) {
+  public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
-    gukYuinRepository.insertGeoUidPnuData(geoUid, pnuList);
+    gukYuinRepository.insertGeoUidPnuData(geoUid, pnuList, chnDtctObjtId);
   }
 
   public LearnInfo findMapSheetLearnInfo(UUID uuid) {
@@ -64,4 +64,17 @@ public class GukYuinCoreService {
   public List<LabelSendDto> findLabelingCompleteSendList(LocalDate yesterday) {
     return gukYuinRepository.findLabelingCompleteSendList(yesterday);
   }
+
+  public Long findMapSheetLearnInfoByYyyy(
+      Integer compareYyyy, Integer targetYyyy, Integer maxStage) {
+    return gukYuinRepository.findMapSheetLearnInfoByYyyy(compareYyyy, targetYyyy, maxStage);
+  }
+
+  public void updateMapSheetLearnGukyuinEndStatus(Long learnId) {
+    gukYuinRepository.updateMapSheetLearnGukyuinEndStatus(learnId);
+  }
+
+  public void updateMapSheetInferenceLabelEndStatus(Long learnId) {
+    gukYuinRepository.updateMapSheetInferenceLabelEndStatus(learnId);
+  }
 }

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

@@ -1,11 +1,11 @@
 package com.kamco.cd.kamcoback.postgres.core;
 
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
 import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinRepository;
 import java.util.List;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class GukYuinJobCoreService {
@@ -16,6 +16,7 @@ public class GukYuinJobCoreService {
     this.gukYuinRepository = gukYuinRepository;
   }
 
+  @Transactional
   public void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status) {
     gukYuinRepository.updateGukYuinApplyStateComplete(id, status);
   }
@@ -23,16 +24,4 @@ public class GukYuinJobCoreService {
   public List<LearnKeyDto> findGukyuinApplyStatusUidList(List<String> gukYuinStatus) {
     return gukYuinRepository.findGukyuinApplyStatusUidList(gukYuinStatus);
   }
-
-  public long upsertMapSheetDataAnalGeomPnu(String chnDtctObjtId, String[] pnuList) {
-    return gukYuinRepository.upsertMapSheetDataAnalGeomPnu(chnDtctObjtId, pnuList);
-  }
-
-  public List<GeomUidDto> findYesterdayLabelingCompleteList() {
-    return gukYuinRepository.findYesterdayLabelingCompleteList();
-  }
-
-  public void updateAnalDataInferenceGeomSendDttm(Long geoUid) {
-    gukYuinRepository.updateAnalDataInferenceGeomSendDttm(geoUid);
-  }
 }

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

@@ -0,0 +1,26 @@
+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.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class GukYuinLabelJobCoreService {
+
+  private final GukYuinLabelJobRepository gukYuinLabelRepository;
+
+  public GukYuinLabelJobCoreService(GukYuinLabelJobRepository gukYuinLabelRepository) {
+    this.gukYuinLabelRepository = gukYuinLabelRepository;
+  }
+
+  public List<GeomUidDto> findYesterdayLabelingCompleteList() {
+    return gukYuinLabelRepository.findYesterdayLabelingCompleteList();
+  }
+
+  @Transactional
+  public void updateAnalDataInferenceGeomSendDttm(Long geoUid) {
+    gukYuinLabelRepository.updateAnalDataInferenceGeomSendDttm(geoUid);
+  }
+}

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

@@ -0,0 +1,44 @@
+package com.kamco.cd.kamcoback.postgres.core;
+
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
+import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinPnuJobRepository;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class GukYuinPnuJobCoreService {
+
+  private final GukYuinPnuJobRepository gukYuinPnuRepository;
+
+  public GukYuinPnuJobCoreService(GukYuinPnuJobRepository gukYuinPnuRepository) {
+    this.gukYuinPnuRepository = gukYuinPnuRepository;
+  }
+
+  public void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status) {
+    gukYuinPnuRepository.updateGukYuinApplyStateComplete(id, status);
+  }
+
+  public List<LearnKeyDto> findGukyuinApplyStatusUidList(List<String> gukYuinStatus) {
+    return gukYuinPnuRepository.findGukyuinApplyStatusUidList(gukYuinStatus);
+  }
+
+  public long upsertMapSheetDataAnalGeomPnu(String chnDtctObjtId, String[] pnuList) {
+    return gukYuinPnuRepository.upsertMapSheetDataAnalGeomPnu(chnDtctObjtId, pnuList);
+  }
+
+  @Transactional
+  public void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt) {
+    gukYuinPnuRepository.updateInferenceGeomDataPnuCnt(chnDtctObjtId, pnuCnt);
+  }
+
+  public Long findMapSheetAnalDataInferenceGeomUid(String chnDtctObjtId) {
+    return gukYuinPnuRepository.findMapSheetAnalDataInferenceGeomUid(chnDtctObjtId);
+  }
+
+  @Transactional
+  public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
+    gukYuinPnuRepository.insertGeoUidPnuData(geoUid, pnuList, chnDtctObjtId);
+  }
+}

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

@@ -0,0 +1,76 @@
+package com.kamco.cd.kamcoback.postgres.core;
+
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.StbltResult;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctMastDto;
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
+import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinStbltJobRepository;
+import java.time.ZonedDateTime;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class GukYuinStbltJobCoreService {
+
+  private final GukYuinStbltJobRepository gukYuinStbltRepository;
+
+  public GukYuinStbltJobCoreService(GukYuinStbltJobRepository gukYuinStbltRepository) {
+    this.gukYuinStbltRepository = gukYuinStbltRepository;
+  }
+
+  public List<LearnKeyDto> findGukYuinEligibleForSurveyList(String status) {
+    return gukYuinStbltRepository.findGukYuinEligibleForSurveyList(status);
+  }
+
+  @Transactional
+  public void updateGukYuinEligibleForSurvey(String resultUid, RlbDtctMastDto stbltDto) {
+    PnuEntity entity =
+        gukYuinStbltRepository.findPnuEntityByResultUid(resultUid, stbltDto.getPnu());
+
+    if (entity != null) {
+      entity.setPnuDtctId(stbltDto.getPnuDtctId());
+      entity.setPnu(stbltDto.getPnu());
+      entity.setLrmSyncYmd(stbltDto.getLrmSyncYmd());
+      entity.setPnuSyncYmd(stbltDto.getPnuSyncYmd());
+      entity.setMpqdNo(stbltDto.getMpqdNo());
+      entity.setCprsYr(stbltDto.getCprsYr());
+      entity.setCrtrYr(stbltDto.getCrtrYr());
+      entity.setChnDtctSno(stbltDto.getChnDtctSno());
+      entity.setChnDtctId(stbltDto.getChnDtctId());
+      entity.setChnDtctMstId(stbltDto.getChnDtctMstId());
+      entity.setChnDtctObjtId(stbltDto.getChnDtctObjtId());
+      entity.setChnDtctContId(stbltDto.getChnDtctContId());
+      entity.setChnCd(stbltDto.getChnCd());
+      entity.setBfClsCd(stbltDto.getBfClsCd());
+      entity.setBfClsProb(stbltDto.getBfClsProb());
+      entity.setAfClsCd(stbltDto.getAfClsCd());
+      entity.setAfClsProb(stbltDto.getAfClsProb());
+      entity.setPnuSqms(stbltDto.getPnuSqms());
+      entity.setPnuDtctSqms(stbltDto.getPnuDtctSqms());
+      entity.setChnDtctSqms(stbltDto.getChnDtctSqms());
+      entity.setStbltYn(stbltDto.getStbltYn());
+      entity.setIncyCd(stbltDto.getIncyCd());
+      entity.setIncyRsnCont(stbltDto.getIncyRsnCont());
+      entity.setLockYn(stbltDto.getLockYn());
+      entity.setLblYn(stbltDto.getLblYn());
+      entity.setChgYn(stbltDto.getChgYn());
+      entity.setRsatctNo(stbltDto.getRsatctNo());
+      entity.setRmk(stbltDto.getRmk());
+      entity.setCrtDt(stbltDto.getCrtDt());
+      entity.setCrtEpno(stbltDto.getCrtEpno());
+      entity.setCrtIp(stbltDto.getCrtIp());
+      entity.setChgDt(stbltDto.getChgDt());
+      entity.setChgIp(stbltDto.getChgIp());
+      entity.setDelYn(stbltDto.getDelYn().equals("Y"));
+
+      entity.setCreatedDttm(ZonedDateTime.now());
+      gukYuinStbltRepository.save(entity);
+    }
+  }
+
+  @Transactional
+  public void updateGukYuinObjectStbltYn(String resultUid, StbltResult stbResult) {
+    gukYuinStbltRepository.updateGukYuinObjectStbltYn(resultUid, stbResult);
+  }
+}

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

@@ -1,8 +1,11 @@
 package com.kamco.cd.kamcoback.postgres.core;
 
+import com.kamco.cd.kamcoback.common.exception.CustomApiException;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceLearnDto;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.MoveInfo;
@@ -13,12 +16,18 @@ import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
+import com.kamco.cd.kamcoback.postgres.repository.batch.BatchStepHistoryRepository;
 import com.kamco.cd.kamcoback.postgres.repository.label.LabelAllocateRepository;
+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;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -26,6 +35,10 @@ import org.springframework.stereotype.Service;
 public class LabelAllocateCoreService {
 
   private final LabelAllocateRepository labelAllocateRepository;
+  private final BatchStepHistoryRepository batchStepHistoryRepository;
+
+  @Value("${file.dataset-response}")
+  private String responsePath;
 
   public List<AllocateInfoDto> fetchNextIds(Long lastId, Long batchSize, UUID uuid) {
     return labelAllocateRepository.fetchNextIds(lastId, batchSize, uuid);
@@ -234,4 +247,34 @@ public class LabelAllocateCoreService {
   public Long findLabelingIngProcessCnt() {
     return labelAllocateRepository.findLabelingIngProcessCnt();
   }
+
+  public boolean isDownloadable(UUID uuid) {
+    InferenceLearnDto dto = labelAllocateRepository.findLabelingIngProcessId(uuid);
+
+    if (dto == null) {
+      return false;
+    }
+
+    // 파일이 있는지만 확인
+    Path path = Paths.get(responsePath).resolve(dto.getLearnUid() + ".zip");
+
+    if (!Files.exists(path) || !Files.isRegularFile(path)) {
+      // 실제 파일만 true (디렉터리는 제외)
+      return false;
+    }
+
+    // 다운로드 확인할 학습데이터가 라벨링중인 경우 파일 생성여부가 정상인지 확인
+    if (dto.getAnalState().equals(LabelMngState.ASSIGNED.getId())
+        || dto.getAnalState().equals(LabelMngState.ING.getId())) {
+      return batchStepHistoryRepository.isDownloadable(dto.getAnalId());
+    }
+
+    return true;
+  }
+
+  public String findLearnUid(UUID uuid) {
+    return labelAllocateRepository
+        .findLearnUid(uuid)
+        .orElseThrow(() -> new CustomApiException("NOT_FOUND_DATA", HttpStatus.NOT_FOUND));
+  }
 }

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

@@ -67,10 +67,6 @@ public class MapLayerCoreService {
             .findDetailByUuid(uuid)
             .orElseThrow(() -> new CustomApiException("NOT_FOUND_DATA", HttpStatus.NOT_FOUND));
 
-    if (LayerType.TILE.getId().equals(entity.getLayerType())) {
-      throw new CustomApiException("UNPROCESSABLE_ENTITY", HttpStatus.CONFLICT);
-    }
-
     entity.setIsDeleted(true);
     entity.setUpdatedUid(userUtil.getId());
     entity.setUpdatedDttm(ZonedDateTime.now());
@@ -91,6 +87,10 @@ public class MapLayerCoreService {
       entity.setDescription(dto.getDescription());
     }
 
+    if (dto.getLayerName() != null) {
+      entity.setLayerName(dto.getLayerName());
+    }
+
     if (dto.getUrl() != null) {
       entity.setUrl(dto.getUrl());
     }
@@ -217,6 +217,7 @@ public class MapLayerCoreService {
     Long order = mapLayerRepository.findSortOrderDesc();
 
     MapLayerEntity mapLayerEntity = new MapLayerEntity();
+    mapLayerEntity.setLayerName(dto.getLayerName());
     mapLayerEntity.setDescription(dto.getDescription());
     mapLayerEntity.setUrl(dto.getUrl());
     mapLayerEntity.setTag(dto.getTag());
@@ -247,6 +248,7 @@ public class MapLayerCoreService {
     Long order = mapLayerRepository.findSortOrderDesc();
 
     MapLayerEntity mapLayerEntity = new MapLayerEntity();
+    mapLayerEntity.setLayerName(addDto.getLayerName());
     mapLayerEntity.setDescription(addDto.getDescription());
     mapLayerEntity.setUrl(addDto.getUrl());
     mapLayerEntity.setTag(addDto.getTag());
@@ -277,6 +279,7 @@ public class MapLayerCoreService {
     }
 
     MapLayerEntity mapLayerEntity = new MapLayerEntity();
+    mapLayerEntity.setLayerName(addDto.getLayerName());
     mapLayerEntity.setTitle(addDto.getTitle());
     mapLayerEntity.setDescription(addDto.getDescription());
     mapLayerEntity.setCreatedUid(userUtil.getId());
@@ -309,6 +312,7 @@ public class MapLayerCoreService {
     }
 
     MapLayerEntity mapLayerEntity = new MapLayerEntity();
+    mapLayerEntity.setLayerName(addDto.getLayerName());
     mapLayerEntity.setTitle(addDto.getTitle());
     mapLayerEntity.setDescription(addDto.getDescription());
     mapLayerEntity.setCreatedUid(userUtil.getId());

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

@@ -0,0 +1,36 @@
+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.util.List;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class TrainingDataLabelJobCoreService {
+
+  private final TrainingDataLabelJobRepository trainingDataLabelJobRepository;
+
+  public List<Tasks> findCompletedYesterdayUnassigned() {
+    return trainingDataLabelJobRepository.findCompletedYesterdayUnassigned();
+  }
+
+  public void assignReviewerBatch(List<UUID> assignmentUids, String reviewerId) {
+    trainingDataLabelJobRepository.assignReviewerBatch(assignmentUids, reviewerId);
+  }
+
+  public List<InspectorPendingDto> findInspectorPendingByRound(Long analUid) {
+    return trainingDataLabelJobRepository.findInspectorPendingByRound(analUid);
+  }
+
+  public void lockInspectors(Long analUid, List<String> reviewerIds) {
+    trainingDataLabelJobRepository.lockInspectors(analUid, reviewerIds);
+  }
+
+  public void updateGeomUidTestState(List<Long> geomUids) {
+    trainingDataLabelJobRepository.updateGeomUidTestState(geomUids);
+  }
+}

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

@@ -4,10 +4,7 @@ import com.kamco.cd.kamcoback.postgres.repository.scheduler.TrainingDataReviewJo
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalCntInfo;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalMapSheetList;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.CompleteLabelData;
-import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.InspectorPendingDto;
-import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.Tasks;
 import java.util.List;
-import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -17,34 +14,6 @@ public class TrainingDataReviewJobCoreService {
 
   private final TrainingDataReviewJobRepository trainingDataReviewJobRepository;
 
-  public List<Tasks> findCompletedYesterdayUnassigned() {
-    return trainingDataReviewJobRepository.findCompletedYesterdayUnassigned();
-  }
-
-  public void assignReviewer(UUID assignmentUid, String reviewerId) {
-    trainingDataReviewJobRepository.assignReviewer(assignmentUid, reviewerId);
-  }
-
-  public void assignReviewerBatch(List<UUID> assignmentUids, String reviewerId) {
-    trainingDataReviewJobRepository.assignReviewerBatch(assignmentUids, reviewerId);
-  }
-
-  public Tasks findAssignmentTask(String assignmentUid) {
-    return trainingDataReviewJobRepository.findAssignmentTask(assignmentUid);
-  }
-
-  public List<InspectorPendingDto> findInspectorPendingByRound(Long analUid) {
-    return trainingDataReviewJobRepository.findInspectorPendingByRound(analUid);
-  }
-
-  public void lockInspectors(Long analUid, List<String> reviewerIds) {
-    trainingDataReviewJobRepository.lockInspectors(analUid, reviewerIds);
-  }
-
-  public void updateGeomUidTestState(List<Long> geomUids) {
-    trainingDataReviewJobRepository.updateGeomUidTestState(geomUids);
-  }
-
   public List<CompleteLabelData> findCompletedYesterdayLabelingList(
       Long analUid, String mapSheetNum) {
     return trainingDataReviewJobRepository.findCompletedYesterdayLabelingList(analUid, mapSheetNum);

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

@@ -0,0 +1,62 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "batch_step_history")
+public class BatchStepHistoryEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id", nullable = false)
+  private Long id;
+
+  @NotNull
+  @Column(name = "anal_uid", nullable = false)
+  private Long analUid;
+
+  @Size(max = 255)
+  @NotNull
+  @Column(name = "result_uid", nullable = false)
+  private String resultUid;
+
+  @Size(max = 100)
+  @NotNull
+  @Column(name = "step_name", nullable = false, length = 100)
+  private String stepName;
+
+  @Size(max = 50)
+  @NotNull
+  @Column(name = "status", nullable = false, length = 50)
+  private String status;
+
+  @Column(name = "error_message", length = Integer.MAX_VALUE)
+  private String errorMessage;
+
+  @NotNull
+  @Column(name = "started_dttm", nullable = false)
+  private LocalDateTime startedDttm;
+
+  @Column(name = "completed_dttm")
+  private LocalDateTime completedDttm;
+
+  @NotNull
+  @Column(name = "created_dttm", nullable = false)
+  private LocalDateTime createdDttm;
+
+  @NotNull
+  @Column(name = "updated_dttm", nullable = false)
+  private LocalDateTime updatedDttm;
+}

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

@@ -43,6 +43,10 @@ public class MapLayerEntity {
   @Column(name = "title", length = 200)
   private String title;
 
+  @Size(max = 255)
+  @Column(name = "layer_name")
+  private String layerName;
+
   @Column(name = "description", length = Integer.MAX_VALUE)
   private String description;
 
@@ -109,6 +113,7 @@ public class MapLayerEntity {
   public LayerDto.Detail toDto() {
     return new LayerDto.Detail(
         this.uuid,
+        this.layerName,
         this.layerType,
         this.title,
         this.description,

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

@@ -159,6 +159,9 @@ public class MapSheetAnalDataInferenceGeomEntity {
   @Column(name = "label_send_dttm")
   private ZonedDateTime labelSendDttm;
 
+  @Column(name = "lock_yn")
+  private String lockYn;
+
   public InferenceDetailDto.DetailListEntity toEntity() {
     DetectionClassification classification = DetectionClassification.fromString(classBeforeCd);
     Clazzes comparedClazz = new Clazzes(classification, classBeforeProb);

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

@@ -12,7 +12,7 @@ import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
-import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;
@@ -39,7 +39,7 @@ public class PnuEntity {
   private String pnu;
 
   @Column(name = "created_dttm")
-  private OffsetDateTime createdDttm;
+  private ZonedDateTime createdDttm;
 
   @Column(name = "created_uid")
   private Long createdUid;
@@ -47,4 +47,140 @@ public class PnuEntity {
   @ColumnDefault("false")
   @Column(name = "del_yn")
   private Boolean delYn;
+
+  @Size(max = 40)
+  @Column(name = "pnu_dtct_id", length = 40)
+  private String pnuDtctId;
+
+  @Size(max = 10)
+  @Column(name = "lrm_sync_ymd", length = 10)
+  private String lrmSyncYmd;
+
+  @Size(max = 10)
+  @Column(name = "pnu_sync_ymd", length = 10)
+  private String pnuSyncYmd;
+
+  @Size(max = 20)
+  @Column(name = "mpqd_no", length = 20)
+  private String mpqdNo;
+
+  @Size(max = 10)
+  @Column(name = "cprs_yr", length = 10)
+  private String cprsYr;
+
+  @Size(max = 10)
+  @Column(name = "crtr_yr", length = 10)
+  private String crtrYr;
+
+  @Size(max = 255)
+  @Column(name = "chn_dtct_id")
+  private String chnDtctId;
+
+  @Size(max = 10)
+  @Column(name = "chn_dtct_mst_id", length = 10)
+  private String chnDtctMstId;
+
+  @Size(max = 255)
+  @Column(name = "chn_dtct_objt_id")
+  private String chnDtctObjtId;
+
+  @Size(max = 255)
+  @Column(name = "chn_dtct_cont_id")
+  private String chnDtctContId;
+
+  @Size(max = 50)
+  @Column(name = "chn_cd", length = 50)
+  private String chnCd;
+
+  @Size(max = 50)
+  @Column(name = "chn_dtct_prob", length = 50)
+  private String chnDtctProb;
+
+  @Size(max = 50)
+  @Column(name = "bf_cls_cd", length = 50)
+  private String bfClsCd;
+
+  @Size(max = 50)
+  @Column(name = "bf_cls_prob", length = 50)
+  private String bfClsProb;
+
+  @Size(max = 50)
+  @Column(name = "af_cls_cd", length = 50)
+  private String afClsCd;
+
+  @Size(max = 50)
+  @Column(name = "af_cls_prob", length = 50)
+  private String afClsProb;
+
+  @Size(max = 100)
+  @Column(name = "pnu_sqms", length = 100)
+  private String pnuSqms;
+
+  @Size(max = 100)
+  @Column(name = "pnu_dtct_sqms", length = 100)
+  private String pnuDtctSqms;
+
+  @Size(max = 100)
+  @Column(name = "chn_dtct_sqms", length = 100)
+  private String chnDtctSqms;
+
+  @Size(max = 1)
+  @Column(name = "stblt_yn", length = 1)
+  private String stbltYn;
+
+  @Size(max = 30)
+  @Column(name = "incy_cd", length = 30)
+  private String incyCd;
+
+  @Size(max = 255)
+  @Column(name = "incy_rsn_cont")
+  private String incyRsnCont;
+
+  @Size(max = 1)
+  @Column(name = "lock_yn", length = 1)
+  private String lockYn;
+
+  @Size(max = 1)
+  @Column(name = "lbl_yn", length = 1)
+  private String lblYn;
+
+  @Size(max = 1)
+  @Column(name = "chg_yn", length = 1)
+  private String chgYn;
+
+  @Size(max = 50)
+  @Column(name = "rsatct_no", length = 50)
+  private String rsatctNo;
+
+  @Size(max = 100)
+  @Column(name = "rmk", length = 100)
+  private String rmk;
+
+  @Size(max = 20)
+  @Column(name = "crt_dt", length = 20)
+  private String crtDt;
+
+  @Size(max = 20)
+  @Column(name = "crt_epno", length = 20)
+  private String crtEpno;
+
+  @Size(max = 20)
+  @Column(name = "crt_ip", length = 20)
+  private String crtIp;
+
+  @Size(max = 20)
+  @Column(name = "chg_dt", length = 20)
+  private String chgDt;
+
+  @Size(max = 20)
+  @Column(name = "chg_epno", length = 20)
+  private String chgEpno;
+
+  @Size(max = 20)
+  @Column(name = "chg_ip", length = 20)
+  private String chgIp;
+
+  @Size(max = 10)
+  @Column(name = "chn_dtct_sno", length = 10)
+  private String chnDtctSno;
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/batch/BatchStepHistoryRepository.java

@@ -0,0 +1,7 @@
+package com.kamco.cd.kamcoback.postgres.repository.batch;
+
+import com.kamco.cd.kamcoback.postgres.entity.BatchStepHistoryEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface BatchStepHistoryRepository
+    extends JpaRepository<BatchStepHistoryEntity, Long>, BatchStepHistoryRepositoryCustom {}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/batch/BatchStepHistoryRepositoryCustom.java

@@ -0,0 +1,5 @@
+package com.kamco.cd.kamcoback.postgres.repository.batch;
+
+public interface BatchStepHistoryRepositoryCustom {
+  boolean isDownloadable(Long analUid);
+}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/batch/BatchStepHistoryRepositoryImpl.java

@@ -0,0 +1,37 @@
+package com.kamco.cd.kamcoback.postgres.repository.batch;
+
+import com.kamco.cd.kamcoback.postgres.entity.QBatchStepHistoryEntity;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class BatchStepHistoryRepositoryImpl implements BatchStepHistoryRepositoryCustom {
+  private final JPAQueryFactory queryFactory;
+
+  @Override
+  public boolean isDownloadable(Long analUid) {
+    QBatchStepHistoryEntity h = QBatchStepHistoryEntity.batchStepHistoryEntity;
+
+    boolean startedExists =
+        queryFactory
+                .selectOne()
+                .from(h)
+                .where(
+                    h.analUid.eq(analUid), h.stepName.eq("zipResponseStep"), h.status.eq("STARTED"))
+                .fetchFirst()
+            != null;
+
+    boolean successExists =
+        queryFactory
+                .selectOne()
+                .from(h)
+                .where(
+                    h.analUid.eq(analUid), h.stepName.eq("zipResponseStep"), h.status.eq("SUCCESS"))
+                .fetchFirst()
+            != null;
+
+    return successExists && !startedExists;
+  }
+}

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

@@ -0,0 +1,7 @@
+package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
+
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface GukYuinLabelJobRepository
+    extends JpaRepository<MapSheetLearnEntity, Long>, GukYuinLabelJobRepositoryCustom {}

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

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

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

@@ -0,0 +1,77 @@
+package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
+
+import static com.kamco.cd.kamcoback.postgres.entity.QLabelingAssignmentEntity.labelingAssignmentEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
+
+import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class GukYuinLabelJobRepositoryImpl implements GukYuinLabelJobRepositoryCustom {
+
+  private final JPAQueryFactory queryFactory;
+  @PersistenceContext private EntityManager em;
+
+  @Override
+  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);
+
+    //    BooleanExpression isYesterday =
+    //        labelingAssignmentEntity
+    //            .inspectStatDttm
+    //            .goe(yesterdayStart)
+    //            .and(labelingAssignmentEntity.inspectStatDttm.lt(todayStart));
+    BooleanExpression isYesterday =
+        labelingAssignmentEntity
+            .inspectStatDttm
+            .goe(todayStart)
+            .and(labelingAssignmentEntity.inspectStatDttm.lt(tomorrowStart));
+
+    return queryFactory
+        .select(
+            Projections.constructor(
+                GeomUidDto.class,
+                labelingAssignmentEntity.inferenceGeomUid,
+                mapSheetAnalDataInferenceGeomEntity.resultUid))
+        .from(labelingAssignmentEntity)
+        .innerJoin(mapSheetAnalDataInferenceGeomEntity)
+        .on(
+            labelingAssignmentEntity.inferenceGeomUid.eq(
+                mapSheetAnalDataInferenceGeomEntity.geoUid))
+        .innerJoin(mapSheetAnalInferenceEntity)
+        .on(labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id))
+        .innerJoin(mapSheetLearnEntity)
+        .on(
+            mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id),
+            mapSheetLearnEntity.applyStatus.in(
+                GukYuinStatus.GUK_COMPLETED.getId(), GukYuinStatus.PNU_COMPLETED.getId()))
+        .where(labelingAssignmentEntity.inspectState.eq(InspectState.COMPLETE.getId()), isYesterday)
+        .fetch();
+  }
+
+  @Override
+  public void updateAnalDataInferenceGeomSendDttm(Long geoUid) {
+    queryFactory
+        .update(mapSheetAnalDataInferenceGeomEntity)
+        .set(mapSheetAnalDataInferenceGeomEntity.labelSendDttm, ZonedDateTime.now())
+        .where(mapSheetAnalDataInferenceGeomEntity.geoUid.eq(geoUid))
+        .execute();
+  }
+}

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

@@ -0,0 +1,7 @@
+package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
+
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface GukYuinPnuJobRepository
+    extends JpaRepository<MapSheetLearnEntity, Long>, GukYuinPnuJobRepositoryCustom {}

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

@@ -0,0 +1,20 @@
+package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
+
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
+import java.util.List;
+
+public interface GukYuinPnuJobRepositoryCustom {
+
+  void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt);
+
+  Long findMapSheetAnalDataInferenceGeomUid(String chnDtctObjtId);
+
+  void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId);
+
+  void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status);
+
+  List<LearnKeyDto> findGukyuinApplyStatusUidList(List<String> gukYuinStatus);
+
+  long upsertMapSheetDataAnalGeomPnu(String uid, String[] pnuList);
+}

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

@@ -0,0 +1,123 @@
+package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
+
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity;
+
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
+import com.querydsl.core.types.Projections;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.transaction.Transactional;
+import java.time.ZonedDateTime;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class GukYuinPnuJobRepositoryImpl implements GukYuinPnuJobRepositoryCustom {
+
+  private final JPAQueryFactory queryFactory;
+  @PersistenceContext private EntityManager em;
+
+  @Override
+  public void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt) {
+    queryFactory
+        .update(mapSheetAnalDataInferenceGeomEntity)
+        .set(mapSheetAnalDataInferenceGeomEntity.pnu, pnuCnt)
+        .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(chnDtctObjtId))
+        .execute();
+  }
+
+  @Override
+  public Long findMapSheetAnalDataInferenceGeomUid(String chnDtctObjtId) {
+    return queryFactory
+        .select(mapSheetAnalDataInferenceGeomEntity.geoUid)
+        .from(mapSheetAnalDataInferenceGeomEntity)
+        .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(chnDtctObjtId))
+        .fetchOne();
+  }
+
+  @Override
+  public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
+    for (String pnu : pnuList) {
+      PnuEntity entity =
+          queryFactory
+              .selectFrom(pnuEntity)
+              .where(pnuEntity.pnu.eq(pnu), pnuEntity.chnDtctObjtId.eq(chnDtctObjtId))
+              .fetchOne();
+      if (entity == null) {
+        queryFactory
+            .insert(pnuEntity)
+            .columns(
+                pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm, pnuEntity.chnDtctObjtId)
+            .values(geoUid, pnu, ZonedDateTime.now(), chnDtctObjtId)
+            .execute();
+      }
+    }
+  }
+
+  @Override
+  public List<LearnKeyDto> findGukyuinApplyStatusUidList(List<String> status) {
+    return queryFactory
+        .select(
+            Projections.constructor(
+                LearnKeyDto.class,
+                mapSheetLearnEntity.id,
+                mapSheetLearnEntity.uid,
+                mapSheetLearnEntity.chnDtctMstId))
+        .from(mapSheetLearnEntity)
+        .where(mapSheetLearnEntity.applyStatus.in(status))
+        .fetch();
+  }
+
+  @Override
+  public long upsertMapSheetDataAnalGeomPnu(String chnDtctObjtId, String[] pnuList) {
+    long length = pnuList.length;
+    queryFactory
+        .update(mapSheetAnalDataInferenceGeomEntity)
+        .set(mapSheetAnalDataInferenceGeomEntity.pnu, length)
+        .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(chnDtctObjtId))
+        .execute();
+
+    Long geoUid =
+        queryFactory
+            .select(mapSheetAnalDataInferenceGeomEntity.geoUid)
+            .from(mapSheetAnalDataInferenceGeomEntity)
+            .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(chnDtctObjtId))
+            .fetchOne();
+
+    long succCnt = 0;
+    for (String pnu : pnuList) {
+      long result =
+          queryFactory
+              .insert(pnuEntity)
+              .columns(
+                  pnuEntity.geo.geoUid,
+                  pnuEntity.pnu,
+                  pnuEntity.createdDttm,
+                  pnuEntity.chnDtctObjtId)
+              .values(geoUid, pnu, ZonedDateTime.now(), chnDtctObjtId)
+              .execute();
+      if (result > 0) {
+        succCnt++;
+      }
+    }
+    return succCnt;
+  }
+
+  @Override
+  @Transactional
+  public void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status) {
+    queryFactory
+        .update(mapSheetLearnEntity)
+        .set(mapSheetLearnEntity.applyStatus, status.getId())
+        .set(mapSheetLearnEntity.applyStatusDttm, ZonedDateTime.now())
+        .where(mapSheetLearnEntity.id.eq(id))
+        .execute();
+  }
+}

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

@@ -14,13 +14,13 @@ public interface GukYuinRepositoryCustom {
 
   void updateGukYuinMastRegResult(Basic resultBody);
 
-  void updateGukYuinMastRegRemove(Basic resultBody);
+  void updateGukYuinMastRegRemove(String chnDtctId);
 
   void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt);
 
   Long findMapSheetAnalDataInferenceGeomUid(String chnDtctObjtId);
 
-  void insertGeoUidPnuData(Long geoUid, String[] pnuList);
+  void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId);
 
   void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status);
 
@@ -39,4 +39,10 @@ public interface GukYuinRepositoryCustom {
   void updateAnalDataInferenceGeomSendDttm(Long geoUid);
 
   List<LabelSendDto> findLabelingCompleteSendList(LocalDate yesterday);
+
+  Long findMapSheetLearnInfoByYyyy(Integer compareYyyy, Integer targetYyyy, Integer maxStage);
+
+  void updateMapSheetLearnGukyuinEndStatus(Long learnId);
+
+  void updateMapSheetInferenceLabelEndStatus(Long learnId);
 }

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

@@ -13,6 +13,8 @@ import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.LearnInfo;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
@@ -52,17 +54,20 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
         .set(mapSheetLearnEntity.applyStatus, status.getId())
         .set(mapSheetLearnEntity.applyStatusDttm, ZonedDateTime.now())
         .set(mapSheetLearnEntity.chnDtctMstId, resultBody.getChnDtctMstId())
+        .set(mapSheetLearnEntity.applyYn, true)
+        .set(mapSheetLearnEntity.applyDttm, ZonedDateTime.now())
         .where(mapSheetLearnEntity.uid.eq(resultBody.getChnDtctId()))
         .execute();
   }
 
   @Override
-  public void updateGukYuinMastRegRemove(Basic resultBody) {
+  public void updateGukYuinMastRegRemove(String chnDtctId) {
     queryFactory
         .update(mapSheetLearnEntity)
         .set(mapSheetLearnEntity.applyStatus, GukYuinStatus.CANCELED.getId())
         .set(mapSheetLearnEntity.applyStatusDttm, ZonedDateTime.now())
-        .where(mapSheetLearnEntity.uid.eq(resultBody.getChnDtctId()))
+        .set(mapSheetLearnEntity.applyYn, false)
+        .where(mapSheetLearnEntity.uid.eq(chnDtctId))
         .execute();
   }
 
@@ -85,13 +90,25 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
   }
 
   @Override
-  public void insertGeoUidPnuData(Long geoUid, String[] pnuList) {
+  public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
     for (String pnu : pnuList) {
-      queryFactory
+      PnuEntity entity =
-          .insert(pnuEntity)
+          queryFactory
-          .columns(pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm)
+              .selectFrom(pnuEntity)
-          .values(geoUid, pnu, ZonedDateTime.now())
+              .where(
-          .execute();
+                  pnuEntity.geo.geoUid.eq(geoUid),
+                  pnuEntity.pnu.eq(pnu),
+                  pnuEntity.chnDtctObjtId.eq(chnDtctObjtId))
+              .fetchOne();
+
+      if (entity == null) {
+        queryFactory
+            .insert(pnuEntity)
+            .columns(
+                pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm, pnuEntity.chnDtctObjtId)
+            .values(geoUid, pnu, ZonedDateTime.now(), chnDtctObjtId)
+            .execute();
+      }
     }
   }
 
@@ -152,7 +169,8 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
                 mapSheetLearnEntity.targetYyyy,
                 mapSheetLearnEntity.stage,
                 mapSheetLearnEntity.uid,
-                mapSheetLearnEntity.applyStatus))
+                mapSheetLearnEntity.applyStatus,
+                mapSheetLearnEntity.applyYn))
         .from(mapSheetLearnEntity)
         .where(mapSheetLearnEntity.uuid.eq(uuid))
         .fetchOne();
@@ -164,7 +182,7 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
         Expressions.numberTemplate(Integer.class, "coalesce({0}, 0)", mapSheetLearnEntity.stage);
 
     return queryFactory
-        .select(stageExpr.max())
+        .select(stageExpr.max().coalesce(0))
         .from(mapSheetLearnEntity)
         .where(
             mapSheetLearnEntity.compareYyyy.eq(compareYyyy),
@@ -187,6 +205,7 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
         .update(mapSheetAnalInferenceEntity)
         .set(mapSheetAnalInferenceEntity.gukyuinUsed, "Y")
         .set(mapSheetAnalInferenceEntity.gukyuinApplyDttm, ZonedDateTime.now())
+        .set(mapSheetAnalInferenceEntity.stage, Integer.parseInt(registRes.getChnDtctSno()))
         .where(mapSheetAnalInferenceEntity.learnId.eq(learnId))
         .execute();
   }
@@ -266,6 +285,39 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
         .fetch();
   }
 
+  @Override
+  public Long findMapSheetLearnInfoByYyyy(
+      Integer compareYyyy, Integer targetYyyy, Integer maxStage) {
+    return queryFactory
+        .select(mapSheetLearnEntity.id)
+        .from(mapSheetLearnEntity)
+        .where(
+            mapSheetLearnEntity.compareYyyy.eq(compareYyyy),
+            mapSheetLearnEntity.targetYyyy.eq(targetYyyy),
+            mapSheetLearnEntity.stage.eq(maxStage))
+        .fetchOne();
+  }
+
+  @Override
+  public void updateMapSheetLearnGukyuinEndStatus(Long learnId) {
+    queryFactory
+        .update(mapSheetLearnEntity)
+        .set(mapSheetLearnEntity.applyStatus, GukYuinStatus.END.getId())
+        .set(mapSheetLearnEntity.applyStatusDttm, ZonedDateTime.now())
+        .where(mapSheetLearnEntity.id.eq(learnId))
+        .execute();
+  }
+
+  @Override
+  public void updateMapSheetInferenceLabelEndStatus(Long learnId) {
+    queryFactory
+        .update(mapSheetAnalInferenceEntity)
+        .set(mapSheetAnalInferenceEntity.analState, LabelMngState.FINISH.getId())
+        .set(mapSheetAnalInferenceEntity.updatedDttm, ZonedDateTime.now())
+        .where(mapSheetAnalInferenceEntity.learnId.eq(learnId))
+        .execute();
+  }
+
   @Override
   @Transactional
   public void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status) {

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

@@ -0,0 +1,7 @@
+package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
+
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface GukYuinStbltJobRepository
+    extends JpaRepository<PnuEntity, Long>, GukYuinStbltJobRepositoryCustom {}

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

@@ -0,0 +1,18 @@
+package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
+
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.StbltResult;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctMastDto;
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
+import java.util.List;
+
+public interface GukYuinStbltJobRepositoryCustom {
+
+  List<LearnKeyDto> findGukYuinEligibleForSurveyList(String status);
+
+  void updateGukYuinEligibleForSurvey(String resultUid, RlbDtctMastDto stbltDto);
+
+  PnuEntity findPnuEntityByResultUid(String resultUid, String pnu);
+
+  void updateGukYuinObjectStbltYn(String resultUid, StbltResult stbResult);
+}

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

@@ -0,0 +1,109 @@
+package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
+
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity.mapSheetAnalDataInferenceEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity;
+
+import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.StbltResult;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctMastDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceGeomEntity;
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
+import com.querydsl.core.types.Projections;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import java.time.ZonedDateTime;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class GukYuinStbltJobRepositoryImpl implements GukYuinStbltJobRepositoryCustom {
+
+  private final JPAQueryFactory queryFactory;
+  @PersistenceContext private EntityManager em;
+
+  @Override
+  public List<LearnKeyDto> findGukYuinEligibleForSurveyList(String status) {
+    return queryFactory
+        .select(
+            Projections.constructor(
+                LearnKeyDto.class,
+                mapSheetLearnEntity.id,
+                mapSheetLearnEntity.uid,
+                mapSheetLearnEntity.chnDtctMstId))
+        .from(mapSheetLearnEntity)
+        .innerJoin(mapSheetAnalInferenceEntity)
+        .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId))
+        .innerJoin(mapSheetAnalDataInferenceEntity)
+        .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
+        .innerJoin(mapSheetAnalDataInferenceGeomEntity)
+        .on(mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid))
+        .where(
+            mapSheetLearnEntity.applyStatus.eq(GukYuinStatus.PNU_COMPLETED.getId()),
+            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            mapSheetAnalDataInferenceGeomEntity.fitState.isNull())
+        .groupBy(mapSheetLearnEntity.id, mapSheetLearnEntity.uid, mapSheetLearnEntity.chnDtctMstId)
+        .having(mapSheetAnalDataInferenceGeomEntity.geoUid.count().gt(1L))
+        .fetch();
+  }
+
+  @Override
+  public void updateGukYuinEligibleForSurvey(String resultUid, RlbDtctMastDto stbltDto) {
+
+    MapSheetAnalDataInferenceGeomEntity geomEntity =
+        queryFactory
+            .selectFrom(mapSheetAnalDataInferenceGeomEntity)
+            .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(resultUid))
+            .fetchOne();
+
+    if (geomEntity != null) {
+      PnuEntity pnuEt =
+          queryFactory
+              .selectFrom(pnuEntity)
+              .where(pnuEntity.chnDtctObjtId.eq(resultUid))
+              .fetchFirst();
+
+      queryFactory
+          .update(mapSheetAnalDataInferenceGeomEntity)
+          .set(
+              mapSheetAnalDataInferenceGeomEntity.fitState,
+              pnuEt.getStbltYn().equals("Y")
+                  ? ImageryFitStatus.UNFIT.getId()
+                  : ImageryFitStatus.FIT.getId()) // 적합여부가 Y 이면 부적합인 것, N 이면 적합한 것이라고 함
+          .set(mapSheetAnalDataInferenceGeomEntity.fitStateDttm, ZonedDateTime.now())
+          .set(mapSheetAnalDataInferenceGeomEntity.lockYn, stbltDto.getLockYn())
+          .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(resultUid))
+          .execute();
+    }
+  }
+
+  @Override
+  public PnuEntity findPnuEntityByResultUid(String resultUid, String pnu) {
+    return queryFactory
+        .selectFrom(pnuEntity)
+        .where(pnuEntity.pnu.eq(pnu), pnuEntity.chnDtctObjtId.eq(resultUid))
+        .fetchOne();
+  }
+
+  @Override
+  public void updateGukYuinObjectStbltYn(String resultUid, StbltResult stbResult) {
+    queryFactory
+        .update(mapSheetAnalDataInferenceGeomEntity)
+        .set(
+            mapSheetAnalDataInferenceGeomEntity.fitState,
+            stbResult.getStbltYn().equals("Y")
+                ? ImageryFitStatus.UNFIT.getId()
+                : ImageryFitStatus.FIT.getId()) // 적합여부가 Y 이면 부적합인 것, N 이면 적합한 것이라고 함
+        .set(mapSheetAnalDataInferenceGeomEntity.fitStateDttm, ZonedDateTime.now())
+        .set(mapSheetAnalDataInferenceGeomEntity.fitStateCmmnt, stbResult.getIncyCmnt())
+        .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(resultUid))
+        .execute();
+  }
+}

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

@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.postgres.repository.label;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceLearnDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.MoveInfo;
@@ -15,6 +16,7 @@ import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import org.springframework.data.domain.Page;
 
@@ -104,4 +106,8 @@ public interface LabelAllocateRepositoryCustom {
   void updateAnalInferenceMngState(UUID uuid, String status);
 
   Long findLabelingIngProcessCnt();
+
+  InferenceLearnDto findLabelingIngProcessId(UUID uuid);
+
+  Optional<String> findLearnUid(UUID uuid);
 }

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

@@ -6,12 +6,15 @@ import static com.kamco.cd.kamcoback.postgres.entity.QLabelingLabelerEntity.labe
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity.mapSheetAnalDataInferenceEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity;
 
+import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
 import com.kamco.cd.kamcoback.common.enums.StatusType;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceLearnDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
@@ -48,6 +51,7 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -82,7 +86,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .innerJoin(mapSheetAnalDataInferenceGeomEntity)
         .on(
             mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
-            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
+            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
+            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()),
             mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
         .where(
             mapSheetAnalInferenceEntity.uuid.eq(uuid),
@@ -126,8 +132,8 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
               """
             insert into tb_labeling_assignment
             (assignment_uid, inference_geom_uid, worker_uid,
-             work_state, assign_group_id, anal_uid, pnu)
+             work_state, assign_group_id, anal_uid)
-            values (?, ?, ?, ?, ?, ?, ?)
+            values (?, ?, ?, ?, ?, ?)
             """;
 
           try (PreparedStatement ps = connection.prepareStatement(sql)) {
@@ -140,7 +146,6 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
               ps.setString(4, LabelState.ASSIGNED.getId());
               ps.setString(5, String.valueOf(info.getMapSheetNum()));
               ps.setLong(6, analEntity.getId());
-              ps.setLong(7, info.getPnu());
 
               ps.addBatch();
               batchSize++;
@@ -190,7 +195,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .innerJoin(mapSheetAnalDataInferenceGeomEntity)
         .on(
             mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
-            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
+            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
+            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()),
             mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
         .where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
         .fetchOne();
@@ -381,9 +388,10 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
                   mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(analEntity.getCompareYyyy()),
                   mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(analEntity.getTargetYyyy()),
                   mapSheetAnalDataInferenceGeomEntity.stage.eq(analEntity.getStage()),
-                  mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+                  //                  mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
-                  //                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L)
+                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
-                  //                  mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()  //TODO:
+                  mapSheetAnalDataInferenceGeomEntity.fitState.eq(
+                      ImageryFitStatus.UNFIT.getId()) // TODO:
                   // 추후 라벨링 대상 조건 수정하기
                   )
               .fetchOne();
@@ -555,11 +563,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
                       mapSheetAnalDataInferenceGeomEntity.dataUid))
               .where(
                   mapSheetAnalInferenceEntity.uuid.eq(targetUuid),
-                  mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+                  //            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
-                  //            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
+                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
-                  //            mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()  //TODO: 추후 라벨링
+                  mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()))
-                  // 대상 조건 수정하기
-                  )
               .fetchOne();
     }
 
@@ -576,8 +582,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         queryFactory
             .select(labelingAssignmentEntity.count())
             .from(labelingAssignmentEntity)
-            .where(
+            .where(analUidCondition, labelingAssignmentEntity.workState.in("SKIP", "DONE"))
-                analUidCondition, labelingAssignmentEntity.workState.in("ASSIGNED", "SKIP", "DONE"))
             .fetchOne();
 
     Long skipCount =
@@ -602,6 +607,13 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
             .where(analUidCondition, labelingAssignmentEntity.inspectState.eq("COMPLETE"))
             .fetchOne();
 
+    Long inspectionExcept =
+        queryFactory
+            .select(labelingAssignmentEntity.count())
+            .from(labelingAssignmentEntity)
+            .where(analUidCondition, labelingAssignmentEntity.inspectState.eq("EXCEPT"))
+            .fetchOne();
+
     Long inspectorCount =
         queryFactory
             .select(labelingAssignmentEntity.inspectorUid.countDistinct())
@@ -614,6 +626,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
     long labelCompleted = labelingCompleted != null ? labelingCompleted : 0L;
     long inspectCompleted = inspectionCompleted != null ? inspectionCompleted : 0L;
     long skipped = skipCount != null ? skipCount : 0L;
+    long inspectExcepted = inspectionExcept != null ? inspectionExcept : 0L;
 
     long labelingRemaining = labelingTotal - labelCompleted - skipped;
     if (labelingRemaining < 0) {
@@ -621,7 +634,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
     }
 
     long inspectionTotal = labelingTotal;
-    long inspectionRemaining = inspectionTotal - inspectCompleted - skipped;
+    long inspectionRemaining = inspectionTotal - inspectCompleted - inspectExcepted;
     if (inspectionRemaining < 0) {
       inspectionRemaining = 0;
     }
@@ -658,7 +671,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .inspectionStatus(inspectionStatus)
         .inspectionTotalCount(inspectionTotal)
         .inspectionCompletedCount(inspectCompleted)
-        .inspectionSkipCount(skipped) // TODO
+        .inspectionSkipCount(inspectExcepted)
         .inspectionRemainingCount(inspectionRemaining)
         .inspectorCount(inspectorCount != null ? inspectorCount : 0L)
         .progressRate(labelingRate)
@@ -740,11 +753,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
             mapSheetAnalInferenceEntity.targetYyyy.eq(
                 mapSheetAnalDataInferenceGeomEntity.targetYyyy),
             mapSheetAnalInferenceEntity.stage.eq(mapSheetAnalDataInferenceGeomEntity.stage),
-            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
-            //        mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
-            //        mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()    //TODO: 추후 라벨링 대상 조건
+            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()))
-            // 수정하기
-            )
         .where(mapSheetAnalInferenceEntity.id.eq(analEntity.getId()))
         .groupBy(
             mapSheetAnalInferenceEntity.analTitle,
@@ -1816,4 +1827,33 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
                 LabelMngState.ASSIGNED.getId(), LabelMngState.ING.getId()))
         .fetchOne();
   }
+
+  @Override
+  public InferenceLearnDto findLabelingIngProcessId(UUID uuid) {
+    return queryFactory
+        .select(
+            Projections.constructor(
+                InferenceLearnDto.class,
+                mapSheetAnalInferenceEntity.uuid,
+                mapSheetLearnEntity.uid,
+                mapSheetAnalInferenceEntity.analState,
+                mapSheetAnalInferenceEntity.id))
+        .from(mapSheetLearnEntity)
+        .join(mapSheetAnalInferenceEntity)
+        .on(mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id))
+        .where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
+        .fetchOne();
+  }
+
+  @Override
+  public Optional<String> findLearnUid(UUID uuid) {
+    return Optional.ofNullable(
+        queryFactory
+            .select(mapSheetLearnEntity.uid)
+            .from(mapSheetLearnEntity)
+            .innerJoin(mapSheetAnalInferenceEntity)
+            .on(mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id))
+            .where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
+            .fetchOne());
+  }
 }

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

@@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.postgres.repository.label;
 
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
 
+import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
@@ -133,20 +134,16 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
               .and(mapSheetAnalDataInferenceGeomEntity.labelStateDttm.lt(end)));
     }
 
-    // labelTotCnt: pnu가 있고 pass_yn = false (부적합)인 건수만 라벨링 대상
+    // labelTotCnt: pnu가 있고 fitState = UNFIT 인 건수만 라벨링 대상
     NumberExpression<Long> labelTotCntExpr =
         new CaseBuilder()
             .when(
                 mapSheetAnalDataInferenceGeomEntity
                     .pnu
-                    .isNotNull()
+                    .gt(0)
                     .and(
-                        mapSheetAnalDataInferenceGeomEntity.pnu
+                        mapSheetAnalDataInferenceGeomEntity.fitState.eq(
-                            .isNotNull()) // TODO: 이노팸 연동 후 0 이상이라고 해야할 듯
+                            ImageryFitStatus.UNFIT.getId())))
-                //
-                // .and(mapSheetAnalDataInferenceGeomEntity.passYn.eq(Boolean.FALSE))  //TODO: 추후
-                // 라벨링 대상 조건 수정하기
-                )
             .then(1L)
             .otherwise(0L)
             .sum();
@@ -200,7 +197,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     new CaseBuilder()
                         .when(
                             mapSheetAnalDataInferenceGeomEntity.labelState.eq(
-                                LabelState.DONE.getId())) // "LABEL_COMPLETE"?
+                                LabelState.DONE.getId()))
                         .then(1L)
                         .otherwise(0L)
                         .sum(),
@@ -294,14 +291,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
 
     if (searchReq.getSearchVal() != null && !searchReq.getSearchVal().isEmpty()) {
       whereSubBuilder.and(
-          Expressions.stringTemplate("{0}", memberEntity.userId)
+          Expressions.stringTemplate("{0}", memberEntity.employeeNo)
               .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
               .or(
                   Expressions.stringTemplate("{0}", memberEntity.name)
                       .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")));
     }
 
-    whereSubBuilder.and(labelingAssignmentEntity.workerUid.eq(memberEntity.userId));
+    whereSubBuilder.and(labelingAssignmentEntity.workerUid.eq(memberEntity.employeeNo));
 
     // 공통 조건 추출
     BooleanExpression doneStateCondition =
@@ -344,7 +341,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     WorkerState.class,
                     memberEntity.userRole,
                     memberEntity.name,
-                    memberEntity.userId,
+                    memberEntity.employeeNo,
                     assignedCnt.as("assignedCnt"),
                     doneCnt.as("doneCnt"),
                     skipCnt.as("skipCnt"),
@@ -363,7 +360,10 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .on(whereSubBuilder)
             .where(whereBuilder)
             .groupBy(
-                memberEntity.userRole, memberEntity.name, memberEntity.userId, memberEntity.status)
+                memberEntity.userRole,
+                memberEntity.name,
+                memberEntity.employeeNo,
+                memberEntity.status)
             .orderBy(orderSpecifiers.toArray(new OrderSpecifier[0]))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
@@ -441,14 +441,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
 
     if (searchReq.getSearchVal() != null && !searchReq.getSearchVal().isEmpty()) {
       whereSubBuilder.and(
-          Expressions.stringTemplate("{0}", memberEntity.userId)
+          Expressions.stringTemplate("{0}", memberEntity.employeeNo)
               .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
               .or(
                   Expressions.stringTemplate("{0}", memberEntity.name)
                       .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")));
     }
 
-    whereSubBuilder.and(labelingAssignmentEntity.inspectorUid.eq(memberEntity.userId));
+    whereSubBuilder.and(labelingAssignmentEntity.inspectorUid.eq(memberEntity.employeeNo));
 
     // 공통 조건 추출
     BooleanExpression doneStateCondition =
@@ -492,7 +492,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     WorkerState.class,
                     memberEntity.userRole,
                     memberEntity.name,
-                    memberEntity.userId,
+                    memberEntity.employeeNo,
                     assignedCnt.as("assignedCnt"),
                     doneCnt.as("doneCnt"),
                     skipCnt.as("skipCnt"),
@@ -511,7 +511,10 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .on(whereSubBuilder)
             .where(whereBuilder)
             .groupBy(
-                memberEntity.userRole, memberEntity.name, memberEntity.userId, memberEntity.status)
+                memberEntity.userRole,
+                memberEntity.name,
+                memberEntity.employeeNo,
+                memberEntity.status)
             .orderBy(orderSpecifiers.toArray(new OrderSpecifier[0]))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
@@ -549,7 +552,19 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
   @Override
   public LabelWorkMngDetail findLabelWorkMngDetail(UUID uuid) {
 
-    NumberExpression<Long> labelTotCnt = mapSheetAnalDataInferenceGeomEntity.geoUid.count();
+    NumberExpression<Long> labelTotCnt =
+        new CaseBuilder()
+            //            .when(mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull())
+            .when(
+                mapSheetAnalDataInferenceGeomEntity
+                    .pnu
+                    .gt(0)
+                    .and(
+                        mapSheetAnalDataInferenceGeomEntity.fitState.eq(
+                            ImageryFitStatus.UNFIT.getId())))
+            .then(1L)
+            .otherwise(0L)
+            .sum();
     NumberExpression<Long> labelerCnt = labelingAssignmentEntity.workerUid.count();
     NumberExpression<Long> reviewerCnt = labelingAssignmentEntity.inspectorUid.count();
 

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

@@ -11,6 +11,7 @@ import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.Collection;
 import java.util.List;
@@ -45,6 +46,7 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
       if (searchReq.getTag() != null) {
         whereBuilder.and(mapLayerEntity.tag.toLowerCase().eq(searchReq.getTag().toLowerCase()));
       }
+
       if (searchReq.getLayerType() != null) {
         whereBuilder.and(
             mapLayerEntity.layerType.toLowerCase().eq(searchReq.getLayerType().toLowerCase()));
@@ -56,6 +58,7 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
             Projections.constructor(
                 LayerDto.Basic.class,
                 mapLayerEntity.uuid,
+                mapLayerEntity.layerName,
                 mapLayerEntity.layerType,
                 mapLayerEntity.description,
                 mapLayerEntity.tag,
@@ -92,10 +95,15 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
 
   @Override
   public List<LayerMapDto> findLayerMapList(String type) {
+    NumberExpression<Integer> crsInt =
+        Expressions.numberTemplate(
+            Integer.class, "cast(replace({0}, 'EPSG_', '') as integer)", mapLayerEntity.crs);
+
     return queryFactory
         .select(
             Projections.constructor(
                 LayerMapDto.class,
+                mapLayerEntity.layerName,
                 mapLayerEntity.layerType,
                 mapLayerEntity.tag,
                 mapLayerEntity.order,
@@ -107,13 +115,15 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                 mapLayerEntity.minZoom,
                 mapLayerEntity.maxZoom,
                 Expressions.stringTemplate(
-                    "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), 5186))",
+                    "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), {4}))",
                     mapLayerEntity.minLon,
                     mapLayerEntity.minLat,
                     mapLayerEntity.maxLon,
-                    mapLayerEntity.maxLat),
+                    mapLayerEntity.maxLat,
+                    crsInt),
                 mapLayerEntity.uuid,
-                Expressions.stringTemplate("cast({0} as text)", mapLayerEntity.rawJson)))
+                Expressions.stringTemplate("cast({0} as text)", mapLayerEntity.rawJson),
+                mapLayerEntity.crs))
         .from(mapLayerEntity)
         .where(layerTypeCondition(type), mapLayerEntity.isDeleted.isFalse())
         .orderBy(mapLayerEntity.order.asc())
@@ -122,6 +132,10 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
 
   @Override
   public LayerDto.YearTileDto getChangeDetectionTileUrl(Integer beforeYear, Integer afterYear) {
+    NumberExpression<Integer> crsInt =
+        Expressions.numberTemplate(
+            Integer.class, "cast(replace({0}, 'EPSG_', '') as integer)", mapSheetMngTileEntity.crs);
+
     LayerDto.TileUrlDto before =
         queryFactory
             .select(
@@ -137,11 +151,13 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                     mapSheetMngTileEntity.minZoom,
                     mapSheetMngTileEntity.maxZoom,
                     Expressions.stringTemplate(
-                        "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), 5186))",
+                        "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), {4}))",
                         mapSheetMngTileEntity.minLon,
                         mapSheetMngTileEntity.minLat,
                         mapSheetMngTileEntity.maxLon,
-                        mapSheetMngTileEntity.maxLat)))
+                        mapSheetMngTileEntity.maxLat,
+                        crsInt),
+                    mapSheetMngTileEntity.crs))
             .from(mapSheetMngTileEntity)
             .where(mapSheetMngTileEntity.mngYyyy.eq(beforeYear))
             .fetchOne();
@@ -161,11 +177,13 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                     mapSheetMngTileEntity.minZoom,
                     mapSheetMngTileEntity.maxZoom,
                     Expressions.stringTemplate(
-                        "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), 5186))",
+                        "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), {4}))",
                         mapSheetMngTileEntity.minLon,
                         mapSheetMngTileEntity.minLat,
                         mapSheetMngTileEntity.maxLon,
-                        mapSheetMngTileEntity.maxLat)))
+                        mapSheetMngTileEntity.maxLat,
+                        crsInt),
+                    mapSheetMngTileEntity.crs))
             .from(mapSheetMngTileEntity)
             .where(mapSheetMngTileEntity.mngYyyy.eq(afterYear))
             .fetchOne();
@@ -175,6 +193,10 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
 
   @Override
   public TileUrlDto getChangeDetectionTileOneYearUrl(Integer year) {
+    NumberExpression<Integer> crsInt =
+        Expressions.numberTemplate(
+            Integer.class, "cast(replace({0}, 'EPSG_', '') as integer)", mapSheetMngTileEntity.crs);
+
     return queryFactory
         .select(
             Projections.constructor(
@@ -189,11 +211,13 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                 mapSheetMngTileEntity.minZoom,
                 mapSheetMngTileEntity.maxZoom,
                 Expressions.stringTemplate(
-                    "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), 5186))",
+                    "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), {4}))",
                     mapSheetMngTileEntity.minLon,
                     mapSheetMngTileEntity.minLat,
                     mapSheetMngTileEntity.maxLon,
-                    mapSheetMngTileEntity.maxLat)))
+                    mapSheetMngTileEntity.maxLat,
+                    crsInt),
+                mapSheetMngTileEntity.crs))
         .from(mapSheetMngTileEntity)
         .where(mapSheetMngTileEntity.mngYyyy.eq(year))
         .fetchOne();

src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/AuditLogRepositoryImpl.java

@@ -168,13 +168,13 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
     whereBuilder.and(auditLogEntity.eventStatus.ne(EventStatus.valueOf("FAILED")));
     whereBuilder.and(auditLogEntity.eventType.eq(EventType.valueOf("DOWNLOAD")));
 
-    if (req.getMenuId() != null && !req.getMenuId().isEmpty()) {
+    //    if (req.getMenuId() != null && !req.getMenuId().isEmpty()) {
-      whereBuilder.and(auditLogEntity.menuUid.eq(req.getMenuId()));
+    //      whereBuilder.and(auditLogEntity.menuUid.eq(req.getMenuId()));
-    }
+    //    }
 
     if (req.getUuid() != null) {
-      whereBuilder.and(auditLogEntity.requestUri.contains("/api/inference/download/"));
+      whereBuilder.and(auditLogEntity.requestUri.contains(req.getRequestUri()));
-      whereBuilder.and(auditLogEntity.requestUri.endsWith(String.valueOf(req.getUuid())));
+      whereBuilder.and(auditLogEntity.downloadUuid.eq(req.getUuid()));
     }
 
     if (req.getSearchValue() != null && !req.getSearchValue().isEmpty()) {

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

@@ -207,7 +207,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
             .on(mapSheetMngEntity.mngYyyy.eq(mapSheetMngHstEntity.mngYyyy))
             .leftJoin(mapInkx5kEntity)
             .on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo))
-            .where(whereBuilder)
+            .where(mapInkx5kEntity.useInference.eq(CommonUseStatus.USE))
             // .offset(pageable.getOffset())
             // .limit(pageable.getPageSize())
             .orderBy(mapSheetMngEntity.mngYyyy.desc())
@@ -254,7 +254,9 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
   public MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy) {
 
     BooleanBuilder whereBuilder = new BooleanBuilder();
-    whereBuilder.and(mapSheetMngEntity.mngYyyy.eq(mngYyyy));
+    whereBuilder
+        .and(mapSheetMngEntity.mngYyyy.eq(mngYyyy))
+        .and(mapInkx5kEntity.useInference.eq(CommonUseStatus.USE));
 
     MapSheetMngDto.MngDto foundContent =
         queryFactory

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

@@ -0,0 +1,23 @@
+package com.kamco.cd.kamcoback.postgres.repository.scheduler;
+
+import com.kamco.cd.kamcoback.postgres.entity.LabelingInspectorEntity;
+import jakarta.persistence.LockModeType;
+import java.util.List;
+import java.util.UUID;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Query;
+
+public interface TrainingDataLabelJobRepository
+    extends JpaRepository<LabelingInspectorEntity, UUID>, TrainingDataLabelJobRepositoryCustom {
+
+  @Lock(LockModeType.PESSIMISTIC_WRITE)
+  @Query(
+      """
+        select r
+        from LabelingInspectorEntity r
+        where r.analUid = :analUid
+            and r.inspectorUid in :inspectorUids
+      """)
+  List<LabelingInspectorEntity> lockInspectors(Long analUid, List<String> inspectorUids);
+}

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

@@ -0,0 +1,17 @@
+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.util.List;
+import java.util.UUID;
+
+public interface TrainingDataLabelJobRepositoryCustom {
+
+  List<Tasks> findCompletedYesterdayUnassigned();
+
+  List<InspectorPendingDto> findInspectorPendingByRound(Long analUid);
+
+  void assignReviewerBatch(List<UUID> assignmentUids, String reviewerId);
+
+  void updateGeomUidTestState(List<Long> geomUids);
+}

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

@@ -0,0 +1,119 @@
+package com.kamco.cd.kamcoback.postgres.repository.scheduler;
+
+import static com.kamco.cd.kamcoback.postgres.entity.QLabelingAssignmentEntity.labelingAssignmentEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QLabelingInspectorEntity.labelingInspectorEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
+
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
+import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
+import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.InspectorPendingDto;
+import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.Tasks;
+import com.querydsl.core.types.Projections;
+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.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.UUID;
+import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class TrainingDataLabelJobRepositoryImpl extends QuerydslRepositorySupport
+    implements TrainingDataLabelJobRepositoryCustom {
+
+  private final JPAQueryFactory queryFactory;
+  private final StringExpression NULL_STRING = Expressions.stringTemplate("cast(null as text)");
+
+  public TrainingDataLabelJobRepositoryImpl(JPAQueryFactory queryFactory) {
+    super(LabelingAssignmentEntity.class);
+    this.queryFactory = queryFactory;
+  }
+
+  @Override
+  public List<Tasks> findCompletedYesterdayUnassigned() {
+    ZoneId zone = ZoneId.of("Asia/Seoul");
+    ZonedDateTime todayStart = ZonedDateTime.now(zone).toLocalDate().atStartOfDay(zone);
+    ZonedDateTime yesterdayStart = todayStart.minusDays(1);
+
+    BooleanExpression isYesterday =
+        labelingAssignmentEntity
+            .workStatDttm
+            .goe(yesterdayStart)
+            .and(labelingAssignmentEntity.workStatDttm.lt(todayStart));
+
+    return queryFactory
+        .select(
+            Projections.constructor(
+                Tasks.class,
+                labelingAssignmentEntity.assignmentUid,
+                labelingAssignmentEntity.inferenceGeomUid,
+                labelingAssignmentEntity.analUid))
+        .from(labelingAssignmentEntity)
+        .where(
+            labelingAssignmentEntity.workState.in(LabelState.SKIP.getId(), LabelState.DONE.getId()),
+            labelingAssignmentEntity.inspectorUid.isNull(),
+            isYesterday)
+        .orderBy(
+            labelingAssignmentEntity.analUid.asc(),
+            labelingAssignmentEntity.assignGroupId.asc(),
+            labelingAssignmentEntity.inferenceGeomUid.asc())
+        .fetch();
+  }
+
+  /**
+   * 해당 회차에 라벨링 할당받은 검수자별 완료 건수 count(), 완료한 게 적은 순으로 해야 일이 한 사람에게 몰리지 않음
+   *
+   * @param analUid
+   * @return
+   */
+  @Override
+  public List<InspectorPendingDto> findInspectorPendingByRound(Long analUid) {
+    return queryFactory
+        .select(
+            Projections.constructor(
+                InspectorPendingDto.class,
+                labelingInspectorEntity.inspectorUid,
+                labelingAssignmentEntity.assignmentUid.count()))
+        .from(labelingInspectorEntity)
+        .leftJoin(labelingAssignmentEntity)
+        .on(
+            labelingInspectorEntity.inspectorUid.eq(labelingAssignmentEntity.inspectorUid),
+            labelingAssignmentEntity.inspectState.in(
+                InspectState.EXCEPT.getId(), InspectState.COMPLETE.getId()))
+        .where(labelingInspectorEntity.analUid.eq(analUid))
+        .groupBy(labelingInspectorEntity.inspectorUid)
+        .orderBy(labelingAssignmentEntity.assignmentUid.count().asc())
+        .fetch();
+  }
+
+  /**
+   * 배치용 여러 건 update
+   *
+   * @param assignmentUids
+   * @param reviewerId
+   */
+  @Override
+  public void assignReviewerBatch(List<UUID> assignmentUids, String reviewerId) {
+    queryFactory
+        .update(labelingAssignmentEntity)
+        .set(labelingAssignmentEntity.inspectorUid, reviewerId)
+        .set(labelingAssignmentEntity.inspectState, InspectState.UNCONFIRM.getId())
+        .set(labelingAssignmentEntity.modifiedDate, ZonedDateTime.now())
+        .where(labelingAssignmentEntity.assignmentUid.in(assignmentUids))
+        .execute();
+  }
+
+  @Override
+  public void updateGeomUidTestState(List<Long> geomUids) {
+    queryFactory
+        .update(mapSheetAnalDataInferenceGeomEntity)
+        .set(mapSheetAnalDataInferenceGeomEntity.testState, InspectState.UNCONFIRM.getId())
+        .set(mapSheetAnalDataInferenceGeomEntity.updatedDttm, ZonedDateTime.now())
+        .where(mapSheetAnalDataInferenceGeomEntity.geoUid.in(geomUids))
+        .execute();
+  }
+}

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

@@ -3,25 +3,10 @@ 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 com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.InspectorPendingDto;
-import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.Tasks;
 import java.util.List;
-import java.util.UUID;
 
 public interface TrainingDataReviewJobRepositoryCustom {
 
-  List<Tasks> findCompletedYesterdayUnassigned();
-
-  List<InspectorPendingDto> findInspectorPendingByRound(Long analUid);
-
-  void assignReviewer(UUID assignmentUid, String reviewerId);
-
-  void assignReviewerBatch(List<UUID> assignmentUids, String reviewerId);
-
-  Tasks findAssignmentTask(String assignmentUid);
-
-  void updateGeomUidTestState(List<Long> geomUids);
-
   List<CompleteLabelData> findCompletedYesterdayLabelingList(Long analUid, String mapSheetNum);
 
   List<AnalMapSheetList> findCompletedAnalMapSheetList(Long analUid);

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

@@ -1,24 +1,18 @@
 package com.kamco.cd.kamcoback.postgres.repository.scheduler;
 
 import static com.kamco.cd.kamcoback.postgres.entity.QLabelingAssignmentEntity.labelingAssignmentEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QLabelingInspectorEntity.labelingInspectorEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnDataGeomEntity.mapSheetLearnDataGeomEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
 
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
-import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalCntInfo;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalMapSheetList;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.CompleteLabelData;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.CompleteLabelData.Properties;
-import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.InspectorPendingDto;
-import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.Tasks;
 import com.querydsl.core.types.Projections;
-import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.CaseBuilder;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.NumberExpression;
@@ -29,9 +23,10 @@ import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
-import java.util.UUID;
 import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public class TrainingDataReviewJobRepositoryImpl extends QuerydslRepositorySupport
     implements TrainingDataReviewJobRepositoryCustom {
 
@@ -43,121 +38,6 @@ public class TrainingDataReviewJobRepositoryImpl extends QuerydslRepositorySuppo
     this.queryFactory = queryFactory;
   }
 
-  @Override
-  public List<Tasks> findCompletedYesterdayUnassigned() {
-    ZoneId zone = ZoneId.of("Asia/Seoul");
-    ZonedDateTime todayStart = ZonedDateTime.now(zone).toLocalDate().atStartOfDay(zone);
-    ZonedDateTime yesterdayStart = todayStart.minusDays(1);
-
-    BooleanExpression isYesterday =
-        labelingAssignmentEntity
-            .workStatDttm
-            .goe(yesterdayStart)
-            .and(labelingAssignmentEntity.workStatDttm.lt(todayStart));
-
-    return queryFactory
-        .select(
-            Projections.constructor(
-                Tasks.class,
-                labelingAssignmentEntity.assignmentUid,
-                labelingAssignmentEntity.inferenceGeomUid,
-                labelingAssignmentEntity.analUid))
-        .from(labelingAssignmentEntity)
-        .where(
-            labelingAssignmentEntity.workState.in(LabelState.SKIP.getId(), LabelState.DONE.getId()),
-            labelingAssignmentEntity.inspectorUid.isNull(),
-            isYesterday)
-        .orderBy(
-            labelingAssignmentEntity.analUid.asc(),
-            labelingAssignmentEntity.assignGroupId.asc(),
-            labelingAssignmentEntity.inferenceGeomUid.asc())
-        .fetch();
-  }
-
-  /**
-   * 해당 회차에 라벨링 할당받은 검수자별 완료 건수 count(), 완료한 게 적은 순으로 해야 일이 한 사람에게 몰리지 않음
-   *
-   * @param analUid
-   * @return
-   */
-  @Override
-  public List<InspectorPendingDto> findInspectorPendingByRound(Long analUid) {
-    return queryFactory
-        .select(
-            Projections.constructor(
-                InspectorPendingDto.class,
-                labelingInspectorEntity.inspectorUid,
-                labelingAssignmentEntity.assignmentUid.count()))
-        .from(labelingInspectorEntity)
-        .leftJoin(labelingAssignmentEntity)
-        .on(
-            labelingInspectorEntity.inspectorUid.eq(labelingAssignmentEntity.inspectorUid),
-            labelingAssignmentEntity.inspectState.in(
-                InspectState.EXCEPT.getId(), InspectState.COMPLETE.getId()))
-        .where(labelingInspectorEntity.analUid.eq(analUid))
-        .groupBy(labelingInspectorEntity.inspectorUid)
-        .orderBy(labelingAssignmentEntity.assignmentUid.count().asc())
-        .fetch();
-  }
-
-  /**
-   * 실시간 분배용 1건 update
-   *
-   * @param assignmentUid
-   * @param reviewerId
-   */
-  @Override
-  public void assignReviewer(UUID assignmentUid, String reviewerId) {
-    queryFactory
-        .update(labelingAssignmentEntity)
-        .set(labelingAssignmentEntity.inspectorUid, reviewerId)
-        .set(labelingAssignmentEntity.inspectState, InspectState.UNCONFIRM.getId())
-        .set(labelingAssignmentEntity.modifiedDate, ZonedDateTime.now())
-        .where(labelingAssignmentEntity.assignmentUid.eq(assignmentUid))
-        .execute();
-  }
-
-  /**
-   * 배치용 여러 건 update
-   *
-   * @param assignmentUids
-   * @param reviewerId
-   */
-  @Override
-  public void assignReviewerBatch(List<UUID> assignmentUids, String reviewerId) {
-    queryFactory
-        .update(labelingAssignmentEntity)
-        .set(labelingAssignmentEntity.inspectorUid, reviewerId)
-        .set(labelingAssignmentEntity.inspectState, InspectState.UNCONFIRM.getId())
-        .set(labelingAssignmentEntity.modifiedDate, ZonedDateTime.now())
-        .where(labelingAssignmentEntity.assignmentUid.in(assignmentUids))
-        .execute();
-  }
-
-  @Override
-  public Tasks findAssignmentTask(String assignmentUid) {
-    return queryFactory
-        .select(
-            Projections.constructor(
-                Tasks.class,
-                labelingAssignmentEntity.assignmentUid,
-                labelingAssignmentEntity.inferenceGeomUid,
-                labelingAssignmentEntity.analUid))
-        .from(labelingAssignmentEntity)
-        .where(labelingAssignmentEntity.assignmentUid.eq(UUID.fromString(assignmentUid)))
-        .fetchOne();
-  }
-
-  @Override
-  public void updateGeomUidTestState(List<Long> geomUids) {
-    queryFactory
-        .update(mapSheetAnalDataInferenceGeomEntity)
-        .set(mapSheetAnalDataInferenceGeomEntity.testState, InspectState.UNCONFIRM.getId())
-        .set(mapSheetAnalDataInferenceGeomEntity.updatedDttm, ZonedDateTime.now())
-        .where(mapSheetAnalDataInferenceGeomEntity.geoUid.in(geomUids))
-        .execute();
-  }
-
   @Override
   public List<CompleteLabelData> findCompletedYesterdayLabelingList(
       Long analUid, String mapSheetNum) {

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

@@ -10,6 +10,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.kamco.cd.kamcoback.common.enums.DetectionClassification;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
@@ -305,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();
 
@@ -325,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"))
@@ -353,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(
@@ -492,6 +505,9 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
                           mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd() != null
                               ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd()
                               : "")
+                      .classificationName(
+                          DetectionClassification.fromStrDesc(
+                              mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd()))
                       .probability(
                           mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() != null
                               ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb()
@@ -503,6 +519,9 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
                           mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd() != null
                               ? mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd()
                               : "")
+                      .classificationName(
+                          DetectionClassification.fromStrDesc(
+                              mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd()))
                       .probability(
                           mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterProb() != null
                               ? mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterProb()
@@ -524,12 +543,17 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
               .build();
 
       var inspectionResultInfo =
-          InspectionResultInfo.builder()
+          queryFactory
-              .verificationResult(convertInspectState(assignment.toDto().getInspectState()))
+              .select(
-              .inappropriateReason("")
+                  Projections.constructor(
-              //        .memo(assignment.toDto().getInspectMemo() != null ?
+                      InspectionResultInfo.class,
-              // assignment.toDto().getInspectMemo() : "")
+                      mapSheetAnalDataInferenceGeomEntity.fitState,
-              .build();
+                      mapSheetAnalDataInferenceGeomEntity.fitStateCmmnt))
+              .from(mapSheetAnalDataInferenceGeomEntity)
+              .where(
+                  mapSheetAnalDataInferenceGeomEntity.geoUid.eq(
+                      mapSheetAnalDataInferenceGeomEntityEntity.getGeoUid()))
+              .fetchOne();
 
       // 6. Geometry를 GeoJSON으로 변환
       InferenceDataGeometry inferData =

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

@@ -11,6 +11,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.kamco.cd.kamcoback.common.enums.DetectionClassification;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
@@ -24,7 +25,6 @@ import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.DetailRes;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.GeoFeatureRequest.Properties;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.InferenceDataGeometry;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.InferenceDataGeometry.InferenceProperties;
-import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.InspectionResultInfo;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.LearnDataGeometry;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.LearnDataGeometry.LearnProperties;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.ReviewGeometryInfo;
@@ -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"),
@@ -483,7 +495,7 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
               queryFactory
                   .select(memberEntity.name)
                   .from(memberEntity)
-                  .where(memberEntity.userId.eq(assignment.toDto().getWorkerUid()))
+                  .where(memberEntity.employeeNo.eq(assignment.toDto().getWorkerUid()))
                   .fetchFirst();
           if (workerName == null) {
             workerName = "";
@@ -520,6 +532,9 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
                           mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd() != null
                               ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd()
                               : "")
+                      .classificationName(
+                          DetectionClassification.fromStrDesc(
+                              mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd()))
                       .probability(
                           mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() != null
                               ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb()
@@ -531,6 +546,9 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
                           mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd() != null
                               ? mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd()
                               : "")
+                      .classificationName(
+                          DetectionClassification.fromStrDesc(
+                              mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd()))
                       .probability(
                           mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterProb() != null
                               ? mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterProb()
@@ -553,11 +571,17 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
               .build();
 
       var inspectionResultInfo =
-          InspectionResultInfo.builder()
+          queryFactory
-              .verificationResult(convertInspectState(assignment.toDto().getInspectState()))
+              .select(
-              .inappropriateReason("")
+                  Projections.constructor(
-              .memo("")
+                      TrainingDataReviewDto.InspectionResultInfo.class,
-              .build();
+                      mapSheetAnalDataInferenceGeomEntity.fitState,
+                      mapSheetAnalDataInferenceGeomEntity.fitStateCmmnt))
+              .from(mapSheetAnalDataInferenceGeomEntity)
+              .where(
+                  mapSheetAnalDataInferenceGeomEntity.geoUid.eq(
+                      mapSheetAnalDataInferenceGeomEntityEntity.getGeoUid()))
+              .fetchOne();
 
       // 6. Geometry를 GeoJSON으로 변환
       InferenceDataGeometry inferData =

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

@@ -1,172 +0,0 @@
-package com.kamco.cd.kamcoback.scheduler.service;
-
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ResultContDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResultDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
-import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
-import com.kamco.cd.kamcoback.postgres.core.GukYuinJobCoreService;
-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
-@Service
-@RequiredArgsConstructor
-public class GukYuinApiJobService {
-
-  private final GukYuinApiService gukYuinApiService;
-  private final GukYuinJobCoreService gukYuinJobCoreService;
-
-  @Value("${spring.profiles.active}")
-  private String profile;
-
-  /**
-   * 실행중인 profile
-   *
-   * @return
-   */
-  private boolean isLocalProfile() {
-    return "local".equalsIgnoreCase(profile);
-  }
-
-  /** 국유인 연동 후, 100% 되었는지 확인하는 스케줄링 매 10분마다 호출 */
-  @Scheduled(cron = "0 0/10 * * * *")
-  public void findGukYuinMastCompleteYn() {
-    if (isLocalProfile()) {
-      return;
-    }
-
-    List<LearnKeyDto> list =
-        gukYuinJobCoreService.findGukyuinApplyStatusUidList(
-            List.of(GukYuinStatus.IN_PROGRESS.getId()));
-    if (list.isEmpty()) {
-      return;
-    }
-
-    for (LearnKeyDto dto : list) {
-      try {
-        ResultDto result = gukYuinApiService.detail(dto.getChnDtctMstId());
-
-        if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
-          log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId());
-          continue;
-        }
-
-        ChngDetectMastDto.Basic basic = result.getResult().get(0);
-
-        Integer progress =
-            basic.getExcnPgrt() == null ? null : Integer.parseInt(basic.getExcnPgrt().trim());
-        if (progress != null && progress == 100) {
-          gukYuinJobCoreService.updateGukYuinApplyStateComplete(
-              dto.getId(), GukYuinStatus.GUK_COMPLETED);
-        }
-      } catch (Exception e) {
-        log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), e);
-      }
-    }
-  }
-
-  /** 국유인 등록 완료 후, 탐지객체 조회해서 PNU 업데이트 하는 스케줄링 하루 1번 새벽 1시에 실행 */
-  @Scheduled(cron = "0 0 1 * * *")
-  public void findGukYuinContListPnuUpdate() {
-    if (isLocalProfile()) {
-      return;
-    }
-
-    List<LearnKeyDto> list =
-        gukYuinJobCoreService.findGukyuinApplyStatusUidList(
-            List.of(GukYuinStatus.GUK_COMPLETED.getId(), GukYuinStatus.PNU_FAILED.getId()));
-    if (list.isEmpty()) {
-      return;
-    }
-
-    for (LearnKeyDto dto : list) {
-      try {
-        long succCnt = processUid(dto.getChnDtctMstId(), dto.getUid());
-        if (succCnt > 0) {
-          gukYuinJobCoreService.updateGukYuinApplyStateComplete(
-              dto.getId(), GukYuinStatus.PNU_COMPLETED);
-        } else {
-          gukYuinJobCoreService.updateGukYuinApplyStateComplete(
-              dto.getId(), GukYuinStatus.PNU_FAILED);
-        }
-      } catch (Exception e) {
-        log.error("[GUKYUIN] failed uid={}", dto.getUid(), e);
-        gukYuinJobCoreService.updateGukYuinApplyStateComplete(
-            dto.getId(), GukYuinStatus.PNU_FAILED);
-      }
-    }
-  }
-
-  private long processUid(String chnDtctMstId, String uid) {
-    long succCnt = 0;
-    ResultDto result = gukYuinApiService.detail(chnDtctMstId);
-    if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
-      return succCnt;
-    }
-
-    ChngDetectMastDto.Basic basic = result.getResult().get(0);
-    String chnDtctCnt = basic.getChnDtctCnt();
-    if (chnDtctCnt == null || chnDtctCnt.isEmpty()) {
-      return succCnt;
-    }
-
-    // page 계산
-    int pageSize = 100;
-    int totalCount = Integer.parseInt(chnDtctCnt);
-    int totalPages = (totalCount + pageSize - 1) / pageSize;
-
-    for (int page = 0; page < totalPages; page++) {
-      succCnt += processPage(uid, page, pageSize);
-    }
-
-    return succCnt;
-  }
-
-  private long processPage(String uid, int page, int pageSize) {
-    long result = 0;
-    ResultContDto cont = gukYuinApiService.findChnContList(uid, page, pageSize);
-    if (cont == null || cont.getResult().isEmpty()) {
-      return result; // 외부 API 이상 방어
-    }
-
-    // pnuList 업데이트
-
-    for (ChngDetectContDto.ContBasic contBasic : cont.getResult()) {
-      if (contBasic.getPnuList() == null || contBasic.getChnDtctObjtId() == null) {
-        return 0;
-      }
-
-      long upsertCnt =
-          gukYuinJobCoreService.upsertMapSheetDataAnalGeomPnu(
-              contBasic.getChnDtctObjtId(), contBasic.getPnuList());
-      result += upsertCnt;
-    }
-
-    return result;
-  }
-
-  /** 어제 라벨링 검수 완료된 것 -> 국유인에 전송 */
-  @Scheduled(cron = "0 0 1 * * *")
-  public void findLabelingCompleteSend() {
-
-    List<GeomUidDto> list = gukYuinJobCoreService.findYesterdayLabelingCompleteList();
-    if (list.isEmpty()) {
-      return;
-    }
-
-    for (GeomUidDto dto : list) {
-      gukYuinApiService.updateChnDtctObjtLabelingYn(dto.getResultUid(), "Y");
-
-      // inference_geom 에 label_send_dttm 업데이트 하기
-      gukYuinJobCoreService.updateAnalDataInferenceGeomSendDttm(dto.getGeoUid());
-    }
-  }
-}

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

@@ -0,0 +1,55 @@
+package com.kamco.cd.kamcoback.scheduler.service;
+
+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.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
+@Service
+@RequiredArgsConstructor
+public class GukYuinApiLabelJobService {
+
+  private final GukYuinLabelJobCoreService gukYuinLabelJobCoreService;
+  private final GukYuinApiService gukYuinApiService;
+
+  @Value("${spring.profiles.active}")
+  private String profile;
+
+  /**
+   * 실행중인 profile
+   *
+   * @return
+   */
+  private boolean isLocalProfile() {
+    return "local".equalsIgnoreCase(profile);
+  }
+
+  /** 어제 라벨링 검수 완료된 것 -> 국유인에 전송 */
+  @Scheduled(cron = "0 0 2 * * *")
+  public void findLabelingCompleteSend() {
+    if (isLocalProfile()) {
+      return;
+    }
+
+    List<GeomUidDto> list = gukYuinLabelJobCoreService.findYesterdayLabelingCompleteList();
+    if (list.isEmpty()) {
+      return;
+    }
+
+    for (GeomUidDto gto : list) {
+      ChngDetectContDto.ResultLabelDto dto =
+          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

@@ -0,0 +1,110 @@
+package com.kamco.cd.kamcoback.scheduler.service;
+
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ContBasic;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ResultContDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResultDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
+import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
+import com.kamco.cd.kamcoback.postgres.core.GukYuinPnuJobCoreService;
+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
+@Service
+@RequiredArgsConstructor
+public class GukYuinApiPnuJobService {
+
+  private final GukYuinPnuJobCoreService gukYuinPnuJobCoreService;
+  private final GukYuinApiService gukYuinApiService;
+
+  @Value("${spring.profiles.active}")
+  private String profile;
+
+  /**
+   * 실행중인 profile
+   *
+   * @return
+   */
+  private boolean isLocalProfile() {
+    return "local".equalsIgnoreCase(profile);
+  }
+
+  /** 국유인 등록 완료 후, 탐지객체 조회해서 PNU 업데이트 하는 스케줄링 하루 1번 새벽 1시에 실행 */
+  @Scheduled(cron = "0 0 1 * * *")
+  public void findGukYuinContListPnuUpdate() {
+    if (isLocalProfile()) {
+      return;
+    }
+
+    List<LearnKeyDto> list =
+        gukYuinPnuJobCoreService.findGukyuinApplyStatusUidList(
+            List.of(GukYuinStatus.GUK_COMPLETED.getId(), GukYuinStatus.PNU_FAILED.getId()));
+    if (list.isEmpty()) {
+      return;
+    }
+
+    for (LearnKeyDto dto : list) {
+      try {
+        processUid(dto.getUid(), dto.getUid());
+        gukYuinPnuJobCoreService.updateGukYuinApplyStateComplete(
+            dto.getId(), GukYuinStatus.PNU_COMPLETED);
+      } catch (Exception e) {
+        log.error("[GUKYUIN] failed uid={}", dto.getUid(), e);
+        gukYuinPnuJobCoreService.updateGukYuinApplyStateComplete(
+            dto.getId(), GukYuinStatus.PNU_FAILED);
+      }
+    }
+  }
+
+  private void processUid(String chnDtctId, String uid) {
+    ResultDto result = gukYuinApiService.listChnDtctId(chnDtctId);
+    if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
+      return;
+    }
+
+    ChngDetectMastDto.Basic basic = result.getResult().get(0);
+    String chnDtctCnt = basic.getChnDtctCnt();
+    if (chnDtctCnt == null || chnDtctCnt.isEmpty()) {
+      return;
+    }
+
+    // page 계산
+    int pageSize = 100;
+    int totalCount = Integer.parseInt(chnDtctCnt);
+    int totalPages = (totalCount + pageSize - 1) / pageSize;
+
+    for (int page = 0; page < totalPages; page++) {
+      processPage(uid, page, pageSize);
+    }
+  }
+
+  private void processPage(String uid, int page, int pageSize) {
+    ResultContDto resContList = gukYuinApiService.findChnContList(uid, page, pageSize);
+
+    if (resContList.getResult() == null || resContList.getResult().isEmpty()) {
+      return; // 외부 API 이상 방어
+    }
+
+    List<ContBasic> contList = resContList.getResult();
+    for (ContBasic cont : contList) {
+      String[] pnuList = cont.getPnuList();
+      long pnuCnt = pnuList == null ? 0 : pnuList.length;
+      if (cont.getChnDtctObjtId() != null) {
+        gukYuinPnuJobCoreService.updateInferenceGeomDataPnuCnt(cont.getChnDtctObjtId(), pnuCnt);
+
+        if (pnuCnt > 0) {
+          Long geoUid =
+              gukYuinPnuJobCoreService.findMapSheetAnalDataInferenceGeomUid(
+                  cont.getChnDtctObjtId());
+          gukYuinPnuJobCoreService.insertGeoUidPnuData(geoUid, pnuList, cont.getChnDtctObjtId());
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,71 @@
+package com.kamco.cd.kamcoback.scheduler.service;
+
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
+import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
+import com.kamco.cd.kamcoback.postgres.core.GukYuinJobCoreService;
+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
+@Service
+@RequiredArgsConstructor
+public class GukYuinApiStatusJobService {
+
+  private final GukYuinJobCoreService gukYuinJobCoreService;
+  private final GukYuinApiService gukYuinApiService;
+
+  @Value("${spring.profiles.active}")
+  private String profile;
+
+  /**
+   * 실행중인 profile
+   *
+   * @return
+   */
+  private boolean isLocalProfile() {
+    return "local".equalsIgnoreCase(profile);
+  }
+
+  /** 국유인 연동 후, 100% 되었는지 확인하는 스케줄링 매 10분마다 호출 */
+  @Scheduled(cron = "0 0/10 * * * *")
+  public void findGukYuinMastCompleteYn() {
+    if (isLocalProfile()) {
+      return;
+    }
+
+    List<LearnKeyDto> list =
+        gukYuinJobCoreService.findGukyuinApplyStatusUidList(
+            List.of(GukYuinStatus.IN_PROGRESS.getId()));
+    if (list.isEmpty()) {
+      return;
+    }
+
+    for (LearnKeyDto dto : list) {
+      try {
+        ChngDetectMastDto.ResultDto result = gukYuinApiService.listChnDtctId(dto.getUid());
+
+        if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
+          log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId());
+          continue;
+        }
+
+        ChngDetectMastDto.Basic basic = result.getResult().getFirst();
+
+        Integer progress =
+            basic.getExcnPgrt() == null ? null : Integer.parseInt(basic.getExcnPgrt().trim());
+        if (progress != null && progress == 100) {
+          gukYuinJobCoreService.updateGukYuinApplyStateComplete(
+              dto.getId(), GukYuinStatus.GUK_COMPLETED);
+        }
+      } catch (Exception e) {
+        log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), e);
+      }
+    }
+  }
+}

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

@@ -0,0 +1,115 @@
+package com.kamco.cd.kamcoback.scheduler.service;
+
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.StbltResult;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctMastDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
+import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
+import com.kamco.cd.kamcoback.postgres.core.GukYuinStbltJobCoreService;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
+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
+@Service
+@RequiredArgsConstructor
+public class GukYuinApiStbltJobService {
+
+  private final GukYuinStbltJobCoreService gukYuinStbltJobCoreService;
+  private final GukYuinApiService gukYuinApiService;
+
+  @Value("${spring.profiles.active}")
+  private String profile;
+
+  /**
+   * 실행중인 profile
+   *
+   * @return
+   */
+  private boolean isLocalProfile() {
+    return "local".equalsIgnoreCase(profile);
+  }
+
+  /** 국유인 연동 후, 실태조사 적합여부 확인하여 update */
+  @Scheduled(cron = "0 0 3 * * *")
+  public void findGukYuinEligibleForSurvey() {
+    if (isLocalProfile()) {
+      return;
+    }
+
+    List<LearnKeyDto> list =
+        gukYuinStbltJobCoreService.findGukYuinEligibleForSurveyList(
+            GukYuinStatus.PNU_COMPLETED.getId());
+    if (list.isEmpty()) {
+      return;
+    }
+
+    for (LearnKeyDto dto : list) {
+      try {
+        String yesterday =
+            LocalDate.now(ZoneId.of("Asia/Seoul"))
+                .minusDays(1)
+                .format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), yesterday);
+
+        if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
+          log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId());
+          continue;
+        }
+
+        for (RlbDtctMastDto stbltDto : result.getResult()) {
+          String resultUid = stbltDto.getChnDtctObjtId();
+          gukYuinStbltJobCoreService.updateGukYuinEligibleForSurvey(resultUid, stbltDto);
+        }
+
+        Map<String, StbltResult> resultMap =
+            result.getResult().stream()
+                .collect(Collectors.groupingBy(RlbDtctMastDto::getChnDtctObjtId))
+                .entrySet()
+                .stream()
+                .collect(
+                    Collectors.toMap(
+                        Map.Entry::getKey,
+                        e -> {
+                          List<RlbDtctMastDto> pnuList = e.getValue();
+
+                          boolean hasY = pnuList.stream().anyMatch(v -> "Y".equals(v.getStbltYn()));
+
+                          String fitYn = hasY ? "Y" : "N";
+
+                          RlbDtctMastDto selected =
+                              hasY
+                                  ? pnuList.stream()
+                                      .filter(v -> "Y".equals(v.getStbltYn()))
+                                      .findFirst()
+                                      .orElse(null)
+                                  : pnuList.stream()
+                                      .filter(v -> "N".equals(v.getStbltYn()))
+                                      .findFirst()
+                                      .orElse(null);
+
+                          if (selected == null) {
+                            return null; // 방어 코드
+                          }
+
+                          return new StbltResult(
+                              fitYn, selected.getIncyCd(), selected.getIncyRsnCont());
+                        }));
+
+        resultMap.forEach(gukYuinStbltJobCoreService::updateGukYuinObjectStbltYn);
+
+      } catch (Exception e) {
+        log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), e);
+      }
+    }
+  }
+}

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

@@ -28,7 +28,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,21 +38,6 @@ public class MapSheetMngFileJobService {
 
   private final MapSheetMngFileJobCoreService mapSheetMngFileJobCoreService;
 
-  @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.sync-auto-exception-start-year}")
-  private int syncAutoExceptionStartYear;
-
-  @Value("${file.sync-auto-exception-before-year-cnt}")
-  private int syncAutoExceptionBeforeYearCnt;
-
   public Integer checkMngFileSync() {
     return mapSheetMngFileJobCoreService.findNotYetMapSheetMng();
   }

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

@@ -0,0 +1,112 @@
+package com.kamco.cd.kamcoback.scheduler.service;
+
+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.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+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
+@Service
+@RequiredArgsConstructor
+public class TrainingDataLabelJobService {
+
+  private final TrainingDataLabelJobCoreService trainingDataLabelJobCoreService;
+
+  @Value("${spring.profiles.active}")
+  private String profile;
+
+  private boolean isLocalProfile() {
+    return "local".equalsIgnoreCase(profile);
+  }
+
+  @Transactional
+  @Scheduled(cron = "0 0 0 * * *")
+  public void assignReviewerYesterdayLabelComplete() {
+
+    if (isLocalProfile()) {
+      return;
+    }
+
+    try {
+      List<Tasks> tasks = trainingDataLabelJobCoreService.findCompletedYesterdayUnassigned();
+
+      if (tasks.isEmpty()) {
+        return;
+      }
+
+      // 회차별로 그룹핑
+      Map<Long, List<Tasks>> taskByRound =
+          tasks.stream().collect(Collectors.groupingBy(Tasks::getAnalUid));
+
+      // 회차별 분배
+      for (Map.Entry<Long, List<Tasks>> entry : taskByRound.entrySet()) {
+        Long analUid = entry.getKey();
+        List<Tasks> analTasks = entry.getValue();
+
+        // pending 계산
+        List<InspectorPendingDto> pendings =
+            trainingDataLabelJobCoreService.findInspectorPendingByRound(analUid);
+
+        if (pendings.isEmpty()) {
+          continue;
+        }
+
+        List<String> reviewerIds =
+            pendings.stream().map(InspectorPendingDto::getInspectorUid).toList();
+
+        // Lock 걸릴 수 있기 때문에 엔티티 조회하는 Repository 에서 구현
+        trainingDataLabelJobCoreService.lockInspectors(analUid, reviewerIds);
+
+        // 균등 분배
+        Map<String, List<Tasks>> assignMap = distributeByLeastPending(analTasks, reviewerIds);
+
+        // reviewer별 batch update
+        assignMap.forEach(
+            (reviewerId, assignedTasks) -> {
+              if (assignedTasks.isEmpty()) {
+                return;
+              }
+
+              List<UUID> assignmentUids =
+                  assignedTasks.stream().map(Tasks::getAssignmentUid).toList();
+              trainingDataLabelJobCoreService.assignReviewerBatch(assignmentUids, reviewerId);
+
+              List<Long> geomUids = assignedTasks.stream().map(Tasks::getInferenceUid).toList();
+              trainingDataLabelJobCoreService.updateGeomUidTestState(geomUids);
+            });
+      }
+    } catch (Exception e) {
+      log.error("배치 처리 중 예외", e);
+    }
+  }
+
+  private Map<String, List<Tasks>> distributeByLeastPending(
+      List<Tasks> tasks, List<String> reviewerIds) {
+    Map<String, List<Tasks>> result = new LinkedHashMap<>();
+
+    // 순서 유지 중요 (ASC 정렬된 상태)
+    for (String reviewerId : reviewerIds) {
+      result.put(reviewerId, new ArrayList<>());
+    }
+
+    int reviewerCount = reviewerIds.size();
+
+    for (int i = 0; i < tasks.size(); i++) {
+      String reviewerId = reviewerIds.get(i % reviewerCount);
+      result.get(reviewerId).add(tasks.get(i));
+    }
+
+    return result;
+  }
+}

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

@@ -8,20 +8,13 @@ import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.AnalMapShee
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.CompleteLabelData;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.CompleteLabelData.GeoJsonFeature;
 import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.FeatureCollection;
-import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.InspectorPendingDto;
-import com.kamco.cd.kamcoback.scheduler.dto.TrainingDataReviewJobDto.Tasks;
 import jakarta.transaction.Transactional;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.UUID;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
@@ -46,89 +39,13 @@ public class TrainingDataReviewJobService {
   }
 
   @Transactional
-  @Scheduled(cron = "0 0 0 * * *")
+  @Scheduled(cron = "0 0 2 * * *")
-  public void assignReviewerYesterdayLabelComplete() {
+  public void exportGeojsonLabelingGeom() {
 
     if (isLocalProfile()) {
       return;
     }
 
-    try {
-      List<Tasks> tasks = trainingDataReviewJobCoreService.findCompletedYesterdayUnassigned();
-
-      if (tasks.isEmpty()) {
-        return;
-      }
-
-      // 회차별로 그룹핑
-      Map<Long, List<Tasks>> taskByRound =
-          tasks.stream().collect(Collectors.groupingBy(Tasks::getAnalUid));
-
-      // 회차별 분배
-      for (Map.Entry<Long, List<Tasks>> entry : taskByRound.entrySet()) {
-        Long analUid = entry.getKey();
-        List<Tasks> analTasks = entry.getValue();
-
-        // pending 계산
-        List<InspectorPendingDto> pendings =
-            trainingDataReviewJobCoreService.findInspectorPendingByRound(analUid);
-
-        if (pendings.isEmpty()) {
-          continue;
-        }
-
-        List<String> reviewerIds =
-            pendings.stream().map(InspectorPendingDto::getInspectorUid).toList();
-
-        // Lock 걸릴 수 있기 때문에 엔티티 조회하는 Repository 에서 구현
-        trainingDataReviewJobCoreService.lockInspectors(analUid, reviewerIds);
-
-        // 균등 분배
-        Map<String, List<Tasks>> assignMap = distributeByLeastPending(analTasks, reviewerIds);
-
-        // reviewer별 batch update
-        assignMap.forEach(
-            (reviewerId, assignedTasks) -> {
-              if (assignedTasks.isEmpty()) {
-                return;
-              }
-
-              List<UUID> assignmentUids =
-                  assignedTasks.stream().map(Tasks::getAssignmentUid).toList();
-              trainingDataReviewJobCoreService.assignReviewerBatch(assignmentUids, reviewerId);
-
-              List<Long> geomUids = assignedTasks.stream().map(Tasks::getInferenceUid).toList();
-              trainingDataReviewJobCoreService.updateGeomUidTestState(geomUids);
-            });
-      }
-    } catch (Exception e) {
-      log.error("배치 처리 중 예외", e);
-    }
-  }
-
-  private Map<String, List<Tasks>> distributeByLeastPending(
-      List<Tasks> tasks, List<String> reviewerIds) {
-    Map<String, List<Tasks>> result = new LinkedHashMap<>();
-
-    // 순서 유지 중요 (ASC 정렬된 상태)
-    for (String reviewerId : reviewerIds) {
-      result.put(reviewerId, new ArrayList<>());
-    }
-
-    int reviewerCount = reviewerIds.size();
-
-    for (int i = 0; i < tasks.size(); i++) {
-      String reviewerId = reviewerIds.get(i % reviewerCount);
-      result.get(reviewerId).add(tasks.get(i));
-    }
-
-    return result;
-  }
-
-  @Transactional
-  @Scheduled(cron = "0 0 2 * * *")
-  public void exportGeojsonLabelingGeom() {
-
     // 1) 경로/파일명 결정
     String targetDir =
         "local".equals(profile) ? System.getProperty("user.home") + "/geojson" : trainingDataDir;

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

@@ -3,6 +3,7 @@ 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;
@@ -32,6 +33,7 @@ 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 = "검수 할당 목록 조회")
@@ -562,7 +564,7 @@ public class TrainingDataReviewApiController {
       description = "스케줄링이 실패한 경우 수동 호출하는 API, 어제 라벨링 완료된 것을 해당 검수자들에게 할당함")
   @GetMapping("/run-schedule")
   public ApiResponseDto<Void> runTrainingReviewSchedule() {
-    trainingDataReviewJobService.assignReviewerYesterdayLabelComplete();
+    trainingDataLabelJobService.assignReviewerYesterdayLabelComplete();
     return ApiResponseDto.ok(null);
   }
 

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

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
 import com.kamco.cd.kamcoback.common.utils.geometry.GeometryDeserializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
@@ -372,9 +373,12 @@ public class TrainingDataLabelDto {
   @AllArgsConstructor
   public static class ClassificationInfo {
 
-    @Schema(description = "분류", example = "일반토지")
+    @Schema(description = "분류", example = "land")
     private String classification;
 
+    @Schema(description = "분류 한글명", example = "일반토지")
+    private String classificationName;
+
     @Schema(description = "확률", example = "80.0")
     private Double probability;
   }
@@ -382,9 +386,7 @@ public class TrainingDataLabelDto {
   @Schema(name = "InspectionResultInfo", description = "실태조사결과정보")
   @Getter
   @Setter
-  @Builder
   @NoArgsConstructor
-  @AllArgsConstructor
   public static class InspectionResultInfo {
 
     @Schema(description = "검증결과 (미확인/제외/완료)", example = "미확인")
@@ -395,6 +397,11 @@ public class TrainingDataLabelDto {
 
     @Schema(description = "메모")
     private String memo;
+
+    public InspectionResultInfo(String verificationResult, String inappropriateReason) {
+      this.verificationResult = ImageryFitStatus.fromCode(verificationResult).getText();
+      this.inappropriateReason = inappropriateReason;
+    }
   }
 
   @Schema(name = "SummaryRes", description = "작업 통계 응답")

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

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
 import com.kamco.cd.kamcoback.common.utils.geometry.GeometryDeserializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
@@ -368,9 +369,12 @@ public class TrainingDataReviewDto {
   @AllArgsConstructor
   public static class ClassificationInfo {
 
-    @Schema(description = "분류", example = "일반토지")
+    @Schema(description = "분류", example = "land")
     private String classification;
 
+    @Schema(description = "분류한글명", example = "일반토지")
+    private String classificationName;
+
     @Schema(description = "확률", example = "80.0")
     private Double probability;
   }
@@ -378,9 +382,7 @@ public class TrainingDataReviewDto {
   @Schema(name = "InspectionResultInfo", description = "실태조사결과정보")
   @Getter
   @Setter
-  @Builder
   @NoArgsConstructor
-  @AllArgsConstructor
   public static class InspectionResultInfo {
 
     @Schema(description = "검증결과 (미확인/제외/완료)", example = "미확인")
@@ -391,6 +393,11 @@ public class TrainingDataReviewDto {
 
     @Schema(description = "메모")
     private String memo;
+
+    public InspectionResultInfo(String verificationResult, String inappropriateReason) {
+      this.verificationResult = ImageryFitStatus.fromCode(verificationResult).getText();
+      this.inappropriateReason = inappropriateReason;
+    }
   }
 
   @Schema(name = "SummaryRes", description = "작업 통계 응답")

src/main/resources/application-dev.yml

@@ -107,6 +107,8 @@ file:
   pt-path: /kamco-nfs/ckpt/model/v6-cls-checkpoints/
   pt-FileName: yolov8_6th-6m.pt
 
+  dataset-response: /kamco-nfs/dataset/response/
+
 inference:
   url: http://192.168.2.183:8000/jobs
   batch-url: http://192.168.2.183:8000/batches
@@ -124,5 +126,6 @@ training-data:
 
 layer:
   geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
-  path: geoserver/cd/gwc/service
+  wms-path: geoserver/cd
+  wmts-path: geoserver/cd/gwc/service
   workspace: cd

src/main/resources/application-prod.yml

@@ -62,6 +62,8 @@ file:
   pt-path: /kamco-nfs/ckpt/model/v6-cls-checkpoints/
   pt-FileName: yolov8_6th-6m.pt
 
+  dataset-response: /kamco-nfs/dataset/response/
+
 inference:
   url: http://192.168.2.183:8000/jobs
   batch-url: http://192.168.2.183:8000/batches
@@ -79,5 +81,6 @@ training-data:
 
 layer:
   geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
-  path: /geoserver/cd/gwc/service/
+  wms-path: geoserver/cd
+  wmts-path: geoserver/cd/gwc/service
   workspace: cd