진행률 모델 개수 4개로 수정

Reviewed-on: #160

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

@@ -37,7 +37,6 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
     // JWT 토큰을 검증하고, 인증된 사용자로 SecurityContext에 등록
     if (token != null && jwtTokenProvider.isValidToken(token)) {
       String username = jwtTokenProvider.getSubject(token);
-
       UserDetails userDetails = userDetailsService.loadUserByUsername(username);
       UsernamePasswordAuthenticationToken authentication =
           new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());

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

@@ -8,11 +8,13 @@ import jakarta.annotation.PostConstruct;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import javax.crypto.SecretKey;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 /** 토큰 생성 */
 @Component
+@Log4j2
 public class JwtTokenProvider {
 
   @Value("${jwt.secret}")
@@ -34,11 +36,13 @@ public class JwtTokenProvider {
 
   // Access Token 생성
   public String createAccessToken(String subject) {
+    log.info("TOKEN VALIDITY = {}", accessTokenValidityInMs);
     return createToken(subject, accessTokenValidityInMs);
   }
 
   // Refresh Token 생성
   public String createRefreshToken(String subject) {
+    log.info("REFRESH TOKEN VALIDITY = {}", refreshTokenValidityInMs);
     return createToken(subject, refreshTokenValidityInMs);
   }
 

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

@@ -58,6 +58,7 @@ public class MenuAuthorizationManager implements AuthorizationManager<RequestAut
 
       for (MenuEntity menu : allowedMenus) {
         String baseUri = menu.getMenuUrl();
+
         if (baseUri == null || baseUri.isBlank()) {
           continue;
         }

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

@@ -35,6 +35,11 @@ public class ChangeDetectionDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return name();
+    }
   }
 
   @CodeExpose
@@ -55,6 +60,11 @@ public class ChangeDetectionDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return desc;
+    }
   }
 
   @Schema(name = "TestDto", description = "테스트용")

src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java

@@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.code.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.common.utils.html.HtmlEscapeDeserializer;
 import com.kamco.cd.kamcoback.common.utils.html.HtmlUnescapeSerializer;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
@@ -119,10 +120,11 @@ public class CommonCodeDto {
         String props2,
         String props3,
         ZonedDateTime deletedDttm) {
+      boolean english = HeaderUtil.isEnglishRequest();
       this.id = id;
       this.code = code;
       this.description = description;
-      this.name = name;
+      this.name = english ? code : name;
       this.order = order;
       this.used = used;
       this.deleted = deleted;

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

@@ -45,4 +45,9 @@ public enum CommonUseStatus implements EnumType {
   public EnumDto<CommonUseStatus> getEnumDto() {
     return new EnumDto<>(this, this.id, this.text);
   }
+
+  @Override
+  public String getTextEn() {
+    return id;
+  }
 }

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

@@ -9,12 +9,13 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum CrsType implements EnumType {
-  EPSG_3857("Web Mercator, 웹지도 미터(EPSG:900913 동일)"),
-  EPSG_4326("WGS84 위경도, GeoJSON/OSM 기본"),
-  EPSG_5186("5186::Korea 2000 중부 TM, 한국 SHP"),
-  EPSG_5179("5179::Korea 2000 중부 TM, 한국 SHP");
+  EPSG_3857("Web Mercator, 웹지도 미터(EPSG:900913 동일)", "Web Mercator"),
+  EPSG_4326("WGS84 위경도, GeoJSON/OSM 기본", "GeoJSON/OSM"),
+  EPSG_5186("5186::Korea 2000 중부 TM, 한국 SHP", "5186::Korea 2000"),
+  EPSG_5179("5179::Korea 2000 중부 TM, 한국 SHP", "5179::Korea 2000");
 
   private final String desc;
+  private final String descEn;
 
   @Override
   public String getId() {
@@ -25,4 +26,9 @@ public enum CrsType implements EnumType {
   public String getText() {
     return desc;
   }
+
+  @Override
+  public String getTextEn() {
+    return descEn;
+  }
 }

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

@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.common.enums;
 
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -51,6 +52,6 @@ public enum DetectionClassification {
    */
   public static String fromStrDesc(String text) {
     DetectionClassification dtf = fromString(text);
-    return dtf.getDesc();
+    return HeaderUtil.isEnglishRequest() ? dtf.getId() : dtf.getDesc();
   }
 }

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

@@ -9,13 +9,14 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum FileUploadStatus implements EnumType {
-  INIT("초기화"),
-  UPLOADING("업로드중"),
-  DONE("업로드완료"),
-  MERGED("병합완료"),
-  MERGE_FAIL("병합 실패");
+  INIT("초기화", "Init"),
+  UPLOADING("업로드중", "Uploading"),
+  DONE("업로드완료", "Upload Done"),
+  MERGED("병합완료", "Merged Done"),
+  MERGE_FAIL("병합 실패", "Merge Failed");
 
   private final String desc;
+  private final String descEn;
 
   @Override
   public String getId() {
@@ -26,4 +27,9 @@ public enum FileUploadStatus implements EnumType {
   public String getText() {
     return desc;
   }
+
+  @Override
+  public String getTextEn() {
+    return descEn;
+  }
 }

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

@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.common.enums;
 
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.common.utils.enums.CodeExpose;
 import com.kamco.cd.kamcoback.common.utils.enums.EnumType;
 import java.util.Arrays;
@@ -25,6 +26,11 @@ public enum ImageryFitStatus implements EnumType {
     return desc;
   }
 
+  @Override
+  public String getTextEn() {
+    return name();
+  }
+
   public static ImageryFitStatus fromCode(String code) {
     if (code == null) {
       return null;
@@ -38,6 +44,8 @@ public enum ImageryFitStatus implements EnumType {
 
   public static String getDescByCode(String code) {
     ImageryFitStatus status = fromCode(code);
-    return status != null ? status.getDesc() : null;
+    return status != null
+        ? (HeaderUtil.isEnglishRequest() ? status.getTextEn() : status.getDesc())
+        : null;
   }
 }

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

@@ -10,14 +10,15 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum LayerType implements EnumType {
-  TILE("배경지도"),
-  GEOJSON("객체데이터"),
-  WMTS("타일레이어"),
-  WMS("지적도"),
-  KAMCO_WMS("국유인WMS"),
-  KAMCO_WMTS("국유인WMTS");
+  TILE("배경지도", "Tile"),
+  GEOJSON("객체데이터", "GeoJSON"),
+  WMTS("타일레이어", "WMTS"),
+  WMS("지적도", "WMS"),
+  KAMCO_WMS("국유인WMS", "KAMCO_WMS"),
+  KAMCO_WMTS("국유인WMTS", "KAMCO_WMTS");
 
   private final String desc;
+  private final String descEn;
 
   @Override
   public String getId() {
@@ -29,6 +30,11 @@ public enum LayerType implements EnumType {
     return desc;
   }
 
+  @Override
+  public String getTextEn() {
+    return descEn;
+  }
+
   public static Optional<LayerType> from(String type) {
     try {
       return Optional.of(LayerType.valueOf(type));

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

@@ -9,12 +9,13 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum MngStateType implements EnumType {
-  NOTYET("동기화 시작"),
-  PROCESSING("데이터 체크"),
-  DONE("동기화 작업 종료"),
-  TAKINGERROR("오류 데이터 처리중");
+  NOTYET("동기화 시작", "Sync Started"),
+  PROCESSING("데이터 체크", "Data Check"),
+  DONE("동기화 작업 종료", "Sync Completed"),
+  TAKINGERROR("오류 데이터 처리중", "Processing Error Data");
 
   private final String desc;
+  private final String descEn;
 
   @Override
   public String getId() {
@@ -25,4 +26,8 @@ public enum MngStateType implements EnumType {
   public String getText() {
     return desc;
   }
+
+  public String getTextEn() {
+    return descEn;
+  }
 }

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

@@ -24,4 +24,9 @@ public enum RoleType implements EnumType {
   public String getText() {
     return desc;
   }
+
+  @Override
+  public String getTextEn() {
+    return name();
+  }
 }

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

@@ -24,4 +24,9 @@ public enum StatusType implements EnumType {
   public String getText() {
     return desc;
   }
+
+  @Override
+  public String getTextEn() {
+    return name();
+  }
 }

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

@@ -23,4 +23,9 @@ public enum SyncCheckStateType implements EnumType {
   public String getText() {
     return desc;
   }
+
+  @Override
+  public String getTextEn() {
+    return name();
+  }
 }

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

@@ -30,4 +30,9 @@ public enum SyncStateType implements EnumType {
   public String getText() {
     return desc;
   }
+
+  @Override
+  public String getTextEn() {
+    return name();
+  }
 }

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

@@ -1,23 +1,45 @@
 package com.kamco.cd.kamcoback.common.service;
 
+import com.kamco.cd.kamcoback.config.InferenceProperties;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Log4j2
+// 0312
+@RequiredArgsConstructor
 @Component
 public class ExternalJarRunner {
   @Value("${spring.profiles.active}")
   private String profile;
 
+  // 0312
+  private final InferenceProperties inferenceProperties;
+
   private static final long TIMEOUT_MINUTES = TimeUnit.DAYS.toMinutes(3);
 
+  //  java -jar build/libs/shp-exporter.jar   --batch   --geoserver.enabled=true
+  // --converter.inference-id=qq99999   --converter.batch-ids[0]=111
+  // 0312 shp 파일 배치를 통해 생성
+  public void run(String inferenceLearningId, List<Long> batchIds) {
+    // JAR 경로 (shape파일 생성용)
+    String jarPathV2 = inferenceProperties.getJarPathV2();
+    List<String> args = new ArrayList<>();
+    args.add(" --spring.profiles.active=" + profile);
+    args.add(" --batch");
+    args.add(" --geoserver.enabled=true");
+    args.add(" --converter.inference-id=" + inferenceLearningId);
+    batchIds.forEach(batchId -> args.add(" --converter.batch-ids[" + args.size() + "]=" + batchId));
+    execJar(jarPathV2, args);
+  }
+
   /**
    * shp 파일 생성
    *
@@ -74,7 +96,8 @@ public class ExternalJarRunner {
       cmd.add("-jar");
       cmd.add(jarPath);
       cmd.addAll(args);
-
+      // 0312
+      log.info("exec jar command: {}", cmd);
       ProcessBuilder pb = new ProcessBuilder(cmd);
       pb.redirectErrorStream(true);
 

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

@@ -1,6 +1,9 @@
 package com.kamco.cd.kamcoback.common.utils;
 
 import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 public final class HeaderUtil {
 
@@ -20,4 +23,20 @@ public final class HeaderUtil {
   public static String getRequired(HttpServletRequest request, String headerName) {
     return get(request, headerName);
   }
+
+  public static boolean isEnglishRequest() {
+    RequestAttributes attrs = RequestContextHolder.getRequestAttributes();
+
+    if (!(attrs instanceof ServletRequestAttributes servletAttrs)) {
+      return false;
+    }
+
+    String acceptLanguage = servletAttrs.getRequest().getHeader("Accept-Language");
+
+    if (acceptLanguage == null || acceptLanguage.isBlank()) {
+      return false;
+    }
+
+    return acceptLanguage.toLowerCase().startsWith("en");
+  }
 }

src/main/java/com/kamco/cd/kamcoback/common/utils/enums/EnumType.java

@@ -5,4 +5,6 @@ public interface EnumType {
   String getId();
 
   String getText();
+
+  String getTextEn();
 }

src/main/java/com/kamco/cd/kamcoback/common/utils/enums/Enums.java

@@ -1,6 +1,7 @@
 package com.kamco.cd.kamcoback.common.utils.enums;
 
 import com.kamco.cd.kamcoback.code.dto.CommonCodeDto.CodeDto;
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -32,11 +33,12 @@ public class Enums {
   // enum -> CodeDto list
   public static List<CodeDto> toList(Class<? extends Enum<?>> enumClass) {
     Object[] enums = enumClass.getEnumConstants();
+    boolean english = HeaderUtil.isEnglishRequest();
 
     return Arrays.stream(enums)
         .map(e -> (EnumType) e)
         .filter(e -> !isHidden(enumClass, (Enum<?>) e))
-        .map(e -> new CodeDto(e.getId(), e.getText()))
+        .map(e -> new CodeDto(e.getId(), english ? e.getTextEn() : e.getText()))
         .toList();
   }
 

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

@@ -16,5 +16,7 @@ public class InferenceProperties {
   private String batchUrl;
   private String geojsonDir;
   private String jarPath;
+  // 0312
+  private String jarPathV2;
   private String inferenceServerName;
 }

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

@@ -71,6 +71,10 @@ public class SecurityConfig {
                     .requestMatchers("/api/test/review")
                     .hasAnyRole("ADMIN", "REVIEWER")
 
+                    // shapefile 생성 테스트 API - 인증 없이 접근 가능
+                    .requestMatchers("/api/test/make-shapefile")
+                    .permitAll()
+
                     // ASYNC/ERROR 재디스패치는 막지 않기 (다운로드/스트리밍에서 필수)
                     .dispatcherTypeMatchers(DispatcherType.ASYNC, DispatcherType.ERROR)
                     .permitAll()

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

@@ -39,10 +39,10 @@ public class ApiLogFunction {
 
   public static String getXFowardedForIp(HttpServletRequest request) {
     String ip = request.getHeader("X-Forwarded-For");
-    if (ip != null) {
-      ip = ip.split(",")[0].trim();
+    if (ip != null && !ip.isBlank()) {
+      return ip.split(",")[0].trim();
     }
-    return ip;
+    return request.getRemoteAddr();
   }
 
   // 사용자 ID 추출 예시 (Spring Security 기준)

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

@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.config.api;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.kamco.cd.kamcoback.common.utils.enums.EnumType;
+import java.util.Arrays;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
@@ -192,6 +193,11 @@ public class ApiResponseDto<T> {
       return message;
     }
 
+    @Override
+    public String getTextEn() {
+      return message;
+    }
+
     public static ApiResponseCode getCode(String name) {
       return ApiResponseCode.valueOf(name.toUpperCase());
     }
@@ -220,5 +226,12 @@ public class ApiResponseDto<T> {
 
       return INTERNAL_SERVER_ERROR;
     }
+
+    public static ApiResponseCode fromMessage(String message) {
+      return Arrays.stream(values())
+          .filter(code -> code.getMessage().equals(message))
+          .findFirst()
+          .orElse(null);
+    }
   }
 }

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

@@ -29,6 +29,11 @@ public class GukYuinDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return desc;
+    }
   }
 
   @Getter

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

@@ -26,4 +26,9 @@ public enum GukYuinStatus implements EnumType {
   public String getText() {
     return desc;
   }
+
+  @Override
+  public String getTextEn() {
+    return desc;
+  }
 }

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

@@ -8,6 +8,7 @@ import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceStatusDetailDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.ResultList;
+import com.kamco.cd.kamcoback.inference.service.InferenceAsyncService;
 import com.kamco.cd.kamcoback.inference.service.InferenceResultService;
 import com.kamco.cd.kamcoback.log.dto.AuditLogDto;
 import com.kamco.cd.kamcoback.log.dto.AuditLogDto.DownloadReq;
@@ -55,6 +56,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class InferenceResultApiController {
 
   private final InferenceResultService inferenceResultService;
+  private final InferenceAsyncService inferenceAsyncService;
   private final MapSheetMngService mapSheetMngService;
   private final ModelMngService modelMngService;
   private final RangeDownloadResponder rangeDownloadResponder;
@@ -176,7 +178,8 @@ public class InferenceResultApiController {
       })
   @DeleteMapping("/end")
   public ApiResponseDto<UUID> getInferenceGeomList() {
-    UUID uuid = inferenceResultService.deleteInferenceEnd();
+    //    UUID uuid = inferenceResultService.deleteInferenceEnd();
+    UUID uuid = inferenceAsyncService.asyncInferenceEnd();
     return ApiResponseDto.ok(uuid);
   }
 
@@ -445,4 +448,22 @@ public class InferenceResultApiController {
           UUID uuid) {
     return ApiResponseDto.ok(inferenceResultService.getInferenceRunMapId(uuid));
   }
+
+  @Operation(summary = "추론 삭제", description = "추론관리 > 추론목록 > 추론 상세 > 추론 삭제")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "201",
+            description = "종료 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Page.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @DeleteMapping("/delete-inference/{uuid}")
+  public ApiResponseDto<ApiResponseDto.ResponseObj> deleteInference(@PathVariable UUID uuid) {
+    return ApiResponseDto.ok(inferenceResultService.deleteInference(uuid));
+  }
 }

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

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.kamco.cd.kamcoback.common.enums.DetectionClassification;
 import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.DetectOption;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope;
@@ -156,9 +157,14 @@ public class InferenceDetailDto {
     String classAfterName;
     Long classAfterCnt;
 
+    boolean english = HeaderUtil.isEnglishRequest();
+
     public Dashboard(String classAfterCd, Long classAfterCnt) {
       this.classAfterCd = classAfterCd;
-      this.classAfterName = DetectionClassification.fromString(classAfterCd).getDesc();
+      this.classAfterName =
+          english
+              ? DetectionClassification.fromString(classAfterCd).getId()
+              : DetectionClassification.fromString(classAfterCd).getDesc();
       this.classAfterCnt = classAfterCnt;
     }
   }
@@ -294,8 +300,10 @@ public class InferenceDetailDto {
   }
 
   @Getter
+  @Setter
   public static class Geom {
 
+    Long geoUid;
     UUID uuid;
     String uid;
     Integer compareYyyy;
@@ -313,7 +321,10 @@ public class InferenceDetailDto {
     String pnu;
     String fitState;
 
+    boolean english = HeaderUtil.isEnglishRequest();
+
     public Geom(
+        Long geoUid,
         UUID uuid,
         String uid,
         Integer compareYyyy,
@@ -328,16 +339,23 @@ public class InferenceDetailDto {
         String subUid,
         String pnu,
         String fitState) {
+      this.geoUid = geoUid;
       this.uuid = uuid;
       this.uid = uid;
       this.compareYyyy = compareYyyy;
       this.targetYyyy = targetYyyy;
       this.cdProb = cdProb;
       this.classBeforeCd = classBeforeCd;
-      this.classBeforeName = DetectionClassification.fromString(classBeforeCd).getDesc();
+      this.classBeforeName =
+          english
+              ? DetectionClassification.fromString(classBeforeCd).getId()
+              : DetectionClassification.fromString(classBeforeCd).getDesc();
       this.classBeforeProb = classBeforeProb;
       this.classAfterCd = classAfterCd;
-      this.classAfterName = DetectionClassification.fromString(classAfterCd).getDesc();
+      this.classAfterName =
+          english
+              ? DetectionClassification.fromString(classAfterCd).getId()
+              : DetectionClassification.fromString(classAfterCd).getDesc();
       this.classAfterProb = classAfterProb;
       this.mapSheetNum = mapSheetNum;
       this.mapSheetName = mapSheetName;
@@ -424,11 +442,13 @@ public class InferenceDetailDto {
     private Long m1BatchId;
     private Long m2BatchId;
     private Long m3BatchId;
+    private Long m4BatchId;
     private String status;
     private String runningModelType;
     private UUID m1ModelUuid;
     private UUID m2ModelUuid;
     private UUID m3ModelUuid;
+    private UUID m4ModelUuid;
     private String uid;
   }
 
@@ -443,6 +463,7 @@ public class InferenceDetailDto {
     private String modelVer1;
     private String modelVer2;
     private String modelVer3;
+    private String modelVer4;
     private Integer compareYyyy;
     private Integer targetYyyy;
     private String detectOption;
@@ -465,6 +486,7 @@ public class InferenceDetailDto {
         String modelVer1,
         String modelVer2,
         String modelVer3,
+        String modelVer4,
         Integer compareYyyy,
         Integer targetYyyy,
         String detectOption,
@@ -481,6 +503,7 @@ public class InferenceDetailDto {
       this.modelVer1 = modelVer1;
       this.modelVer2 = modelVer2;
       this.modelVer3 = modelVer3;
+      this.modelVer4 = modelVer4;
       this.compareYyyy = compareYyyy;
       this.targetYyyy = targetYyyy;
       this.detectOption = DetectOption.getDescByCode(detectOption);

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

@@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.inference.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.common.utils.enums.EnumType;
 import com.kamco.cd.kamcoback.common.utils.interfaces.EnumValid;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
@@ -14,6 +15,8 @@ import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -51,6 +54,11 @@ public class InferenceResultDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return desc;
+    }
   }
 
   /** 탐지 데이터 옵션 dto */
@@ -79,6 +87,11 @@ public class InferenceResultDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return desc;
+    }
   }
 
   @Getter
@@ -87,6 +100,7 @@ public class InferenceResultDto {
     READY("대기"),
     IN_PROGRESS("진행중"),
     END("완료"),
+    END_FAIL("종료실패"),
     FORCED_END("강제종료");
     private final String desc;
 
@@ -95,8 +109,13 @@ public class InferenceResultDto {
     }
 
     public static String getDescByCode(String code) {
+      boolean english = HeaderUtil.isEnglishRequest();
+      if (english) {
+        return fromCode(code).getTextEn();
+      } else {
         return fromCode(code).getDesc();
       }
+    }
 
     @Override
     public String getId() {
@@ -107,6 +126,11 @@ public class InferenceResultDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return name();
+    }
   }
 
   @Getter
@@ -128,6 +152,11 @@ public class InferenceResultDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return desc;
+    }
   }
 
   /** 목록조회 dto */
@@ -210,10 +239,49 @@ public class InferenceResultDto {
       long m = (s % 3600) / 60;
       long sec = s % 60;
 
+      boolean english = HeaderUtil.isEnglishRequest();
+      if (english) {
+        return String.format("%dh %dm %ds", h, m, sec);
+      } else {
         return String.format("%d시간 %d분 %d초", h, m, sec);
       }
     }
 
+    @JsonProperty("mapSheetCnt")
+    public String getMapSheetCnt() {
+      boolean english = HeaderUtil.isEnglishRequest();
+      String text = this.mapSheetCnt;
+
+      if (!english) {
+        return text;
+      }
+
+      // "창원 외 34건"
+      Pattern otherPattern = Pattern.compile("^(.+) 외 (\\d+)건$");
+      Matcher otherMatcher = otherPattern.matcher(text);
+
+      if (otherMatcher.find()) {
+        String name = otherMatcher.group(1);
+        int count = Integer.parseInt(otherMatcher.group(2));
+
+        return name + " and " + count + (count == 1 ? " other" : " others");
+      }
+
+      // "창원 1건"
+      Pattern itemPattern = Pattern.compile("^(.+) (\\d+)건$");
+      Matcher itemMatcher = itemPattern.matcher(text);
+
+      if (itemMatcher.find()) {
+        String name = itemMatcher.group(1);
+        int count = Integer.parseInt(itemMatcher.group(2));
+
+        return name + " (" + count + (count == 1 ? " item" : " items") + ")";
+      }
+
+      return text;
+    }
+  }
+
   /** 목록조회 검색 조건 dto */
   @Getter
   @Setter
@@ -260,6 +328,10 @@ public class InferenceResultDto {
     @NotNull
     private UUID model3Uuid;
 
+    @Schema(description = "G4", example = "58c1153e-dec6-4424-82a1-189083a9d9dc")
+    @NotNull
+    private UUID model4Uuid;
+
     @Schema(description = "비교년도", example = "2023")
     @NotNull
     private Integer compareYyyy;
@@ -310,6 +382,10 @@ public class InferenceResultDto {
     @JsonFormatDttm
     ZonedDateTime m3ModelStartDttm;
 
+    @Schema(description = "모델4 사용시간 시작일시")
+    @JsonFormatDttm
+    ZonedDateTime m4ModelStartDttm;
+
     @Schema(description = "모델1 사용시간 종료일시")
     @JsonFormatDttm
     ZonedDateTime m1ModelEndDttm;
@@ -322,6 +398,10 @@ public class InferenceResultDto {
     @JsonFormatDttm
     ZonedDateTime m3ModelEndDttm;
 
+    @Schema(description = "모델4 사용시간 종료일시")
+    @JsonFormatDttm
+    ZonedDateTime m4ModelEndDttm;
+
     @Schema(description = "탐지대상 도엽수")
     private Long detectingCnt;
 
@@ -334,6 +414,9 @@ public class InferenceResultDto {
     @Schema(description = "모델3 분석 대기")
     private Integer m3PendingJobs;
 
+    @Schema(description = "모델4 분석 대기")
+    private Integer m4PendingJobs;
+
     @Schema(description = "모델1 분석 진행중")
     private Integer m1RunningJobs;
 
@@ -343,6 +426,9 @@ public class InferenceResultDto {
     @Schema(description = "모델3 분석 진행중")
     private Integer m3RunningJobs;
 
+    @Schema(description = "모델4 분석 진행중")
+    private Integer m4RunningJobs;
+
     @Schema(description = "모델1 분석 완료")
     private Integer m1CompletedJobs;
 
@@ -352,6 +438,9 @@ public class InferenceResultDto {
     @Schema(description = "모델3 분석 완료")
     private Integer m3CompletedJobs;
 
+    @Schema(description = "모델4 분석 완료")
+    private Integer m4CompletedJobs;
+
     @Schema(description = "모델1 분석 실패")
     private Integer m1FailedJobs;
 
@@ -361,6 +450,9 @@ public class InferenceResultDto {
     @Schema(description = "모델3 분석 실패")
     private Integer m3FailedJobs;
 
+    @Schema(description = "모델4 분석 실패")
+    private Integer m4FailedJobs;
+
     @Schema(description = "변화탐지 제목")
     private String title;
 
@@ -396,6 +488,9 @@ public class InferenceResultDto {
     @Schema(description = "모델3 버전")
     private String modelVer3;
 
+    @Schema(description = "모델4 버전")
+    private String modelVer4;
+
     @Schema(description = "탑지 도엽 수")
     @JsonIgnore
     private Long totalJobs;
@@ -405,21 +500,27 @@ public class InferenceResultDto {
         Integer m1PendingJobs,
         Integer m2PendingJobs,
         Integer m3PendingJobs,
+        Integer m4PendingJobs,
         Integer m1RunningJobs,
         Integer m2RunningJobs,
         Integer m3RunningJobs,
+        Integer m4RunningJobs,
         Integer m1CompletedJobs,
         Integer m2CompletedJobs,
         Integer m3CompletedJobs,
+        Integer m4CompletedJobs,
         Integer m1FailedJobs,
         Integer m2FailedJobs,
         Integer m3FailedJobs,
+        Integer m4FailedJobs,
         ZonedDateTime m1ModelStartDttm,
         ZonedDateTime m2ModelStartDttm,
         ZonedDateTime m3ModelStartDttm,
+        ZonedDateTime m4ModelStartDttm,
         ZonedDateTime m1ModelEndDttm,
         ZonedDateTime m2ModelEndDttm,
         ZonedDateTime m3ModelEndDttm,
+        ZonedDateTime m4ModelEndDttm,
         String title,
         Integer compareYyyy,
         Integer targetYyyy,
@@ -431,26 +532,33 @@ public class InferenceResultDto {
         String modelVer1,
         String modelVer2,
         String modelVer3,
+        String modelVer4,
         Long totalJobs) {
       this.detectingCnt = detectingCnt;
       this.m1PendingJobs = m1PendingJobs;
       this.m2PendingJobs = m2PendingJobs;
       this.m3PendingJobs = m3PendingJobs;
+      this.m4PendingJobs = m4PendingJobs;
       this.m1RunningJobs = m1RunningJobs;
       this.m2RunningJobs = m2RunningJobs;
       this.m3RunningJobs = m3RunningJobs;
+      this.m4RunningJobs = m4RunningJobs;
       this.m1CompletedJobs = m1CompletedJobs;
       this.m2CompletedJobs = m2CompletedJobs;
       this.m3CompletedJobs = m3CompletedJobs;
+      this.m4CompletedJobs = m4CompletedJobs;
       this.m1FailedJobs = m1FailedJobs;
       this.m2FailedJobs = m2FailedJobs;
       this.m3FailedJobs = m3FailedJobs;
+      this.m4FailedJobs = m4FailedJobs;
       this.m1ModelStartDttm = m1ModelStartDttm;
       this.m2ModelStartDttm = m2ModelStartDttm;
       this.m3ModelStartDttm = m3ModelStartDttm;
+      this.m4ModelStartDttm = m4ModelStartDttm;
       this.m1ModelEndDttm = m1ModelEndDttm;
       this.m2ModelEndDttm = m2ModelEndDttm;
       this.m3ModelEndDttm = m3ModelEndDttm;
+      this.m4ModelEndDttm = m4ModelEndDttm;
       this.title = title;
       this.compareYyyy = compareYyyy;
       this.targetYyyy = targetYyyy;
@@ -462,6 +570,7 @@ public class InferenceResultDto {
       this.modelVer1 = modelVer1;
       this.modelVer2 = modelVer2;
       this.modelVer3 = modelVer3;
+      this.modelVer4 = modelVer4;
       this.totalJobs = totalJobs;
     }
 
@@ -469,14 +578,16 @@ public class InferenceResultDto {
     @JsonProperty("progress")
     private int getProgress() {
       long tiles = this.totalJobs == null ? 0L : this.totalJobs; // 도엽수
-      int models = 3; // 모델 개수
+      int models = 4; // 모델 개수
       int completed =
           this.m1CompletedJobs
               + this.m2CompletedJobs
               + this.m3CompletedJobs
+              + this.m4CompletedJobs
               + this.m1FailedJobs
               + this.m2FailedJobs
-              + this.m3FailedJobs; // 완료수
+              + this.m3FailedJobs
+              + this.m4FailedJobs; // 완료수
 
       long total = tiles * models; // 전체 작업량
       if (completed >= total) {
@@ -515,6 +626,12 @@ public class InferenceResultDto {
       return formatElapsedTime(this.m3ModelStartDttm, this.m3ModelEndDttm);
     }
 
+    @Schema(description = "G4 사용시간")
+    @JsonProperty("m4ElapsedTim")
+    public String getM4ElapsedTime() {
+      return formatElapsedTime(this.m4ModelStartDttm, this.m4ModelEndDttm);
+    }
+
     private String formatElapsedTime(ZonedDateTime start, ZonedDateTime end) {
       if (start == null || end == null) {
         return null;
@@ -683,6 +800,7 @@ public class InferenceResultDto {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class MapSheetFallbackYearDto {
+
     private String mapSheetNum;
     private Integer mngYyyy;
   }

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

@@ -0,0 +1,117 @@
+package com.kamco.cd.kamcoback.inference.service;
+
+import com.kamco.cd.kamcoback.common.exception.CustomApiException;
+import com.kamco.cd.kamcoback.common.inference.service.InferenceCommonService;
+import com.kamco.cd.kamcoback.common.utils.UserUtil;
+import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient;
+import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult;
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.SaveInferenceAiDto;
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Status;
+import com.kamco.cd.kamcoback.postgres.core.AuditLogCoreService;
+import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService;
+import com.kamco.cd.kamcoback.postgres.core.MapSheetMngCoreService;
+import com.kamco.cd.kamcoback.postgres.core.ModelMngCoreService;
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/** 추론 관리 */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class InferenceAsyncService {
+
+  private final InferenceResultCoreService inferenceResultCoreService;
+  private final MapSheetMngCoreService mapSheetMngCoreService;
+  private final ModelMngCoreService modelMngCoreService;
+  private final AuditLogCoreService auditLogCoreService;
+  private final InferenceCommonService inferenceCommonService;
+
+  private final ExternalHttpClient externalHttpClient;
+  private final UserUtil userUtil;
+
+  @Value("${inference.batch-url}")
+  private String batchUrl;
+
+  @Value("${inference.inference-server-name}")
+  private String inferenceServerName;
+
+  @Value("${file.dataset-dir}")
+  private String datasetDir;
+
+  @Value("${spring.profiles.active}")
+  private String activeEnv;
+
+  @Value("${inference.geojson-dir}")
+  private String inferenceDir;
+
+  // 0313
+  @Transactional
+  public UUID asyncInferenceEnd() {
+    SaveInferenceAiDto dto = inferenceResultCoreService.getProcessing();
+    if (dto == null) {
+      throw new CustomApiException("NOT_FOUND", HttpStatus.NOT_FOUND);
+    }
+
+    this.deleteInferenceEndAsync(dto); // 비동기 종료 호출
+
+    return dto.getUuid();
+  }
+
+  // 0313
+  @Async("inferenceEndExecutor")
+  @Transactional
+  public void deleteInferenceEndAsync(SaveInferenceAiDto dto) {
+    Long batchId = dto.getBatchId();
+    String url = batchUrl + "/" + batchId;
+
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(MediaType.APPLICATION_JSON);
+    headers.setAccept(List.of(MediaType.APPLICATION_JSON));
+
+    try {
+      log.info("[추론 종료 비동기 시작] uuid={}, batchId={}", dto.getUuid(), batchId);
+
+      ExternalCallResult<String> result =
+          externalHttpClient.callLong(url, HttpMethod.DELETE, dto, headers, String.class);
+
+      if (!result.success()) {
+        log.error("[추론 종료 실패] 외부 API 호출 실패. uuid={}, batchId={}", dto.getUuid(), batchId);
+
+        SaveInferenceAiDto failRequest = new SaveInferenceAiDto();
+        failRequest.setUuid(dto.getUuid());
+        failRequest.setStatus(Status.END_FAIL.getId()); // TODO: 종료실패 상태 추가하는 게 맞는지?
+        failRequest.setUpdateUid(userUtil.getId());
+        failRequest.setInferEndDttm(ZonedDateTime.now());
+        inferenceResultCoreService.update(failRequest);
+        return;
+      }
+
+      SaveInferenceAiDto request = new SaveInferenceAiDto();
+      request.setStatus(Status.FORCED_END.getId());
+      request.setUuid(dto.getUuid());
+      request.setUpdateUid(userUtil.getId());
+      request.setInferEndDttm(ZonedDateTime.now());
+      inferenceResultCoreService.update(request);
+
+      Long learnId = inferenceResultCoreService.getInferenceLearnIdByUuid(dto.getUuid());
+      inferenceResultCoreService.upsertGeomData(learnId);
+
+      log.info("[추론 종료 비동기 완료] uuid={}, batchId={}", dto.getUuid(), batchId);
+
+    } catch (Exception e) {
+      log.error("[추론 종료 비동기 예외] uuid={}, batchId={}", dto.getUuid(), batchId, e);
+    }
+  }
+}

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

@@ -7,24 +7,13 @@ import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.Scene;
 import com.kamco.cd.kamcoback.common.inference.service.InferenceCommonService;
 import com.kamco.cd.kamcoback.common.inference.utils.GeoJsonValidator;
 import com.kamco.cd.kamcoback.common.utils.UserUtil;
+import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient;
 import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult;
 import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto;
-import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.AnalResultInfo;
-import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.Dashboard;
-import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.Detail;
-import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.Geom;
-import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.MapSheet;
-import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.SearchGeoReq;
+import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.*;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.DetectOption;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceLearnDto;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceStatusDetailDto;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.ResultList;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.SaveInferenceAiDto;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Status;
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.*;
 import com.kamco.cd.kamcoback.inference.dto.InferenceSendDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceSendDto.pred_requests_areas;
 import com.kamco.cd.kamcoback.log.dto.AuditLogDto;
@@ -44,16 +33,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -70,7 +50,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Slf4j
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
+@Transactional
 public class InferenceResultService {
 
   private final InferenceResultCoreService inferenceResultCoreService;
@@ -636,8 +616,10 @@ public class InferenceResultService {
       modelType = ModelType.G1.getId();
     } else if (modelInfo.getModelType().equals(ModelType.G2.getId())) {
       modelType = ModelType.G2.getId();
-    } else {
+    } else if (modelInfo.getModelType().equals(ModelType.G3.getId())) {
       modelType = ModelType.G3.getId();
+    } else {
+      modelType = ModelType.G4.getId();
     }
 
     InferenceSendDto sendDto = new InferenceSendDto();
@@ -1033,4 +1015,14 @@ public class InferenceResultService {
     }
     return "";
   }
+
+  public ApiResponseDto.ResponseObj deleteInference(UUID uuid) {
+    long result = inferenceResultCoreService.deleteInference(uuid);
+    if (result > 0) {
+      return new ApiResponseDto.ResponseObj(ApiResponseDto.ApiResponseCode.OK, "삭제되었습니다.");
+    } else {
+      return new ApiResponseDto.ResponseObj(
+          ApiResponseDto.ApiResponseCode.INTERNAL_SERVER_ERROR, "삭제 실패하였습니다. 관리자에게 문의해주세요.");
+    }
+  }
 }

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

@@ -37,6 +37,11 @@ public class LabelAllocateDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return name();
+    }
   }
 
   @CodeExpose
@@ -59,6 +64,11 @@ public class LabelAllocateDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return name();
+    }
   }
 
   @CodeExpose
@@ -80,6 +90,11 @@ public class LabelAllocateDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return name();
+    }
   }
 
   @Getter

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

@@ -1,6 +1,8 @@
 package com.kamco.cd.kamcoback.label.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.kamco.cd.kamcoback.common.enums.RoleType;
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.common.utils.enums.Enums;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
@@ -34,6 +36,7 @@ public class LabelWorkDto {
   @AllArgsConstructor
   public static class LabelWorkMng {
 
+    private Long analUid;
     private UUID uuid;
     private Integer compareYyyy;
     private Integer targetYyyy;
@@ -108,9 +111,15 @@ public class LabelWorkDto {
       if (type == null) {
         return enumId;
       }
+
+      boolean english = HeaderUtil.isEnglishRequest();
+      if (!english) {
         return type.getText();
       }
 
+      return type.getTextEn();
+    }
+
     /**
      * 작업 진행률 반환 (tb_labeling_assignment.stagnation_yn = 'N'인 정상 진행율 기준) 계산식: (정상 진행 건수 / 총 배정 건수) *
      * 100
@@ -222,10 +231,8 @@ public class LabelWorkDto {
     }
 
     public String getUserRoleName() {
-      if (this.userRole.equals("LABELER")) {
-        return "라벨러";
-      }
-      return "검수자";
+      RoleType type = Enums.fromId(RoleType.class, this.userRole);
+      return HeaderUtil.isEnglishRequest() ? type.getTextEn() : type.getText();
     }
   }
 
@@ -260,4 +267,18 @@ public class LabelWorkDto {
       return PageRequest.of(page, size);
     }
   }
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  public static class LabelCntInfo {
+
+    private Long assignedCnt;
+    private Long skipCnt;
+    private Long doneCnt;
+    private Long unconfirmCnt;
+    private Long exceptCnt;
+    private Long completeCnt;
+  }
 }

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

@@ -157,6 +157,7 @@ public class LabelAllocateService {
     return labelAllocateCoreService.findInferenceDetail(uuid);
   }
 
+  @Transactional
   public ApiResponseDto.ResponseObj allocateMove(
       Integer totalCnt, String uuid, List<String> targetUsers, String userId) {
 

src/main/java/com/kamco/cd/kamcoback/log/dto/ErrorLogDto.java

@@ -1,7 +1,10 @@
 package com.kamco.cd.kamcoback.log.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.common.utils.enums.CodeExpose;
 import com.kamco.cd.kamcoback.common.utils.enums.EnumType;
+import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.LocalDate;
 import lombok.AllArgsConstructor;
@@ -36,6 +39,11 @@ public class ErrorLogDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return desc;
+    }
   }
 
   @Schema(name = "ErrorLogBasic", description = "에러로그 기본 정보")
@@ -56,6 +64,26 @@ public class ErrorLogDto {
     private final String errorMessage;
     private final String errorDetail;
     private final String createDate; // to_char해서 가져옴
+
+    @JsonProperty("errorMessage")
+    public String getErrorMessage() {
+      boolean english = HeaderUtil.isEnglishRequest();
+      if (!english) {
+        return this.errorMessage;
+      }
+
+      return ApiResponseDto.ApiResponseCode.fromMessage(this.errorMessage).toString();
+    }
+
+    @JsonProperty("errorName")
+    public String getErrorName() {
+      boolean english = HeaderUtil.isEnglishRequest();
+      if (!english) {
+        return this.errorName;
+      }
+
+      return ApiResponseDto.ApiResponseCode.fromMessage(this.errorName).toString();
+    }
   }
 
   @Schema(name = "ErrorSearchReq", description = "에러로그 검색 요청")

src/main/java/com/kamco/cd/kamcoback/log/dto/EventStatus.java

@@ -21,4 +21,9 @@ public enum EventStatus implements EnumType {
   public String getText() {
     return desc;
   }
+
+  @Override
+  public String getTextEn() {
+    return desc;
+  }
 }

src/main/java/com/kamco/cd/kamcoback/log/dto/EventType.java

@@ -39,4 +39,9 @@ public enum EventType implements EnumType {
   public String getText() {
     return desc;
   }
+
+  @Override
+  public String getTextEn() {
+    return name();
+  }
 }

src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java

@@ -22,14 +22,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 @Tag(name = "영상 관리", description = "영상 관리 API")
@@ -256,4 +249,11 @@ public class MapSheetMngApiController {
     return ApiResponseDto.ok(
         mapSheetMngService.uploadChunkMapSheetFile(hstUid, upAddReqDto, chunkFile));
   }
+
+  @Operation(summary = "영상데이터관리 > 등록된 년도 데이터 전체 삭제", description = "영상데이터관리 > 등록된 년도 데이터 전체 삭제")
+  @DeleteMapping
+  public ApiResponseDto<Void> deleteByMngYyyyMngAll(@RequestParam Integer mngYyyy) {
+    mapSheetMngService.deleteByMngYyyyMngAll(mngYyyy);
+    return ApiResponseDto.ok(null);
+  }
 }

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

@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.mapsheet.dto;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.kamco.cd.kamcoback.common.enums.MngStateType;
 import com.kamco.cd.kamcoback.common.enums.SyncStateType;
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.common.utils.enums.EnumType;
 import com.kamco.cd.kamcoback.common.utils.enums.Enums;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
@@ -41,6 +42,11 @@ public class MapSheetMngDto {
     public String getText() {
       return message;
     }
+
+    @Override
+    public String getTextEn() {
+      return message;
+    }
   }
 
   @Schema(name = "MngSearchReq", description = "영상관리 검색 요청")
@@ -217,7 +223,11 @@ public class MapSheetMngDto {
         enumId = "NOTYET";
       }
 
+      boolean english = HeaderUtil.isEnglishRequest();
       MngStateType type = Enums.fromId(MngStateType.class, enumId);
+      if (english) {
+        return type.getTextEn();
+      }
       return type.getText();
     }
   }
@@ -341,6 +351,10 @@ public class MapSheetMngDto {
       }
 
       SyncStateType type = Enums.fromId(SyncStateType.class, enumId);
+      boolean english = HeaderUtil.isEnglishRequest();
+      if (english) {
+        return type.getTextEn();
+      }
       return type.getText();
     }
   }

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

@@ -40,7 +40,7 @@ import org.springframework.web.multipart.MultipartFile;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
+@Transactional
 public class MapSheetMngService {
 
   private final MapSheetMngCoreService mapSheetMngCoreService;
@@ -489,4 +489,8 @@ public class MapSheetMngService {
 
     return modelUploadResDto;
   }
+
+  public void deleteByMngYyyyMngAll(Integer mngYyyy) {
+    mapSheetMngCoreService.deleteByMngYyyyMngAll(mngYyyy);
+  }
 }

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

@@ -4,6 +4,7 @@ import com.kamco.cd.kamcoback.auth.CustomUserDetails;
 import com.kamco.cd.kamcoback.auth.JwtTokenProvider;
 import com.kamco.cd.kamcoback.auth.RefreshTokenService;
 import com.kamco.cd.kamcoback.common.enums.StatusType;
+import com.kamco.cd.kamcoback.config.api.ApiLogFunction;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.members.dto.MembersDto;
 import com.kamco.cd.kamcoback.members.dto.SignInRequest;
@@ -16,11 +17,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.nio.file.AccessDeniedException;
 import java.time.Duration;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseCookie;
@@ -34,6 +37,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Slf4j
 @Tag(name = "인증(Auth)", description = "로그인, 토큰 재발급, 로그아웃 API")
 @RestController
 @RequestMapping("/api/auth")
@@ -103,8 +107,13 @@ public class AuthController {
               required = true)
           @RequestBody
           SignInRequest request,
+      HttpServletRequest servletRequest,
       HttpServletResponse response) {
 
+    // TODO: 접속 가능한 IP 대역 조회
+    String clientIp = ApiLogFunction.getXFowardedForIp(servletRequest);
+    log.info("####### clientIp: {}", clientIp);
+
     // 사용자 상태 조회
     String status = authService.getUserStatus(request);
     Authentication authentication = null;
@@ -169,6 +178,7 @@ public class AuthController {
     if (refreshToken == null || !jwtTokenProvider.isValidToken(refreshToken)) {
       throw new AccessDeniedException("만료되었거나 유효하지 않은 리프레시 토큰 입니다.");
     }
+
     String username = jwtTokenProvider.getSubject(refreshToken);
 
     // Redis에 저장된 RefreshToken과 일치하는지 확인

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

@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.members.dto;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.kamco.cd.kamcoback.common.enums.RoleType;
 import com.kamco.cd.kamcoback.common.enums.StatusType;
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.common.utils.enums.Enums;
 import com.kamco.cd.kamcoback.common.utils.interfaces.EnumValid;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
@@ -65,16 +66,18 @@ public class MembersDto {
 
     private String getUserRoleName(String roleId) {
       RoleType type = Enums.fromId(RoleType.class, roleId);
-      return type.getText();
+      boolean english = HeaderUtil.isEnglishRequest();
+      return english ? type.getTextEn() : type.getText();
     }
 
     private String getStatusName(String status, Boolean pwdResetYn) {
       StatusType type = Enums.fromId(StatusType.class, status);
+      boolean english = HeaderUtil.isEnglishRequest();
       pwdResetYn = pwdResetYn != null && pwdResetYn;
       if (type.equals(StatusType.PENDING) && pwdResetYn) {
         type = StatusType.ACTIVE;
       }
-      return type.getText();
+      return english ? type.getTextEn() : type.getText();
     }
   }
 

src/main/java/com/kamco/cd/kamcoback/menu/dto/MenuDto.java

@@ -31,7 +31,7 @@ public class MenuDto {
 
     @JsonFormatDttm private ZonedDateTime updatedDttm;
 
-    private String menuApiUrl;
+    private String menuNmEn;
 
     public Basic(
         String menuUid,
@@ -45,7 +45,8 @@ public class MenuDto {
         Long updatedUid,
         List<MenuDto.Basic> children,
         ZonedDateTime createdDttm,
-        ZonedDateTime updatedDttm) {
+        ZonedDateTime updatedDttm,
+        String menuNmEn) {
       this.menuUid = menuUid;
       this.menuNm = menuNm;
       this.menuUrl = menuUrl;
@@ -58,6 +59,7 @@ public class MenuDto {
       this.children = children;
       this.createdDttm = createdDttm;
       this.updatedDttm = updatedDttm;
+      this.menuNmEn = menuNmEn;
     }
   }
 

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

@@ -23,7 +23,8 @@ public class ModelMngDto {
   public enum ModelType implements EnumType {
     G1("G1"),
     G2("G2"),
-    G3("G3");
+    G3("G3"),
+    G4("G4");
 
     private final String desc;
 
@@ -36,6 +37,11 @@ public class ModelMngDto {
     public String getText() {
       return desc;
     }
+
+    @Override
+    public String getTextEn() {
+      return desc;
+    }
   }
 
   @Schema(name = "ModelMgmtDto Basic", description = "모델관리 엔티티 기본 정보")

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

@@ -47,7 +47,7 @@ public class ModelMngService {
    * @param searchReq 페이징
    * @param startDate 시작날짜
    * @param endDate 종료날짜
-   * @param modelType 모델 타입 G1, G2, G3
+   * @param modelType 모델 타입 G1, G2, G3, G4
    * @param searchVal 모델 ver
    * @return 모델 목록
    */

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

@@ -117,6 +117,7 @@ public class InferenceResultCoreService {
     mapSheetLearnEntity.setM1ModelUuid(req.getModel1Uuid());
     mapSheetLearnEntity.setM2ModelUuid(req.getModel2Uuid());
     mapSheetLearnEntity.setM3ModelUuid(req.getModel3Uuid());
+    mapSheetLearnEntity.setM4ModelUuid(req.getModel4Uuid());
     mapSheetLearnEntity.setCompareYyyy(req.getCompareYyyy());
     mapSheetLearnEntity.setTargetYyyy(req.getTargetYyyy());
     mapSheetLearnEntity.setMapSheetScope(req.getMapSheetScope());
@@ -279,7 +280,10 @@ public class InferenceResultCoreService {
 
     List<Long> batchIds =
         Stream.of(
-                entity.getM1ModelBatchId(), entity.getM2ModelBatchId(), entity.getM3ModelBatchId())
+                entity.getM1ModelBatchId(),
+                entity.getM2ModelBatchId(),
+                entity.getM3ModelBatchId(),
+                entity.getM4ModelBatchId())
             .filter(Objects::nonNull)
             .distinct() // 중복 방지 (선택)
             .toList();
@@ -333,6 +337,16 @@ public class InferenceResultCoreService {
               entity::setM3RunningJobs,
               entity::setM3CompletedJobs,
               entity::setM3FailedJobs);
+      case "G4" ->
+          applyModelFields(
+              request,
+              entity::setM4ModelBatchId,
+              entity::setM4ModelStartDttm,
+              entity::setM4ModelEndDttm,
+              entity::setM4PendingJobs,
+              entity::setM4RunningJobs,
+              entity::setM4CompletedJobs,
+              entity::setM4FailedJobs);
       default -> throw new IllegalArgumentException("Unknown type: " + request.getType());
     }
   }
@@ -390,11 +404,13 @@ public class InferenceResultCoreService {
     inferenceBatchSheet.setM1BatchId(entity.getM1ModelBatchId());
     inferenceBatchSheet.setM2BatchId(entity.getM2ModelBatchId());
     inferenceBatchSheet.setM3BatchId(entity.getM3ModelBatchId());
+    inferenceBatchSheet.setM4BatchId(entity.getM4ModelBatchId());
     inferenceBatchSheet.setStatus(entity.getStatus());
     inferenceBatchSheet.setRunningModelType(entity.getRunningModelType());
     inferenceBatchSheet.setM1ModelUuid(entity.getM1ModelUuid());
     inferenceBatchSheet.setM2ModelUuid(entity.getM2ModelUuid());
     inferenceBatchSheet.setM3ModelUuid(entity.getM3ModelUuid());
+    inferenceBatchSheet.setM4ModelUuid(entity.getM4ModelUuid());
     inferenceBatchSheet.setUid(entity.getUid());
     return inferenceBatchSheet;
   }
@@ -435,6 +451,9 @@ public class InferenceResultCoreService {
     SaveInferenceAiDto dto = new SaveInferenceAiDto();
     dto.setUuid(entity.getUuid());
 
+    if (entity.getM4ModelBatchId() != null) {
+      dto.setBatchId(entity.getM4ModelBatchId());
+    }
     if (entity.getM3ModelBatchId() != null) {
       dto.setBatchId(entity.getM3ModelBatchId());
     }
@@ -626,4 +645,8 @@ public class InferenceResultCoreService {
   public List<InferenceResultsTestingDto.Basic> getInferenceResultGroupList(List<Long> batchIds) {
     return inferenceResultsTestingRepository.getInferenceResultGroupList(batchIds);
   }
+
+  public long deleteInference(UUID uuid) {
+    return inferenceResultRepository.deleteInference(uuid);
+  }
 }

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

@@ -379,4 +379,8 @@ public class MapSheetMngCoreService {
 
     return result;
   }
+
+  public void deleteByMngYyyyMngAll(Integer mngYyyy) {
+    mapSheetMngRepository.deleteByMngYyyyMngAll(mngYyyy);
+  }
 }

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

@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.postgres.core;
 
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.menu.dto.MenuDto;
 import com.kamco.cd.kamcoback.menu.dto.MyMenuDto;
 import com.kamco.cd.kamcoback.postgres.entity.MenuEntity;
@@ -7,8 +8,10 @@ import com.kamco.cd.kamcoback.postgres.repository.menu.MenuRepository;
 import java.util.Comparator;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class MenuCoreService {
@@ -27,6 +30,8 @@ public class MenuCoreService {
    */
   public List<MyMenuDto.Basic> getFindByRole(String role) {
     List<MenuEntity> entities = menuRepository.getFindByRole(role);
+    boolean english = HeaderUtil.isEnglishRequest();
+    log.info("[LANG CHECK] english={}", english);
 
     return entities.stream()
         .map(
@@ -34,7 +39,7 @@ public class MenuCoreService {
               MyMenuDto.Basic p =
                   new MyMenuDto.Basic(
                       parent.getMenuUid(),
-                      parent.getMenuNm(),
+                      english ? parent.getMenuNmEn() : parent.getMenuNm(),
                       parent.getMenuUrl(),
                       parent.getMenuOrder());
 
@@ -48,7 +53,10 @@ public class MenuCoreService {
                   .map(
                       c ->
                           new MyMenuDto.Basic(
-                              c.getMenuUid(), c.getMenuNm(), c.getMenuUrl(), c.getMenuOrder()))
+                              c.getMenuUid(),
+                              english ? c.getMenuNmEn() : c.getMenuNm(),
+                              c.getMenuUrl(),
+                              c.getMenuOrder()))
                   .forEach(childDto -> p.getChildren().add(childDto));
 
               return p;

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

@@ -136,6 +136,10 @@ public class MapSheetAnalInferenceEntity {
   @Column(name = "model_m3_ver", length = 50)
   private String modelM3Ver;
 
+  @Size(max = 50)
+  @Column(name = "model_m4_ver", length = 50)
+  private String modelM4Ver;
+
   @Size(max = 20)
   @Column(name = "anal_target_type", length = 20)
   private String analTargetType;

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

@@ -64,6 +64,9 @@ public class MapSheetLearn5kEntity {
   @Column(name = "is_m3_fail")
   private Boolean isM3Fail = false;
 
+  @Column(name = "is_m4_fail")
+  private Boolean isM4Fail = false;
+
   @Column(name = "m1_error_message", columnDefinition = "text")
   private String m1ErrorMessage;
 
@@ -73,6 +76,9 @@ public class MapSheetLearn5kEntity {
   @Column(name = "m3_error_message", columnDefinition = "text")
   private String m3ErrorMessage;
 
+  @Column(name = "m4_error_message", columnDefinition = "text")
+  private String m4ErrorMessage;
+
   @Column(name = "m1_job_id")
   private Long m1JobId;
 
@@ -81,4 +87,7 @@ public class MapSheetLearn5kEntity {
 
   @Column(name = "m3_job_id")
   private Long m3JobId;
+
+  @Column(name = "m4_job_id")
+  private Long m4JobId;
 }

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

@@ -54,6 +54,9 @@ public class MapSheetLearnEntity {
   @Column(name = "m3_model_uuid")
   private UUID m3ModelUuid;
 
+  @Column(name = "m4_model_uuid")
+  private UUID m4ModelUuid;
+
   @Column(name = "compare_yyyy")
   private Integer compareYyyy;
 
@@ -187,6 +190,29 @@ public class MapSheetLearnEntity {
   @Column(name = "m3_failed_jobs", nullable = false)
   private int m3FailedJobs = 0;
 
+  /* ===================== M4 ===================== */
+
+  @Column(name = "m4_model_batch_id")
+  private Long m4ModelBatchId;
+
+  @Column(name = "m4_model_start_dttm")
+  private ZonedDateTime m4ModelStartDttm;
+
+  @Column(name = "m4_model_end_dttm")
+  private ZonedDateTime m4ModelEndDttm;
+
+  @Column(name = "m4_pending_jobs", nullable = false)
+  private int m4PendingJobs = 0;
+
+  @Column(name = "m4_running_jobs", nullable = false)
+  private int m4RunningJobs = 0;
+
+  @Column(name = "m4_completed_jobs", nullable = false)
+  private int m4CompletedJobs = 0;
+
+  @Column(name = "m4_failed_jobs", nullable = false)
+  private int m4FailedJobs = 0;
+
   @Column(name = "apply_status")
   private String applyStatus = GukYuinStatus.PENDING.getId();
 
@@ -229,6 +255,9 @@ public class MapSheetLearnEntity {
   @Column(name = "shp_error_message")
   private String shp_error_message;
 
+  @Column(name = "is_deleted")
+  private Boolean isDeleted;
+
   public InferenceResultDto.ResultList toDto() {
     return new InferenceResultDto.ResultList(
         this.uuid,

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

@@ -58,6 +58,9 @@ public class MenuEntity extends CommonDateEntity {
   @OneToMany(mappedBy = "parent", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
   private List<MenuEntity> children = new ArrayList<>();
 
+  @Column(name = "menu_nm_en")
+  private String menuNmEn; // 영문 메뉴명
+
   public MenuDto.Basic toDto() {
     return new MenuDto.Basic(
         this.menuUid,
@@ -71,6 +74,7 @@ public class MenuEntity extends CommonDateEntity {
         this.updatedUid,
         this.children.stream().map(MenuEntity::toDto).toList(),
         this.getCreatedDate(),
-        this.getModifiedDate());
+        this.getModifiedDate(),
+        this.menuNmEn);
   }
 }

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

@@ -62,4 +62,11 @@ public interface InferenceResultRepositoryCustom {
    * @return
    */
   Optional<MapSheetAnalInferenceEntity> getAnalInferenceDataByLearnId(Long id);
+
+  /**
+   * 추론 삭제
+   *
+   * @param uuid
+   */
+  long deleteInference(UUID uuid);
 }

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

@@ -38,6 +38,7 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
                     m1_model_batch_id,
                     m2_model_batch_id,
                     m3_model_batch_id,
+                    m4_model_batch_id,
                     learn_id,
                     anal_state
                 )
@@ -51,6 +52,7 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
                     r.m1_model_batch_id,
                     r.m2_model_batch_id,
                     r.m3_model_batch_id,
+                    r.m4_model_batch_id,
                     r.id,
                     :pendingStateId
                  FROM tb_map_sheet_learn r
@@ -111,7 +113,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
           ON r.batch_id IN (
               msl.m1_model_batch_id,
               msl.m2_model_batch_id,
-              msl.m3_model_batch_id
+              msl.m3_model_batch_id,
+              msl.m4_model_batch_id
             )
         WHERE msl.anal_uid = :analId
         group by msl.anal_uid,
@@ -207,7 +210,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
               ON r.batch_id IN (
                   msl.m1_model_batch_id,
                   msl.m2_model_batch_id,
-                  msl.m3_model_batch_id
+                  msl.m3_model_batch_id,
+                  msl.m4_model_batch_id
                 )
            INNER JOIN tb_map_sheet_anal_data_inference  msadi
            ON msadi.anal_uid = msl.anal_uid
@@ -346,4 +350,13 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
             .where(mapSheetAnalInferenceEntity.learnId.eq(id))
             .fetchOne());
   }
+
+  @Override
+  public long deleteInference(UUID uuid) {
+    return queryFactory
+        .update(mapSheetLearnEntity)
+        .set(mapSheetLearnEntity.isDeleted, true)
+        .where(mapSheetLearnEntity.uuid.eq(uuid))
+        .execute();
+  }
 }

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

@@ -50,6 +50,11 @@ public class MapSheetLearn5kRepositoryImpl implements MapSheetLearn5kRepositoryC
         jobIdPath = mapSheetLearn5kEntity.m3JobId;
         errorMsgPath = mapSheetLearn5kEntity.m3ErrorMessage;
       }
+      case "G4" -> {
+        failPath = mapSheetLearn5kEntity.isM4Fail;
+        jobIdPath = mapSheetLearn5kEntity.m4JobId;
+        errorMsgPath = mapSheetLearn5kEntity.m4ErrorMessage;
+      }
       default -> {
         return;
       }
@@ -97,6 +102,10 @@ public class MapSheetLearn5kRepositoryImpl implements MapSheetLearn5kRepositoryC
         failPath = mapSheetLearn5kEntity.isM3Fail;
         jobIdPath = mapSheetLearn5kEntity.m3JobId;
       }
+      case "G4" -> {
+        failPath = mapSheetLearn5kEntity.isM4Fail;
+        jobIdPath = mapSheetLearn5kEntity.m4JobId;
+      }
       default -> {
         return;
       }
@@ -147,6 +156,10 @@ public class MapSheetLearn5kRepositoryImpl implements MapSheetLearn5kRepositoryC
         jobIdPath = mapSheetLearn5kEntity.m3JobId;
         failPath = mapSheetLearn5kEntity.isM3Fail;
       }
+      case "G4" -> {
+        jobIdPath = mapSheetLearn5kEntity.m4JobId;
+        failPath = mapSheetLearn5kEntity.isM4Fail;
+      }
       default -> {
         return List.of();
       }
@@ -189,6 +202,9 @@ public class MapSheetLearn5kRepositoryImpl implements MapSheetLearn5kRepositoryC
       case "G3" -> {
         jobIdPath = mapSheetLearn5kEntity.m3JobId;
       }
+      case "G4" -> {
+        jobIdPath = mapSheetLearn5kEntity.m4JobId;
+      }
       default -> {
         return List.of();
       }

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

@@ -30,6 +30,7 @@ import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity;
 import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
@@ -37,13 +38,10 @@ import com.querydsl.core.types.dsl.CaseBuilder;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.NumberExpression;
 import com.querydsl.core.types.dsl.StringExpression;
-import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.time.OffsetDateTime;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
@@ -90,6 +88,9 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
       builder.and(mapSheetLearnEntity.title.containsIgnoreCase(req.getTitle()));
     }
 
+    // 삭제여부 값 추가
+    builder.and(mapSheetLearnEntity.isDeleted.eq(false).or(mapSheetLearnEntity.isDeleted.isNull()));
+
     List<MapSheetLearnEntity> content =
         queryFactory
             .select(mapSheetLearnEntity)
@@ -195,6 +196,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
     QModelMngEntity m1Model = new QModelMngEntity("m1Model");
     QModelMngEntity m2Model = new QModelMngEntity("m2Model");
     QModelMngEntity m3Model = new QModelMngEntity("m3Model");
+    QModelMngEntity m4Model = new QModelMngEntity("m4Model");
 
     InferenceStatusDetailDto foundContent =
         queryFactory
@@ -205,21 +207,27 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                     mapSheetLearnEntity.m1PendingJobs,
                     mapSheetLearnEntity.m2PendingJobs,
                     mapSheetLearnEntity.m3PendingJobs,
+                    mapSheetLearnEntity.m4PendingJobs,
                     mapSheetLearnEntity.m1RunningJobs,
                     mapSheetLearnEntity.m2RunningJobs,
                     mapSheetLearnEntity.m3RunningJobs,
+                    mapSheetLearnEntity.m4RunningJobs,
                     mapSheetLearnEntity.m1CompletedJobs,
                     mapSheetLearnEntity.m2CompletedJobs,
                     mapSheetLearnEntity.m3CompletedJobs,
+                    mapSheetLearnEntity.m4CompletedJobs,
                     mapSheetLearnEntity.m1FailedJobs,
                     mapSheetLearnEntity.m2FailedJobs,
                     mapSheetLearnEntity.m3FailedJobs,
+                    mapSheetLearnEntity.m4FailedJobs,
                     mapSheetLearnEntity.m1ModelStartDttm,
                     mapSheetLearnEntity.m2ModelStartDttm,
                     mapSheetLearnEntity.m3ModelStartDttm,
+                    mapSheetLearnEntity.m4ModelStartDttm,
                     mapSheetLearnEntity.m1ModelEndDttm,
                     mapSheetLearnEntity.m2ModelEndDttm,
                     mapSheetLearnEntity.m3ModelEndDttm,
+                    mapSheetLearnEntity.m4ModelEndDttm,
                     mapSheetLearnEntity.title,
                     mapSheetLearnEntity.compareYyyy,
                     mapSheetLearnEntity.targetYyyy,
@@ -231,6 +239,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                     m1Model.modelVer.as("model1Ver"),
                     m2Model.modelVer.as("model2Ver"),
                     m3Model.modelVer.as("model3Ver"),
+                    m4Model.modelVer.as("model4Ver"),
                     mapSheetLearnEntity.totalJobs))
             .from(mapSheetLearnEntity)
             .leftJoin(m1Model)
@@ -239,6 +248,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
             .on(m2Model.uuid.eq(mapSheetLearnEntity.m2ModelUuid))
             .leftJoin(m3Model)
             .on(m3Model.uuid.eq(mapSheetLearnEntity.m3ModelUuid))
+            .leftJoin(m4Model)
+            .on(m4Model.uuid.eq(mapSheetLearnEntity.m4ModelUuid))
             .where(mapSheetLearnEntity.uuid.eq(uuid))
             .fetchOne();
 
@@ -296,6 +307,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
     QModelMngEntity m1 = new QModelMngEntity("m1");
     QModelMngEntity m2 = new QModelMngEntity("m2");
     QModelMngEntity m3 = new QModelMngEntity("m3");
+    QModelMngEntity m4 = new QModelMngEntity("m4");
 
     return queryFactory
         .select(
@@ -305,6 +317,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                 m1.modelVer,
                 m2.modelVer,
                 m3.modelVer,
+                m4.modelVer,
                 mapSheetLearnEntity.compareYyyy,
                 mapSheetLearnEntity.targetYyyy,
                 mapSheetLearnEntity.detectOption,
@@ -324,6 +337,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
         .on(mapSheetLearnEntity.m2ModelUuid.eq(m2.uuid))
         .leftJoin(m3)
         .on(mapSheetLearnEntity.m3ModelUuid.eq(m3.uuid))
+        .leftJoin(m4)
+        .on(mapSheetLearnEntity.m4ModelUuid.eq(m4.uuid))
         .leftJoin(mapSheetAnalInferenceEntity)
         .on(mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id))
         .where(mapSheetLearnEntity.uuid.eq(uuid))
@@ -445,12 +460,14 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
     NumberExpression<Long> inkxNoAsLong =
         Expressions.numberTemplate(Long.class, "cast({0} as long)", mapInkx5kEntity.mapidcdNo);
 
+    /* 미사용
     StringExpression pnu =
         Expressions.stringTemplate(
             "nullif(({0}), '')",
             JPAExpressions.select(Expressions.stringTemplate("string_agg({0}, ',')", pnuEntity.pnu))
                 .from(pnuEntity)
                 .where(pnuEntity.geo.geoUid.eq(mapSheetAnalDataInferenceGeomEntity.geoUid)));
+    */
 
     // 4) content
     List<Geom> content =
@@ -458,6 +475,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
             .select(
                 Projections.constructor(
                     Geom.class,
+                    mapSheetAnalDataInferenceGeomEntity.geoUid,
                     mapSheetAnalDataInferenceGeomEntity.uuid,
                     mapSheetAnalDataInferenceGeomEntity.resultUid,
                     mapSheetAnalDataInferenceGeomEntity.compareYyyy,
@@ -472,7 +490,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                     Expressions.stringTemplate(
                         "substring({0} from 1 for 8)",
                         mapSheetAnalDataInferenceGeomEntity.resultUid),
-                    pnu,
+                    Expressions.constant(""),
                     mapSheetAnalDataInferenceGeomEntity.fitState))
             .from(mapSheetAnalInferenceEntity)
             .join(mapSheetAnalDataInferenceEntity)
@@ -487,6 +505,33 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
             .limit(pageable.getPageSize())
             .fetch();
 
+    // 4-1) pnu 를 geoUid 로 검색하기 -> AS-IS 에서는 전체 tb_pnu 를 조회해서 오래 걸렸음
+    List<Long> geoUids = content.stream().map(Geom::getGeoUid).filter(Objects::nonNull).toList();
+    Map<Long, String> pnuMap = new HashMap<>();
+
+    if (!geoUids.isEmpty()) {
+      StringExpression pnuAgg = Expressions.stringTemplate("string_agg({0}, ',')", pnuEntity.pnu);
+
+      List<Tuple> pnuRows =
+          queryFactory
+              .select(
+                  pnuEntity.geo.geoUid,
+                  Expressions.stringTemplate("string_agg({0}, ',')", pnuEntity.pnu))
+              .from(pnuEntity)
+              .where(pnuEntity.geo.geoUid.in(geoUids))
+              .groupBy(pnuEntity.geo.geoUid)
+              .fetch();
+
+      pnuMap =
+          pnuRows.stream()
+              .collect(
+                  Collectors.toMap(row -> row.get(pnuEntity.geo.geoUid), row -> row.get(pnuAgg)));
+    }
+
+    for (Geom geom : content) {
+      geom.setPnu(pnuMap.get(geom.getGeoUid()));
+    }
+
     // 5) total (조인 최소화 유지)
     Long total =
         queryFactory

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

@@ -211,8 +211,9 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
         .where(
             l.status
                 .eq(Status.END.getId())
-                .and(JPAExpressions.selectOne().from(d).where(d.analUid.eq(a.id)).exists()))
-        .orderBy(l.id.asc())
+                .and(JPAExpressions.selectOne().from(d).where(d.analUid.eq(a.id)).exists()),
+            l.isDeleted.eq(false).or(l.isDeleted.isNull()))
+        .orderBy(l.id.desc())
         .fetch();
   }
 

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

@@ -7,6 +7,7 @@ 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.label.dto.LabelWorkDto;
+import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelCntInfo;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMng;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.LabelWorkMngDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto.WorkerState;
@@ -18,7 +19,6 @@ import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEnti
 import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QMemberEntity;
 import com.querydsl.core.BooleanBuilder;
-import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
@@ -86,7 +86,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
   }
 
   /**
-   * 라벨링 작업관리 목록 조회 (복잡한 집계 쿼리로 인해 DTO 직접 반환)
+   * 라벨링 작업관리 목록 조회 :: 전체 geom 집계 -> inference 먼저 쿼리 하고 count 정보 따로 집계하도록 수정
    *
    * @param searchReq 검색 조건
    * @return 라벨링 작업관리 목록 페이지
@@ -95,9 +95,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
   public Page<LabelWorkMng> labelWorkMngList(LabelWorkDto.LabelWorkMngSearchReq searchReq) {
 
     Pageable pageable = PageRequest.of(searchReq.getPage(), searchReq.getSize());
-    BooleanBuilder whereBuilder = new BooleanBuilder();
-    BooleanBuilder whereSubDataBuilder = new BooleanBuilder();
-    BooleanBuilder whereSubBuilder = new BooleanBuilder();
+
+    BooleanBuilder baseWhereBuilder = new BooleanBuilder();
 
     if (StringUtils.isNotBlank(searchReq.getDetectYear())) {
       String[] years = searchReq.getDetectYear().split("-");
@@ -106,67 +105,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
         Integer compareYear = Integer.valueOf(years[0]);
         Integer targetYear = Integer.valueOf(years[1]);
 
-        whereBuilder.and(
-            mapSheetAnalDataInferenceEntity
+        baseWhereBuilder.and(
+            mapSheetAnalInferenceEntity
                 .compareYyyy
                 .eq(compareYear)
-                .and(mapSheetAnalDataInferenceEntity.targetYyyy.eq(targetYear)));
+                .and(mapSheetAnalInferenceEntity.targetYyyy.eq(targetYear)));
       }
     }
 
-    whereSubDataBuilder.and(
-        mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid));
-
-    whereSubBuilder.and(
-        mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id));
-
-    if (searchReq.getStrtDttm() != null && searchReq.getEndDttm() != null) {
-
-      ZoneId zoneId = ZoneId.of("Asia/Seoul");
-
-      ZonedDateTime start = searchReq.getStrtDttm().atStartOfDay(zoneId);
-
-      ZonedDateTime end = searchReq.getEndDttm().plusDays(1).atStartOfDay(zoneId);
-
-      whereSubBuilder.and(
-          mapSheetAnalDataInferenceGeomEntity
-              .labelStateDttm
-              .goe(start)
-              .and(mapSheetAnalDataInferenceGeomEntity.labelStateDttm.lt(end)));
-    }
-
-    // labelTotCnt: pnu가 있고 fitState = UNFIT 인 건수만 라벨링 대상
-    NumberExpression<Long> labelTotCntExpr =
-        new CaseBuilder()
-            .when(
-                mapSheetAnalDataInferenceGeomEntity
-                    .pnu
-                    .gt(0)
-                    .and(
-                        mapSheetAnalDataInferenceGeomEntity.fitState.eq(
-                            ImageryFitStatus.UNFIT.getId())))
-            .then(1L)
-            .otherwise(0L)
-            .sum();
-
-    // stagnation_yn = 'N'인 정상 진행 건수 (서브쿼리로 별도 집계)
-    Expression<Long> normalProgressCntSubQuery =
-        JPAExpressions.select(
-                new CaseBuilder()
-                    .when(labelingAssignmentEntity.stagnationYn.eq('N'))
-                    .then(1L)
-                    .otherwise(0L)
-                    .sum()
-                    .coalesce(0L))
-            .from(labelingAssignmentEntity)
-            .where(labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id));
-
-    // 총 배정 건수 (서브쿼리로 별도 집계)
-    Expression<Long> totalAssignmentCntSubQuery =
-        JPAExpressions.select(labelingAssignmentEntity.count().coalesce(0L))
-            .from(labelingAssignmentEntity)
-            .where(labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id));
-
     /** 순서 ING 진행중 ASSIGNED 작업할당 PENDING 작업대기 FINISH 종료 */
     NumberExpression<Integer> stateOrder =
         new CaseBuilder()
@@ -180,64 +126,31 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .then(3)
             .otherwise(99);
 
+    // 1단계: anal_inference 기준으로 상위 페이지 목록만 조회
     List<LabelWorkMng> foundContent =
         queryFactory
             .select(
                 Projections.constructor(
                     LabelWorkMng.class,
+                    mapSheetAnalInferenceEntity.id, // analUid 추가
                     mapSheetAnalInferenceEntity.uuid,
                     mapSheetAnalInferenceEntity.compareYyyy,
                     mapSheetAnalInferenceEntity.targetYyyy,
                     mapSheetAnalInferenceEntity.stage,
-                    // 국유인 반영 컬럼 gukyuinApplyDttm
                     mapSheetAnalInferenceEntity.gukyuinApplyDttm,
-                    mapSheetAnalDataInferenceGeomEntity.dataUid.count(),
-                    // labelTotCnt: pnu 있고 pass_yn = false인 건수
-                    labelTotCntExpr,
-                    new CaseBuilder()
-                        .when(
-                            mapSheetAnalDataInferenceGeomEntity.labelState.eq(
-                                LabelState.ASSIGNED.getId()))
-                        .then(1L)
-                        .otherwise(0L)
-                        .sum(),
-                    new CaseBuilder()
-                        .when(
-                            mapSheetAnalDataInferenceGeomEntity.labelState.eq(
-                                LabelState.SKIP.getId())) // "STOP"?
-                        .then(1L)
-                        .otherwise(0L)
-                        .sum(),
-                    new CaseBuilder()
-                        .when(
-                            mapSheetAnalDataInferenceGeomEntity.labelState.eq(
-                                LabelState.DONE.getId()))
-                        .then(1L)
-                        .otherwise(0L)
-                        .sum(),
-                    mapSheetAnalDataInferenceGeomEntity.labelStateDttm.min(),
-                    // analState: tb_map_sheet_anal_inference.anal_state
+                    mapSheetAnalInferenceEntity.detectingCnt,
+                    Expressions.constant(0L),
+                    Expressions.constant(0L),
+                    Expressions.constant(0L),
+                    Expressions.constant(0L),
+                    mapSheetAnalInferenceEntity.createdDttm,
                     mapSheetAnalInferenceEntity.analState,
-                    // normalProgressCnt: stagnation_yn = 'N'인 건수 (서브쿼리)
-                    normalProgressCntSubQuery,
-                    // totalAssignmentCnt: 총 배정 건수 (서브쿼리)
-                    totalAssignmentCntSubQuery,
+                    Expressions.constant(0L),
+                    Expressions.constant(0L),
                     mapSheetAnalInferenceEntity.labelingClosedYn,
                     mapSheetAnalInferenceEntity.inspectionClosedYn,
-                    new CaseBuilder()
-                        .when(
-                            mapSheetAnalDataInferenceGeomEntity.testState.eq(
-                                InspectState.COMPLETE.getId()))
-                        .then(1L)
-                        .otherwise(0L)
-                        .sum(),
-                    new CaseBuilder()
-                        .when(
-                            mapSheetAnalDataInferenceGeomEntity.testState.eq(
-                                InspectState.UNCONFIRM.getId()))
-                        .then(1L)
-                        .otherwise(0L)
-                        .sum(),
+                    Expressions.constant(0L),
+                    Expressions.constant(0L),
                     new CaseBuilder()
                         .when(mapSheetAnalInferenceEntity.inspectionClosedYn.eq("Y"))
                         .then(mapSheetAnalInferenceEntity.updatedDttm)
@@ -247,23 +160,11 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                         "substring({0} from 1 for 8)", mapSheetLearnEntity.uid),
                     mapSheetLearnEntity.uuid))
             .from(mapSheetAnalInferenceEntity)
-            .innerJoin(mapSheetAnalDataInferenceEntity)
-            .on(whereSubDataBuilder)
-            .innerJoin(mapSheetAnalDataInferenceGeomEntity)
-            .on(whereSubBuilder)
-            .leftJoin(mapSheetLearnEntity)
-            .on(mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id))
-            .where(whereBuilder)
-            .groupBy(
-                mapSheetAnalInferenceEntity.uuid,
-                mapSheetAnalInferenceEntity.compareYyyy,
-                mapSheetAnalInferenceEntity.targetYyyy,
-                mapSheetAnalInferenceEntity.stage,
-                mapSheetAnalInferenceEntity.createdDttm,
-                mapSheetAnalInferenceEntity.analState,
-                mapSheetAnalInferenceEntity.id,
-                mapSheetLearnEntity.uid,
-                mapSheetLearnEntity.uuid)
+            .innerJoin(mapSheetLearnEntity)
+            .on(
+                mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id),
+                mapSheetLearnEntity.isDeleted.eq(false).or(mapSheetLearnEntity.isDeleted.isNull()))
+            .where(baseWhereBuilder)
             .orderBy(
                 stateOrder.asc(),
                 mapSheetAnalInferenceEntity.targetYyyy.desc(),
@@ -273,20 +174,122 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .limit(pageable.getPageSize())
             .fetch();
 
-    // Count 쿼리 별도 실행 (null safe handling)
+    // total count
     long total =
         Optional.ofNullable(
                 queryFactory
-                    .select(mapSheetAnalInferenceEntity.uuid.countDistinct())
+                    .select(mapSheetAnalInferenceEntity.count())
                     .from(mapSheetAnalInferenceEntity)
-                    .innerJoin(mapSheetAnalDataInferenceEntity)
-                    .on(whereSubDataBuilder)
-                    .innerJoin(mapSheetAnalDataInferenceGeomEntity)
-                    .on(whereSubBuilder)
-                    .where(whereBuilder)
+                    .where(baseWhereBuilder)
                     .fetchOne())
             .orElse(0L);
 
+    // 2단계: 각 analUid별 count 조회 후 세팅
+    for (LabelWorkMng item : foundContent) {
+      Long analUid = item.getAnalUid();
+
+      BooleanBuilder geomWhereBuilder = new BooleanBuilder();
+      geomWhereBuilder.and(mapSheetAnalDataInferenceEntity.analUid.eq(analUid));
+      geomWhereBuilder.and(
+          mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id));
+
+      if (searchReq.getStrtDttm() != null && searchReq.getEndDttm() != null) {
+        ZoneId zoneId = ZoneId.of("Asia/Seoul");
+        ZonedDateTime start = searchReq.getStrtDttm().atStartOfDay(zoneId);
+        ZonedDateTime end = searchReq.getEndDttm().plusDays(1).atStartOfDay(zoneId);
+
+        geomWhereBuilder.and(
+            mapSheetAnalDataInferenceGeomEntity
+                .createdDttm
+                .goe(start)
+                .and(mapSheetAnalDataInferenceGeomEntity.createdDttm.lt(end)));
+      }
+
+      // labelTotCnt: pnu > 0 and fitState = UNFIT
+      Long labelTotCnt =
+          Optional.ofNullable(
+                  queryFactory
+                      .select(mapSheetAnalDataInferenceGeomEntity.count())
+                      .from(mapSheetAnalDataInferenceEntity)
+                      .innerJoin(mapSheetAnalDataInferenceGeomEntity)
+                      .on(
+                          mapSheetAnalDataInferenceGeomEntity.dataUid.eq(
+                              mapSheetAnalDataInferenceEntity.id))
+                      .where(
+                          geomWhereBuilder,
+                          mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+                          mapSheetAnalDataInferenceGeomEntity.fitState.eq(
+                              ImageryFitStatus.UNFIT.getId()))
+                      .fetchOne())
+              .orElse(0L);
+
+      LabelCntInfo cntInfo =
+          queryFactory
+              .select(
+                  Projections.constructor(
+                      LabelCntInfo.class,
+                      new CaseBuilder()
+                          .when(labelingAssignmentEntity.workState.eq(LabelState.ASSIGNED.getId()))
+                          .then(1L)
+                          .otherwise(0L)
+                          .sum()
+                          .coalesce(0L),
+                      new CaseBuilder()
+                          .when(labelingAssignmentEntity.workState.eq(LabelState.SKIP.getId()))
+                          .then(1L)
+                          .otherwise(0L)
+                          .sum()
+                          .coalesce(0L),
+                      new CaseBuilder()
+                          .when(labelingAssignmentEntity.workState.eq(LabelState.DONE.getId()))
+                          .then(1L)
+                          .otherwise(0L)
+                          .sum()
+                          .coalesce(0L),
+                      new CaseBuilder()
+                          .when(
+                              labelingAssignmentEntity.inspectState.eq(
+                                  InspectState.UNCONFIRM.getId()))
+                          .then(1L)
+                          .otherwise(0L)
+                          .sum()
+                          .coalesce(0L),
+                      new CaseBuilder()
+                          .when(
+                              labelingAssignmentEntity.inspectState.eq(InspectState.EXCEPT.getId()))
+                          .then(1L)
+                          .otherwise(0L)
+                          .sum()
+                          .coalesce(0L),
+                      new CaseBuilder()
+                          .when(
+                              labelingAssignmentEntity.inspectState.eq(
+                                  InspectState.COMPLETE.getId()))
+                          .then(1L)
+                          .otherwise(0L)
+                          .sum()
+                          .coalesce(0L)))
+              .from(labelingAssignmentEntity)
+              .where(labelingAssignmentEntity.analUid.eq(analUid))
+              .fetchOne();
+
+      Long normalProgressCnt = 0L;
+      Long totalAssignmentCnt = 0L;
+
+      if (cntInfo == null) {
+        cntInfo = new LabelCntInfo(0L, 0L, 0L, 0L, 0L, 0L);
+      }
+
+      item.setLabelTotCnt(labelTotCnt);
+      item.setLabelAssignCnt(cntInfo.getAssignedCnt());
+      item.setLabelSkipTotCnt(cntInfo.getSkipCnt());
+      item.setLabelCompleteTotCnt(cntInfo.getDoneCnt());
+      item.setNormalProgressCnt(normalProgressCnt);
+      item.setTotalAssignmentCnt(totalAssignmentCnt);
+      item.setInspectorCompleteTotCnt(cntInfo.getCompleteCnt());
+      item.setInspectorRemainCnt(cntInfo.getUnconfirmCnt());
+    }
+
     return new PageImpl<>(foundContent, pageable, total);
   }
 

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

@@ -5,6 +5,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QErrorLogEntity.errorLogEnt
 import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMenuEntity.menuEntity;
 
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.log.dto.AuditLogDto;
 import com.kamco.cd.kamcoback.log.dto.AuditLogDto.DownloadReq;
 import com.kamco.cd.kamcoback.log.dto.ErrorLogDto;
@@ -13,6 +14,7 @@ import com.kamco.cd.kamcoback.log.dto.EventType;
 import com.kamco.cd.kamcoback.postgres.entity.AuditLogEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QMenuEntity;
 import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.CaseBuilder;
@@ -83,13 +85,16 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
   public Page<AuditLogDto.MenuAuditList> findLogByMenu(
       AuditLogDto.searchReq searchReq, String searchValue) {
     Pageable pageable = searchReq.toPageable();
+    boolean english = HeaderUtil.isEnglishRequest();
+    Expression<String> menuNameExpr = english ? menuEntity.menuNmEn.max() : menuEntity.menuNm.max();
+
     List<AuditLogDto.MenuAuditList> foundContent =
         queryFactory
             .select(
                 Projections.constructor(
                     AuditLogDto.MenuAuditList.class,
                     auditLogEntity.menuUid.as("menuId"),
-                    menuEntity.menuNm.max().as("menuName"),
+                    menuNameExpr,
                     readCount().as("readCount"),
                     cudCount().as("cudCount"),
                     printCount().as("printCount"),
@@ -217,21 +222,24 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
   @Override
   public Page<AuditLogDto.DailyDetail> findLogByDailyResult(
       AuditLogDto.searchReq searchReq, LocalDate logDate) {
+    boolean english = HeaderUtil.isEnglishRequest();
     Pageable pageable = searchReq.toPageable();
     QMenuEntity parent = new QMenuEntity("parent");
     // 1depth menu name
     StringExpression parentMenuName =
         new CaseBuilder()
             .when(parent.menuUid.isNull())
-            .then(menuEntity.menuNm)
-            .otherwise(parent.menuNm);
+            .then(english ? menuEntity.menuNmEn : menuEntity.menuNm)
+            .otherwise(english ? parent.menuNmEn : parent.menuNm);
 
     // 2depth menu name
     StringExpression menuName =
         new CaseBuilder()
             .when(parent.menuUid.isNull())
             .then(NULL_STRING)
-            .otherwise(menuEntity.menuNm);
+            .otherwise(english ? menuEntity.menuNmEn : menuEntity.menuNm);
+
+    StringExpression menuNm = (english ? menuEntity.menuNmEn : menuEntity.menuNm);
 
     List<AuditLogDto.DailyDetail> foundContent =
         queryFactory
@@ -241,20 +249,20 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
                     auditLogEntity.id.as("logId"),
                     memberEntity.name.as("userName"),
                     memberEntity.employeeNo.as("loginId"),
-                    menuEntity.menuNm.as("menuName"),
+                    menuNm.as("menuName"),
                     auditLogEntity.eventType.as("eventType"),
                     Expressions.stringTemplate(
                             "to_char({0}, 'YYYY-MM-DD HH24:MI')", auditLogEntity.createdDate)
                         .as("logDateTime"),
                     Projections.constructor(
                         AuditLogDto.LogDetail.class,
-                        Expressions.constant("한국자산관리공사"), // serviceName
+                        Expressions.constant(english ? "Kamco" : "한국자산관리공사"), // serviceName
                         parentMenuName.as("parentMenuName"),
                         menuName,
                         menuEntity.menuUrl.as("menuUrl"),
                         menuEntity.description.as("menuDescription"),
                         menuEntity.menuOrder.as("sortOrder"),
-                        menuEntity.isUse.as("used")))) // TODO
+                        menuEntity.isUse.as("used"))))
             .from(auditLogEntity)
             .leftJoin(menuEntity)
             .on(auditLogEntity.menuUid.eq(menuEntity.menuUid))
@@ -285,21 +293,22 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
   @Override
   public Page<AuditLogDto.MenuDetail> findLogByMenuResult(
       AuditLogDto.searchReq searchReq, String menuUid) {
+    boolean english = HeaderUtil.isEnglishRequest();
     Pageable pageable = searchReq.toPageable();
     QMenuEntity parent = new QMenuEntity("parent");
     // 1depth menu name
     StringExpression parentMenuName =
         new CaseBuilder()
             .when(parent.menuUid.isNull())
-            .then(menuEntity.menuNm)
-            .otherwise(parent.menuNm);
+            .then(english ? menuEntity.menuNmEn : menuEntity.menuNm)
+            .otherwise(english ? parent.menuNmEn : parent.menuNm);
 
     // 2depth menu name
     StringExpression menuName =
         new CaseBuilder()
             .when(parent.menuUid.isNull())
             .then(NULL_STRING)
-            .otherwise(menuEntity.menuNm);
+            .otherwise(english ? menuEntity.menuNmEn : menuEntity.menuNm);
 
     List<AuditLogDto.MenuDetail> foundContent =
         queryFactory
@@ -315,7 +324,7 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
                     auditLogEntity.eventType.as("eventType"),
                     Projections.constructor(
                         AuditLogDto.LogDetail.class,
-                        Expressions.constant("한국자산관리공사"), // serviceName
+                        Expressions.constant(english ? "Kamco" : "한국자산관리공사"), // serviceName
                         parentMenuName.as("parentMenuName"),
                         menuName,
                         menuEntity.menuUrl.as("menuUrl"),
@@ -352,21 +361,24 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
   @Override
   public Page<AuditLogDto.UserDetail> findLogByAccountResult(
       AuditLogDto.searchReq searchReq, Long userUid) {
+    boolean english = HeaderUtil.isEnglishRequest();
     Pageable pageable = searchReq.toPageable();
     QMenuEntity parent = new QMenuEntity("parent");
     // 1depth menu name
     StringExpression parentMenuName =
         new CaseBuilder()
             .when(parent.menuUid.isNull())
-            .then(menuEntity.menuNm)
-            .otherwise(parent.menuNm);
+            .then(english ? menuEntity.menuNmEn : menuEntity.menuNm)
+            .otherwise(english ? parent.menuNmEn : parent.menuNm);
 
     // 2depth menu name
     StringExpression menuName =
         new CaseBuilder()
             .when(parent.menuUid.isNull())
             .then(NULL_STRING)
-            .otherwise(menuEntity.menuNm);
+            .otherwise(english ? menuEntity.menuNmEn : menuEntity.menuNm);
+
+    StringExpression menuNm = (english ? menuEntity.menuNmEn : menuEntity.menuNm);
 
     List<AuditLogDto.UserDetail> foundContent =
         queryFactory
@@ -377,11 +389,11 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
                     Expressions.stringTemplate(
                             "to_char({0}, 'YYYY-MM-DD HH24:MI')", auditLogEntity.createdDate)
                         .as("logDateTime"),
-                    menuEntity.menuNm.as("menuName"),
+                    menuNm.as("menuName"),
                     auditLogEntity.eventType.as("eventType"),
                     Projections.constructor(
                         AuditLogDto.LogDetail.class,
-                        Expressions.constant("한국자산관리공사"), // serviceName
+                        Expressions.constant(english ? "Kamco" : "한국자산관리공사"), // serviceName
                         parentMenuName.as("parentMenuName"),
                         menuName,
                         menuEntity.menuUrl.as("menuUrl"),
@@ -442,7 +454,7 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
     if (StringUtils.isBlank(searchValue)) {
       return null;
     }
-    return menuEntity.menuNm.contains(searchValue);
+    return menuEntity.menuNm.contains(searchValue).or(menuEntity.menuNmEn.contains(searchValue));
   }
 
   private BooleanExpression loginIdOrUsernameContains(String searchValue) {

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

@@ -5,6 +5,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QErrorLogEntity.errorLogEnt
 import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMenuEntity.menuEntity;
 
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.log.dto.ErrorLogDto;
 import com.kamco.cd.kamcoback.log.dto.EventStatus;
 import com.kamco.cd.kamcoback.log.dto.EventType;
@@ -38,14 +39,17 @@ public class ErrorLogRepositoryImpl extends QuerydslRepositorySupport
   @Override
   public Page<ErrorLogDto.Basic> findLogByError(ErrorLogDto.ErrorSearchReq searchReq) {
     Pageable pageable = searchReq.toPageable();
+    boolean english = HeaderUtil.isEnglishRequest();
+    StringExpression menuNm = (english ? menuEntity.menuNmEn : menuEntity.menuNm);
+
     List<ErrorLogDto.Basic> foundContent =
         queryFactory
             .select(
                 Projections.constructor(
                     ErrorLogDto.Basic.class,
                     errorLogEntity.id.as("logId"),
-                    Expressions.stringTemplate("{0}", "한국자산관리공사"), // serviceName
-                    menuEntity.menuNm.as("menuName"),
+                    Expressions.constant(english ? "Kamco" : "한국자산관리공사"), // serviceName
+                    menuNm.as("menuName"),
                     memberEntity.employeeNo.as("loginId"),
                     memberEntity.name.as("userName"),
                     errorLogEntity.errorType.as("eventType"),

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

@@ -748,6 +748,13 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
             .delete(mapSheetMngTileEntity)
             .where(mapSheetMngTileEntity.mngYyyy.eq(mngYyyy))
             .execute();
+
+    long updateNotYetCount =
+        queryFactory
+            .update(yearEntity)
+            .set(yearEntity.status, "NOTYET")
+            .where(yearEntity.yyyy.eq(mngYyyy))
+            .execute();
   }
 
   @Override

src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java

@@ -4,7 +4,6 @@ import static com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity.modelMngEnt
 import static com.kamco.cd.kamcoback.postgres.entity.QModelResultMetricEntity.modelResultMetricEntity;
 
 import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
-import com.kamco.cd.kamcoback.postgres.QuerydslOrderUtil;
 import com.kamco.cd.kamcoback.postgres.entity.ModelMngEntity;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Expression;
@@ -101,9 +100,10 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport
                 modelMngEntity.deleted.isFalse().or(modelMngEntity.deleted.isNull()))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
-            .orderBy(
-                QuerydslOrderUtil.getOrderSpecifiers(
-                    pageable, ModelMngEntity.class, "modelMngEntity"))
+            .orderBy(modelMngEntity.createCompleteDttm.desc())
+            // .orderBy(
+            //    QuerydslOrderUtil.getOrderSpecifiers(
+            //        pageable, ModelMngEntity.class, "modelMngEntity"))
             .fetch();
 
     Long countQuery =

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

@@ -63,6 +63,8 @@ public class TrainingDataReviewJobRepositoryImpl extends QuerydslRepositorySuppo
                         .then(ModelType.G1.getId())
                         .when(mapSheetLearnDataGeomEntity.classAfterCd.eq("waste"))
                         .then(ModelType.G2.getId())
+                        .when(mapSheetLearnDataGeomEntity.classAfterCd.eq("solar"))
+                        .then(ModelType.G4.getId())
                         .otherwise(ModelType.G3.getId()),
                     mapSheetLearnDataGeomEntity.classBeforeCd,
                     mapSheetLearnDataGeomEntity.classAfterCd)))

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

@@ -508,7 +508,7 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
                               : "")
                       .classificationName(
                           DetectionClassification.fromStrDesc(
-                              mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd()))
+                              mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd()))
                       .probability(
                           mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() != null
                               ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb()

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

@@ -534,7 +534,7 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
                               : "")
                       .classificationName(
                           DetectionClassification.fromStrDesc(
-                              mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd()))
+                              mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd()))
                       .probability(
                           mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() != null
                               ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb()

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

@@ -3,24 +3,30 @@ package com.kamco.cd.kamcoback.scheduler;
 import com.kamco.cd.kamcoback.scheduler.service.MapSheetMngFileJobService;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class MapSheetMngFileJobController {
 
   private final MapSheetMngFileJobService mapSheetMngFileJobService;
 
+  @Value("${spring.profiles.active}")
+  private String profile;
+
   // 현재 상태 확인용 Getter
-  @Getter private boolean isSchedulerEnabled = false;
+  @Getter private boolean isSchedulerEnabled = true;
   @Getter private boolean isFileSyncSchedulerEnabled = false;
   @Getter private int mngSyncPageSize = 20;
 
   // 파일싱크 진행여부 확인하기
   @Scheduled(fixedDelay = 1000 * 10)
   public void checkMngFileSync() {
-    if (!isSchedulerEnabled) {
+    if ("local".equals(profile) || !isSchedulerEnabled) {
       return;
     }
 

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

@@ -21,6 +21,17 @@ public class AsyncConfig {
     return ex;
   }
 
+  @Bean(name = "makeShapeFile")
+  public Executor makeShapeFileExecutor() {
+    ThreadPoolTaskExecutor ex = new ThreadPoolTaskExecutor();
+    ex.setCorePoolSize(2);
+    ex.setMaxPoolSize(4);
+    ex.setQueueCapacity(50);
+    ex.setThreadNamePrefix("makeShapeFile-");
+    ex.initialize();
+    return ex;
+  }
+
   @Bean(name = "auditLogExecutor")
   public Executor auditLogExecutor() {
     ThreadPoolTaskExecutor exec = new ThreadPoolTaskExecutor();
@@ -31,4 +42,16 @@ public class AsyncConfig {
     exec.initialize();
     return exec;
   }
+
+  // 0313
+  @Bean(name = "inferenceEndExecutor")
+  public Executor inferenceEndExecutor() {
+    ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+    executor.setCorePoolSize(5);
+    executor.setMaxPoolSize(10);
+    executor.setQueueCapacity(100);
+    executor.setThreadNamePrefix("inference-async-");
+    executor.initialize();
+    return executor;
+  }
 }

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

@@ -121,7 +121,10 @@ public class MapSheetInferenceJobService {
    * @return
    */
   private Long resolveBatchId(InferenceBatchSheet sheet) {
-    // G3 > G2 > G1
+    // G4 > G3 > G2 > G1
+    if (sheet.getM4BatchId() != null) {
+      return sheet.getM4BatchId();
+    }
     if (sheet.getM3BatchId() != null) {
       return sheet.getM3BatchId();
     }
@@ -214,8 +217,8 @@ public class MapSheetInferenceJobService {
     // 현재 모델 종료 업데이트
     updateProcessingEndTimeByModel(job, sheet.getUuid(), now, currentType);
 
-    // G3이면 전체 종료
-    if (ModelType.G3.getId().equals(currentType)) {
+    // G3이면 전체 종료 -> G4 이면 전체 종료(7/14)
+    if (ModelType.G4.getId().equals(currentType)) {
       endAll(sheet, now);
       return;
     }
@@ -237,7 +240,11 @@ public class MapSheetInferenceJobService {
   private void endAll(InferenceBatchSheet sheet, ZonedDateTime now) {
 
     List<Long> batchIds =
-        Stream.of(sheet.getM1BatchId(), sheet.getM2BatchId(), sheet.getM3BatchId())
+        Stream.of(
+                sheet.getM1BatchId(),
+                sheet.getM2BatchId(),
+                sheet.getM3BatchId(),
+                sheet.getM4BatchId())
             .filter(Objects::nonNull)
             .distinct()
             .toList();
@@ -246,7 +253,7 @@ public class MapSheetInferenceJobService {
     save.setUuid(sheet.getUuid());
     save.setStatus(Status.END.getId());
     save.setInferEndDttm(now);
-    save.setType(ModelType.G3.getId()); // 마지막 모델 기준
+    save.setType(ModelType.G4.getId()); // 마지막 모델 기준 -> G4 (7/14)
     inferenceResultCoreService.update(save);
 
     // 추론 종료일때 geom 데이터 저장
@@ -255,7 +262,9 @@ public class MapSheetInferenceJobService {
     // 추론 종료일때 shp 파일 생성
     String batchIdStr = batchIds.stream().map(String::valueOf).collect(Collectors.joining(","));
 
-    // shp 파일 비동기 생성
+    // 0312 shp 파일 비동기 생성 (바꿔주세요)
+    // shpPipelineService.makeShapeFile(sheet.getUid(), batchIds);
+    // 0511 shp-exporter-v2.jar 에 에러가 있어 우선 기존 로직으로 변경함
     shpPipelineService.runPipeline(jarPath, datasetDir, batchIdStr, sheet.getUid());
   }
 
@@ -272,6 +281,9 @@ public class MapSheetInferenceJobService {
     if (ModelType.G2.getId().equals(currentType)) {
       return ModelType.G3.getId();
     }
+    if (ModelType.G3.getId().equals(currentType)) {
+      return ModelType.G4.getId();
+    }
     throw new IllegalArgumentException("Unknown runningModelType: " + currentType);
   }
 
@@ -292,6 +304,9 @@ public class MapSheetInferenceJobService {
     if (ModelType.G3.getId().equals(type)) {
       return sheet.getM3ModelUuid();
     }
+    if (ModelType.G4.getId().equals(type)) {
+      return sheet.getM4ModelUuid();
+    }
     throw new IllegalArgumentException("Unknown type: " + type);
   }
 

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

@@ -3,7 +3,7 @@ package com.kamco.cd.kamcoback.scheduler.service;
 import com.kamco.cd.kamcoback.common.service.ExternalJarRunner;
 import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService;
 import com.kamco.cd.kamcoback.scheduler.config.ShpKeyLock;
-import java.nio.file.Paths;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.scheduling.annotation.Async;
@@ -18,6 +18,30 @@ public class ShpPipelineService {
   private final ExternalJarRunner externalJarRunner;
   private final ShpKeyLock shpKeyLock;
 
+  // 0312 shp 파일 비동기 생성
+  @Async("makeShapeFile")
+  public void makeShapeFile(String inferenceId, List<Long> batchIds) {
+    if (!shpKeyLock.tryLock(inferenceId)) {
+      log.info("");
+      log.info("============================================================");
+      log.info("SHP pipeline already running. inferenceId={}", inferenceId);
+      log.info("============================================================");
+      try {
+        log.info("SHP pipeline already start. inferenceId={}", inferenceId);
+        externalJarRunner.run(inferenceId, batchIds);
+      } catch (Exception e) {
+        log.error("SHP pipeline failed. inferenceId={}", inferenceId, e);
+        // TODO 실패 상태 업데이트 로직 추가
+      } finally {
+        log.info("============================================================");
+        log.info("SHP pipeline DONE. inferenceId={}", inferenceId);
+        log.info("============================================================");
+        log.info("");
+        shpKeyLock.unlock(inferenceId);
+      }
+    }
+  }
+
   /**
    * shp 파일 생성 1. merge 생성 2. 생성된 merge shp 파일로 geoserver 등록, 3.도엽별로 shp 생성
    *
@@ -36,24 +60,33 @@ public class ShpPipelineService {
     }
 
     try {
+
+      log.info("");
+      log.info("============================================================");
+      log.info("SHP pipeline started. inferenceId={}", inferenceId);
+      log.info("============================================================");
+
       // uid 기준 merge shp, geojson 파일 생성
       externalJarRunner.run(jarPath, batchIds, inferenceId, "", "MERGED");
 
       // uid 기준 shp 파일 geoserver 등록
-      String register =
-          Paths.get(datasetDir, inferenceId, "merge", inferenceId + ".shp").toString();
-      log.info("register={}", register);
-      externalJarRunner.run(jarPath, register, inferenceId);
-
-      // uid 기준 도엽별 shp, geojson 파일 생성
-      externalJarRunner.run(jarPath, batchIds, inferenceId, "", "RESOLVE");
-
-      log.info("SHP pipeline finished. inferenceId={}", inferenceId);
+      //      String register =
+      //          Paths.get(datasetDir, inferenceId, "merge", inferenceId + ".shp").toString();
+      //      log.info("register={}", register);
+      //      externalJarRunner.run(jarPath, register, inferenceId);
+      //
+      //      // uid 기준 도엽별 shp, geojson 파일 생성
+      //      externalJarRunner.run(jarPath, batchIds, inferenceId, "", "RESOLVE");
+      //
+      //      log.info("SHP pipeline finished. inferenceId={}", inferenceId);
 
     } catch (Exception e) {
       log.error("SHP pipeline failed. inferenceId={}", inferenceId, e);
       // TODO 실패 상태 업데이트 로직 추가
     } finally {
+      log.info("============================================================");
+      log.info("SHP pipeline DONE. inferenceId={}", inferenceId);
+      log.info("============================================================");
       shpKeyLock.unlock(inferenceId);
     }
   }

src/main/java/com/kamco/cd/kamcoback/test/TestShapeApiController.java

@@ -0,0 +1,83 @@
+package com.kamco.cd.kamcoback.test;
+
+import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
+import com.kamco.cd.kamcoback.scheduler.service.ShpPipelineService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.ErrorResponse;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "test shape api", description = "test shape api")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/test")
+public class TestShapeApiController {
+
+  private final ShpPipelineService shpPipelineService;
+
+  @Value("${inference.jar-path}")
+  private String jarPath;
+
+  @Value("${file.dataset-dir}")
+  private String datasetDir;
+
+  @Operation(
+      summary = "shapefile 생성 테스트",
+      description = "지정된 inference ID와 batch ID 목록으로 shapefile을 생성합니다.")
+  @ApiResponses({
+    @ApiResponse(
+        responseCode = "200",
+        description = "shapefile 생성 요청 성공",
+        content = @Content(schema = @Schema(implementation = String.class))),
+    @ApiResponse(
+        responseCode = "400",
+        description = "잘못된 요청 데이터",
+        content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+    @ApiResponse(
+        responseCode = "500",
+        description = "서버 오류",
+        content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+  })
+  @GetMapping("/make-shapefile")
+  public ApiResponseDto<String> makeShapeFile(
+      @RequestParam String inferenceId, @RequestParam List<Long> batchIds) {
+    shpPipelineService.makeShapeFile(inferenceId, batchIds);
+    return ApiResponseDto.ok("Shapefile 생성이 시작되었습니다. inferenceId: " + inferenceId);
+  }
+
+  @Operation(
+      summary = "기존 run pipeline 테스트",
+      description = "지정된 inference ID와 batch ID 목록으로 shapefile을 생성합니다.")
+  @ApiResponses({
+    @ApiResponse(
+        responseCode = "200",
+        description = "shapefile 생성 요청 성공",
+        content = @Content(schema = @Schema(implementation = String.class))),
+    @ApiResponse(
+        responseCode = "400",
+        description = "잘못된 요청 데이터",
+        content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+    @ApiResponse(
+        responseCode = "500",
+        description = "서버 오류",
+        content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+  })
+  @GetMapping("/run-pipeline")
+  public ApiResponseDto<String> runPipeline(
+      @RequestParam String inferenceId, @RequestParam List<Long> batchIds) {
+    String batchIdStr = batchIds.stream().map(String::valueOf).collect(Collectors.joining(","));
+    shpPipelineService.runPipeline(jarPath, datasetDir, batchIdStr, inferenceId);
+    return ApiResponseDto.ok("runPipeline 생성이 시작되었습니다. inferenceId: " + inferenceId);
+  }
+}

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

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
+import com.kamco.cd.kamcoback.common.utils.HeaderUtil;
 import com.kamco.cd.kamcoback.common.utils.geometry.GeometryDeserializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
@@ -399,7 +400,10 @@ public class TrainingDataLabelDto {
     private String memo;
 
     public InspectionResultInfo(String verificationResult, String inappropriateReason) {
-      this.verificationResult = ImageryFitStatus.fromCode(verificationResult).getText();
+      this.verificationResult =
+          HeaderUtil.isEnglishRequest()
+              ? ImageryFitStatus.fromCode(verificationResult).getTextEn()
+              : ImageryFitStatus.fromCode(verificationResult).getText();
       this.inappropriateReason = inappropriateReason;
     }
   }

src/main/resources/application-dev.yml

@@ -39,7 +39,7 @@ spring:
 
   data:
     redis:
-      host: 192.168.2.109
+      host: 192.168.2.126
       port: 6379
       password: kamco
 
@@ -59,8 +59,8 @@ jwt:
   secret: "kamco_token_9b71e778-19a3-4c1d-97bf-2d687de17d5b"
   access-token-validity-in-ms: 86400000      # 1일
   refresh-token-validity-in-ms: 604800000    # 7일
-  #access-token-validity-in-ms: 60000        # 1분
-  #refresh-token-validity-in-ms: 300000      # 5분
+  #access-token-validity-in-ms: 300000        # 5분
+  #refresh-token-validity-in-ms: 600000      # 10분
 
 token:
   refresh-cookie-name: kamco-dev   # 개발용 쿠키 이름
@@ -100,6 +100,7 @@ inference:
   url: http://192.168.2.183:8000/jobs
   batch-url: http://192.168.2.183:8000/batches
   jar-path: ${inference.nfs}/repo/jar/shp-exporter.jar
+  jar-path-v2: ${inference.nfs}/repo/jar/shp-exporter-v2.jar
   inference-server-name: server1,server2,server3,server4
   output-dir: ${inference.nfs}/model_output/export
 

src/main/resources/application-local.yml

@@ -27,7 +27,7 @@ spring:
 
   data:
     redis:
-      host: 192.168.2.109
+      host: 192.168.2.126
       port: 6379
       password: kamco
 
@@ -78,6 +78,7 @@ inference:
   url: http://10.100.0.11:8000/jobs
   batch-url: http://10.100.0.11:8000/batches
   jar-path: jar/shp-exporter.jar
+  jar-path-v2: jar/shp-exporter-v2.jar
   inference-server-name: server1,server2,server3,server4
   output-dir: ${inference.nfs}/model_output/export
 

src/main/resources/application-prod.yml

@@ -95,6 +95,8 @@ inference:
   url: http://172.16.4.56:8000/jobs
   batch-url: http://172.16.4.56:8000/batches
   jar-path: ${inference.nfs}/repo/jar/shp-exporter.jar
+  #  //0312
+  jar-path-v2: ${inference.nfs}/repo/jar/shp-exporter-v2.jar
   inference-server-name: server1,server2,server3,server4
   output-dir: ${inference.nfs}/model_output/export
 

src/main/resources/application.yml

@@ -88,3 +88,6 @@ inference:
   nfs: /kamco-nfs
   geojson-dir: ${inference.nfs}/requests/                   # 추론실행을 위한 파일생성경로
   jar-path: ${inference.nfs}/repo/jar/shp-exporter.jar
+  #  //0312
+  jar-path-v2: ${inference.nfs}/repo/jar/shp-exporter-v2.jar
+