diff --git a/src/main/java/com/kamco/cd/training/code/service/CommonCodeService.java b/src/main/java/com/kamco/cd/training/code/service/CommonCodeService.java index 4787c2e..b5c0475 100644 --- a/src/main/java/com/kamco/cd/training/code/service/CommonCodeService.java +++ b/src/main/java/com/kamco/cd/training/code/service/CommonCodeService.java @@ -125,6 +125,7 @@ public class CommonCodeService { return commonCodeCoreService.getCode(parentCodeCd, childCodeCd); } + // TODO 미사용시작 /** * 공통코드 이름 조회 * @@ -136,6 +137,8 @@ public class CommonCodeService { return commonCodeCoreService.getCode(parentCodeCd, childCodeCd); } + // TODO 미사용 끝 + public List getTypeCode(String type) { return Enums.getCodes(type); } diff --git a/src/main/java/com/kamco/cd/training/common/download/DownloadExecutor.java b/src/main/java/com/kamco/cd/training/common/download/DownloadExecutor.java index e08bdbf..83ab213 100644 --- a/src/main/java/com/kamco/cd/training/common/download/DownloadExecutor.java +++ b/src/main/java/com/kamco/cd/training/common/download/DownloadExecutor.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.common.download; import com.kamco.cd.training.common.download.dto.DownloadSpec; @@ -46,3 +47,4 @@ public class DownloadExecutor { .body(body); } } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/common/download/DownloadPaths.java b/src/main/java/com/kamco/cd/training/common/download/DownloadPaths.java index fb3f363..5827960 100644 --- a/src/main/java/com/kamco/cd/training/common/download/DownloadPaths.java +++ b/src/main/java/com/kamco/cd/training/common/download/DownloadPaths.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.common.download; import org.springframework.util.AntPathMatcher; @@ -17,3 +18,4 @@ public final class DownloadPaths { return false; } } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/common/enums/DeployTargetType.java b/src/main/java/com/kamco/cd/training/common/enums/DeployTargetType.java index 2975f05..0b6a4b8 100644 --- a/src/main/java/com/kamco/cd/training/common/enums/DeployTargetType.java +++ b/src/main/java/com/kamco/cd/training/common/enums/DeployTargetType.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.common.enums; import com.kamco.cd.training.common.utils.enums.CodeExpose; @@ -17,3 +18,4 @@ public enum DeployTargetType implements EnumType { private final String id; private final String text; } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/common/enums/ModelMngStatusType.java b/src/main/java/com/kamco/cd/training/common/enums/ModelMngStatusType.java index 438d876..90984b2 100644 --- a/src/main/java/com/kamco/cd/training/common/enums/ModelMngStatusType.java +++ b/src/main/java/com/kamco/cd/training/common/enums/ModelMngStatusType.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.common.enums; import com.kamco.cd.training.common.utils.enums.CodeExpose; @@ -25,3 +26,4 @@ public enum ModelMngStatusType implements EnumType { return desc; } } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/common/enums/ProcessStepType.java b/src/main/java/com/kamco/cd/training/common/enums/ProcessStepType.java index b2c55d5..2271656 100644 --- a/src/main/java/com/kamco/cd/training/common/enums/ProcessStepType.java +++ b/src/main/java/com/kamco/cd/training/common/enums/ProcessStepType.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.common.enums; import com.kamco.cd.training.common.utils.enums.CodeExpose; @@ -18,3 +19,4 @@ public enum ProcessStepType implements EnumType { private final String id; private final String text; } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/dataset/DatasetApiController.java b/src/main/java/com/kamco/cd/training/dataset/DatasetApiController.java index d5d7260..c8589a3 100644 --- a/src/main/java/com/kamco/cd/training/dataset/DatasetApiController.java +++ b/src/main/java/com/kamco/cd/training/dataset/DatasetApiController.java @@ -288,6 +288,12 @@ public class DatasetApiController { }) @PostMapping("/deliveries") public ApiResponseDto insertDeliveriesDataset(@RequestBody AddDeliveriesReq req) { + + // 폴더 구조 검증 + DatasetService.validateTrainValTestDirs(req.getFilePath()); + // 파일 개수 검증 + DatasetService.validateDirFileCount(req.getFilePath()); + datasetAsyncService.insertDeliveriesDatasetAsync(req); return ApiResponseDto.createOK("ok"); } diff --git a/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java b/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java index 694524d..52db4c4 100644 --- a/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java +++ b/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java @@ -145,6 +145,7 @@ public class DatasetDto { } } + // TODO 미사용시작 @Schema(name = "DatasetDetailReq", description = "데이터셋 상세 조회 요청") @Getter @Setter @@ -157,6 +158,8 @@ public class DatasetDto { private Long datasetId; } + // TODO 미사용 끝 + @Schema(name = "DatasetRegisterReq", description = "데이터셋 등록 요청") @Getter @Setter diff --git a/src/main/java/com/kamco/cd/training/dataset/dto/MapSheetDto.java b/src/main/java/com/kamco/cd/training/dataset/dto/MapSheetDto.java index 8f46478..9781799 100644 --- a/src/main/java/com/kamco/cd/training/dataset/dto/MapSheetDto.java +++ b/src/main/java/com/kamco/cd/training/dataset/dto/MapSheetDto.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.dataset.dto; import com.kamco.cd.training.common.utils.interfaces.JsonFormatDttm; @@ -72,6 +73,7 @@ public class MapSheetDto { private List itemIds; } + // TODO 미사용시작 @Schema(name = "MapSheetCheckReq", description = "도엽 번호 유효성 검증 요청") @Getter @Setter @@ -101,3 +103,4 @@ public class MapSheetDto { private boolean duplicate; } } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/dataset/service/DatasetAsyncService.java b/src/main/java/com/kamco/cd/training/dataset/service/DatasetAsyncService.java index 379f744..8c6db6f 100644 --- a/src/main/java/com/kamco/cd/training/dataset/service/DatasetAsyncService.java +++ b/src/main/java/com/kamco/cd/training/dataset/service/DatasetAsyncService.java @@ -44,21 +44,11 @@ public class DatasetAsyncService { try { - // ===== 1. 폴더/파일 검증 ===== - long validateStart = System.currentTimeMillis(); - - // 폴더 구조 검증 - DatasetService.validateTrainValTestDirs(req.getFilePath()); - // 파일 개수 검증 - DatasetService.validateDirFileCount(req.getFilePath()); - - log.info("{} 데이터셋 검증 완료. ({} ms)", LOG_PREFIX, System.currentTimeMillis() - validateStart); - - // ===== 2. UID 생성 ===== + // ===== 1. UID 생성 ===== String uid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); log.info("{} 생성된 UID: {}", LOG_PREFIX, uid); - // ===== 3. 마스터 데이터 생성 ===== + // ===== 2. 마스터 데이터 생성 ===== String title = req.getTitle(); if (title == null || title.isBlank()) { @@ -87,11 +77,11 @@ public class DatasetAsyncService { log.info("{} 마스터 저장 완료. datasetUid={}", LOG_PREFIX, datasetUid); - // ===== 4. 상태 변경 (업로드중) ===== + // ===== 3. 상태 변경 (업로드중) ===== datasetCoreService.updateDatasetUploadStatus(datasetUid, LearnDataRegister.UPLOADING); log.info("{} 상태 변경 → UPLOADING. datasetUid={}", LOG_PREFIX, datasetUid); - // ===== 5. 데이터 등록 ===== + // ===== 4. 데이터 등록 ===== long insertStart = System.currentTimeMillis(); // 납품 데이터 obj 등록 @@ -103,7 +93,7 @@ public class DatasetAsyncService { datasetUid, System.currentTimeMillis() - insertStart); - // ===== 6. 상태 변경 (완료) ===== + // ===== 5. 상태 변경 (완료) ===== datasetCoreService.updateDatasetUploadStatus(datasetUid, LearnDataRegister.COMPLETED); log.info("{} 상태 변경 → COMPLETED. datasetUid={}", LOG_PREFIX, datasetUid); diff --git a/src/main/java/com/kamco/cd/training/dataset/service/DatasetService.java b/src/main/java/com/kamco/cd/training/dataset/service/DatasetService.java index 1a25a1b..a2ca0da 100644 --- a/src/main/java/com/kamco/cd/training/dataset/service/DatasetService.java +++ b/src/main/java/com/kamco/cd/training/dataset/service/DatasetService.java @@ -87,6 +87,7 @@ public class DatasetService { return datasetCoreService.getOneByUuid(id); } + // TODO 미사용시작 /** * 데이터셋 등록 * @@ -101,6 +102,7 @@ public class DatasetService { return saved.getId(); } + // TODO 미사용 끝 /** * 데이터셋 수정 * diff --git a/src/main/java/com/kamco/cd/training/dataset/service/MapSheetService.java b/src/main/java/com/kamco/cd/training/dataset/service/MapSheetService.java index 0eb385c..a690c19 100644 --- a/src/main/java/com/kamco/cd/training/dataset/service/MapSheetService.java +++ b/src/main/java/com/kamco/cd/training/dataset/service/MapSheetService.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.dataset.service; import com.kamco.cd.training.dataset.dto.MapSheetDto; @@ -39,3 +40,4 @@ public class MapSheetService { log.info("도엽 삭제 완료 - 개수: {}", deleteReq.getItemIds().size()); } } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/model/ModelTrainDetailApiController.java b/src/main/java/com/kamco/cd/training/model/ModelTrainDetailApiController.java index 330905e..a967a7a 100644 --- a/src/main/java/com/kamco/cd/training/model/ModelTrainDetailApiController.java +++ b/src/main/java/com/kamco/cd/training/model/ModelTrainDetailApiController.java @@ -14,7 +14,6 @@ import com.kamco.cd.training.model.dto.ModelTrainMngDto.Basic; import com.kamco.cd.training.model.dto.ModelTrainMngDto.CleanupResult; import com.kamco.cd.training.model.dto.ModelTrainMngDto.ModelProgressStepDto; import com.kamco.cd.training.model.service.ModelTrainDetailService; -import com.kamco.cd.training.model.service.ModelTrainMngService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -47,7 +46,6 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/models") public class ModelTrainDetailApiController { private final ModelTrainDetailService modelTrainDetailService; - private final ModelTrainMngService modelTrainMngService; private final RangeDownloadResponder rangeDownloadResponder; @Value("${train.docker.responseDir}") diff --git a/src/main/java/com/kamco/cd/training/model/dto/FileDto.java b/src/main/java/com/kamco/cd/training/model/dto/FileDto.java index a7dff79..a33c39f 100644 --- a/src/main/java/com/kamco/cd/training/model/dto/FileDto.java +++ b/src/main/java/com/kamco/cd/training/model/dto/FileDto.java @@ -47,6 +47,7 @@ public class FileDto { private Integer endPos; } + // TODO 미사용시작 @Getter @Setter @NoArgsConstructor @@ -89,6 +90,8 @@ public class FileDto { } } + // TODO 미사용 끝 + @Schema(name = "FoldersDto", description = "폴더목록 정보") @Getter public static class FoldersDto { diff --git a/src/main/java/com/kamco/cd/training/model/service/ModelTrainDetailService.java b/src/main/java/com/kamco/cd/training/model/service/ModelTrainDetailService.java index 96aa777..f5be480 100644 --- a/src/main/java/com/kamco/cd/training/model/service/ModelTrainDetailService.java +++ b/src/main/java/com/kamco/cd/training/model/service/ModelTrainDetailService.java @@ -84,6 +84,7 @@ public class ModelTrainDetailService { return modelTrainDetailCoreService.findByModelByUUID(uuid); } + // TODO 미사용시작 /** * 전이학습 모델선택 정보 * @@ -150,6 +151,8 @@ public class ModelTrainDetailService { return transferDetailDto; } + // TODO 미사용 끝 + public List getModelTrainMetricResult(UUID uuid) { return modelTrainDetailCoreService.getModelTrainMetricResult(uuid); } diff --git a/src/main/java/com/kamco/cd/training/postgres/core/DatasetCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/DatasetCoreService.java index 4c82418..5f4d488 100644 --- a/src/main/java/com/kamco/cd/training/postgres/core/DatasetCoreService.java +++ b/src/main/java/com/kamco/cd/training/postgres/core/DatasetCoreService.java @@ -95,6 +95,7 @@ public class DatasetCoreService return search(searchReq); } + // TODO 미사용시작 /** * 학습데이터 등록 * @@ -129,6 +130,7 @@ public class DatasetCoreService return savedEntity.toDto(); } + // TODO 미사용 끝 /** * 학습 데이터 수정 * diff --git a/src/main/java/com/kamco/cd/training/postgres/core/MapSheetCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/MapSheetCoreService.java index db0164e..d6e586c 100644 --- a/src/main/java/com/kamco/cd/training/postgres/core/MapSheetCoreService.java +++ b/src/main/java/com/kamco/cd/training/postgres/core/MapSheetCoreService.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.postgres.core; import com.kamco.cd.training.common.exception.NotFoundException; @@ -70,3 +71,4 @@ public class MapSheetCoreService } } } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainDetailCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainDetailCoreService.java index 5afcce4..93f24fd 100644 --- a/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainDetailCoreService.java +++ b/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainDetailCoreService.java @@ -67,10 +67,13 @@ public class ModelTrainDetailCoreService { return modelDetailRepository.getByModelHyperParamSummary(uuid); } + // TODO 미사용시작 public TransferHyperSummary getTransferHyperSummary(UUID uuid) { return modelDetailRepository.getByModelTransferHyperParamSummary(uuid); } + // TODO 미사용 끝 + public List getByModelMappingDataset(UUID uuid) { return modelDetailRepository.getByModelMappingDataset(uuid); } @@ -80,6 +83,7 @@ public class ModelTrainDetailCoreService { return entity.toDto(); } + // TODO 미사용시작 /** * 모델 학습별 config 정보 조회 * @@ -90,6 +94,7 @@ public class ModelTrainDetailCoreService { return modelConfigRepository.findModelConfigByModelId(modelId).orElse(null); } + // TODO 미사용 끝 public List getModelTrainMetricResult(UUID uuid) { return modelDetailRepository.getModelTrainMetricResult(uuid); } diff --git a/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java index 63bee2c..081393d 100644 --- a/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java +++ b/src/main/java/com/kamco/cd/training/postgres/core/ModelTrainMngCoreService.java @@ -219,6 +219,7 @@ public class ModelTrainMngCoreService { modelConfigRepository.save(entity); } + // TODO 미사용시작 /** * 데이터셋 매핑 생성 * @@ -235,6 +236,8 @@ public class ModelTrainMngCoreService { } } + // TODO 미사용 끝 + /** * UUID로 모델 조회 * @@ -278,6 +281,7 @@ public class ModelTrainMngCoreService { .orElseThrow(() -> new CustomApiException("NOT_FOUND_DATA", HttpStatus.NOT_FOUND)); } + // TODO 미사용시작 public ModelConfigDto.TransferBasic findModelTransferConfigByModelId(UUID uuid) { ModelMasterEntity modelEntity = findByUuid(uuid); return modelConfigRepository @@ -285,6 +289,8 @@ public class ModelTrainMngCoreService { .orElseThrow(() -> new CustomApiException("NOT_FOUND_DATA", HttpStatus.NOT_FOUND)); } + // TODO 미사용 끝 + /** * 데이터셋 G1 목록 * @@ -295,6 +301,7 @@ public class ModelTrainMngCoreService { return datasetRepository.getDatasetSelectG1List(req); } + // TODO 미사용시작 /** * 전이학습 데이터셋 G1 목록 * @@ -305,6 +312,8 @@ public class ModelTrainMngCoreService { return datasetRepository.getDatasetTransferSelectG1List(modelId); } + // TODO 미사용 끝 + /** * 데이터셋 G2, G3 목록 * @@ -315,6 +324,7 @@ public class ModelTrainMngCoreService { return datasetRepository.getDatasetSelectG2G3List(req); } + // TODO 미사용시작 /** * 전이학습 데이터셋 G2, G3 목록 * @@ -327,6 +337,8 @@ public class ModelTrainMngCoreService { return datasetRepository.getDatasetTransferSelectG2G3List(modelId, modelNo); } + // TODO 미사용 끝 + /** * 모델관리 조회 * diff --git a/src/main/java/com/kamco/cd/training/postgres/core/SystemMetricsCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/SystemMetricsCoreService.java index dfca947..ff7c183 100644 --- a/src/main/java/com/kamco/cd/training/postgres/core/SystemMetricsCoreService.java +++ b/src/main/java/com/kamco/cd/training/postgres/core/SystemMetricsCoreService.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.postgres.core; import com.kamco.cd.training.postgres.entity.SystemMetricsEntity; @@ -64,3 +65,4 @@ public class SystemMetricsCoreService { return isAvailable; } } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/postgres/entity/DatasetEntity.java b/src/main/java/com/kamco/cd/training/postgres/entity/DatasetEntity.java index d8480d2..6876e39 100644 --- a/src/main/java/com/kamco/cd/training/postgres/entity/DatasetEntity.java +++ b/src/main/java/com/kamco/cd/training/postgres/entity/DatasetEntity.java @@ -117,10 +117,12 @@ public class DatasetEntity { @Column(name = "dataset_path", length = 1000) private String datasetPath; + // TODO 미사용시작 @Column(name = "class_counts") @JdbcTypeCode(SqlTypes.JSON) private Map classCounts; + // TODO 미사용 끝 @Size(max = 32) @Column(name = "uid") private String uid; diff --git a/src/main/java/com/kamco/cd/training/postgres/entity/MapSheetEntity.java b/src/main/java/com/kamco/cd/training/postgres/entity/MapSheetEntity.java index b73861f..57b325f 100644 --- a/src/main/java/com/kamco/cd/training/postgres/entity/MapSheetEntity.java +++ b/src/main/java/com/kamco/cd/training/postgres/entity/MapSheetEntity.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.postgres.entity; import com.kamco.cd.training.dataset.dto.MapSheetDto; @@ -103,3 +104,4 @@ public class MapSheetEntity { return dto; } } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/postgres/entity/ModelDatasetMappEntity.java b/src/main/java/com/kamco/cd/training/postgres/entity/ModelDatasetMappEntity.java index 3f5f54e..8c76cfd 100644 --- a/src/main/java/com/kamco/cd/training/postgres/entity/ModelDatasetMappEntity.java +++ b/src/main/java/com/kamco/cd/training/postgres/entity/ModelDatasetMappEntity.java @@ -32,10 +32,13 @@ public class ModelDatasetMappEntity { @Column(name = "dataset_uid", nullable = false) private Long datasetUid; + // TODO 미사용시작 @Size(max = 20) @Column(name = "dataset_type", length = 20) private String datasetType; + // TODO 미사용 끝 + @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/kamco/cd/training/postgres/entity/ModelMngEntity.java b/src/main/java/com/kamco/cd/training/postgres/entity/ModelMngEntity.java index a951242..1410966 100644 --- a/src/main/java/com/kamco/cd/training/postgres/entity/ModelMngEntity.java +++ b/src/main/java/com/kamco/cd/training/postgres/entity/ModelMngEntity.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.postgres.entity; import jakarta.persistence.Column; @@ -92,3 +93,4 @@ public class ModelMngEntity { return this.uuid != null ? this.uuid.toString() : null; } } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/postgres/entity/SystemMetricsEntity.java b/src/main/java/com/kamco/cd/training/postgres/entity/SystemMetricsEntity.java index 21a6e73..455f712 100644 --- a/src/main/java/com/kamco/cd/training/postgres/entity/SystemMetricsEntity.java +++ b/src/main/java/com/kamco/cd/training/postgres/entity/SystemMetricsEntity.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.postgres.entity; import jakarta.persistence.Column; @@ -53,3 +54,4 @@ public class SystemMetricsEntity { @Column(name = "memused") private Float memused; } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/SystemMetricsRepository.java b/src/main/java/com/kamco/cd/training/postgres/repository/SystemMetricsRepository.java index 97c158a..07d6c79 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/SystemMetricsRepository.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/SystemMetricsRepository.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.postgres.repository; import com.kamco.cd.training.postgres.entity.SystemMetricsEntity; @@ -17,3 +18,4 @@ public interface SystemMetricsRepository extends JpaRepository findLatestMetrics(); } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepository.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepository.java index b8ea142..60480f9 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepository.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepository.java @@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface DatasetRepository extends JpaRepository, DatasetRepositoryCustom { - + // TODO 미사용시작 List findByDeletedOrderByCreatedDttmDesc(Boolean deleted); + // TODO 미사용 끝 } diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryCustom.java index 6a18e80..c7bd570 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryCustom.java @@ -18,10 +18,13 @@ public interface DatasetRepositoryCustom { List getDatasetSelectG1List(DatasetReq req); + // TODO 미사용시작 public List getDatasetTransferSelectG1List(Long modelId); public List getDatasetTransferSelectG2G3List(Long modelId, String modelNo); + // TODO 미사용 끝 + List getDatasetSelectG2G3List(DatasetReq req); Long getDatasetMaxStage(int compareYyyy, int targetYyyy); diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java index 4ca78e8..dd1f2c4 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java @@ -150,6 +150,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom { .fetch(); } + // TODO 미사용시작 @Override public List getDatasetTransferSelectG1List(Long modelId) { @@ -247,6 +248,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom { .fetch(); } + // TODO 미사용 끝 @Override public List getDatasetSelectG2G3List(DatasetReq req) { @@ -311,6 +313,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom { .fetch(); } + // TODO 미사용시작 @Override public List getDatasetTransferSelectG2G3List( Long modelId, String modelNo) { @@ -421,6 +424,8 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom { .fetch(); } + // TODO 미사용 끝 + @Override public Long getDatasetMaxStage(int compareYyyy, int targetYyyy) { return queryFactory diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepository.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepository.java index a940baf..1446bf0 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepository.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepository.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.postgres.repository.dataset; import com.kamco.cd.training.postgres.entity.MapSheetEntity; @@ -11,3 +12,4 @@ public interface MapSheetRepository long countByDatasetIdAndDeletedFalse(Long datasetId); } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepositoryCustom.java index a2e0f4c..a608614 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepositoryCustom.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.postgres.repository.dataset; import com.kamco.cd.training.dataset.dto.MapSheetDto; @@ -7,3 +8,4 @@ import org.springframework.data.domain.Page; public interface MapSheetRepositoryCustom { Page findMapSheetList(MapSheetDto.SearchReq searchReq); } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepositoryImpl.java index 8607fca..f9af13e 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/MapSheetRepositoryImpl.java @@ -1,3 +1,4 @@ +// TODO 미사용시작 package com.kamco.cd.training.postgres.repository.dataset; import com.kamco.cd.training.dataset.dto.MapSheetDto; @@ -52,3 +53,4 @@ public class MapSheetRepositoryImpl implements MapSheetRepositoryCustom { return new PageImpl<>(content, pageable, total); } } +// TODO 미사용 끝 diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepository.java b/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepository.java index 6e1d5e1..4ba2fe1 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepository.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepository.java @@ -8,5 +8,7 @@ import org.springframework.stereotype.Repository; @Repository public interface HyperParamRepository extends JpaRepository, HyperParamRepositoryCustom { + // TODO 미사용시작 Optional findByHyperVer(String hyperVer); + // TODO 미사용 끝 } diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryCustom.java index f77205c..d908488 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryCustom.java @@ -11,6 +11,7 @@ import org.springframework.data.domain.Page; public interface HyperParamRepositoryCustom { + // TODO 미사용시작 /** * 마지막 버전 조회 * @@ -19,6 +20,8 @@ public interface HyperParamRepositoryCustom { @Deprecated Optional findHyperParamVer(); + // TODO 미사용 끝 + /** * 모델 타입별 마지막 버전 조회 * @@ -27,8 +30,11 @@ public interface HyperParamRepositoryCustom { */ Optional findHyperParamVerByModelType(ModelType modelType); + // TODO 미사용시작 Optional findHyperParamByHyperVer(String hyperVer); + // TODO 미사용 끝 + /** * 하이퍼 파라미터 상세조회 * diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryImpl.java index fc37f17..0ada4d3 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/hyperparam/HyperParamRepositoryImpl.java @@ -29,6 +29,7 @@ public class HyperParamRepositoryImpl implements HyperParamRepositoryCustom { private final JPAQueryFactory queryFactory; + // TODO 미사용시작 @Override public Optional findHyperParamVer() { @@ -42,6 +43,8 @@ public class HyperParamRepositoryImpl implements HyperParamRepositoryCustom { .fetchOne()); } + // TODO 미사용 끝 + @Override public Optional findHyperParamVerByModelType(ModelType modelType) { @@ -59,6 +62,7 @@ public class HyperParamRepositoryImpl implements HyperParamRepositoryCustom { .fetchOne()); } + // TODO 미사용시작 @Override public Optional findHyperParamByHyperVer(String hyperVer) { @@ -75,6 +79,8 @@ public class HyperParamRepositoryImpl implements HyperParamRepositoryCustom { .fetchOne()); } + // TODO 미사용 끝 + @Override public Optional findHyperParamByUuid(UUID uuid) { return Optional.ofNullable( diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/members/MembersRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/members/MembersRepositoryCustom.java index 66dfa83..45159ac 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/members/MembersRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/members/MembersRepositoryCustom.java @@ -7,14 +7,18 @@ import java.util.UUID; import org.springframework.data.domain.Page; public interface MembersRepositoryCustom { + // TODO 미사용시작 boolean existsByUserId(String userId); + // TODO 미사용 끝 boolean existsByEmployeeNo(String employeeNo); Optional findByEmployeeNo(String employeeNo); + // TODO 미사용시작 Optional findByUserId(String userId); + // TODO 미사용 끝 Optional findByUUID(UUID uuid); Page findByMembers(MembersDto.SearchReq searchReq); diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/members/MembersRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/members/MembersRepositoryImpl.java index f3420c6..eeca017 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/members/MembersRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/members/MembersRepositoryImpl.java @@ -27,6 +27,7 @@ public class MembersRepositoryImpl extends QuerydslRepositorySupport this.queryFactory = queryFactory; } + // TODO 미사용시작 /** * 사용자 ID 조회 * @@ -43,6 +44,8 @@ public class MembersRepositoryImpl extends QuerydslRepositorySupport != null; } + // TODO 미사용 끝 + /** * 사용자 사번 조회 * @@ -59,6 +62,7 @@ public class MembersRepositoryImpl extends QuerydslRepositorySupport != null; } + // TODO 미사용시작 /** * 사용자 조회 user id * @@ -71,6 +75,8 @@ public class MembersRepositoryImpl extends QuerydslRepositorySupport queryFactory.selectFrom(memberEntity).where(memberEntity.userId.eq(userId)).fetchOne()); } + // TODO 미사용 끝 + /** * 사용자 조회 employeed no * diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelConfigRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelConfigRepositoryCustom.java index 33f95b3..bb07fb7 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelConfigRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelConfigRepositoryCustom.java @@ -6,5 +6,7 @@ import java.util.Optional; public interface ModelConfigRepositoryCustom { Optional findModelConfigByModelId(Long modelId); + // TODO 미사용시작 Optional findModelTransferConfigByModelId(Long modelId); + // TODO 미사용 끝 } diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelConfigRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelConfigRepositoryImpl.java index 4ce585c..19fb71c 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelConfigRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelConfigRepositoryImpl.java @@ -39,6 +39,7 @@ public class ModelConfigRepositoryImpl implements ModelConfigRepositoryCustom { .fetchOne()); } + // TODO 미사용시작 @Override public Optional findModelTransferConfigByModelId(Long modelId) { QModelConfigEntity beforeConfig = new QModelConfigEntity("beforeConfig"); @@ -78,4 +79,5 @@ public class ModelConfigRepositoryImpl implements ModelConfigRepositoryCustom { .where(modelMasterEntity.id.eq(modelId)) .fetchOne()); } + // TODO 미사용 끝 } diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDetailRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDetailRepositoryCustom.java index 57412b8..a7c0d67 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDetailRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelDetailRepositoryCustom.java @@ -23,8 +23,11 @@ public interface ModelDetailRepositoryCustom { HyperSummary getByModelHyperParamSummary(UUID uuid); + // TODO 미사용시작 TransferHyperSummary getByModelTransferHyperParamSummary(UUID uuid); + // TODO 미사용 끝 + List getByModelMappingDataset(UUID uuid); ModelMasterEntity findByModelByUUID(UUID uuid); diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryCustom.java index ec84098..9adfe9a 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryCustom.java @@ -20,8 +20,11 @@ public interface ModelMngRepositoryCustom { Optional findByUuid(UUID uuid); + // TODO 미사용시작 Optional findFirstByStatusCdAndDelYn(String statusCd, Boolean delYn); + // TODO 미사용 끝 + TrainRunRequest findTrainRunRequest(Long modelId); Long findModelStep1InProgressCnt(); diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java index 010f79e..b3abf0f 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java @@ -133,11 +133,14 @@ public class ModelMngRepositoryImpl implements ModelMngRepositoryCustom { .fetchOne()); } + // TODO 미사용시작 @Override public Optional findFirstByStatusCdAndDelYn(String statusCd, Boolean delYn) { return Optional.empty(); } + // TODO 미사용 끝 + @Override public TrainRunRequest findTrainRunRequest(Long modelId) { return queryFactory diff --git a/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java b/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java index 7a58ce9..f1fd395 100644 --- a/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java +++ b/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java @@ -98,6 +98,7 @@ public class TmpDatasetService { return 1; } + // TODO 미사용시작 /** * request 전체 폴더 link * @@ -210,4 +211,5 @@ public class TmpDatasetService { } return Paths.get(p).toAbsolutePath().normalize(); } + // TODO 미사용 끝 } diff --git a/src/main/java/com/kamco/cd/training/upload/dto/UploadDto.java b/src/main/java/com/kamco/cd/training/upload/dto/UploadDto.java index cb55752..c58ff96 100644 --- a/src/main/java/com/kamco/cd/training/upload/dto/UploadDto.java +++ b/src/main/java/com/kamco/cd/training/upload/dto/UploadDto.java @@ -83,6 +83,7 @@ public class UploadDto { private UUID uuid; } + // TODO 미사용시작 @Schema(name = "UploadCompleteReq", description = "업로드 완료 요청") @Getter @Setter @@ -139,6 +140,8 @@ public class UploadDto { private String errorMessage; } + // TODO 미사용 끝 + @Schema(name = "UploadAddReq", description = "업로드 요청") @Getter @Setter diff --git a/src/main/java/com/kamco/cd/training/upload/service/UploadService.java b/src/main/java/com/kamco/cd/training/upload/service/UploadService.java index 1ab4c58..061f896 100644 --- a/src/main/java/com/kamco/cd/training/upload/service/UploadService.java +++ b/src/main/java/com/kamco/cd/training/upload/service/UploadService.java @@ -41,12 +41,15 @@ public class UploadService { @Value("${file.dataset-tmp-dir}") private String datasetTmpDir; + // TODO 미사용시작 @Transactional public DmlReturn initUpload(UploadDto.InitReq initReq) { return new DmlReturn("success", "UPLOAD CHUNK INIT"); } + // TODO 미사용 끝 + @Transactional public UploadDto.UploadRes uploadChunk(UploadDto.UploadAddReq upAddReqDto, MultipartFile file) {