From 0060f746315a6065361fa77d5de160159b50f635 Mon Sep 17 00:00:00 2001 From: Moon Date: Mon, 12 Jan 2026 21:25:47 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=B6=94=EB=A1=A0=ED=98=84=ED=99=A9?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/kamcoback/inference/InferenceResultApiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cc0fbaea..dcf61add 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java @@ -257,7 +257,7 @@ public class InferenceResultApiController { @GetMapping("/status/{uuid}") public ApiResponseDto getInferenceStatus( @io.swagger.v3.oas.annotations.parameters.RequestBody( - description = "모델 삭제 요청 정보", + description = "추론진행현왕 요청 정보", required = true) @PathVariable UUID uuid) { From fcbb35715572125e48703141d62c4e7342e570e0 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 12 Jan 2026 21:27:32 +0900 Subject: [PATCH 2/4] spotless --- .../cd/kamcoback/inference/InferenceResultApiController.java | 1 - 1 file changed, 1 deletion(-) 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 dcf61add..5da4c5bc 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java @@ -240,7 +240,6 @@ public class InferenceResultApiController { return ApiResponseDto.ok(inferenceResultService.getInferenceServerStatusList()); } - @Operation(summary = "추론관리 진행현황 상세", description = "어드민 홈 > 추론관리 > 추론관리 > 진행현황 상세") @ApiResponses( value = { From 61ef2729a3b8bb73cb583bd6e24f8c29bec1043e Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 12 Jan 2026 21:44:18 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=9D=BC=EB=B2=A8=EB=9F=AC=20=EC=9D=BC?= =?UTF-8?q?=EC=9E=90=EB=B3=84=20=EA=B1=B4=EC=88=98=20=EC=BF=BC=EB=A6=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/label/LabelAllocateRepositoryImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java index cb64cfe3..f2353cea 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java @@ -1101,9 +1101,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto Expression completeCnt = Expressions.numberTemplate( - Long.class, - "COUNT(*) FILTER (WHERE {0} = 'COMPLETE')", - labelingAssignmentEntity.workState); + Long.class, "COUNT(*) FILTER (WHERE {0} = 'DONE')", labelingAssignmentEntity.workState); Expression remainCnt = Expressions.numberTemplate(Long.class, "({0} - {1} - {2})", totalCnt, skipCnt, completeCnt); From 4376054562f09fa27d7abbf2f24c61475d92e880 Mon Sep 17 00:00:00 2001 From: Moon Date: Mon, 12 Jan 2026 22:18:36 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=B6=94=EB=A1=A0=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=9C=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inference/dto/InferenceResultDto.java | 24 +++++++++++++++---- .../MapSheetLearnRepositoryImpl.java | 1 + 2 files changed, 21 insertions(+), 4 deletions(-) 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 69b85394..005b32ff 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 @@ -207,7 +207,8 @@ public class InferenceResultDto { private String mapSheetScope; @JsonFormatDttm private ZonedDateTime inferStartDttm; @JsonFormatDttm private ZonedDateTime inferEndDttm; - private Long detectingCnt; + private Long detectingCnt = 0L; + private Long detectingEndCnt = 0L; private String model1Ver; private String model2Ver; @@ -222,6 +223,7 @@ public class InferenceResultDto { ZonedDateTime inferStartDttm, ZonedDateTime inferEndDttm, Long detectingCnt, + Long detectingEndCnt, String model1Ver, String model2Ver, String model3Ver) { @@ -233,19 +235,22 @@ public class InferenceResultDto { this.inferStartDttm = inferStartDttm; this.inferEndDttm = inferEndDttm; this.detectingCnt = detectingCnt; + this.detectingEndCnt = detectingEndCnt; this.model1Ver = model1Ver; this.model2Ver = model2Ver; this.model3Ver = model3Ver; + + if( this.detectingEndCnt == null )this.detectingEndCnt = 0L; + } 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 = "진행중"; + private String model3VerStatusName = "진행중"; public String getDetectOptionName() { if (this.detectOption.equals("EXCL")) return "추론제외"; @@ -253,9 +258,20 @@ public class InferenceResultDto { } public String getMapSheetScopeName() { - if (this.detectOption.equals("ALL")) return "전체"; + if (this.mapSheetScope.equals("ALL")) return "전체"; return "부분"; } + + public double getDetectingRate() { + if (this.detectingCnt == null || this.detectingCnt == 0L) { + return 0.0; + } + + if( this.detectingEndCnt == null )this.detectingEndCnt = 0L; + + return (double) (this.detectingEndCnt / this.detectingCnt) * 100.0; + } + } @Getter 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 a6522291..fe6c21f4 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 @@ -171,6 +171,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto mapSheetLearnEntity.inferStartDttm, mapSheetLearnEntity.inferEndDttm, mapSheetLearnEntity.detectingCnt, + mapSheetLearnEntity.detectEndCnt, m1Model.modelVer.as("model1Ver"), m2Model.modelVer.as("model2Ver"), m3Model.modelVer.as("model3Ver")))