gemo 테이블 수정

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

@@ -6,6 +6,7 @@ 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 java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
@@ -46,4 +47,13 @@ public class InferenceResultCoreService {
       .map(MapSheetAnalSttcEntity::toDto)
       .toList();
   }
+
+  /**
+   * 분석결과 상세 목록
+   * @param searchGeoReq
+   * @return
+   */
+  public Page<InferenceResultDto.Geom> getInferenceResultGeomList(InferenceResultDto.SearchGeoReq searchGeoReq) {
+    return inferenceResultRepository.getInferenceGeomList(searchGeoReq);
+  }
 }

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

@@ -50,6 +50,9 @@ public class CommonCodeEntity extends CommonDateEntity {
   @Column(name = "used")
   private Boolean used;
 
+  @Column(name = "misc_cd")
+  private String miscCd;
+
   @NotNull
   @Column(name = "deleted", nullable = false)
   private Boolean deleted = false;

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

@@ -28,16 +28,14 @@ public class MapSheetAnalDataGeomEntity {
   @Column(name = "cd_prob")
   private Double cdProb;
 
-  @Size(max = 100)
-  @Column(name = "class_before_name", length = 100)
-  private String classBeforeName;
+  @Column(name = "class_before_cd")
+  private String classBeforeCd;
 
   @Column(name = "class_before_prob")
   private Double classBeforeProb;
 
-  @Size(max = 100)
-  @Column(name = "class_after_name", length = 100)
-  private String classAfterName;
+  @Column(name = "class_after_cd")
+  private String classAfterCd;
 
   @Column(name = "class_after_prob")
   private Double classAfterProb;
@@ -69,13 +67,8 @@ public class MapSheetAnalDataGeomEntity {
 
   @Column(name = "updated_dttm")
   private ZonedDateTime updatedDttm;
+
   @Column(name = "updated_uid")
   private Long updatedUid;
 
-/*
- TODO [Reverse Engineering] create field to map the 'geom' column
- Available actions: Define target Java type | Uncomment as is | Remove column mapping
-    @Column(name = "geom", columnDefinition = "geometry")
-    private Object geom;
-*/
 }

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

@@ -2,6 +2,7 @@ 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.MapSheetAnalDataGeomEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalSttcEntity;
 import java.util.List;
@@ -12,5 +13,5 @@ public interface InferenceResultRepositoryCustom {
   Page<InferenceResultDto.AnalResList> getInferenceResultList(InferenceResultDto.SearchReq searchReq);
   Optional<InferenceResultDto.AnalResSummary> getInferenceResultSummary(Long id);
   List<MapSheetAnalSttcEntity>  getInferenceResultDashboard(Long id);
-
+  Page<InferenceResultDto.Geom> getInferenceGeomList(InferenceResultDto.SearchGeoReq searchGeoReq);
 }

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

@@ -1,8 +1,10 @@
 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.inference.dto.InferenceResultDto.SearchGeoReq;
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataGeomEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalSttcEntity;
+import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataGeomEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalSttcEntity;
 import com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity;
@@ -30,6 +32,7 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
   private final QModelMngEntity tmm = QModelMngEntity.modelMngEntity;
   private final QModelVerEntity tmv = QModelVerEntity.modelVerEntity;
   private final QMapSheetAnalSttcEntity mapSheetAnalSttc = QMapSheetAnalSttcEntity.mapSheetAnalSttcEntity;
+  private final QMapSheetAnalDataGeomEntity mapSheetAnalDataGeom = QMapSheetAnalDataGeomEntity.mapSheetAnalDataGeomEntity;
 
 
 
@@ -145,4 +148,56 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
       .where(mapSheetAnalSttc.dataUid.eq(id))
       .fetch();
   }
+
+  /**
+   * 분석결과 상세 목록
+   * @param searchGeoReq
+   * @return
+   */
+  @Override
+  public Page<InferenceResultDto.Geom> getInferenceGeomList(SearchGeoReq searchGeoReq) {
+    Pageable pageable = searchGeoReq.toPageable();
+    BooleanBuilder builder = new BooleanBuilder();
+
+    // 기준년도 분류
+    if(searchGeoReq.getTargetClass() != null && !searchGeoReq.getTargetClass().equals("")){
+      builder.and(mapSheetAnalDataGeom.classAfterCd.eq(searchGeoReq.getTargetClass()));
+
+    }
+
+    // 비교년도 분류
+    if(searchGeoReq.getCompareClass() != null && !searchGeoReq.getCompareClass().equals("")){
+      builder.and(mapSheetAnalDataGeom.classBeforeCd.eq(searchGeoReq.getCompareClass()));
+    }
+
+    // 분석도엽
+    if(searchGeoReq.getMapSheetNum() != null){
+      List<Long> mapSheetNum = searchGeoReq.getMapSheetNum();
+      builder.and(mapSheetAnalDataGeom.mapSheetNum.in(mapSheetNum));
+    }
+
+    List<InferenceResultDto.Geom> content = queryFactory
+      .select(Projections.constructor(InferenceResultDto.Geom.class,
+        mapSheetAnalDataGeom.compareYyyy,
+        mapSheetAnalDataGeom.targetYyyy,
+        mapSheetAnalDataGeom.classBeforeCd,
+        mapSheetAnalDataGeom.classBeforeProb,
+        mapSheetAnalDataGeom.classAfterCd,
+        mapSheetAnalDataGeom.classAfterProb,
+        mapSheetAnalDataGeom.mapSheetNum))
+      .from(mapSheetAnalDataGeom)
+      .where(builder)
+      .fetch()
+      ;
+
+    long total = queryFactory
+      .select(mapSheetAnalDataGeom.id)
+      .from(mapSheetAnalDataGeom)
+      .where(
+        builder
+      )
+      .fetchCount();
+
+    return new PageImpl<>(content, pageable, total);
+  }
 }