Merge pull request '라벨 다운로드 수정' (#64) from feat/infer_dev_260211 into develop

Reviewed-on: #64

Dockerfile-prod

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

docker-compose-dev.yml

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

docker-compose-prod.yml

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

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

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

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

@@ -34,6 +34,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -48,6 +49,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
 @Tag(name = "추론관리", description = "추론관리 API")
+@Log4j2
 @RequestMapping("/api/inference")
 @RequiredArgsConstructor
 @RestController
@@ -373,6 +375,7 @@ public class InferenceResultApiController {
     }
 
     Path zipPath = Path.of(path);
+    log.info("shp download request path = {}", path);
 
     return downloadExecutor.stream(
         new DownloadSpec(uuid, zipPath, uid + ".zip", MediaType.APPLICATION_OCTET_STREAM));

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

@@ -31,7 +31,6 @@ import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.coyote.BadRequestException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
@@ -386,9 +385,9 @@ public class LabelAllocateApiController {
       @Parameter(example = "6d8d49dc-0c9d-4124-adc7-b9ca610cc394") @PathVariable UUID uuid)
       throws IOException {
 
-    if (!labelAllocateService.isDownloadable(uuid)) {
+    //    if (!labelAllocateService.isDownloadable(uuid)) {
-      throw new BadRequestException();
+    //      throw new BadRequestException();
-    }
+    //    }
 
     String uid = labelAllocateService.findLearnUid(uuid);
     Path zipPath = Paths.get(responsePath).resolve(uid + ".zip");

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

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

src/main/java/com/kamco/cd/kamcoback/model/ModelMngApiController.java

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

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

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

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

@@ -257,16 +257,16 @@ public class LabelAllocateCoreService {
 
     // 파일이 있는지만 확인
     Path path = Paths.get(responsePath).resolve(dto.getLearnUid() + ".zip");
+    if (!Files.isRegularFile(path)) return false; // exists 포함
 
-    if (!Files.exists(path) || !Files.isRegularFile(path)) {
+    String state = dto.getAnalState();
-      // 실제 파일만 true (디렉터리는 제외)
+    boolean isLabelingIng =
-      return false;
+        LabelMngState.ASSIGNED.getId().equals(state) || LabelMngState.ING.getId().equals(state);
-    }
 
-    // 다운로드 확인할 학습데이터가 라벨링중인 경우 파일 생성여부가 정상인지 확인
+    if (isLabelingIng) {
-    if (dto.getAnalState().equals(LabelMngState.ASSIGNED.getId())
+      Long analId = dto.getAnalId();
-        || dto.getAnalState().equals(LabelMngState.ING.getId())) {
+      if (analId == null) return false;
-      return batchStepHistoryRepository.isDownloadable(dto.getAnalId());
+      return batchStepHistoryRepository.isDownloadable(analId);
     }
 
     return true;

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

@@ -306,10 +306,6 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             queryFactory
                 .select(labelingAssignmentEntity.count())
                 .from(labelingAssignmentEntity)
-                .innerJoin(mapSheetAnalInferenceEntity)
-                .on(
-                    labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
-                    mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                 .where(labelingAssignmentEntity.workerUid.eq(userId))
                 .fetchOne();
 
@@ -330,10 +326,6 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             queryFactory
                 .select(labelingAssignmentEntity.count())
                 .from(labelingAssignmentEntity)
-                .innerJoin(mapSheetAnalInferenceEntity)
-                .on(
-                    labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
-                    mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                 .where(
                     labelingAssignmentEntity.workerUid.eq(userId),
                     labelingAssignmentEntity.workState.eq("ASSIGNED"))
@@ -362,10 +354,6 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             queryFactory
                 .select(labelingAssignmentEntity.count())
                 .from(labelingAssignmentEntity)
-                .innerJoin(mapSheetAnalInferenceEntity)
-                .on(
-                    labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
-                    mapSheetAnalInferenceEntity.analState.ne(LabelMngState.FINISH.getId()))
                 .where(
                     labelingAssignmentEntity.workerUid.eq(userId),
                     labelingAssignmentEntity.workState.in(

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

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

src/main/java/com/kamco/cd/kamcoback/upload/UploadApiController.java

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

src/main/resources/application-dev.yml

@@ -83,24 +83,25 @@ mapsheet:
   upload:
     skipGdalValidation: true
   shp:
-    baseurl: /app/tmp/detect/result
+    baseurl: /app/tmp/detect/result  #현재사용안함
 
 
 
 file:
   #sync-root-dir: D:/kamco-nfs/images/
   sync-root-dir: /kamco-nfs/images/
-  sync-tmp-dir: ${file.sync-root-dir}/tmp
+  sync-tmp-dir: /kamco-nfs/requests/temp              # image upload temp dir
+  #sync-tmp-dir: ${file.sync-root-dir}/tmp
   sync-file-extention: tfw,tif
   sync-auto-exception-start-year: 2024
   sync-auto-exception-before-year-cnt: 3
 
-  #dataset-dir: D:/kamco-nfs/dataset/
+  #dataset-dir: D:/kamco-nfs/model_output/
-  dataset-dir: /kamco-nfs/dataset/export/
+  dataset-dir: /kamco-nfs/model_output/export/        # 마운트경로 AI 추론결과
   dataset-tmp-dir: ${file.dataset-dir}tmp/
 
   #model-dir: D:/kamco-nfs/ckpt/model/
-  model-dir: /kamco-nfs/ckpt/model/
+  model-dir: /kamco-nfs/ckpt/model/                   # 학습서버에서 트레이닝한 모델업로드경로
   model-tmp-dir: ${file.model-dir}tmp/
   model-file-extention: pth,json,py
 
@@ -112,8 +113,8 @@ file:
 inference:
   url: http://192.168.2.183:8000/jobs
   batch-url: http://192.168.2.183:8000/batches
-  geojson-dir: /kamco-nfs/requests/
+  geojson-dir: /kamco-nfs/requests/                   # 추론실행을 위한 파일생성경로
-  jar-path: /kamco-nfs/dataset/shp/shp-exporter.jar
+  jar-path: /kamco-nfs/repo/jar/shp-exporter.jar
   inference-server-name: server1,server2,server3,server4
 
 gukyuin:
@@ -122,7 +123,7 @@ gukyuin:
   cdi: ${gukyuin.url}/api/kcd/cdi
 
 training-data:
-  geojson-dir: /kamco-nfs/model_output/labeling/
+  geojson-dir: /kamco-nfs/dataset/request/
 
 layer:
   geoserver-url: https://kamco.geo-dev.gs.dabeeo.com

src/main/resources/application-prod.yml

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