추론결과 > 기본정보 작업 진행중

2026-01-14 15:14:36 +09:00
parent 5599889ac0
commit af428423c9
6 changed files with 314 additions and 187 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java
@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.postgres.core;
 import com.kamco.cd.kamcoback.common.exception.CustomApiException;
 import com.kamco.cd.kamcoback.common.utils.UserUtil;
 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.InferenceBatchSheet;
 import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.MapSheet;
@@ -370,4 +371,8 @@ public class InferenceResultCoreService {
  public Integer getLearnStage(Integer compareYear, Integer targetYear) {
    return mapSheetLearnRepository.getLearnStage(compareYear, targetYear);
  }
+
+  public AnalResultInfo getInferenceResultInfo(String uuid) {
+    return mapSheetLearnRepository.getInferenceResultInfo(uuid);
+  }
 }
--- 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,5 +1,6 @@
 package com.kamco.cd.kamcoback.postgres.repository.Inference;

+import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.AnalResultInfo;
 import com.kamco.cd.kamcoback.inference.dto.InferenceProgressDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
@@ -27,4 +28,6 @@ public interface MapSheetLearnRepositoryCustom {
  UUID getProcessing();

  Integer getLearnStage(Integer compareYear, Integer targetYear);
+
+  AnalResultInfo getInferenceResultInfo(String uuid);
 }
--- 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
@@ -5,6 +5,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapShe
 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.AnalResultInfo;
 import com.kamco.cd.kamcoback.inference.dto.InferenceProgressDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
@@ -40,7 +41,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
    BooleanBuilder builder = new BooleanBuilder();

    NumberExpression<Integer> statusOrder =
-        new CaseBuilder().when(mapSheetLearnEntity.status.eq("Y")).then(0).otherwise(1);
+      new CaseBuilder().when(mapSheetLearnEntity.status.eq("Y")).then(0).otherwise(1);

    // 국유인 반영 여부
    if (StringUtils.isNotBlank(req.getApplyYn())) {
@@ -54,10 +55,10 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
    // 국유인 반영일
    if (req.getStrtDttm() != null && req.getEndDttm() != null) {
      builder.and(
-          mapSheetLearnEntity
-              .applyDttm
-              .goe(DateRange.start(req.getStrtDttm()))
-              .and(mapSheetLearnEntity.applyDttm.lt(DateRange.end(req.getEndDttm()))));
+        mapSheetLearnEntity
+          .applyDttm
+          .goe(DateRange.start(req.getStrtDttm()))
+          .and(mapSheetLearnEntity.applyDttm.lt(DateRange.end(req.getEndDttm()))));
    }

    // 제목
@@ -66,21 +67,21 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
    }

    List<MapSheetLearnEntity> content =
-        queryFactory
-            .select(mapSheetLearnEntity)
-            .from(mapSheetLearnEntity)
-            .where(builder)
-            .offset(pageable.getOffset())
-            .limit(pageable.getPageSize())
-            .orderBy(mapSheetLearnEntity.id.desc())
-            .fetch();
+      queryFactory
+        .select(mapSheetLearnEntity)
+        .from(mapSheetLearnEntity)
+        .where(builder)
+        .offset(pageable.getOffset())
+        .limit(pageable.getPageSize())
+        .orderBy(mapSheetLearnEntity.id.desc())
+        .fetch();

    Long total =
-        queryFactory
-            .select(mapSheetLearnEntity.count())
-            .from(mapSheetLearnEntity)
-            .where(builder)
-            .fetchOne();
+      queryFactory
+        .select(mapSheetLearnEntity.count())
+        .from(mapSheetLearnEntity)
+        .where(builder)
+        .fetchOne();

    return new PageImpl<>(content, pageable, total == null ? 0L : total);
  }
@@ -88,10 +89,10 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
  @Override
  public Optional<MapSheetLearnEntity> getInferenceResultByUuid(UUID uuid) {
    return Optional.ofNullable(
-        queryFactory
-            .selectFrom(mapSheetLearnEntity)
-            .where(mapSheetLearnEntity.uuid.eq(uuid))
-            .fetchOne());
+      queryFactory
+        .selectFrom(mapSheetLearnEntity)
+        .where(mapSheetLearnEntity.uuid.eq(uuid))
+        .fetchOne());
  }

  @Override
@@ -100,41 +101,41 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
    BooleanBuilder builder = new BooleanBuilder();

    List<Integer> latestIds =
-        queryFactory
-            .select(systemMetricEntity.id1.max())
-            .from(systemMetricEntity)
-            .groupBy(systemMetricEntity.serverName)
-            .fetch();
+      queryFactory
+        .select(systemMetricEntity.id1.max())
+        .from(systemMetricEntity)
+        .groupBy(systemMetricEntity.serverName)
+        .fetch();

    List<Integer> latestGpuIds =
-        queryFactory
-            .select(gpuMetricEntity.id1.max())
-            .from(gpuMetricEntity)
-            .groupBy(gpuMetricEntity.serverName)
-            .fetch();
+      queryFactory
+        .select(gpuMetricEntity.id1.max())
+        .from(gpuMetricEntity)
+        .groupBy(gpuMetricEntity.serverName)
+        .fetch();

    List<InferenceServerStatusDto> 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();
+      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,11 +143,11 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
  @Override
  public Optional<MapSheetLearnEntity> getInferenceResultByStatus(String status) {
    return Optional.ofNullable(
-        queryFactory
-            .selectFrom(mapSheetLearnEntity)
-            .where(mapSheetLearnEntity.status.eq(status))
-            .limit(1)
-            .fetchOne());
+      queryFactory
+        .selectFrom(mapSheetLearnEntity)
+        .where(mapSheetLearnEntity.status.eq(status))
+        .limit(1)
+        .fetchOne());
  }

  @Override
@@ -159,37 +160,37 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
    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,
-                    mapSheetLearnEntity.detectEndCnt,
-                    mapSheetLearnEntity.m1ModelStartDttm,
-                    mapSheetLearnEntity.m1ModelEndDttm,
-                    mapSheetLearnEntity.m2ModelStartDttm,
-                    mapSheetLearnEntity.m2ModelEndDttm,
-                    mapSheetLearnEntity.m3ModelStartDttm,
-                    mapSheetLearnEntity.m3ModelEndDttm,
-                    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();
+      queryFactory
+        .select(
+          Projections.constructor(
+            InferenceStatusDetailDto.class,
+            mapSheetLearnEntity.title,
+            mapSheetLearnEntity.compareYyyy,
+            mapSheetLearnEntity.targetYyyy,
+            mapSheetLearnEntity.detectOption,
+            mapSheetLearnEntity.mapSheetScope,
+            mapSheetLearnEntity.inferStartDttm,
+            mapSheetLearnEntity.inferEndDttm,
+            mapSheetLearnEntity.detectingCnt,
+            mapSheetLearnEntity.detectEndCnt,
+            mapSheetLearnEntity.m1ModelStartDttm,
+            mapSheetLearnEntity.m1ModelEndDttm,
+            mapSheetLearnEntity.m2ModelStartDttm,
+            mapSheetLearnEntity.m2ModelEndDttm,
+            mapSheetLearnEntity.m3ModelStartDttm,
+            mapSheetLearnEntity.m3ModelEndDttm,
+            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;
  }
@@ -200,30 +201,30 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
    QModelMngEntity model = new QModelMngEntity("model");

    InferenceProgressDto dto =
-        queryFactory
-            .select(
-                Projections.constructor(
-                    InferenceProgressDto.class,
-                    Projections.constructor(
-                        InferenceProgressDto.pred_requests_areas.class,
-                        mapSheetLearnEntity.compareYyyy,
-                        mapSheetLearnEntity.targetYyyy,
-                        mapSheetLearnEntity.modelComparePath,
-                        mapSheetLearnEntity.modelTargetPath),
-                    model.modelVer.as("modelVer"),
-                    model.cdModelPath.as("cdModelPath"),
-                    model.cdModelFileName.as("cdModelFileName"),
-                    model.cdModelConfigPath.as("cdModelConfigPath"),
-                    model.cdModelConfigFileName.as("cdModelConfigFileName"),
-                    model.clsModelPath,
-                    model.clsModelFileName,
-                    model.clsModelVersion,
-                    model.priority))
-            .from(mapSheetLearnEntity)
-            .join(model)
-            .on(model.uuid.eq(modelUuid))
-            .where(mapSheetLearnEntity.id.eq(id))
-            .fetchOne();
+      queryFactory
+        .select(
+          Projections.constructor(
+            InferenceProgressDto.class,
+            Projections.constructor(
+              InferenceProgressDto.pred_requests_areas.class,
+              mapSheetLearnEntity.compareYyyy,
+              mapSheetLearnEntity.targetYyyy,
+              mapSheetLearnEntity.modelComparePath,
+              mapSheetLearnEntity.modelTargetPath),
+            model.modelVer.as("modelVer"),
+            model.cdModelPath.as("cdModelPath"),
+            model.cdModelFileName.as("cdModelFileName"),
+            model.cdModelConfigPath.as("cdModelConfigPath"),
+            model.cdModelConfigFileName.as("cdModelConfigFileName"),
+            model.clsModelPath,
+            model.clsModelFileName,
+            model.clsModelVersion,
+            model.priority))
+        .from(mapSheetLearnEntity)
+        .join(model)
+        .on(model.uuid.eq(modelUuid))
+        .where(mapSheetLearnEntity.id.eq(id))
+        .fetchOne();
    return dto;
  }

@@ -234,10 +235,10 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
   */
  public UUID getProcessing() {
    return queryFactory
-        .select(mapSheetLearnEntity.uuid)
-        .from(mapSheetLearnEntity)
-        .where(mapSheetLearnEntity.status.eq("IN_PROGRESS"))
-        .fetchOne();
+      .select(mapSheetLearnEntity.uuid)
+      .from(mapSheetLearnEntity)
+      .where(mapSheetLearnEntity.status.eq("IN_PROGRESS"))
+      .fetchOne();
  }

  @Override
@@ -247,18 +248,50 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
    entity.setTargetYyyy(targetYear);

    Integer stage =
-        queryFactory
-            .select(mapSheetLearnEntity.stage)
-            .from(mapSheetLearnEntity)
-            .where(
-                mapSheetLearnEntity
-                    .compareYyyy
-                    .eq(compareYear)
-                    .and(mapSheetLearnEntity.targetYyyy.eq(targetYear)))
-            .orderBy(mapSheetLearnEntity.stage.desc())
-            .limit(1)
-            .fetchOne();
+      queryFactory
+        .select(mapSheetLearnEntity.stage)
+        .from(mapSheetLearnEntity)
+        .where(
+          mapSheetLearnEntity
+            .compareYyyy
+            .eq(compareYear)
+            .and(mapSheetLearnEntity.targetYyyy.eq(targetYear)))
+        .orderBy(mapSheetLearnEntity.stage.desc())
+        .limit(1)
+        .fetchOne();

    return stage == null ? 1 : stage + 1;
  }
+
+  @Override
+  public AnalResultInfo getInferenceResultInfo(String uuid) {
+    QModelMngEntity m1 = new QModelMngEntity("m1");
+    QModelMngEntity m2 = new QModelMngEntity("m2");
+    QModelMngEntity m3 = new QModelMngEntity("m3");
+
+    return queryFactory
+      .select(
+        Projections.constructor(
+          AnalResultInfo.class,
+          mapSheetLearnEntity.title,
+          m1.modelVer,
+          m2.modelVer,
+          m3.modelVer,
+          mapSheetLearnEntity.compareYyyy,
+          mapSheetLearnEntity.targetYyyy,
+          mapSheetLearnEntity.detectOption,
+          mapSheetLearnEntity.mapSheetScope,
+          mapSheetLearnEntity.inferStartDttm,
+          mapSheetLearnEntity.inferEndDttm
+        )
+      )
+      .from(mapSheetLearnEntity)
+      .leftJoin(m1)
+      .on(mapSheetLearnEntity.m1ModelUuid.eq(m1.uuid))
+      .leftJoin(m2)
+      .on(mapSheetLearnEntity.m2ModelUuid.eq(m2.uuid))
+      .leftJoin(m3)
+      .on(mapSheetLearnEntity.m3ModelUuid.eq(m3.uuid))
+      .where(mapSheetLearnEntity.uuid.eq(UUID.fromString(uuid))).fetchOne();
+  }
 }