추론관리 > 분석결과 상세 summary, dashboard 추가

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

@@ -1,8 +1,11 @@
 package com.kamco.cd.kamcoback.postgres.core;
 
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Dashboard;
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalSttcEntity;
 import com.kamco.cd.kamcoback.postgres.repository.Inference.InferenceResultRepository;
 import jakarta.persistence.EntityNotFoundException;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
@@ -31,4 +34,16 @@ public class InferenceResultCoreService {
     InferenceResultDto.AnalResSummary summary = inferenceResultRepository.getInferenceResultSummary(id).orElseThrow(() -> new EntityNotFoundException("요약정보를 찾을 수 없습니다. " + id));
     return summary;
   }
+
+  /**
+   * 분석결과 대시보드 조회
+   * @param id
+   * @return
+   */
+  public List<Dashboard> getInferenceResultDashboard(Long id) {
+    return inferenceResultRepository.getInferenceResultDashboard(id)
+      .stream()
+      .map(MapSheetAnalSttcEntity::toDto)
+      .toList();
+  }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalSttcEntity.java

@@ -0,0 +1,70 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+import com.kamco.cd.kamcoback.code.dto.CommonCodeDto;
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "tb_map_sheet_anal_sttc")
+public class MapSheetAnalSttcEntity {
+
+  @EmbeddedId
+  private MapSheetAnalSttcEntityId id;
+
+  @Column(name = "class_before_cnt")
+  private Long classBeforeCnt;
+
+  @Column(name = "class_after_cnt")
+  private Long classAfterCnt;
+
+  @ColumnDefault("now()")
+  @Column(name = "created_dttm")
+  private ZonedDateTime createdDttm;
+
+  @Column(name = "created_uid")
+  private Long createdUid;
+
+  @ColumnDefault("now()")
+  @Column(name = "updated_dttm")
+  private ZonedDateTime updatedDttm;
+
+  @Column(name = "updated_uid", length = Integer.MAX_VALUE)
+  private Long updatedUid;
+
+  @NotNull
+  @Column(name = "ref_map_sheet_num", nullable = false)
+  private Long refMapSheetNum;
+
+  @NotNull
+  @Column(name = "data_uid", nullable = false)
+  private Long dataUid;
+
+  public InferenceResultDto.Dashboard toDto() {
+    return new InferenceResultDto.Dashboard(
+      id.getCompareYyyy(),
+      id.getTargetYyyy(),
+      id.getMapSheetNum(),
+      id.getClassBeforeName(),
+      id.getClassAfterName(),
+      this.classBeforeCnt,
+      this.classAfterCnt,
+      this.createdDttm,
+      this.createdUid,
+      this.updatedDttm,
+      this.updatedUid,
+      this.refMapSheetNum,
+      this.dataUid
+    );
+  }
+}

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalSttcEntityId.java

@@ -0,0 +1,62 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Objects;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.Hibernate;
+
+@Getter
+@Setter
+@Embeddable
+public class MapSheetAnalSttcEntityId implements Serializable {
+
+  private static final long serialVersionUID = -8630519290255405042L;
+  @NotNull
+  @Column(name = "compare_yyyy", nullable = false)
+  private Integer compareYyyy;
+
+  @NotNull
+  @Column(name = "target_yyyy", nullable = false)
+  private Integer targetYyyy;
+
+  @NotNull
+  @Column(name = "map_sheet_num", nullable = false)
+  private Long mapSheetNum;
+
+  @Size(max = 64)
+  @NotNull
+  @Column(name = "class_before_name", nullable = false, length = 64)
+  private String classBeforeName;
+
+  @Size(max = 64)
+  @NotNull
+  @Column(name = "class_after_name", nullable = false, length = 64)
+  private String classAfterName;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
+      return false;
+    }
+    MapSheetAnalSttcEntityId entity = (MapSheetAnalSttcEntityId) o;
+    return Objects.equals(this.targetYyyy, entity.targetYyyy) &&
+      Objects.equals(this.classBeforeName, entity.classBeforeName) &&
+      Objects.equals(this.classAfterName, entity.classAfterName) &&
+      Objects.equals(this.compareYyyy, entity.compareYyyy) &&
+      Objects.equals(this.mapSheetNum, entity.mapSheetNum);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(targetYyyy, classBeforeName, classAfterName, compareYyyy, mapSheetNum);
+  }
+
+}

src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryCustom.java

@@ -1,11 +1,16 @@
 package com.kamco.cd.kamcoback.postgres.repository.Inference;
 
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Dashboard;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalEntity;
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalSttcEntity;
+import java.util.List;
 import java.util.Optional;
 import org.springframework.data.domain.Page;
 
 public interface InferenceResultRepositoryCustom {
   Page<InferenceResultDto.AnalResList> getInferenceResultList(InferenceResultDto.SearchReq searchReq);
   Optional<InferenceResultDto.AnalResSummary> getInferenceResultSummary(Long id);
+  List<MapSheetAnalSttcEntity>  getInferenceResultDashboard(Long id);
+
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java

@@ -1,21 +1,18 @@
 package com.kamco.cd.kamcoback.postgres.repository.Inference;
 
-import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
-import com.kamco.cd.kamcoback.postgres.entity.ModelVerEntity;
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Dashboard;
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalSttcEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalEntity;
+import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalSttcEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QModelVerEntity;
-import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.Expressions;
-import com.querydsl.core.types.dsl.NumberExpression;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.JPQLQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import java.time.ZonedDateTime;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -32,6 +29,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
   private final QMapSheetAnalEntity mapSheetAnal = QMapSheetAnalEntity.mapSheetAnalEntity;
   private final QModelMngEntity tmm = QModelMngEntity.modelMngEntity;
   private final QModelVerEntity tmv = QModelVerEntity.modelVerEntity;
+  private final QMapSheetAnalSttcEntity mapSheetAnalSttc = QMapSheetAnalSttcEntity.mapSheetAnalSttcEntity;
+
 
 
   /**
@@ -117,7 +116,9 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
         mapSheetAnal.analPredSec,
         mapSheetAnal.resultUrl,
         mapSheetAnal.detectingCnt,
-        mapSheetAnal.accuracy
+        mapSheetAnal.accuracy,
+        mapSheetAnal.analState,
+        Expressions.stringTemplate("fn_code_name({0}, {1})", "0002", mapSheetAnal.analState)
       ))
       .from(mapSheetAnal)
       .leftJoin(tmm).on(mapSheetAnal.modelUid.eq(tmm.id))
@@ -130,4 +131,18 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
     );
     return content;
   }
+
+  /**
+   * 분석결과 상세 대시보드 조회
+   * @param id
+   * @return
+   */
+  @Override
+  public List<MapSheetAnalSttcEntity> getInferenceResultDashboard(Long id) {
+    return queryFactory
+      .select(mapSheetAnalSttc)
+      .from(mapSheetAnalSttc)
+      .where(mapSheetAnalSttc.dataUid.eq(id))
+      .fetch();
+  }
 }