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

Reviewed-on: #17

src/main/java/com/kamco/cd/kamcoback/common/enums/CrsType.java

@@ -1,27 +0,0 @@
-package com.kamco.cd.kamcoback.common.enums;
-
-import com.kamco.cd.kamcoback.common.utils.enums.CodeExpose;
-import com.kamco.cd.kamcoback.common.utils.enums.EnumType;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@CodeExpose
-@Getter
-@AllArgsConstructor
-public enum CrsType implements EnumType {
-  EPSG_3857("Web Mercator, 웹지도 미터(EPSG:900913 동일)"),
-  EPSG_4326("WGS84 위경도, GeoJSON/OSM 기본"),
-  EPSG_5186("Korea 2000 중부 TM, 한국 SHP");
-
-  private final String desc;
-
-  @Override
-  public String getId() {
-    return name();
-  }
-
-  @Override
-  public String getText() {
-    return desc;
-  }
-}

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

@@ -5,9 +5,11 @@ import java.net.InetAddress;
 import java.net.URLEncoder;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 
 public class NetUtils {
 
@@ -54,8 +56,9 @@ public class NetUtils {
 
   public HttpHeaders jsonHeaders() {
     HttpHeaders headers = new HttpHeaders();
-    headers.set(HttpHeaders.ACCEPT, "application/json;charset=UTF-8");
-    headers.set(HttpHeaders.CONTENT_TYPE, "application/json;charset=UTF-8");
+    headers.setContentType(MediaType.APPLICATION_JSON);
+    headers.setAccept(List.of(MediaType.APPLICATION_JSON));
+
     return headers;
   }
 }

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

@@ -86,9 +86,7 @@ public class SecurityConfig {
                         "/api/upload/file-chunk-upload",
                         "/api/upload/chunk-upload-complete",
                         "/api/change-detection/**",
-                        "/api/layer/map/**",
-                        "/api/layer/tile-url",
-                        "/api/layer/tile-url-year")
+                        "/api/layer/map/**")
                     .permitAll()
                     // 로그인한 사용자만 가능 IAM
                     .requestMatchers(

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

@@ -1,120 +1,72 @@
 package com.kamco.cd.kamcoback.config.resttemplate;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.HttpStatusCodeException;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.RestTemplate;
 
-@RequiredArgsConstructor
 @Component
 @Log4j2
+@RequiredArgsConstructor
 public class ExternalHttpClient {
 
   private final RestTemplate restTemplate;
-  private final ObjectMapper objectMapper;
 
   public <T> ExternalCallResult<T> call(
       String url, HttpMethod method, Object body, HttpHeaders headers, Class<T> responseType) {
 
-    // responseType 기반으로 Accept 동적 세팅
-    HttpHeaders resolvedHeaders = resolveHeaders(headers, responseType);
-    logRequestBody(body);
+    HttpEntity<Object> entity = new HttpEntity<>(body, headers);
 
-    HttpEntity<Object> entity = new HttpEntity<>(body, resolvedHeaders);
+    // 요청 로그
+    log.info("[HTTP-REQ] {} {}", method, url);
+    if (body != null) {
+      log.debug("[HTTP-REQ-BODY] {}", body);
+    }
 
     try {
-      // String: raw bytes -> UTF-8 string
-      if (responseType == String.class) {
-        ResponseEntity<byte[]> res = restTemplate.exchange(url, method, entity, byte[].class);
-        String raw =
-            (res.getBody() == null) ? null : new String(res.getBody(), StandardCharsets.UTF_8);
-
-        @SuppressWarnings("unchecked")
-        T casted = (T) raw;
-        return new ExternalCallResult<>(res.getStatusCodeValue(), true, casted, null);
-      }
-
-      // byte[]: raw bytes로 받고, JSON이면 에러로 처리
-      if (responseType == byte[].class) {
-        ResponseEntity<byte[]> res = restTemplate.exchange(url, method, entity, byte[].class);
-
-        MediaType ct = res.getHeaders().getContentType();
-        byte[] bytes = res.getBody();
-
-        if (isJsonLike(ct)) {
-          String err = (bytes == null) ? null : new String(bytes, StandardCharsets.UTF_8);
-          return new ExternalCallResult<>(res.getStatusCodeValue(), false, null, err);
-        }
-
-        @SuppressWarnings("unchecked")
-        T casted = (T) bytes;
-        return new ExternalCallResult<>(res.getStatusCodeValue(), true, casted, null);
-      }
-
-      // DTO 등: 일반 역직렬화
       ResponseEntity<T> res = restTemplate.exchange(url, method, entity, responseType);
-      return new ExternalCallResult<>(res.getStatusCodeValue(), true, res.getBody(), null);
 
-    } catch (HttpStatusCodeException e) {
-      return new ExternalCallResult<>(
-          e.getStatusCode().value(), false, null, e.getResponseBodyAsString());
+      int code = res.getStatusCodeValue();
+
+      // 응답 로그
+      log.info("[HTTP-RES] {} {} -> {}", method, url, code);
+      log.debug("[HTTP-RES-BODY] {}", res.getBody());
+
+      return new ExternalCallResult<>(code, code >= 200 && code < 300, res.getBody());
+
+    } catch (HttpClientErrorException.NotFound e) {
+      log.info("[HTTP-RES] {} {} -> 404 (Not Found)", method, url);
+      log.debug("[HTTP-RES-BODY] {}", e.getResponseBodyAsString());
+
+      return new ExternalCallResult<>(404, false, null);
+
+    } catch (HttpClientErrorException e) {
+      // 기타 4xx
+      log.warn(
+          "[HTTP-ERR] {} {} -> {} body={}",
+          method,
+          url,
+          e.getStatusCode().value(),
+          e.getResponseBodyAsString());
+      throw e;
+
+    } catch (HttpServerErrorException e) {
+      // 5xx
+      log.error(
+          "[HTTP-ERR] {} {} -> {} body={}",
+          method,
+          url,
+          e.getStatusCode().value(),
+          e.getResponseBodyAsString());
+      throw e;
     }
   }
 
-  // 기존 resolveJsonHeaders를 "동적"으로 교체
-  private HttpHeaders resolveHeaders(HttpHeaders headers, Class<?> responseType) {
-    // 원본 headers를 그대로 쓰면 외부에서 재사용할 때 사이드이펙트 날 수 있어서 복사 권장
-    HttpHeaders h = (headers == null) ? new HttpHeaders() : new HttpHeaders(headers);
-
-    // 요청 바디 기본은 JSON이라고 가정 (필요하면 호출부에서 덮어쓰기)
-    if (h.getContentType() == null) {
-      h.setContentType(MediaType.APPLICATION_JSON);
-    }
-
-    // 호출부에서 Accept를 명시했으면 존중
-    if (h.getAccept() != null && !h.getAccept().isEmpty()) {
-      return h;
-    }
-
-    // responseType 기반 Accept 자동 지정
-    if (responseType == byte[].class) {
-      h.setAccept(
-          List.of(
-              MediaType.APPLICATION_OCTET_STREAM,
-              MediaType.valueOf("application/zip"),
-              MediaType.APPLICATION_JSON // 실패(JSON 에러 바디) 대비
-              ));
-    } else {
-      h.setAccept(List.of(MediaType.APPLICATION_JSON));
-    }
-
-    return h;
-  }
-
-  private boolean isJsonLike(MediaType ct) {
-    if (ct == null) return false;
-    return ct.includes(MediaType.APPLICATION_JSON)
-        || "application/problem+json".equalsIgnoreCase(ct.toString());
-  }
-
-  private void logRequestBody(Object body) {
-    try {
-      if (body != null) {
-        log.info("[HTTP-REQ-BODY-JSON] {}", objectMapper.writeValueAsString(body));
-      }
-    } catch (Exception e) {
-      log.warn("[HTTP-REQ-BODY-JSON] serialize failed: {}", e.getMessage());
-    }
-  }
-
-  public record ExternalCallResult<T>(int statusCode, boolean success, T body, String errBody) {}
+  public record ExternalCallResult<T>(int statusCode, boolean success, T body) {}
 }

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

@@ -4,7 +4,6 @@ import lombok.extern.log4j.Log4j2;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.BufferingClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
@@ -14,20 +13,10 @@ public class RestTemplateConfig {
 
   @Bean
   public RestTemplate restTemplate(RestTemplateBuilder builder) {
-    SimpleClientHttpRequestFactory baseFactory = new SimpleClientHttpRequestFactory();
-    baseFactory.setConnectTimeout(2000);
-    baseFactory.setReadTimeout(3000);
+    SimpleClientHttpRequestFactory f = new SimpleClientHttpRequestFactory();
+    f.setConnectTimeout(2000);
+    f.setReadTimeout(3000);
 
-    RestTemplate rt =
-        builder
-            .requestFactory(() -> new BufferingClientHttpRequestFactory(baseFactory))
-            .additionalInterceptors(new RetryInterceptor())
-            .build();
-
-    // byte[] 응답은 무조건 raw로 읽게 강제 (Jackson이 끼어들 여지 제거)
-    rt.getMessageConverters()
-        .add(0, new org.springframework.http.converter.ByteArrayHttpMessageConverter());
-
-    return rt;
+    return builder.requestFactory(() -> f).additionalInterceptors(new RetryInterceptor()).build();
   }
 }

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

@@ -1,15 +1,12 @@
 package com.kamco.cd.kamcoback.config.resttemplate;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
-import lombok.extern.log4j.Log4j2;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
 
-@Log4j2
 public class RetryInterceptor implements ClientHttpRequestInterceptor {
 
   private static final int MAX_RETRY = 3;
@@ -23,25 +20,21 @@ public class RetryInterceptor implements ClientHttpRequestInterceptor {
 
     for (int attempt = 1; attempt <= MAX_RETRY; attempt++) {
       try {
-        log.info("[WIRE-REQ] {} {}", request.getMethod(), request.getURI());
-        log.info("[WIRE-REQ-HEADERS] {}", request.getHeaders());
-        log.info("[WIRE-REQ-BODY] {}", new String(body, StandardCharsets.UTF_8));
-
-        ClientHttpResponse response = execution.execute(request, body);
-
-        log.info("[WIRE-RES-STATUS] {}", response.getStatusCode());
-        return response;
+        // HTTP 응답을 받으면(2xx/4xx/5xx 포함) 그대로 반환
+        return execution.execute(request, body);
 
       } catch (IOException e) {
+        // 네트워크/타임아웃 등 I/O 예외만 재시도
         lastException = e;
-        log.error("[WIRE-IO-ERR] attempt={} msg={}", attempt, e.getMessage(), e);
       }
 
+      // 마지막 시도가 아니면 대기
       if (attempt < MAX_RETRY) {
         sleep();
       }
     }
 
+    //  마지막 예외를 그대로 던져서 원인이 로그에 남게 함
     throw lastException;
   }
 

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

@@ -6,16 +6,11 @@ import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto;
 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;
@@ -24,8 +19,6 @@ 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.time.LocalDate;
-import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -43,10 +36,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class GukYuinApiController {
 
   private final GukYuinApiService gukYuinApiService;
-  private final GukYuinApiPnuJobService gukYuinApiPnuJobService;
-  private final GukYuinApiStatusJobService gukYuinApiStatusJobService;
-  private final GukYuinApiLabelJobService gukYuinApiLabelJobService;
-  private final GukYuinApiStbltJobService gukYuinApiStbltJobService;
 
   /** 탐지결과 등록 */
   @Operation(summary = "탐지결과 등록", description = "탐지결과 등록")
@@ -82,7 +71,7 @@ public class GukYuinApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   @PostMapping("/chn/mast/remove")
-  public ApiResponseDto<ChngDetectMastDto.RemoveResDto> remove(
+  public ApiResponseDto<ResReturn> remove(
       @RequestBody @Valid ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
     return ApiResponseDto.ok(gukYuinApiService.remove(chnDetectMastReq));
   }
@@ -195,29 +184,6 @@ 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(
@@ -270,7 +236,7 @@ public class GukYuinApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   @PostMapping("/rlb/objt/{chnDtctObjtId}/lbl/{lblYn}")
-  public ApiResponseDto<ChngDetectContDto.ResultLabelDto> updateChnDtctObjtLabelingYn(
+  public ApiResponseDto<ResReturn> updateChnDtctObjtLabelingYn(
       @PathVariable String chnDtctObjtId, @PathVariable String lblYn) {
     return ApiResponseDto.ok(gukYuinApiService.updateChnDtctObjtLabelingYn(chnDtctObjtId, lblYn));
   }
@@ -281,85 +247,6 @@ public class GukYuinApiController {
       @Parameter(description = "uuid", example = "7a593d0e-76a8-4b50-8978-9af1fbe871af")
           @PathVariable
           UUID uuid) {
-    return ApiResponseDto.okObject(gukYuinApiService.connectChnMastRegist(uuid));
-  }
-
-  @Operation(summary = "라벨 전송 완료 리스트", description = "라벨 전송 완료 리스트")
-  @GetMapping("/label/send-list")
-  public ApiResponseDto<List<LabelSendDto>> findLabelingCompleteSendList(
-      @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);
+    return ApiResponseDto.ok(gukYuinApiService.connectChnMastRegist(uuid));
   }
 }

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

@@ -114,27 +114,4 @@ 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;
-  }
 }

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

@@ -1,7 +1,6 @@
 package com.kamco.cd.kamcoback.gukyuin.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.time.ZonedDateTime;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -201,104 +200,4 @@ public class ChngDetectMastDto {
     private String uid;
     private String chnDtctMstId;
   }
-
-  @Schema(name = "LabelSendDto", description = "라벨링 전송한 목록")
-  @Getter
-  @Setter
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class LabelSendDto {
-
-    private String chnDtctObjtId;
-    private String labelerId;
-    private ZonedDateTime labelerWorkDttm;
-    private String reviewerId;
-    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;
-    private String pnu;
-    private String lrmSyncYmd;
-    private String pnuSyncYmd;
-    private String mpqdNo; // 도엽번호
-    private String cprsYr; // 비교년도
-    private String crtrYr; // 기준년도
-    private String chnDtctSno; // 회차
-    private String chnDtctId;
-
-    private String chnDtctMstId;
-    private String chnDtctObjtId;
-    private String chnDtctContId;
-    private String chnCd;
-    private String chnDtctProb;
-
-    private String bfClsCd; // 이전분류코드
-    private String bfClsProb; // 이전분류정확도
-    private String afClsCd; // 이후분류코드
-    private String afClsProb; // 이후분류정확도
-
-    private String pnuSqms;
-    private String pnuDtctSqms;
-    private String chnDtctSqms;
-    private String stbltYn;
-    private String incyCd;
-    private String incyRsnCont;
-    private String lockYn;
-    private String lblYn;
-    private String chgYn;
-    private String rsatctNo;
-    private String rmk;
-
-    private String crtDt; // 생성일시
-    private String crtEpno; // 생성사원번호
-    private String crtIp; // 생성사원아이피
-    private String chgDt;
-    private String chgEpno;
-    private String chgIp;
-    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,19 +59,5 @@ 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
-  @Setter
-  @AllArgsConstructor
-  public static class GeomUidDto {
-
-    private Long geoUid;
-    private String resultUid;
   }
 }

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

@@ -12,7 +12,6 @@ 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,7 +1,5 @@
 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;
@@ -11,15 +9,12 @@ 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;
@@ -29,9 +24,6 @@ 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;
 import lombok.RequiredArgsConstructor;
@@ -54,8 +46,6 @@ 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;
@@ -66,15 +56,13 @@ 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());
 
@@ -87,36 +75,15 @@ public class GukYuinApiService {
             ChngDetectMastDto.RegistResDto.class);
 
     ChngDetectMastDto.RegistResDto resultBody = result.body();
-    boolean success = false;
-    if (resultBody != null && resultBody.getSuccess() != null) {
+    Boolean success = false;
+    if (resultBody != 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);
-    } 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);
-      }
+      success = resultBody.getSuccess();
     }
 
     this.insertGukyuinAuditLog(
@@ -126,35 +93,27 @@ public class GukYuinApiService {
         url.replace(gukyuinUrl, ""),
         chnDetectMastReq,
         success);
-
     return resultBody;
   }
 
   @Transactional
-  public ChngDetectMastDto.RemoveResDto remove(
-      ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
+  public ResReturn remove(ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
     String url = gukyuinCdiUrl + "/chn/mast/remove";
 
+    String myip = netUtils.getLocalIP();
     chnDetectMastReq.setReqIp(myip);
     chnDetectMastReq.setReqEpno(userUtil.getEmployeeNo());
 
-    boolean success = false;
-    ExternalCallResult<ChngDetectMastDto.RemoveResDto> result =
+    ExternalCallResult<ChngDetectMastDto.Basic> result =
         externalHttpClient.call(
             url,
             HttpMethod.POST,
             chnDetectMastReq,
             netUtils.jsonHeaders(),
-            ChngDetectMastDto.RemoveResDto.class);
+            ChngDetectMastDto.Basic.class);
 
-    ChngDetectMastDto.RemoveResDto resultBody = result.body();
-    if (resultBody != null && resultBody.getSuccess() != null) {
-
-      success = resultBody.getSuccess();
-      if (resultBody.getSuccess()) {
-        gukyuinCoreService.updateGukYuinMastRegRemove(chnDetectMastReq.getChnDtctId());
-      }
-    }
+    ChngDetectMastDto.Basic resultBody = result.body();
+    gukyuinCoreService.updateGukYuinMastRegRemove(resultBody);
 
     this.insertGukyuinAuditLog(
         EventType.REMOVE.getId(),
@@ -162,22 +121,14 @@ public class GukYuinApiService {
         userUtil.getId(),
         url.replace(gukyuinUrl, ""),
         chnDetectMastReq,
-        success);
-
-    return resultBody;
+        true); // TODO : successFail 여부
+    return new ResReturn("success", "탐지결과 삭제 되었습니다.");
   }
 
   // 등록목록 1개 확인
   public ChngDetectMastDto.ResultDto detail(String chnDtctMstId) {
 
-    String url =
-        gukyuinCdiUrl
-            + "/chn/mast/list/"
-            + chnDtctMstId
-            + "?reqIp="
-            + myip
-            + "&reqEpno="
-            + userUtil.getEmployeeNo();
+    String url = gukyuinCdiUrl + "/chn/mast/list/" + chnDtctMstId;
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -196,15 +147,9 @@ public class GukYuinApiService {
   // 등록목록 비교년도,기준년도,차수 조합해서 n개 확인
   public ChngDetectMastDto.ResultDto listYearStage(
       ChngDetectMastDto.ChngDetectMastSearchDto searchDto) {
+
     String queryString = netUtils.dtoToQueryString(searchDto, null);
-    String url =
-        gukyuinCdiUrl
-            + "/chn/mast"
-            + queryString
-            + "&reqIp="
-            + myip
-            + "&reqEpno="
-            + userUtil.getEmployeeNo();
+    String url = gukyuinCdiUrl + "/chn/mast" + queryString;
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -268,11 +213,7 @@ public class GukYuinApiService {
             + "?pageIndex="
             + pageIndex
             + "&pageSize="
-            + pageSize
-            + "&reqIp="
-            + myip
-            + "&reqEpno="
-            + userUtil.getEmployeeNo();
+            + pageSize;
 
     ExternalCallResult<ChngDetectContDto.ResultContDto> result =
         externalHttpClient.call(
@@ -284,11 +225,21 @@ public class GukYuinApiService {
 
     List<ContBasic> contList = result.body().getResult();
     if (contList == null || contList.isEmpty()) {
-      return new ResultContDto(
-          result.body().getCode(),
-          result.body().getMessage(),
-          result.body().getResult(),
-          result.body().getSuccess());
+      return new ResultContDto();
+    }
+
+    for (ContBasic cont : contList) {
+      String[] pnuList = cont.getPnuList();
+      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(
@@ -303,16 +254,7 @@ public class GukYuinApiService {
   }
 
   public ResultPnuDto findPnuObjMgmtList(String chnDtctId, String chnDtctObjtId) {
-    String url =
-        gukyuinCdiUrl
-            + "/chn/pnu/"
-            + chnDtctId
-            + "/objt/"
-            + chnDtctObjtId
-            + "?reqIp="
-            + myip
-            + "&reqEpno="
-            + userUtil.getEmployeeNo();
+    String url = gukyuinCdiUrl + "/chn/pnu/" + chnDtctId + "/objt/" + chnDtctObjtId;
 
     ExternalCallResult<ChngDetectContDto.ResultPnuDto> result =
         externalHttpClient.call(
@@ -333,21 +275,18 @@ public class GukYuinApiService {
     return result.body();
   }
 
-  public ChngDetectContDto.ResultLabelDto updateChnDtctObjtLabelingYn(
-      String chnDtctObjtId, String lblYn) {
+  public ResReturn updateChnDtctObjtLabelingYn(String chnDtctObjtId, String lblYn) {
     String url = gukyuinCdiUrl + "/rlb/objt/" + chnDtctObjtId + "/lbl/" + lblYn;
 
-    ReqInfo info = new ReqInfo();
-    info.setReqIp(myip);
-    info.setReqEpno(userUtil.getEmployeeNo());
-
-    ExternalCallResult<ChngDetectContDto.ResultLabelDto> result =
+    ExternalCallResult<ChngDetectContDto.ResultPnuDto> result =
         externalHttpClient.call(
             url,
             HttpMethod.POST,
-            info,
+            null,
             netUtils.jsonHeaders(),
-            ChngDetectContDto.ResultLabelDto.class);
+            ChngDetectContDto.ResultPnuDto.class);
+
+    ChngDetectContDto.ResultPnuDto dto = result.body();
 
     this.insertGukyuinAuditLog(
         EventType.MODIFIED.getId(),
@@ -357,21 +296,11 @@ public class GukYuinApiService {
         null,
         result.body().getSuccess());
 
-    return result.body();
+    return new ResReturn(dto.getCode() > 200000 ? "fail" : "success", dto.getMessage());
   }
 
   public ResultContDto findChnPnuToContList(String chnDtctId, String pnu) {
-
-    String url =
-        gukyuinCdiUrl
-            + "/chn/cont/"
-            + chnDtctId
-            + "/pnu/"
-            + pnu
-            + "?reqIp="
-            + myip
-            + "&reqEpno="
-            + userUtil.getEmployeeNo();
+    String url = gukyuinCdiUrl + "/chn/cont/" + chnDtctId + "/pnu/" + pnu;
 
     ExternalCallResult<ChngDetectContDto.ResultContDto> result =
         externalHttpClient.call(
@@ -392,14 +321,7 @@ public class GukYuinApiService {
   }
 
   public ResultDto listChnDtctId(String chnDtctId) {
-    String url =
-        gukyuinCdiUrl
-            + "/chn/mast/"
-            + chnDtctId
-            + "?reqIp="
-            + myip
-            + "&reqEpno="
-            + userUtil.getEmployeeNo();
+    String url = gukyuinCdiUrl + "/chn/mast/" + chnDtctId;
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -448,24 +370,16 @@ public class GukYuinApiService {
   public ResponseObj connectChnMastRegist(UUID uuid) {
     // uuid로 추론 회차 조회
     LearnInfo info = gukyuinCoreService.findMapSheetLearnInfo(uuid);
-    if (info.getApplyYn() != null && info.getApplyYn()) {
-      return new ResponseObj(ApiResponseCode.DUPLICATE_DATA, "이미 국유인 연동을 한 회차입니다.");
-    }
+    //    if (info.getApplyStatus() != null &&
+    // !info.getApplyStatus().equals(GukYuinStatus.PENDING.getId()))
+    // {
+    //      return new ResponseObj(ApiResponseCode.DUPLICATE_DATA, "이미 국유인 연동을 한 추론 회차입니다.");
+    //    }
 
     // 비교년도,기준년도로 전송한 데이터 있는지 확인 후 회차 번호 생성
     Integer maxStage =
         gukyuinCoreService.findMapSheetLearnYearStage(info.getCompareYyyy(), info.getTargetYyyy());
 
-    // 1회차를 종료 상태로 처리하고 2회차를 보내야 함
-    // 추론(learn), 학습데이터(inference) 둘 다 종료 처리
-    if (maxStage > 0) {
-      Long learnId =
-          gukyuinCoreService.findMapSheetLearnInfoByYyyy(
-              info.getCompareYyyy(), info.getTargetYyyy(), maxStage);
-      gukyuinCoreService.updateMapSheetLearnGukyuinEndStatus(learnId);
-      gukyuinCoreService.updateMapSheetInferenceLabelEndStatus(learnId);
-    }
-
     // reqDto 셋팅
     ChnDetectMastReqDto reqDto = new ChnDetectMastReqDto();
     reqDto.setCprsYr(String.valueOf(info.getCompareYyyy()));
@@ -474,108 +388,9 @@ public class GukYuinApiService {
     reqDto.setChnDtctId(info.getUid());
     reqDto.setPathNm("/kamco-nfs/dataset/export/" + info.getUid());
 
-    if (!Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid()))) {
-      return new ResponseObj(
-          ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다.");
-    }
-
     // 국유인 /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());
-    }
-  }
+    this.regist(reqDto);
 
-  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();
+    return new ResponseObj(ApiResponseCode.OK, "");
   }
 }

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

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

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

@@ -17,11 +17,6 @@ import lombok.Setter;
 
 public class LayerDto {
 
-  public enum MapType {
-    CHANGE_MAP,
-    LABELING_MAP
-  }
-
   @Getter
   @Setter
   @AllArgsConstructor
@@ -108,9 +103,6 @@ public class LayerDto {
     @JsonFormatDttm
     @Schema(description = "등록일시")
     private ZonedDateTime createdDttm;
-
-    @Schema(description = "좌표계")
-    private String crs;
   }
 
   @Getter
@@ -148,9 +140,6 @@ public class LayerDto {
 
     @Schema(description = "zoom max", example = "18")
     private Short max;
-
-    @Schema(description = "좌표계", example = "EPSG_3857")
-    private String crs;
   }
 
   @Getter
@@ -264,9 +253,6 @@ public class LayerDto {
     @Schema(description = "rawJson")
     private JsonNode rawJson;
 
-    @Schema(description = "crs")
-    private String crs;
-
     public LayerMapDto(
         String layerType,
         String tag,
@@ -280,8 +266,7 @@ public class LayerDto {
         Short maxZoom,
         String bboxGeometry,
         UUID uuid,
-        String rawJsonString,
-        String crs) {
+        String rawJsonString) {
       this.layerType = layerType;
       this.tag = tag;
       this.sortOrder = sortOrder;
@@ -317,7 +302,6 @@ public class LayerDto {
 
       this.rawJson = rawJson;
       this.bbox = geoJson;
-      this.crs = crs;
     }
 
     @JsonProperty("workspace")
@@ -364,8 +348,6 @@ public class LayerDto {
 
     @JsonIgnore private String bboxGeometry;
 
-    private String crs;
-
     public TileUrlDto(
         Integer mngYyyy,
         String url,
@@ -376,8 +358,7 @@ public class LayerDto {
         BigDecimal maxLat,
         Short minZoom,
         Short maxZoom,
-        String bboxGeometry,
-        String crs) {
+        String bboxGeometry) {
       this.mngYyyy = mngYyyy;
       this.url = url;
       this.tag = tag;
@@ -401,7 +382,6 @@ public class LayerDto {
       }
 
       this.bbox = geoJson;
-      this.crs = crs;
     }
   }
 
@@ -422,11 +402,15 @@ 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/WmtsLayerInfo.java

@@ -18,20 +18,17 @@ public class WmtsLayerInfo {
 
   private List<String> keywords = new ArrayList<>();
   private BoundingBox boundingBox;
+
   private List<String> formats = new ArrayList<>();
   private List<TileMatrixSetLink> tileMatrixSetLinks = new ArrayList<>();
   private List<ResourceUrl> resourceUrls = new ArrayList<>();
   private List<Style> styles = new ArrayList<>();
 
-  private List<String> matrixIds = new ArrayList<>(); // 20250130
-  private String workspace; // 20250130
+  // add (2025-01-30)
+  private List<String> matrixIds = new ArrayList<>();
+  private String workspace;
 
-  private List<TileMatric> tileMatrices = new ArrayList<>();
-
-  // (선택) 기존 add 메서드 유지하고 싶으면 남겨도 됨
-  public void addTileMatric(TileMatric tileMatric) {
-    this.tileMatrices.add(tileMatric);
-  }
+  /* ===== convenience methods ===== */
 
   public void addMatrixId(String matrixId) {
     this.matrixIds.add(matrixId);
@@ -89,20 +86,6 @@ public class WmtsLayerInfo {
     private boolean isDefault;
   }
 
-  /** TileMatrix 정보를 담는 내부 클래스 */
-  @Data
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class TileMatric {
-    private String identifier;
-    private String scaleDenominator;
-    private String topLeftCorner;
-    //    private String tileWidth;
-    //    private String tileHeight;
-    //    private String matrixWidth;
-    //    private String matrixHeight;
-  }
-
   /** TileMatrixSetLink 정보를 담는 내부 클래스 */
   @Data
   @NoArgsConstructor

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

@@ -17,7 +17,6 @@ import com.kamco.cd.kamcoback.postgres.core.MapLayerCoreService;
 import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,15 +30,6 @@ public class LayerService {
   private final WmtsService wmtsService;
   private final WmsService wmsService;
 
-  @Value("${layer.geoserver-url}")
-  private String geoserverUrl;
-
-  @Value("${layer.wms-path}")
-  private String wmsPath;
-
-  @Value("${layer.wmts-path}")
-  private String wmtsPath;
-
   /**
    * 지도 레이어 관리 목록
    *
@@ -68,7 +58,7 @@ public class LayerService {
       }
 
       case GEOJSON -> {
-        return mapLayerCoreService.saveGeoJson(dto);
+        mapLayerCoreService.saveGeoJson(dto);
       }
 
       case WMTS -> {
@@ -94,6 +84,7 @@ public class LayerService {
 
       default -> throw new CustomApiException("BAD_REQUEST", HttpStatus.BAD_REQUEST);
     }
+    return null;
   }
 
   /**
@@ -184,31 +175,7 @@ public class LayerService {
   }
 
   public List<LayerMapDto> findLayerMapList(String type) {
-    List<LayerMapDto> layerMapDtoList = mapLayerCoreService.findLayerMapList(type);
-    layerMapDtoList.forEach(
-        dto -> {
-          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(wmtsPath),
-                    dto.getLayerType().toLowerCase()));
-          }
-        });
-    return layerMapDtoList;
-  }
-
-  private String trimSlash(String s) {
-    if (s == null) {
-      return "";
-    }
-    return s.replaceAll("/+$", "").replaceAll("^/+", "");
+    return mapLayerCoreService.findLayerMapList(type);
   }
 
   public LayerDto.YearTileDto getChangeDetectionTileUrl(Integer beforeYear, Integer afterYear) {

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

@@ -60,9 +60,9 @@ public class WmtsService {
   public List<WmtsLayerInfo> getAllLayers(String geoserverUrl, String workspace) {
     List<WmtsLayerInfo> layers = new ArrayList<>();
     try {
-      // 1. XML 문서 로드 및 파싱
       String capabilitiesUrl =
           geoserverUrl + WMTS_GEOSERVER_URL + workspace + WMTS_CAPABILITIES_URL;
+
       DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
       factory.setNamespaceAware(true);
       DocumentBuilder builder = factory.newDocumentBuilder();
@@ -71,18 +71,16 @@ public class WmtsService {
       XPathFactory xPathFactory = XPathFactory.newInstance();
       XPath xpath = xPathFactory.newXPath();
 
-      // 2. 모든 Layer 노드 검색
       String expression = "//*[local-name()='Layer']";
       NodeList layerNodes =
           (NodeList) xpath.compile(expression).evaluate(doc, XPathConstants.NODESET);
 
-      // 3. 모든 레이어를 파싱하여 리스트에 추가
       for (int i = 0; i < layerNodes.getLength(); i++) {
         Node layerNode = layerNodes.item(i);
         String title = getChildValue(layerNode, "Title");
 
         if (title != null && !title.trim().isEmpty()) {
-          WmtsLayerInfo layerInfo = parseLayerNode(workspace, doc, layerNode, title);
+          WmtsLayerInfo layerInfo = parseLayerNode(workspace, layerNode, title);
           layers.add(layerInfo);
         }
       }
@@ -96,28 +94,25 @@ public class WmtsService {
   }
 
   /**
-   * WMTS Capabilities URL에서 특정 타이틀의 레이어 정보를 가져옵니다. // * @param capabilitiesUrl 예:
-   * http://localhost:8080/geoserver/gwc/service/wmts?REQUEST=GetCapabilities
+   * WMTS Capabilities URL에서 특정 타이틀의 레이어 정보를 가져옵니다.
    *
    * @param geoserverUrl 예: http://localhost:8080
-   * @param targetTitle 찾고자 하는 레이어의 Title (예: "My Maps")
+   * @param targetTitle 찾고자 하는 레이어의 Title
    */
   public WmtsLayerInfo getLayerInfoByTitle(
       String geoserverUrl, String workspace, String targetTitle) {
     try {
-      // 1. XML 문서 로드 및 파싱
       String capabilitiesUrl =
           geoserverUrl + WMTS_GEOSERVER_URL + workspace + WMTS_CAPABILITIES_URL;
+
       DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-      factory.setNamespaceAware(true); // 네임스페이스 인식
+      factory.setNamespaceAware(true);
       DocumentBuilder builder = factory.newDocumentBuilder();
       Document doc = builder.parse(new URL(capabilitiesUrl).openStream());
 
       XPathFactory xPathFactory = XPathFactory.newInstance();
       XPath xpath = xPathFactory.newXPath();
 
-      // 2. 모든 Layer 노드 검색 (네임스페이스 무시하고 local-name으로 검색)
-      // GeoServer WMTS에서 Layer는 <Contents> -> <Layer> 구조임
       String expression = "//*[local-name()='Layer']";
       NodeList layerNodes =
           (NodeList) xpath.compile(expression).evaluate(doc, XPathConstants.NODESET);
@@ -125,12 +120,9 @@ public class WmtsService {
       for (int i = 0; i < layerNodes.getLength(); i++) {
         Node layerNode = layerNodes.item(i);
 
-        // 3. Title 확인
         String title = getChildValue(layerNode, "Title");
-
-        // 타이틀이 일치하면 객체 매핑 시작
         if (title != null && title.trim().equals(targetTitle)) {
-          return parseLayerNode(workspace, doc, layerNode, title);
+          return parseLayerNode(workspace, layerNode, title);
         }
       }
 
@@ -139,12 +131,11 @@ public class WmtsService {
       throw new RuntimeException("WMTS 정보 조회 중 오류 발생: " + e.getMessage());
     }
 
-    return null; // 찾지 못한 경우
+    return null;
   }
 
-  // 레이어 노드를 Java 객체로 변환 20250130
-  private WmtsLayerInfo parseLayerNode(
-      String workspace, Document doc, Node layerNode, String title) {
+  // 레이어 노드를 Java 객체로 변환 (2025-01-30)
+  private WmtsLayerInfo parseLayerNode(String workspace, Node layerNode, String title) {
     WmtsLayerInfo info = new WmtsLayerInfo();
 
     info.setWorkspace(workspace); // 20250130
@@ -164,7 +155,7 @@ public class WmtsService {
     // TileMatrixSetLink 파싱 (TileMatrixSet + Zoom Levels)
     info.setTileMatrixSetLinks(parseTileMatrixSetLinks(layerNode));
 
-    // TileMatrixSetLimits에서 줌 레벨 추출 (개별 zoom 리스트)
+    // TileMatrixSetLimits에서 줌 레벨 추출
     info.setMatrixIds(parseMatrixIds(layerNode)); // 20260130
 
     // ResourceURL 파싱
@@ -173,59 +164,46 @@ public class WmtsService {
     // Styles 파싱
     info.setStyles(parseStyles(layerNode));
 
-    // TileMatrixSet의 TileMatrix 정보 파싱
-    List<String> tileMatrixSetNames = new ArrayList<>();
-    if (info.getTileMatrixSetLinks() != null) {
-      for (WmtsLayerInfo.TileMatrixSetLink link : info.getTileMatrixSetLinks()) {
-        tileMatrixSetNames.add(link.getTileMatrixSet());
-      }
-    }
-
-    info.setTileMatrices(parseTileMatrices(doc, tileMatrixSetNames));
-
     return info;
   }
 
   // --- Helper Methods ---
 
   private WmtsLayerInfo.BoundingBox parseBoundingBox(Node layerNode) {
-    // 보통 <ows:WGS84BoundingBox>를 찾음
     Node bboxNode = findChildNode(layerNode, "WGS84BoundingBox");
     if (bboxNode == null) bboxNode = findChildNode(layerNode, "BoundingBox");
 
-    if (bboxNode != null) {
-      WmtsLayerInfo.BoundingBox bbox = new WmtsLayerInfo.BoundingBox();
+    if (bboxNode == null) return null;
 
-      // WGS84는 CRS 속성이 없을 수 있음
-      bbox.setCrs(getAttributeValue(bboxNode, "crs"));
+    WmtsLayerInfo.BoundingBox bbox = new WmtsLayerInfo.BoundingBox();
 
-      String lowerCorner = getChildValue(bboxNode, "LowerCorner");
-      String upperCorner = getChildValue(bboxNode, "UpperCorner");
+    bbox.setCrs(getAttributeValue(bboxNode, "crs"));
 
-      if (lowerCorner != null) {
-        String[] coords = lowerCorner.split(" ");
-        bbox.setLowerCornerX(Double.parseDouble(coords[0]));
-        bbox.setLowerCornerY(Double.parseDouble(coords[1]));
-      }
+    String lowerCorner = getChildValue(bboxNode, "LowerCorner");
+    String upperCorner = getChildValue(bboxNode, "UpperCorner");
 
-      if (upperCorner != null) {
-        String[] coords = upperCorner.split(" ");
-        bbox.setUpperCornerX(Double.parseDouble(coords[0]));
-        bbox.setUpperCornerY(Double.parseDouble(coords[1]));
-      }
-
-      return bbox;
+    if (lowerCorner != null) {
+      String[] coords = lowerCorner.trim().split("\\s+");
+      bbox.setLowerCornerX(Double.parseDouble(coords[0]));
+      bbox.setLowerCornerY(Double.parseDouble(coords[1]));
     }
 
-    return null;
+    if (upperCorner != null) {
+      String[] coords = upperCorner.trim().split("\\s+");
+      bbox.setUpperCornerX(Double.parseDouble(coords[0]));
+      bbox.setUpperCornerY(Double.parseDouble(coords[1]));
+    }
+
+    return bbox;
   }
 
   private List<WmtsLayerInfo.ResourceUrl> parseResourceUrls(Node layerNode) {
     List<WmtsLayerInfo.ResourceUrl> list = new ArrayList<>();
     NodeList children = layerNode.getChildNodes();
+
     for (int i = 0; i < children.getLength(); i++) {
       Node node = children.item(i);
-      if (node.getNodeName().contains("ResourceURL")) { // local-name check simplification
+      if (node.getNodeName().contains("ResourceURL")) {
         WmtsLayerInfo.ResourceUrl url = new WmtsLayerInfo.ResourceUrl();
         url.setFormat(getAttributeValue(node, "format"));
         url.setResourceType(getAttributeValue(node, "resourceType"));
@@ -239,6 +217,7 @@ public class WmtsService {
   private List<WmtsLayerInfo.Style> parseStyles(Node layerNode) {
     List<WmtsLayerInfo.Style> styles = new ArrayList<>();
     NodeList children = layerNode.getChildNodes();
+
     for (int i = 0; i < children.getLength(); i++) {
       Node node = children.item(i);
       if (node.getNodeName().endsWith("Style")) {
@@ -252,34 +231,23 @@ public class WmtsService {
     return styles;
   }
 
-  /**
-   * TileMatrixSetLimits에서 줌 레벨을 추출합니다. 예: "EPSG:4326:0" → "0", "EPSG:4326:1" → "1"
-   *
-   * @param layerNode Layer 노드
-   * @return 줌 레벨 문자열 리스트
-   */
+  /** TileMatrixSetLimits에서 줌 레벨을 추출합니다. 예: "EPSG:4326:0" → "0" */
   private List<String> parseMatrixIds(Node layerNode) {
     List<String> matrixIds = new ArrayList<>();
     NodeList children = layerNode.getChildNodes();
 
-    // 모든 TileMatrixSetLink 찾기
     for (int i = 0; i < children.getLength(); i++) {
       Node node = children.item(i);
       if (node.getNodeName().contains("TileMatrixSetLink")) {
-        // TileMatrixSetLimits 찾기
         Node limitsNode = findChildNode(node, "TileMatrixSetLimits");
         if (limitsNode != null) {
           NodeList limitsList = limitsNode.getChildNodes();
-          // 각 TileMatrixLimits 처리
           for (int j = 0; j < limitsList.getLength(); j++) {
             Node limitNode = limitsList.item(j);
             if (limitNode.getNodeName().contains("TileMatrixLimits")) {
-              // TileMatrix 또는 Identifier 값 추출
               String identifier = getChildValue(limitNode, "TileMatrix");
-              if (identifier == null) {
-                identifier = getChildValue(limitNode, "Identifier");
-              }
-              // 마지막 콜론 이후 값(줌 레벨) 추출
+              if (identifier == null) identifier = getChildValue(limitNode, "Identifier");
+
               if (identifier != null && identifier.contains(":")) {
                 String[] parts = identifier.split(":");
                 String zoomLevel = parts[parts.length - 1];
@@ -294,25 +262,16 @@ public class WmtsService {
     return matrixIds;
   }
 
-  /**
-   * TileMatrixSetLink 정보를 파싱합니다. 각 TileMatrixSetLink에서 TileMatrixSet 이름과 줌 레벨들을 추출합니다.
-   *
-   * @param layerNode Layer 노드
-   * @return TileMatrixSetLink 객체 리스트
-   */
   private List<WmtsLayerInfo.TileMatrixSetLink> parseTileMatrixSetLinks(Node layerNode) {
     List<WmtsLayerInfo.TileMatrixSetLink> links = new ArrayList<>();
     NodeList children = layerNode.getChildNodes();
 
-    // 모든 TileMatrixSetLink 찾기
     for (int i = 0; i < children.getLength(); i++) {
       Node node = children.item(i);
       if (node.getNodeName().contains("TileMatrixSetLink")) {
 
-        // TileMatrixSet 이름 추출
         String tileMatrixSet = getChildValue(node, "TileMatrixSet");
 
-        // 줌 레벨들 추출
         List<String> zoomLevels = new ArrayList<>();
         Node limitsNode = findChildNode(node, "TileMatrixSetLimits");
         if (limitsNode != null) {
@@ -320,12 +279,9 @@ public class WmtsService {
           for (int j = 0; j < limitsList.getLength(); j++) {
             Node limitNode = limitsList.item(j);
             if (limitNode.getNodeName().contains("TileMatrixLimits")) {
-              // TileMatrix 또는 Identifier 값 추출
               String identifier = getChildValue(limitNode, "TileMatrix");
-              if (identifier == null) {
-                identifier = getChildValue(limitNode, "Identifier");
-              }
-              // 마지막 콜론 이후 값(줌 레벨) 추출
+              if (identifier == null) identifier = getChildValue(limitNode, "Identifier");
+
               if (identifier != null && identifier.contains(":")) {
                 String[] parts = identifier.split(":");
                 String zoomLevel = parts[parts.length - 1];
@@ -335,7 +291,6 @@ public class WmtsService {
           }
         }
 
-        // TileMatrixSetLink 객체 생성 및 추가
         if (tileMatrixSet != null) {
           WmtsLayerInfo.TileMatrixSetLink link =
               new WmtsLayerInfo.TileMatrixSetLink(tileMatrixSet, zoomLevels);
@@ -347,76 +302,15 @@ public class WmtsService {
     return links;
   }
 
-  /**
-   * Document에서 TileMatrixSet의 TileMatrix 정보를 파싱합니다.
-   *
-   * @param doc WMTS Capabilities Document
-   * @param tileMatrixSetNames 조회할 TileMatrixSet 이름 리스트
-   * @return TileMatric 객체 리스트
-   */
-  private List<WmtsLayerInfo.TileMatric> parseTileMatrices(
-      Document doc, List<String> tileMatrixSetNames) {
-    List<WmtsLayerInfo.TileMatric> allMatrices = new ArrayList<>();
-
-    try {
-      XPathFactory xPathFactory = XPathFactory.newInstance();
-      XPath xpath = xPathFactory.newXPath();
-
-      // 각 TileMatrixSet 이름에 대해 TileMatrix 찾기
-      for (String tileMatrixSetName : tileMatrixSetNames) {
-        // TileMatrixSet 찾기
-        String expression = "//*[local-name()='TileMatrixSet']";
-        NodeList tileMatrixSetNodes =
-            (NodeList) xpath.compile(expression).evaluate(doc, XPathConstants.NODESET);
-
-        for (int i = 0; i < tileMatrixSetNodes.getLength(); i++) {
-          Node tileMatrixSetNode = tileMatrixSetNodes.item(i);
-          String identifier = getChildValue(tileMatrixSetNode, "Identifier");
-
-          // 일치하는 TileMatrixSet 찾으면 TileMatrix 파싱
-          if (tileMatrixSetName.equals(identifier)) {
-            NodeList children = tileMatrixSetNode.getChildNodes();
-            for (int j = 0; j < children.getLength(); j++) {
-              Node node = children.item(j);
-              if (node.getNodeName().contains("TileMatrix")) {
-                WmtsLayerInfo.TileMatric tileMatric = new WmtsLayerInfo.TileMatric();
-
-                // TileMatrix 정보 추출
-                tileMatric.setScaleDenominator(getChildValue(node, "ScaleDenominator"));
-                tileMatric.setTopLeftCorner(getChildValue(node, "TopLeftCorner"));
-                tileMatric.setIdentifier(getChildValue(node, "Identifier"));
-
-                /* 미사용 정보 주석처리함
-                tileMatric.setTileWidth(getChildValue(node, "TileWidth"));
-                tileMatric.setTileHeight(getChildValue(node, "TileHeight"));
-                tileMatric.setMatrixWidth(getChildValue(node, "MatrixWidth"));
-                tileMatric.setMatrixHeight(getChildValue(node, "MatrixHeight"));
-                */
-
-                allMatrices.add(tileMatric);
-              }
-            }
-            break; // 일치하는 TileMatrixSet 찾았으므로 다음으로
-          }
-        }
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-
-    return allMatrices;
-  }
-
-  // 특정 노드 아래의 자식 태그 값 추출 (예: <Title>값)
   private String getChildValue(Node parent, String childName) {
     Node child = findChildNode(parent, childName);
     return (child != null) ? child.getTextContent() : null;
   }
 
-  // 특정 노드 아래의 반복되는 자식 구조 값 추출 (예: Keywords -> Keyword)
   private List<String> getChildValues(Node parent, String wrapperName, String childName) {
     List<String> results = new ArrayList<>();
     Node wrapper = findChildNode(parent, wrapperName);
+
     if (wrapper != null) {
       NodeList children = wrapper.getChildNodes();
       for (int i = 0; i < children.getLength(); i++) {
@@ -429,10 +323,10 @@ public class WmtsService {
     return results;
   }
 
-  // Wrapper 없이 바로 반복되는 값 추출 (예: Format)
   private List<String> getChildValuesDirect(Node parent, String childName) {
     List<String> results = new ArrayList<>();
     NodeList children = parent.getChildNodes();
+
     for (int i = 0; i < children.getLength(); i++) {
       Node node = children.item(i);
       if (node.getNodeName().endsWith(childName)) {
@@ -442,12 +336,10 @@ public class WmtsService {
     return results;
   }
 
-  // 이름으로 자식 노드 찾기 (Local Name 기준)
   private Node findChildNode(Node parent, String localName) {
     NodeList children = parent.getChildNodes();
     for (int i = 0; i < children.getLength(); i++) {
       Node node = children.item(i);
-      // 네임스페이스 접두사(ows:, wmts:)를 무시하고 태그 이름 확인
       if (node.getNodeName().endsWith(":" + localName) || node.getNodeName().equals(localName)) {
         return node;
       }

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

@@ -103,9 +103,6 @@ public class MapSheetMngDto {
     @Schema(description = "tag")
     private String tag;
 
-    @Schema(description = "crs 좌표계")
-    private String crs;
-
     @JsonIgnore private Long createdUid;
   }
 
@@ -184,14 +181,11 @@ public class MapSheetMngDto {
     }
 
     public long getSyncErrorTotCnt() {
-      return this.syncNotPaireCnt + this.syncDuplicateCnt + this.syncFaultCnt + this.syncNoFileCnt;
+      return this.syncNotPaireCnt + this.syncDuplicateCnt + this.syncFaultCnt;
     }
 
     public long getSyncErrorExecTotCnt() {
-      return this.syncNotPaireExecCnt
-          + this.syncDuplicateExecCnt
-          + this.syncFaultExecCnt
-          + this.syncNoFileExecCnt;
+      return this.syncNotPaireExecCnt + this.syncDuplicateExecCnt + this.syncFaultExecCnt;
     }
 
     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 = "123456")
-    @Size(max = 6)
+    @Schema(description = "사번", example = "K20251212001")
+    @Size(max = 50)
     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 = "123456")
+  @Schema(description = "사용자 ID", example = "1234567")
   private String username;
 
   @Schema(description = "비밀번호", example = "qwe123!@#")

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

@@ -1,13 +1,10 @@
 package com.kamco.cd.kamcoback.postgres.core;
 
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.Basic;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LabelSendDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkFacts;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.LearnInfo;
 import com.kamco.cd.kamcoback.postgres.repository.Inference.MapSheetLearnRepository;
 import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinRepository;
-import java.time.LocalDate;
-import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -33,8 +30,8 @@ public class GukYuinCoreService {
     gukYuinRepository.updateGukYuinMastRegResult(resultBody);
   }
 
-  public void updateGukYuinMastRegRemove(String chnDtctId) {
-    gukYuinRepository.updateGukYuinMastRegRemove(chnDtctId);
+  public void updateGukYuinMastRegRemove(Basic resultBody) {
+    gukYuinRepository.updateGukYuinMastRegRemove(resultBody);
   }
 
   public void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt) {
@@ -45,8 +42,8 @@ public class GukYuinCoreService {
     return gukYuinRepository.findMapSheetAnalDataInferenceGeomUid(chnDtctObjtId);
   }
 
-  public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
-    gukYuinRepository.insertGeoUidPnuData(geoUid, pnuList, chnDtctObjtId);
+  public void insertGeoUidPnuData(Long geoUid, String[] pnuList) {
+    gukYuinRepository.insertGeoUidPnuData(geoUid, pnuList);
   }
 
   public LearnInfo findMapSheetLearnInfo(UUID uuid) {
@@ -60,21 +57,4 @@ public class GukYuinCoreService {
   public void updateAnalInferenceApplyDttm(Basic registRes) {
     gukYuinRepository.updateAnalInferenceApplyDttm(registRes);
   }
-
-  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

@@ -5,7 +5,6 @@ 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,12 +15,15 @@ public class GukYuinJobCoreService {
     this.gukYuinRepository = gukYuinRepository;
   }
 
-  @Transactional
   public void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status) {
     gukYuinRepository.updateGukYuinApplyStateComplete(id, status);
   }
 
-  public List<LearnKeyDto> findGukyuinApplyStatusUidList(List<String> gukYuinStatus) {
+  public List<LearnKeyDto> findGukyuinApplyStatusUidList(GukYuinStatus gukYuinStatus) {
     return gukYuinRepository.findGukyuinApplyStatusUidList(gukYuinStatus);
   }
+
+  public void upsertMapSheetDataAnalGeomPnu(String chnDtctObjtId, String[] pnuList) {
+    gukYuinRepository.upsertMapSheetDataAnalGeomPnu(chnDtctObjtId, pnuList);
+  }
 }

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

@@ -1,26 +0,0 @@
-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

@@ -1,44 +0,0 @@
-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

@@ -1,75 +0,0 @@
-package com.kamco.cd.kamcoback.postgres.core;
-
-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) {
-    String chnDtctObjtId = "";
-    PnuEntity entity =
-        gukYuinStbltRepository.findPnuEntityByResultUid(resultUid, stbltDto.getPnu());
-
-    if (entity != null) {
-      chnDtctObjtId = resultUid;
-
-      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);
-
-      //
-    }
-  }
-}

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

@@ -37,12 +37,10 @@ import jakarta.persistence.EntityNotFoundException;
 import jakarta.validation.constraints.NotNull;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -83,29 +81,23 @@ public class InferenceResultCoreService {
    * @param req
    */
   public UUID saveInferenceInfo(InferenceResultDto.RegReq req, List<MngListDto> targetList) {
+    String firstMapSheetName = null;
+    String mapSheetName = "";
+    int detectingCnt = 0;
 
-    List<MngListDto> distinctList =
-        targetList.stream()
-            .filter(dto -> dto.getMapSheetName() != null && !dto.getMapSheetName().isBlank())
-            .collect(
-                Collectors.toMap(
-                    MngListDto::getMapSheetName,
-                    dto -> dto,
-                    (existing, duplicate) -> existing,
-                    LinkedHashMap::new))
-            .values()
-            .stream()
-            .toList();
+    for (MngListDto dto : targetList) {
+      if (detectingCnt == 0) {
+        firstMapSheetName = dto.getMapSheetName();
+      }
+      detectingCnt++;
+    }
 
-    int detectingCnt = distinctList.size();
-
-    String mapSheetName;
     if (detectingCnt == 0) {
       mapSheetName = "";
     } else if (detectingCnt == 1) {
-      mapSheetName = distinctList.get(0).getMapSheetName() + " 1건";
+      mapSheetName = firstMapSheetName + " 1건";
     } else {
-      mapSheetName = distinctList.get(0).getMapSheetName() + " 외 " + (detectingCnt - 1) + "건";
+      mapSheetName = firstMapSheetName + " 외 " + (detectingCnt - 1) + "건";
     }
 
     MapSheetLearnEntity mapSheetLearnEntity = new MapSheetLearnEntity();
@@ -121,7 +113,7 @@ public class InferenceResultCoreService {
     mapSheetLearnEntity.setCreatedUid(userUtil.getId());
     mapSheetLearnEntity.setMapSheetCnt(mapSheetName);
     mapSheetLearnEntity.setDetectingCnt(0L);
-    mapSheetLearnEntity.setTotalJobs((long) targetList.size());
+    mapSheetLearnEntity.setTotalJobs((long) detectingCnt);
 
     // 회차는 국유인 반영할때 update로 변경됨
     //    mapSheetLearnEntity.setStage(

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

@@ -67,6 +67,10 @@ 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());
@@ -127,10 +131,6 @@ public class MapLayerCoreService {
       entity.setIsLabelingMap(dto.getIsLabelingMap());
     }
 
-    if (dto.getCrs() != null) {
-      entity.setCrs(dto.getCrs());
-    }
-
     entity.setUpdatedUid(userUtil.getId());
     entity.setUpdatedDttm(ZonedDateTime.now());
   }
@@ -210,7 +210,13 @@ public class MapLayerCoreService {
    * @param dto
    */
   public UUID saveTile(LayerDto.AddReq dto) {
-    Long order = mapLayerRepository.findSortOrderDesc();
+    LayerDto.SearchReq searchReq = new LayerDto.SearchReq();
+    searchReq.setLayerType(LayerType.TILE.getId());
+    List<LayerDto.Basic> entityList = mapLayerRepository.findAllLayer(searchReq);
+
+    if (!entityList.isEmpty()) {
+      throw new CustomApiException("DUPLICATE_DATA", HttpStatus.CONFLICT);
+    }
 
     MapLayerEntity mapLayerEntity = new MapLayerEntity();
     mapLayerEntity.setDescription(dto.getDescription());
@@ -222,12 +228,11 @@ public class MapLayerCoreService {
     mapLayerEntity.setMaxLat(dto.getMaxLat());
     mapLayerEntity.setMinZoom(dto.getMin());
     mapLayerEntity.setMaxZoom(dto.getMax());
-    mapLayerEntity.setCrs(dto.getCrs());
 
     mapLayerEntity.setCreatedUid(userUtil.getId());
     mapLayerEntity.setIsChangeMap(true);
-    mapLayerEntity.setIsLabelingMap(true);
-    mapLayerEntity.setOrder(order + 1);
+    mapLayerEntity.setIsLabelingMap(false);
+    mapLayerEntity.setOrder(1L);
     mapLayerEntity.setLayerType(LayerType.TILE.getId());
     mapLayerEntity.setUpdatedDttm(ZonedDateTime.now());
     return mapLayerRepository.save(mapLayerEntity).getUuid();
@@ -250,7 +255,6 @@ public class MapLayerCoreService {
     mapLayerEntity.setIsChangeMap(true);
     mapLayerEntity.setIsLabelingMap(true);
     mapLayerEntity.setLayerType(LayerType.GEOJSON.getId());
-    mapLayerEntity.setCrs(addDto.getCrs());
     mapLayerEntity.setUpdatedDttm(ZonedDateTime.now());
     mapLayerEntity.setOrder(order + 1);
     return mapLayerRepository.save(mapLayerEntity).getUuid();

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

@@ -1,36 +0,0 @@
-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,7 +4,10 @@ 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;
 
@@ -14,6 +17,34 @@ 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/MapLayerEntity.java

@@ -103,9 +103,6 @@ public class MapLayerEntity {
   @Column(name = "is_deleted")
   private Boolean isDeleted = false;
 
-  @Column(name = "crs")
-  private String crs;
-
   public LayerDto.Detail toDto() {
     return new LayerDto.Detail(
         this.uuid,
@@ -123,7 +120,6 @@ public class MapLayerEntity {
         this.maxLat,
         this.minZoom,
         this.maxZoom,
-        this.createdDttm,
-        this.crs);
+        this.createdDttm);
   }
 }

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

@@ -156,12 +156,6 @@ public class MapSheetAnalDataInferenceGeomEntity {
   @JoinColumn(name = "map_5k_id", referencedColumnName = "fid")
   private MapInkx5kEntity map5k;
 
-  @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/MapSheetMngTileEntity.java

@@ -45,9 +45,6 @@ public class MapSheetMngTileEntity {
   @Column(name = "tag")
   private String tag;
 
-  @Column(name = "crs")
-  private String crs;
-
   @NotNull
   @ColumnDefault("now()")
   @Column(name = "created_dttm", nullable = false)

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.ZonedDateTime;
+import java.time.OffsetDateTime;
 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 ZonedDateTime createdDttm;
+  private OffsetDateTime createdDttm;
 
   @Column(name = "created_uid")
   private Long createdUid;
@@ -47,140 +47,4 @@ 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/gukyuin/GukYuinLabelJobRepository.java

@@ -1,7 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,77 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -1,123 +0,0 @@
-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

@@ -1,12 +1,9 @@
 package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
 
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.Basic;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LabelSendDto;
 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.GukYuinDto.LearnInfo;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
-import java.time.LocalDate;
 import java.util.List;
 import java.util.UUID;
 
@@ -14,35 +11,23 @@ public interface GukYuinRepositoryCustom {
 
   void updateGukYuinMastRegResult(Basic resultBody);
 
-  void updateGukYuinMastRegRemove(String chnDtctId);
+  void updateGukYuinMastRegRemove(Basic resultBody);
 
   void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt);
 
   Long findMapSheetAnalDataInferenceGeomUid(String chnDtctObjtId);
 
-  void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId);
+  void insertGeoUidPnuData(Long geoUid, String[] pnuList);
 
   void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status);
 
-  List<LearnKeyDto> findGukyuinApplyStatusUidList(List<String> gukYuinStatus);
+  List<LearnKeyDto> findGukyuinApplyStatusUidList(GukYuinStatus gukYuinStatus);
 
-  long upsertMapSheetDataAnalGeomPnu(String uid, String[] pnuList);
+  void upsertMapSheetDataAnalGeomPnu(String uid, String[] pnuList);
 
   LearnInfo findMapSheetLearnInfo(UUID uuid);
 
   Integer findMapSheetLearnYearStage(Integer compareYyyy, Integer targetYyyy);
 
   void updateAnalInferenceApplyDttm(Basic registRes);
-
-  List<GeomUidDto> findYesterdayLabelingCompleteList();
-
-  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

@@ -1,30 +1,21 @@
 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 static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity;
 
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.Basic;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LabelSendDto;
 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.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;
 import com.querydsl.core.types.dsl.NumberExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import jakarta.transaction.Transactional;
-import java.time.LocalDate;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.UUID;
@@ -54,20 +45,17 @@ 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(String chnDtctId) {
+  public void updateGukYuinMastRegRemove(Basic resultBody) {
     queryFactory
         .update(mapSheetLearnEntity)
         .set(mapSheetLearnEntity.applyStatus, GukYuinStatus.CANCELED.getId())
         .set(mapSheetLearnEntity.applyStatusDttm, ZonedDateTime.now())
-        .set(mapSheetLearnEntity.applyYn, false)
-        .where(mapSheetLearnEntity.uid.eq(chnDtctId))
+        .where(mapSheetLearnEntity.uid.eq(resultBody.getChnDtctId()))
         .execute();
   }
 
@@ -90,30 +78,18 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
   }
 
   @Override
-  public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
+  public void insertGeoUidPnuData(Long geoUid, String[] pnuList) {
     for (String pnu : pnuList) {
-      PnuEntity entity =
-          queryFactory
-              .selectFrom(pnuEntity)
-              .where(
-                  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();
-      }
+      queryFactory
+          .insert(pnuEntity)
+          .columns(pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm)
+          .values(geoUid, pnu, ZonedDateTime.now())
+          .execute();
     }
   }
 
   @Override
-  public List<LearnKeyDto> findGukyuinApplyStatusUidList(List<String> status) {
+  public List<LearnKeyDto> findGukyuinApplyStatusUidList(GukYuinStatus status) {
     return queryFactory
         .select(
             Projections.constructor(
@@ -122,12 +98,12 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
                 mapSheetLearnEntity.uid,
                 mapSheetLearnEntity.chnDtctMstId))
         .from(mapSheetLearnEntity)
-        .where(mapSheetLearnEntity.applyStatus.in(status))
+        .where(mapSheetLearnEntity.applyStatus.eq(status.getId()))
         .fetch();
   }
 
   @Override
-  public long upsertMapSheetDataAnalGeomPnu(String chnDtctObjtId, String[] pnuList) {
+  public void upsertMapSheetDataAnalGeomPnu(String chnDtctObjtId, String[] pnuList) {
     long length = pnuList.length;
     queryFactory
         .update(mapSheetAnalDataInferenceGeomEntity)
@@ -142,19 +118,13 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
             .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)
-              .values(geoUid, pnu, ZonedDateTime.now())
-              .execute();
-      if (result > 0) {
-        succCnt++;
-      }
+    for (int i = 0; i < length; i++) {
+      queryFactory
+          .insert(pnuEntity)
+          .columns(pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm)
+          .values(geoUid, pnuList[i], ZonedDateTime.now())
+          .execute();
     }
-    return succCnt;
   }
 
   @Override
@@ -169,8 +139,7 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
                 mapSheetLearnEntity.targetYyyy,
                 mapSheetLearnEntity.stage,
                 mapSheetLearnEntity.uid,
-                mapSheetLearnEntity.applyStatus,
-                mapSheetLearnEntity.applyYn))
+                mapSheetLearnEntity.applyStatus))
         .from(mapSheetLearnEntity)
         .where(mapSheetLearnEntity.uuid.eq(uuid))
         .fetchOne();
@@ -182,7 +151,7 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
         Expressions.numberTemplate(Integer.class, "coalesce({0}, 0)", mapSheetLearnEntity.stage);
 
     return queryFactory
-        .select(stageExpr.max().coalesce(0))
+        .select(stageExpr.max())
         .from(mapSheetLearnEntity)
         .where(
             mapSheetLearnEntity.compareYyyy.eq(compareYyyy),
@@ -205,115 +174,6 @@ 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();
-  }
-
-  @Override
-  public List<GeomUidDto> findYesterdayLabelingCompleteList() {
-    ZoneId zone = ZoneId.of("Asia/Seoul");
-    ZonedDateTime todayStart = ZonedDateTime.now(zone).toLocalDate().atStartOfDay(zone);
-    ZonedDateTime yesterdayStart = todayStart.minusDays(1);
-
-    BooleanExpression isYesterday =
-        labelingAssignmentEntity
-            .inspectStatDttm
-            .goe(yesterdayStart)
-            .and(labelingAssignmentEntity.inspectStatDttm.lt(todayStart));
-
-    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();
-  }
-
-  @Override
-  public List<LabelSendDto> findLabelingCompleteSendList(LocalDate yesterday) {
-
-    ZoneId zone = ZoneId.of("Asia/Seoul");
-    ZonedDateTime from = yesterday.atStartOfDay(zone);
-    ZonedDateTime to = from.plusDays(1);
-
-    BooleanExpression isYesterday =
-        labelingAssignmentEntity
-            .inspectStatDttm
-            .goe(from)
-            .and(labelingAssignmentEntity.inspectStatDttm.lt(to));
-
-    return queryFactory
-        .select(
-            Projections.constructor(
-                LabelSendDto.class,
-                mapSheetAnalDataInferenceGeomEntity.resultUid,
-                labelingAssignmentEntity.workerUid,
-                labelingAssignmentEntity.workStatDttm,
-                labelingAssignmentEntity.inspectorUid,
-                labelingAssignmentEntity.inspectStatDttm,
-                mapSheetAnalDataInferenceGeomEntity.labelSendDttm))
-        .from(labelingAssignmentEntity)
-        .innerJoin(mapSheetAnalDataInferenceGeomEntity)
-        .on(
-            labelingAssignmentEntity.inferenceGeomUid.eq(
-                mapSheetAnalDataInferenceGeomEntity.geoUid))
-        .where(labelingAssignmentEntity.inspectState.eq(InspectState.COMPLETE.getId()), isYesterday)
-        .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();
   }

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

@@ -1,7 +0,0 @@
-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

@@ -1,15 +0,0 @@
-package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
-
-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);
-}

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

@@ -1,93 +0,0 @@
-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.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();
-  }
-}

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

@@ -8,7 +8,6 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceG
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.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;
@@ -83,9 +82,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .innerJoin(mapSheetAnalDataInferenceGeomEntity)
         .on(
             mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
-            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
-            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
-            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()),
+            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
             mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
         .where(
             mapSheetAnalInferenceEntity.uuid.eq(uuid),
@@ -129,8 +126,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)
-            values (?, ?, ?, ?, ?, ?)
+             work_state, assign_group_id, anal_uid, pnu)
+            values (?, ?, ?, ?, ?, ?, ?)
             """;
 
           try (PreparedStatement ps = connection.prepareStatement(sql)) {
@@ -143,6 +140,7 @@ 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++;
@@ -192,9 +190,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .innerJoin(mapSheetAnalDataInferenceGeomEntity)
         .on(
             mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
-            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
-            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
-            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()),
+            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
             mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
         .where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
         .fetchOne();
@@ -385,10 +381,9 @@ 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.gt(0L),
-                  mapSheetAnalDataInferenceGeomEntity.fitState.eq(
-                      ImageryFitStatus.UNFIT.getId()) // TODO:
+                  mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+                  //                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L)
+                  //                  mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()  //TODO:
                   // 추후 라벨링 대상 조건 수정하기
                   )
               .fetchOne();
@@ -560,9 +555,11 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
                       mapSheetAnalDataInferenceGeomEntity.dataUid))
               .where(
                   mapSheetAnalInferenceEntity.uuid.eq(targetUuid),
-                  //            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
-                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
-                  mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()))
+                  mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+                  //            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
+                  //            mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()  //TODO: 추후 라벨링
+                  // 대상 조건 수정하기
+                  )
               .fetchOne();
     }
 
@@ -579,7 +576,8 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         queryFactory
             .select(labelingAssignmentEntity.count())
             .from(labelingAssignmentEntity)
-            .where(analUidCondition, labelingAssignmentEntity.workState.in("SKIP", "DONE"))
+            .where(
+                analUidCondition, labelingAssignmentEntity.workState.in("ASSIGNED", "SKIP", "DONE"))
             .fetchOne();
 
     Long skipCount =
@@ -604,13 +602,6 @@ 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())
@@ -623,7 +614,6 @@ 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) {
@@ -631,7 +621,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
     }
 
     long inspectionTotal = labelingTotal;
-    long inspectionRemaining = inspectionTotal - inspectCompleted - inspectExcepted;
+    long inspectionRemaining = inspectionTotal - inspectCompleted - skipped;
     if (inspectionRemaining < 0) {
       inspectionRemaining = 0;
     }
@@ -668,7 +658,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .inspectionStatus(inspectionStatus)
         .inspectionTotalCount(inspectionTotal)
         .inspectionCompletedCount(inspectCompleted)
-        .inspectionSkipCount(inspectExcepted)
+        .inspectionSkipCount(skipped) // TODO
         .inspectionRemainingCount(inspectionRemaining)
         .inspectorCount(inspectorCount != null ? inspectorCount : 0L)
         .progressRate(labelingRate)
@@ -750,9 +740,11 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
             mapSheetAnalInferenceEntity.targetYyyy.eq(
                 mapSheetAnalDataInferenceGeomEntity.targetYyyy),
             mapSheetAnalInferenceEntity.stage.eq(mapSheetAnalDataInferenceGeomEntity.stage),
-            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
-            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
-            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()))
+            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+            //        mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            //        mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()    //TODO: 추후 라벨링 대상 조건
+            // 수정하기
+            )
         .where(mapSheetAnalInferenceEntity.id.eq(analEntity.getId()))
         .groupBy(
             mapSheetAnalInferenceEntity.analTitle,

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

@@ -2,7 +2,6 @@ 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;
@@ -295,14 +294,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
 
     if (searchReq.getSearchVal() != null && !searchReq.getSearchVal().isEmpty()) {
       whereSubBuilder.and(
-          Expressions.stringTemplate("{0}", memberEntity.employeeNo)
+          Expressions.stringTemplate("{0}", memberEntity.userId)
               .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
               .or(
                   Expressions.stringTemplate("{0}", memberEntity.name)
                       .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")));
     }
 
-    whereSubBuilder.and(labelingAssignmentEntity.workerUid.eq(memberEntity.employeeNo));
+    whereSubBuilder.and(labelingAssignmentEntity.workerUid.eq(memberEntity.userId));
 
     // 공통 조건 추출
     BooleanExpression doneStateCondition =
@@ -345,7 +344,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     WorkerState.class,
                     memberEntity.userRole,
                     memberEntity.name,
-                    memberEntity.employeeNo,
+                    memberEntity.userId,
                     assignedCnt.as("assignedCnt"),
                     doneCnt.as("doneCnt"),
                     skipCnt.as("skipCnt"),
@@ -364,10 +363,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .on(whereSubBuilder)
             .where(whereBuilder)
             .groupBy(
-                memberEntity.userRole,
-                memberEntity.name,
-                memberEntity.employeeNo,
-                memberEntity.status)
+                memberEntity.userRole, memberEntity.name, memberEntity.userId, memberEntity.status)
             .orderBy(orderSpecifiers.toArray(new OrderSpecifier[0]))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
@@ -445,14 +441,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
 
     if (searchReq.getSearchVal() != null && !searchReq.getSearchVal().isEmpty()) {
       whereSubBuilder.and(
-          Expressions.stringTemplate("{0}", memberEntity.employeeNo)
+          Expressions.stringTemplate("{0}", memberEntity.userId)
               .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
               .or(
                   Expressions.stringTemplate("{0}", memberEntity.name)
                       .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")));
     }
 
-    whereSubBuilder.and(labelingAssignmentEntity.inspectorUid.eq(memberEntity.employeeNo));
+    whereSubBuilder.and(labelingAssignmentEntity.inspectorUid.eq(memberEntity.userId));
 
     // 공통 조건 추출
     BooleanExpression doneStateCondition =
@@ -496,7 +492,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     WorkerState.class,
                     memberEntity.userRole,
                     memberEntity.name,
-                    memberEntity.employeeNo,
+                    memberEntity.userId,
                     assignedCnt.as("assignedCnt"),
                     doneCnt.as("doneCnt"),
                     skipCnt.as("skipCnt"),
@@ -515,10 +511,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .on(whereSubBuilder)
             .where(whereBuilder)
             .groupBy(
-                memberEntity.userRole,
-                memberEntity.name,
-                memberEntity.employeeNo,
-                memberEntity.status)
+                memberEntity.userRole, memberEntity.name, memberEntity.userId, memberEntity.status)
             .orderBy(orderSpecifiers.toArray(new OrderSpecifier[0]))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
@@ -556,19 +549,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
   @Override
   public LabelWorkMngDetail findLabelWorkMngDetail(UUID uuid) {
 
-    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> labelTotCnt = mapSheetAnalDataInferenceGeomEntity.geoUid.count();
     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,7 +11,6 @@ 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;
@@ -93,10 +92,6 @@ 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(
@@ -112,15 +107,13 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                 mapLayerEntity.minZoom,
                 mapLayerEntity.maxZoom,
                 Expressions.stringTemplate(
-                    "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), {4}))",
+                    "ST_AsGeoJSON(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326))",
                     mapLayerEntity.minLon,
                     mapLayerEntity.minLat,
                     mapLayerEntity.maxLon,
-                    mapLayerEntity.maxLat,
-                    crsInt),
+                    mapLayerEntity.maxLat),
                 mapLayerEntity.uuid,
-                Expressions.stringTemplate("cast({0} as text)", mapLayerEntity.rawJson),
-                mapLayerEntity.crs))
+                Expressions.stringTemplate("cast({0} as text)", mapLayerEntity.rawJson)))
         .from(mapLayerEntity)
         .where(layerTypeCondition(type), mapLayerEntity.isDeleted.isFalse())
         .orderBy(mapLayerEntity.order.asc())
@@ -129,10 +122,6 @@ 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(
@@ -148,13 +137,11 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                     mapSheetMngTileEntity.minZoom,
                     mapSheetMngTileEntity.maxZoom,
                     Expressions.stringTemplate(
-                        "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), {4}))",
+                        "ST_AsGeoJSON(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326))",
                         mapSheetMngTileEntity.minLon,
                         mapSheetMngTileEntity.minLat,
                         mapSheetMngTileEntity.maxLon,
-                        mapSheetMngTileEntity.maxLat,
-                        crsInt),
-                    mapSheetMngTileEntity.crs))
+                        mapSheetMngTileEntity.maxLat)))
             .from(mapSheetMngTileEntity)
             .where(mapSheetMngTileEntity.mngYyyy.eq(beforeYear))
             .fetchOne();
@@ -174,13 +161,11 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                     mapSheetMngTileEntity.minZoom,
                     mapSheetMngTileEntity.maxZoom,
                     Expressions.stringTemplate(
-                        "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), {4}))",
+                        "ST_AsGeoJSON(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326))",
                         mapSheetMngTileEntity.minLon,
                         mapSheetMngTileEntity.minLat,
                         mapSheetMngTileEntity.maxLon,
-                        mapSheetMngTileEntity.maxLat,
-                        crsInt),
-                    mapSheetMngTileEntity.crs))
+                        mapSheetMngTileEntity.maxLat)))
             .from(mapSheetMngTileEntity)
             .where(mapSheetMngTileEntity.mngYyyy.eq(afterYear))
             .fetchOne();
@@ -190,10 +175,6 @@ 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(
@@ -208,13 +189,11 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                 mapSheetMngTileEntity.minZoom,
                 mapSheetMngTileEntity.maxZoom,
                 Expressions.stringTemplate(
-                    "ST_AsGeoJSON(ST_Transform(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326), {4}))",
+                    "ST_AsGeoJSON(ST_MakeEnvelope({0}, {1}, {2}, {3}, 4326))",
                     mapSheetMngTileEntity.minLon,
                     mapSheetMngTileEntity.minLat,
                     mapSheetMngTileEntity.maxLon,
-                    mapSheetMngTileEntity.maxLat,
-                    crsInt),
-                mapSheetMngTileEntity.crs))
+                    mapSheetMngTileEntity.maxLat)))
         .from(mapSheetMngTileEntity)
         .where(mapSheetMngTileEntity.mngYyyy.eq(year))
         .fetchOne();

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(mapInkx5kEntity.useInference.eq(CommonUseStatus.USE))
+            .where(whereBuilder)
             // .offset(pageable.getOffset())
             // .limit(pageable.getPageSize())
             .orderBy(mapSheetMngEntity.mngYyyy.desc())
@@ -254,9 +254,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
   public MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy) {
 
     BooleanBuilder whereBuilder = new BooleanBuilder();
-    whereBuilder
-        .and(mapSheetMngEntity.mngYyyy.eq(mngYyyy))
-        .and(mapInkx5kEntity.useInference.eq(CommonUseStatus.USE));
+    whereBuilder.and(mapSheetMngEntity.mngYyyy.eq(mngYyyy));
 
     MapSheetMngDto.MngDto foundContent =
         queryFactory
@@ -1058,8 +1056,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
                 mapSheetMngTileEntity.maxLat,
                 mapSheetMngTileEntity.minZoom,
                 mapSheetMngTileEntity.maxZoom,
-                mapSheetMngTileEntity.tag,
-                mapSheetMngTileEntity.crs)
+                mapSheetMngTileEntity.tag)
             .values(
                 addReq.getMngYyyy(),
                 addReq.getUrl(),
@@ -1069,8 +1066,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
                 addReq.getMaxLat(),
                 addReq.getMinZoom(),
                 addReq.getMaxZoom(),
-                addReq.getTag(),
-                addReq.getCrs())
+                addReq.getTag())
             .execute();
   }
 

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

@@ -1,23 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,119 +0,0 @@
-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,10 +3,25 @@ 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,18 +1,24 @@
 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;
@@ -23,10 +29,9 @@ 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 {
 
@@ -38,6 +43,121 @@ 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/scheduler/service/GukYuinApiJobService.java

@@ -1,13 +1,13 @@
 package com.kamco.cd.kamcoback.scheduler.service;
 
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ContBasic;
+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.GukYuinStatus;
 import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
-import com.kamco.cd.kamcoback.postgres.core.GukYuinPnuJobCoreService;
+import com.kamco.cd.kamcoback.postgres.core.GukYuinJobCoreService;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -18,10 +18,10 @@ import org.springframework.stereotype.Service;
 @Log4j2
 @Service
 @RequiredArgsConstructor
-public class GukYuinApiPnuJobService {
+public class GukYuinApiJobService {
 
-  private final GukYuinPnuJobCoreService gukYuinPnuJobCoreService;
   private final GukYuinApiService gukYuinApiService;
+  private final GukYuinJobCoreService gukYuinJobCoreService;
 
   @Value("${spring.profiles.active}")
   private String profile;
@@ -35,7 +35,41 @@ public class GukYuinApiPnuJobService {
     return "local".equalsIgnoreCase(profile);
   }
 
-  /** 국유인 등록 완료 후, 탐지객체 조회해서 PNU 업데이트 하는 스케줄링 하루 1번 새벽 1시에 실행 */
+  @Scheduled(cron = "0 * * * * *") // 0 0/10 * * * *
+  public void findGukYuinMastCompleteYn() {
+    //    if (isLocalProfile()) {
+    //      return;
+    //    }
+
+    List<LearnKeyDto> list =
+        gukYuinJobCoreService.findGukyuinApplyStatusUidList(GukYuinStatus.IN_PROGRESS);
+    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);
+      }
+    }
+  }
+
   @Scheduled(cron = "0 0 1 * * *")
   public void findGukYuinContListPnuUpdate() {
     if (isLocalProfile()) {
@@ -43,27 +77,26 @@ public class GukYuinApiPnuJobService {
     }
 
     List<LearnKeyDto> list =
-        gukYuinPnuJobCoreService.findGukyuinApplyStatusUidList(
-            List.of(GukYuinStatus.GUK_COMPLETED.getId(), GukYuinStatus.PNU_FAILED.getId()));
+        gukYuinJobCoreService.findGukyuinApplyStatusUidList(GukYuinStatus.GUK_COMPLETED);
     if (list.isEmpty()) {
       return;
     }
 
     for (LearnKeyDto dto : list) {
       try {
-        processUid(dto.getUid(), dto.getUid());
-        gukYuinPnuJobCoreService.updateGukYuinApplyStateComplete(
+        processUid(dto.getChnDtctMstId(), dto.getUid());
+        gukYuinJobCoreService.updateGukYuinApplyStateComplete(
             dto.getId(), GukYuinStatus.PNU_COMPLETED);
       } catch (Exception e) {
         log.error("[GUKYUIN] failed uid={}", dto.getUid(), e);
-        gukYuinPnuJobCoreService.updateGukYuinApplyStateComplete(
+        gukYuinJobCoreService.updateGukYuinApplyStateComplete(
             dto.getId(), GukYuinStatus.PNU_FAILED);
       }
     }
   }
 
-  private void processUid(String chnDtctId, String uid) {
-    ResultDto result = gukYuinApiService.listChnDtctId(chnDtctId);
+  private void processUid(String chnDtctMstId, String uid) {
+    ResultDto result = gukYuinApiService.detail(chnDtctMstId);
     if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
       return;
     }
@@ -85,26 +118,19 @@ public class GukYuinApiPnuJobService {
   }
 
   private void processPage(String uid, int page, int pageSize) {
-    ResultContDto resContList = gukYuinApiService.findChnContList(uid, page, pageSize);
-
-    if (resContList.getResult() == null || resContList.getResult().isEmpty()) {
+    ResultContDto cont = gukYuinApiService.findChnContList(uid, page, pageSize);
+    if (cont == null || cont.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());
-        }
+    // pnuList 업데이트
+    for (ChngDetectContDto.ContBasic contBasic : cont.getResult()) {
+      if (contBasic.getPnuList() == null) {
+        return;
       }
+
+      gukYuinJobCoreService.upsertMapSheetDataAnalGeomPnu(
+          contBasic.getChnDtctObjtId(), contBasic.getPnuList());
     }
   }
 }

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

@@ -1,55 +0,0 @@
-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/GukYuinApiStatusJobService.java

@@ -1,71 +0,0 @@
-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

@@ -1,76 +0,0 @@
-package com.kamco.cd.kamcoback.scheduler.service;
-
-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 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 * * *") // 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);
-        }
-
-      } catch (Exception e) {
-        log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), e);
-      }
-    }
-  }
-}

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

@@ -28,6 +28,7 @@ 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;
 
@@ -38,6 +39,21 @@ 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

@@ -1,112 +0,0 @@
-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,13 +8,20 @@ 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;
@@ -39,13 +46,89 @@ public class TrainingDataReviewJobService {
   }
 
   @Transactional
-  @Scheduled(cron = "0 0 2 * * *")
-  public void exportGeojsonLabelingGeom() {
+  @Scheduled(cron = "0 0 0 * * *")
+  public void assignReviewerYesterdayLabelComplete() {
 
     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,7 +3,6 @@ package com.kamco.cd.kamcoback.trainingdata;
 import com.kamco.cd.kamcoback.code.dto.CommonCodeDto;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto.ResponseObj;
-import com.kamco.cd.kamcoback.scheduler.service.TrainingDataLabelJobService;
 import com.kamco.cd.kamcoback.scheduler.service.TrainingDataReviewJobService;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto;
 import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.ReviewGeometryInfo;
@@ -33,7 +32,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class TrainingDataReviewApiController {
 
   private final TrainingDataReviewService trainingDataReviewService;
-  private final TrainingDataLabelJobService trainingDataLabelJobService;
   private final TrainingDataReviewJobService trainingDataReviewJobService;
 
   @Operation(summary = "목록 조회", description = "검수 할당 목록 조회")
@@ -564,7 +562,7 @@ public class TrainingDataReviewApiController {
       description = "스케줄링이 실패한 경우 수동 호출하는 API, 어제 라벨링 완료된 것을 해당 검수자들에게 할당함")
   @GetMapping("/run-schedule")
   public ApiResponseDto<Void> runTrainingReviewSchedule() {
-    trainingDataLabelJobService.assignReviewerYesterdayLabelComplete();
+    trainingDataReviewJobService.assignReviewerYesterdayLabelComplete();
     return ApiResponseDto.ok(null);
   }
 

src/main/resources/application-dev.yml

@@ -123,7 +123,5 @@ training-data:
   geojson-dir: /kamco-nfs/model_output/labeling/
 
 layer:
-  geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
-  wms-path: geoserver/cd
-  wmts-path: geoserver/cd/gwc/service
+  geoserver-url: http://label-tile.gs.dabeeo.com
   workspace: cd

src/main/resources/application-local.yml

@@ -6,7 +6,7 @@ spring:
   jpa:
     show-sql: false
     hibernate:
-      ddl-auto: validate  # 로컬만 완화(시킬려면 update으로 변경)
+      ddl-auto: update  # 로컬만 완화(시킬려면 update으로 변경)
     properties:
       hibernate:
         default_batch_fetch_size: 100     # ✅ 성능 - N+1 쿼리 방지
@@ -16,11 +16,9 @@ spring:
 
   datasource:
     url: jdbc:postgresql://192.168.2.127:15432/kamco_cds
-    #    url: jdbc:postgresql://localhost:5432/local_0128
+    #url: jdbc:postgresql://localhost:5432/kamco_cds # 로컬호스트
     username: kamco_cds
     password: kamco_cds_Q!W@E#R$
-    #    username: postgres
-    #    password: 1234
     hikari:
       minimum-idle: 1
       maximum-pool-size: 5
@@ -70,30 +68,30 @@ mapsheet:
 
 
 file:
-  sync-root-dir: C:/Users/gypark/kamco-nfs/images/
+  sync-root-dir: /Users/bokmin/kamco-nfs/images/
   #sync-root-dir: /kamco-nfs/images/
-  sync-tmp-dir: ${file.sync-root-dir}/tmp/
+  sync-tmp-dir: ${file.sync-root-dir}/tmp
   sync-file-extention: tfw,tif
-  sync-auto-exception-start-year: 2025
+  sync-auto-exception-start-year: 2024
   sync-auto-exception-before-year-cnt: 3
 
-  dataset-dir: C:/Users/gypark/kamco-nfs/dataset/
+  dataset-dir: /Users/bokmin/kamco-nfs/dataset/export/
   #dataset-dir: /kamco-nfs/dataset/export/
   dataset-tmp-dir: ${file.dataset-dir}tmp/
 
-  model-dir: C:/Users/gypark/kamco-nfs/ckpt/model/
+  model-dir: /Users/bokmin/kamco-nfs/ckpt/model/
   #model-dir: /kamco-nfs/ckpt/model/
   model-tmp-dir: ${file.model-dir}tmp/
   model-file-extention: pth,json,py
 
-  pt-path: /kamco-nfs/ckpt/classification/
-  pt-FileName: v5-best.pt
+  pt-path: /kamco-nfs/ckpt/model/v6-cls-checkpoints/
+  pt-FileName: yolov8_6th-6m.pt
 
 inference:
-  url: http://10.100.0.11:8000/jobs
-  batch-url: http://10.100.0.11:8000/batches
-  geojson-dir: /kamco-nfs/requests/
-  jar-path: jar/makeshp-1.0.0.jar
+  url: http://192.168.2.183:8000/jobs
+  batch-url: http://192.168.2.183:8000/batches
+  geojson-dir: /Users/bokmin/kamco-nfs/requests/
+  jar-path: /Users/bokmin/kamco-nfs/dataset/shp/shp-exporter.jar
   inference-server-name: server1,server2,server3,server4
 
 gukyuin:
@@ -102,9 +100,8 @@ gukyuin:
   cdi: ${gukyuin.url}/api/kcd/cdi
 
 training-data:
-  geojson-dir: /kamco-nfs/model_output/labeling/
+  geojson-dir: /Users/bokmin/kamco-nfs/model_output/labeling/
 
 layer:
-  geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
-  path: /geoserver/cd/gwc/service/
+  geoserver-url: http://localhost:9080
   workspace: cd

src/main/resources/application-prod.yml

@@ -78,7 +78,5 @@ training-data:
   geojson-dir: /kamco-nfs/model_output/labeling/
 
 layer:
-  geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
-  wms-path: geoserver/cd
-  wmts-path: geoserver/cd/gwc/service
+  geoserver-url: http://label-tile.gs.dabeeo.com
   workspace: cd