From d69e10a024f58496fcd44dc84669317980fbabf6 Mon Sep 17 00:00:00 2001 From: Moon Date: Mon, 12 Jan 2026 21:05:24 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=B6=94=EB=A1=A0=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=83=81=ED=83=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InferenceResultApiController.java | 29 ++++++++ .../inference/dto/InferenceResultDto.java | 72 +++++++++++++++++-- .../service/InferenceResultService.java | 18 +++++ .../model/service/ModelMngService.java | 24 ++++++- .../core/InferenceResultCoreService.java | 5 ++ .../MapSheetLearnRepositoryCustom.java | 4 ++ .../MapSheetLearnRepositoryImpl.java | 44 +++++++++++- 7 files changed, 186 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java index afedbb4b..9e6f2879 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java @@ -1,8 +1,10 @@ package com.kamco.cd.kamcoback.inference; import com.kamco.cd.kamcoback.config.api.ApiResponseDto; +import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto; 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.InferenceResultService; import com.kamco.cd.kamcoback.mapsheet.service.MapSheetMngService; @@ -23,6 +25,7 @@ import java.util.UUID; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -237,4 +240,30 @@ public class InferenceResultApiController { return ApiResponseDto.ok(inferenceResultService.getInferenceServerStatusList()); } + + + + @Operation(summary = "추론관리 진행현황 상세", description = "어드민 홈 > 추론관리 > 추론관리 > 진행현황 상세") + @ApiResponses( + value = { + @ApiResponse( + responseCode = "200", + description = "검색 성공", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = Page.class))), + @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content), + @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) + }) + @GetMapping("/status/{uuid}") + public ApiResponseDto getInferenceStatus( + @io.swagger.v3.oas.annotations.parameters.RequestBody( + description = "모델 삭제 요청 정보", + required = true) + @PathVariable + UUID uuid) { + + return ApiResponseDto.ok(inferenceResultService.getInferenceStatus(uuid)); + } } diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java index 3941876f..3129a90e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java @@ -198,6 +198,72 @@ public class InferenceResultDto { private String mapSheetName; } + @Getter + @Setter + @NoArgsConstructor + @AllArgsConstructor + public static class InferenceStatusDetailDto { + private String title; + private Integer compareYyyy; + private Integer targetYyyy; + private String detectOption; + private String mapSheetScope; + @JsonFormatDttm private ZonedDateTime inferStartDttm; + @JsonFormatDttm private ZonedDateTime inferEndDttm; + private Long detectingCnt; + + private String model1Ver; + private String model2Ver; + private String model3Ver; + + public InferenceStatusDetailDto( + String title, + Integer compareYyyy, + Integer targetYyyy, + String detectOption, + String mapSheetScope, + ZonedDateTime inferStartDttm, + ZonedDateTime inferEndDttm, + Long detectingCnt, + String model1Ver, + String model2Ver, + String model3Ver) { + this.title = title; + this.compareYyyy = compareYyyy; + this.targetYyyy = targetYyyy; + this.detectOption = detectOption; + this.mapSheetScope = mapSheetScope; + this.inferStartDttm = inferStartDttm; + this.inferEndDttm = inferEndDttm; + this.detectingCnt = detectingCnt; + this.model1Ver = model1Ver; + this.model2Ver = model2Ver; + this.model3Ver = model3Ver; + } + + private String usedServerName; + private Long detectingEndCnt = 7L; + private String model1VerStatus = "PROCCESING"; + private String model1VerStatusName = "진행중"; + private String model2VerStatus = "PROCCESING"; + private String model2VerStatusName = "진행중"; + private String model3VerStatus = "PROCCESING"; + private String model4VerStatusName = "진행중"; + + public String getDetectOptionName() + { + if( this.detectOption.equals("EXCL") )return "추론제외"; + return "이전 년도 도엽 사용"; + } + + public String getMapSheetScopeName() + { + if( this.detectOption.equals("ALL") )return "전체"; + return "부분"; + } + + } + @Getter @Setter @NoArgsConstructor @@ -211,12 +277,6 @@ public class InferenceResultDto { @JsonIgnore private float memused; private Long kbmemused; private float gpuUtil; - //private String cpuStatusName; - //private String memStatusName; - //private String gpuStatusName; - //private float cpu_use_rate; - //private float gpu_use_rate; - //private float mem_use_rate; public float getCpuUseRate() { diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java index 705936bc..23e084d7 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java @@ -12,6 +12,7 @@ import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.MapSheet; 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.InferenceServerStatusDto; +import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceStatusDetailDto; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetNumDto; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.ResultList; @@ -391,4 +392,21 @@ public class InferenceResultService { public List getInferenceServerStatusList() { return inferenceResultCoreService.getInferenceServerStatusList(); } + + public InferenceStatusDetailDto getInferenceStatus(UUID uuid) { + + List servers = inferenceResultCoreService.getInferenceServerStatusList(); + + String serverNames = ""; + for (InferenceServerStatusDto server : servers) { + if( serverNames.equals("") )serverNames = server.getServerName(); + else serverNames = serverNames+","+server.getServerName(); + } + + InferenceStatusDetailDto dto = inferenceResultCoreService.getInferenceStatus(uuid); + dto.setUsedServerName(serverNames); + + return dto; + } + } diff --git a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java index efefe1a2..d62ceeeb 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java @@ -86,8 +86,24 @@ public class ModelMngService { modelMetricAddReq.setLoss(0); modelMetricAddReq.setIou(0); + ModelUploadResDto modelUploadResDto = new ModelUploadResDto(); + try { + FIleChecker.unzip(addReq.getFileName(), addReq.getFilePath()); + this.getUnzipModelFiles(addReq.getFilePath(), modelUploadResDto); + + addReq.setCdModelPath(modelUploadResDto.getCdModelPath()); + addReq.setCdModelFileName(modelUploadResDto.getCdModelFileName()); + addReq.setCdModelConfigPath(modelUploadResDto.getCdModelConfigPath()); + addReq.setCdModelConfigFileName(modelUploadResDto.getCdModelConfigFileName()); + addReq.setClsModelPath(modelUploadResDto.getClsModelPath()); + addReq.setClsModelFileName(modelUploadResDto.getClsModelFileName()); + + } catch (IOException e) { + throw new RuntimeException(e); + } + ObjectMapper mapper = new ObjectMapper(); - String filePath = addReq.getClsModelPath() + addReq.getClsModelFileName(); + String filePath = modelUploadResDto.getClsModelPath() + modelUploadResDto.getClsModelFileName(); String dataJson = null; try { dataJson = Files.readString(Path.of(filePath)); @@ -115,7 +131,7 @@ public class ModelMngService { } public ModelUploadResDto uploadChunkModelFile( - UploadDto.UploadAddReq upAddReqDto, MultipartFile chunkFile) { + UploadDto.UploadAddReq upAddReqDto, MultipartFile chunkFile) { UploadDto.UploadRes upRes = uploadService.uploadChunk(upAddReqDto, chunkFile); ModelUploadResDto modelUploadResDto = new ModelUploadResDto(); @@ -126,8 +142,9 @@ public class ModelMngService { modelUploadResDto.setFileName(upRes.getFileName()); modelUploadResDto.setChunkIndex(upRes.getChunkIndex()); modelUploadResDto.setChunkTotalIndex(upRes.getChunkTotalIndex()); - // 압축풀기 (String zipFilePath, String destDirectory) + // 압축풀기 (String zipFilePath, String destDirectory) + /* if (upRes.getChunkIndex() == upRes.getChunkTotalIndex()) { try { FIleChecker.unzip(upRes.getFileName(), upRes.getFilePath()); @@ -138,6 +155,7 @@ public class ModelMngService { throw new RuntimeException(e); } } + */ return modelUploadResDto; } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java index 1d7710a1..b7db07b3 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java @@ -7,6 +7,7 @@ import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.Dashboard; import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.MapSheet; 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.MapSheetNumDto; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.ResultList; import com.kamco.cd.kamcoback.postgres.entity.MapInkx5kEntity; @@ -230,4 +231,8 @@ public class InferenceResultCoreService { public List getInferenceServerStatusList(){return mapSheetLearnRepository.getInferenceServerStatusList(); } + + public InferenceStatusDetailDto getInferenceStatus(UUID uuid){ + return mapSheetLearnRepository.getInferenceStatus(uuid); + } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java index 4d896aa3..67448929 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java @@ -1,7 +1,9 @@ package com.kamco.cd.kamcoback.postgres.repository.Inference; +import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto; 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.postgres.entity.MapSheetLearnEntity; import java.util.Optional; import java.util.UUID; @@ -15,4 +17,6 @@ public interface MapSheetLearnRepositoryCustom { Optional getInferenceResultByUuid(UUID uuid); List getInferenceServerStatusList(); + + public InferenceStatusDetailDto getInferenceStatus(UUID uuid); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java index 79c7e827..b83ffe2e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java @@ -2,12 +2,17 @@ package com.kamco.cd.kamcoback.postgres.repository.Inference; import static com.kamco.cd.kamcoback.postgres.entity.QGpuMetricEntity.gpuMetricEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity; +import static com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity.modelMngEntity; import static com.kamco.cd.kamcoback.postgres.entity.QSystemMetricEntity.systemMetricEntity; import com.kamco.cd.kamcoback.common.utils.DateRange; +import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto; 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.model.service.ModelMngService; import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity; +import com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.CaseBuilder; @@ -28,6 +33,7 @@ import org.springframework.stereotype.Repository; public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCustom { private final JPAQueryFactory queryFactory; + private final ModelMngService modelMngService; @Override public Page getInferenceMgnResultList(InferenceResultDto.SearchListReq req) { @@ -117,7 +123,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto gpuMetricEntity.gpuUtil )) .from(systemMetricEntity) - .leftJoin(gpuMetricEntity).on(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName)) + .leftJoin(gpuMetricEntity).on(gpuMetricEntity.id1.in(latestGpuIds) + .and(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName))) .where(systemMetricEntity.id1.in(latestIds)) // In 절 사용 .orderBy(systemMetricEntity.serverName.asc()) .limit(4) @@ -125,4 +132,39 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto return foundContent; } + + @Override + public InferenceStatusDetailDto getInferenceStatus(UUID uuid) { + + String serverNames = ""; + + QModelMngEntity m1Model = new QModelMngEntity("m1Model"); + QModelMngEntity m2Model = new QModelMngEntity("m2Model"); + QModelMngEntity m3Model = new QModelMngEntity("m3Model"); + + InferenceStatusDetailDto foundContent = queryFactory + .select(Projections.constructor( + InferenceStatusDetailDto.class, + mapSheetLearnEntity.title, + mapSheetLearnEntity.compareYyyy, + mapSheetLearnEntity.targetYyyy, + mapSheetLearnEntity.detectOption, + mapSheetLearnEntity.mapSheetScope, + mapSheetLearnEntity.inferStartDttm, + mapSheetLearnEntity.inferEndDttm, + mapSheetLearnEntity.detectingCnt, + m1Model.modelVer.as("model1Ver"), + m2Model.modelVer.as("model2Ver"), + m3Model.modelVer.as("model3Ver") + )) + .from(mapSheetLearnEntity) + .leftJoin(m1Model).on(m1Model.uuid.eq(mapSheetLearnEntity.m1ModelUuid)) + .leftJoin(m2Model).on(m2Model.uuid.eq(mapSheetLearnEntity.m2ModelUuid)) + .leftJoin(m3Model).on(m3Model.uuid.eq(mapSheetLearnEntity.m3ModelUuid)) + .where(mapSheetLearnEntity.uuid.eq(uuid)) + .fetchOne(); + + return foundContent; + } + } From b4ad2fb8585a78b31079b62886ed5b52686cc2c8 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 12 Jan 2026 21:08:34 +0900 Subject: [PATCH 2/4] spotless --- .../InferenceResultApiController.java | 35 +++--- .../inference/dto/InferenceResultDto.java | 33 +++--- .../service/InferenceResultService.java | 8 +- .../model/service/ModelMngService.java | 2 +- .../core/InferenceResultCoreService.java | 2 +- .../MapSheetLearnRepositoryCustom.java | 3 +- .../MapSheetLearnRepositoryImpl.java | 110 ++++++++++-------- 7 files changed, 97 insertions(+), 96 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java index 28718d69..c7f7aa72 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java @@ -1,7 +1,6 @@ package com.kamco.cd.kamcoback.inference; import com.kamco.cd.kamcoback.config.api.ApiResponseDto; -import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto; 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; @@ -241,28 +240,26 @@ public class InferenceResultApiController { return ApiResponseDto.ok(inferenceResultService.getInferenceServerStatusList()); } - - @Operation(summary = "추론관리 진행현황 상세", description = "어드민 홈 > 추론관리 > 추론관리 > 진행현황 상세") @ApiResponses( - value = { - @ApiResponse( - responseCode = "200", - description = "검색 성공", - content = - @Content( - mediaType = "application/json", - schema = @Schema(implementation = Page.class))), - @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content), - @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) - }) + value = { + @ApiResponse( + responseCode = "200", + description = "검색 성공", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = Page.class))), + @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content), + @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) + }) @GetMapping("/status/{uuid}") public ApiResponseDto getInferenceStatus( - @io.swagger.v3.oas.annotations.parameters.RequestBody( - description = "모델 삭제 요청 정보", - required = true) - @PathVariable - UUID uuid) { + @io.swagger.v3.oas.annotations.parameters.RequestBody( + description = "모델 삭제 요청 정보", + required = true) + @PathVariable + UUID uuid) { return ApiResponseDto.ok(inferenceResultService.getInferenceStatus(uuid)); } diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java index b1bc3c99..aaae1591 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java @@ -214,17 +214,17 @@ public class InferenceResultDto { private String model3Ver; public InferenceStatusDetailDto( - String title, - Integer compareYyyy, - Integer targetYyyy, - String detectOption, - String mapSheetScope, - ZonedDateTime inferStartDttm, - ZonedDateTime inferEndDttm, - Long detectingCnt, - String model1Ver, - String model2Ver, - String model3Ver) { + String title, + Integer compareYyyy, + Integer targetYyyy, + String detectOption, + String mapSheetScope, + ZonedDateTime inferStartDttm, + ZonedDateTime inferEndDttm, + Long detectingCnt, + String model1Ver, + String model2Ver, + String model3Ver) { this.title = title; this.compareYyyy = compareYyyy; this.targetYyyy = targetYyyy; @@ -247,18 +247,15 @@ public class InferenceResultDto { private String model3VerStatus = "PROCCESING"; private String model4VerStatusName = "진행중"; - public String getDetectOptionName() - { - if( this.detectOption.equals("EXCL") )return "추론제외"; + public String getDetectOptionName() { + if (this.detectOption.equals("EXCL")) return "추론제외"; return "이전 년도 도엽 사용"; } - public String getMapSheetScopeName() - { - if( this.detectOption.equals("ALL") )return "전체"; + public String getMapSheetScopeName() { + if (this.detectOption.equals("ALL")) return "전체"; return "부분"; } - } @Getter diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java index 38e13037..db7e6099 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java @@ -405,12 +405,13 @@ public class InferenceResultService { public InferenceStatusDetailDto getInferenceStatus(UUID uuid) { - List servers = inferenceResultCoreService.getInferenceServerStatusList(); + List servers = + inferenceResultCoreService.getInferenceServerStatusList(); String serverNames = ""; for (InferenceServerStatusDto server : servers) { - if( serverNames.equals("") )serverNames = server.getServerName(); - else serverNames = serverNames+","+server.getServerName(); + if (serverNames.equals("")) serverNames = server.getServerName(); + else serverNames = serverNames + "," + server.getServerName(); } InferenceStatusDetailDto dto = inferenceResultCoreService.getInferenceStatus(uuid); @@ -418,5 +419,4 @@ public class InferenceResultService { return dto; } - } diff --git a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java index d62ceeeb..6381b8f1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java @@ -131,7 +131,7 @@ public class ModelMngService { } public ModelUploadResDto uploadChunkModelFile( - UploadDto.UploadAddReq upAddReqDto, MultipartFile chunkFile) { + UploadDto.UploadAddReq upAddReqDto, MultipartFile chunkFile) { UploadDto.UploadRes upRes = uploadService.uploadChunk(upAddReqDto, chunkFile); ModelUploadResDto modelUploadResDto = new ModelUploadResDto(); diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java index 38243a63..de3cc439 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java @@ -260,7 +260,7 @@ public class InferenceResultCoreService { return inferenceBatchSheet; } - public InferenceStatusDetailDto getInferenceStatus(UUID uuid){ + public InferenceStatusDetailDto getInferenceStatus(UUID uuid) { return mapSheetLearnRepository.getInferenceStatus(uuid); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java index 67448929..50892c71 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java @@ -1,13 +1,12 @@ package com.kamco.cd.kamcoback.postgres.repository.Inference; -import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto; 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.postgres.entity.MapSheetLearnEntity; +import java.util.List; import java.util.Optional; import java.util.UUID; -import java.util.List; import org.springframework.data.domain.Page; public interface MapSheetLearnRepositoryCustom { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java index b83ffe2e..ad199a12 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java @@ -2,11 +2,9 @@ package com.kamco.cd.kamcoback.postgres.repository.Inference; import static com.kamco.cd.kamcoback.postgres.entity.QGpuMetricEntity.gpuMetricEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity; -import static com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity.modelMngEntity; import static com.kamco.cd.kamcoback.postgres.entity.QSystemMetricEntity.systemMetricEntity; import com.kamco.cd.kamcoback.common.utils.DateRange; -import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto; 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; @@ -100,35 +98,42 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto BooleanBuilder builder = new BooleanBuilder(); - List latestIds = queryFactory - .select(systemMetricEntity.id1.max()) - .from(systemMetricEntity) - .groupBy(systemMetricEntity.serverName) - .fetch(); + List latestIds = + queryFactory + .select(systemMetricEntity.id1.max()) + .from(systemMetricEntity) + .groupBy(systemMetricEntity.serverName) + .fetch(); - List latestGpuIds = queryFactory - .select(gpuMetricEntity.id1.max()) - .from(gpuMetricEntity) - .groupBy(gpuMetricEntity.serverName) - .fetch(); + List latestGpuIds = + queryFactory + .select(gpuMetricEntity.id1.max()) + .from(gpuMetricEntity) + .groupBy(gpuMetricEntity.serverName) + .fetch(); - List foundContent = queryFactory - .select(Projections.constructor( - InferenceServerStatusDto.class, - systemMetricEntity.serverName, - systemMetricEntity.cpuUser, - systemMetricEntity.cpuSystem, - systemMetricEntity.memused, - systemMetricEntity.kbmemused, - gpuMetricEntity.gpuUtil - )) - .from(systemMetricEntity) - .leftJoin(gpuMetricEntity).on(gpuMetricEntity.id1.in(latestGpuIds) - .and(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName))) - .where(systemMetricEntity.id1.in(latestIds)) // In 절 사용 - .orderBy(systemMetricEntity.serverName.asc()) - .limit(4) - .fetch(); + List foundContent = + queryFactory + .select( + Projections.constructor( + InferenceServerStatusDto.class, + systemMetricEntity.serverName, + systemMetricEntity.cpuUser, + systemMetricEntity.cpuSystem, + systemMetricEntity.memused, + systemMetricEntity.kbmemused, + gpuMetricEntity.gpuUtil)) + .from(systemMetricEntity) + .leftJoin(gpuMetricEntity) + .on( + gpuMetricEntity + .id1 + .in(latestGpuIds) + .and(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName))) + .where(systemMetricEntity.id1.in(latestIds)) // In 절 사용 + .orderBy(systemMetricEntity.serverName.asc()) + .limit(4) + .fetch(); return foundContent; } @@ -142,29 +147,32 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto QModelMngEntity m2Model = new QModelMngEntity("m2Model"); QModelMngEntity m3Model = new QModelMngEntity("m3Model"); - InferenceStatusDetailDto foundContent = queryFactory - .select(Projections.constructor( - InferenceStatusDetailDto.class, - mapSheetLearnEntity.title, - mapSheetLearnEntity.compareYyyy, - mapSheetLearnEntity.targetYyyy, - mapSheetLearnEntity.detectOption, - mapSheetLearnEntity.mapSheetScope, - mapSheetLearnEntity.inferStartDttm, - mapSheetLearnEntity.inferEndDttm, - mapSheetLearnEntity.detectingCnt, - m1Model.modelVer.as("model1Ver"), - m2Model.modelVer.as("model2Ver"), - m3Model.modelVer.as("model3Ver") - )) - .from(mapSheetLearnEntity) - .leftJoin(m1Model).on(m1Model.uuid.eq(mapSheetLearnEntity.m1ModelUuid)) - .leftJoin(m2Model).on(m2Model.uuid.eq(mapSheetLearnEntity.m2ModelUuid)) - .leftJoin(m3Model).on(m3Model.uuid.eq(mapSheetLearnEntity.m3ModelUuid)) - .where(mapSheetLearnEntity.uuid.eq(uuid)) - .fetchOne(); + InferenceStatusDetailDto foundContent = + queryFactory + .select( + Projections.constructor( + InferenceStatusDetailDto.class, + mapSheetLearnEntity.title, + mapSheetLearnEntity.compareYyyy, + mapSheetLearnEntity.targetYyyy, + mapSheetLearnEntity.detectOption, + mapSheetLearnEntity.mapSheetScope, + mapSheetLearnEntity.inferStartDttm, + mapSheetLearnEntity.inferEndDttm, + mapSheetLearnEntity.detectingCnt, + m1Model.modelVer.as("model1Ver"), + m2Model.modelVer.as("model2Ver"), + m3Model.modelVer.as("model3Ver"))) + .from(mapSheetLearnEntity) + .leftJoin(m1Model) + .on(m1Model.uuid.eq(mapSheetLearnEntity.m1ModelUuid)) + .leftJoin(m2Model) + .on(m2Model.uuid.eq(mapSheetLearnEntity.m2ModelUuid)) + .leftJoin(m3Model) + .on(m3Model.uuid.eq(mapSheetLearnEntity.m3ModelUuid)) + .where(mapSheetLearnEntity.uuid.eq(uuid)) + .fetchOne(); return foundContent; } - } From 1225c90e329dc05b42b347821c08c46b6493314f Mon Sep 17 00:00:00 2001 From: Moon Date: Mon, 12 Jan 2026 21:08:51 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=AA=A8=EB=8D=B8=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/service/ModelMngService.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java index d62ceeeb..d247920d 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java @@ -75,16 +75,6 @@ public class ModelMngService { addReq.setUuid(uuid); addReq.setClsModelVersion(addReq.getModelVer()); addReq.setPriority(0d); - Long modelUid = modelMngCoreService.insertModel(addReq); - - ModelMetricAddReq modelMetricAddReq = new ModelMetricAddReq(); - modelMetricAddReq.setModelUid(modelUid); - modelMetricAddReq.setModelVerUid(modelUid); - modelMetricAddReq.setF1Score(0); - modelMetricAddReq.setPrecision(0); - modelMetricAddReq.setRecall(0); - modelMetricAddReq.setLoss(0); - modelMetricAddReq.setIou(0); ModelUploadResDto modelUploadResDto = new ModelUploadResDto(); try { @@ -102,6 +92,19 @@ public class ModelMngService { throw new RuntimeException(e); } + Long modelUid = modelMngCoreService.insertModel(addReq); + + ModelMetricAddReq modelMetricAddReq = new ModelMetricAddReq(); + modelMetricAddReq.setModelUid(modelUid); + modelMetricAddReq.setModelVerUid(modelUid); + modelMetricAddReq.setF1Score(0); + modelMetricAddReq.setPrecision(0); + modelMetricAddReq.setRecall(0); + modelMetricAddReq.setLoss(0); + modelMetricAddReq.setIou(0); + + + ObjectMapper mapper = new ObjectMapper(); String filePath = modelUploadResDto.getClsModelPath() + modelUploadResDto.getClsModelFileName(); String dataJson = null; From 50ea32c53866fc25ed50f97fee9da88fdfed6ac4 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 12 Jan 2026 21:09:37 +0900 Subject: [PATCH 4/4] spotless --- .../com/kamco/cd/kamcoback/model/service/ModelMngService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java index b3367ad1..0104e206 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java @@ -103,8 +103,6 @@ public class ModelMngService { modelMetricAddReq.setLoss(0); modelMetricAddReq.setIou(0); - - ObjectMapper mapper = new ObjectMapper(); String filePath = modelUploadResDto.getClsModelPath() + modelUploadResDto.getClsModelFileName(); String dataJson = null;