:spotlessApply 실행

2025-11-27 18:13:42 +09:00
parent 8bab44d7e4
commit f74d49f7e1
10 changed files with 211 additions and 161 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/ChangeDetectionCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/ChangeDetectionCoreService.java
@@ -57,7 +57,8 @@ public class ChangeDetectionCoreService {

  public ChangeDetectionDto.CogUrlDto getChangeDetectionCogUrl(ChangeDetectionDto.CogUrlReq req) {
    ObjectMapper mapper = new ObjectMapper();
-    ChangeDetectionDto.CogUrlDto resultDto = changeDetectionRepository.getChangeDetectionCogUrl(req);
+    ChangeDetectionDto.CogUrlDto resultDto =
+        changeDetectionRepository.getChangeDetectionCogUrl(req);

    try {
      JsonNode geomNode = mapper.readTree(resultDto.getBbox().toString());
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ImageryEntity.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ImageryEntity.java
@@ -1,21 +1,23 @@
 package com.kamco.cd.kamcoback.postgres.entity;

 import jakarta.persistence.*;
+import java.time.ZonedDateTime;
+import java.util.UUID;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;

-import java.time.ZonedDateTime;
-import java.util.UUID;
-
@Getter
@Setter
@Table(name = "imagery")
@Entity
 public class ImageryEntity {
  @Id
-  @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "imagery_id_seq_gen")
-  @SequenceGenerator(name = "imagery_id_seq_gen",sequenceName = "imagery_id_seq",allocationSize = 1)
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "imagery_id_seq_gen")
+  @SequenceGenerator(
+      name = "imagery_id_seq_gen",
+      sequenceName = "imagery_id_seq",
+      allocationSize = 1)
  @Column(name = "id", nullable = false)
  private Long id;

--- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapInkx50kEntity.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapInkx50kEntity.java
@@ -13,9 +13,9 @@ public class MapInkx50kEntity {
  @Id
  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tb_map_inkx_50k_fid_seq_gen")
  @SequenceGenerator(
-    name = "tb_map_inkx_50k_fid_seq_gen",
-    sequenceName = "tb_map_inkx_50k_fid_seq",
-    allocationSize = 1)
+      name = "tb_map_inkx_50k_fid_seq_gen",
+      sequenceName = "tb_map_inkx_50k_fid_seq",
+      allocationSize = 1)
  private Integer fid;

  @Column(name = "mapidcd_no")
@@ -29,5 +29,4 @@ public class MapInkx50kEntity {

  @Column(name = "geom")
  private Geometry geom;
-
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapInkx5kEntity.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapInkx5kEntity.java
@@ -13,9 +13,9 @@ public class MapInkx5kEntity {
  @Id
  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tb_map_inkx_5k_fid_seq_gen")
  @SequenceGenerator(
-    name = "tb_map_inkx_5k_fid_seq_gen",
-    sequenceName = "tb_map_inkx_5k_fid_seq",
-    allocationSize = 1)
+      name = "tb_map_inkx_5k_fid_seq_gen",
+      sequenceName = "tb_map_inkx_5k_fid_seq",
+      allocationSize = 1)
  private Integer fid;

  @Column(name = "mapidcd_no")
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/MapSheetLearnDataGeomRepository.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/MapSheetLearnDataGeomRepository.java
@@ -29,26 +29,26 @@ public interface MapSheetLearnDataGeomRepository
  /** 데이터 UID로 기존 지오메트리 데이터 삭제 (재생성 전에 사용) */
  void deleteByDataUid(Long dataUid);

-  /** 
-   * PostGIS 함수를 사용하여 geometry 데이터를 직접 삽입
-   * ST_SetSRID(ST_GeomFromGeoJSON(...), 5186) 형식으로 저장
-   */
+  /** PostGIS 함수를 사용하여 geometry 데이터를 직접 삽입 ST_SetSRID(ST_GeomFromGeoJSON(...), 5186) 형식으로 저장 */
  @Modifying
  @Transactional
-  @Query(value = """
+  @Query(
+      value =
+          """
      INSERT INTO tb_map_sheet_learn_data_geom (
-          geo_uid, cd_prob, class_before_name, class_before_prob, 
-          class_after_name, class_after_prob, map_sheet_num, 
-          before_yyyy, after_yyyy, area, geom, geo_type, data_uid, 
+          geo_uid, cd_prob, class_before_name, class_before_prob,
+          class_after_name, class_after_prob, map_sheet_num,
+          before_yyyy, after_yyyy, area, geom, geo_type, data_uid,
          created_dttm, updated_dttm
      ) VALUES (
          :geoUid, :cdProb, :classBeforeName, :classBeforeProb,
          :classAfterName, :classAfterProb, :mapSheetNum,
-          :beforeYyyy, :afterYyyy, :area, 
-          ST_SetSRID(ST_GeomFromGeoJSON(CAST(:geometryJson AS TEXT)), 5186), 
+          :beforeYyyy, :afterYyyy, :area,
+          ST_SetSRID(ST_GeomFromGeoJSON(CAST(:geometryJson AS TEXT)), 5186),
          :geoType, :dataUid, NOW(), NOW()
      ) ON CONFLICT (geo_uid) DO NOTHING
-      """, nativeQuery = true)
+      """,
+      nativeQuery = true)
  void insertWithPostGISGeometry(
      @Param("geoUid") Long geoUid,
      @Param("cdProb") Double cdProb,
@@ -62,6 +62,5 @@ public interface MapSheetLearnDataGeomRepository
      @Param("area") Double area,
      @Param("geometryJson") String geometryJson,
      @Param("geoType") String geoType,
-      @Param("dataUid") Long dataUid
-  );
+      @Param("dataUid") Long dataUid);
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryCustom.java
@@ -1,8 +1,6 @@
 package com.kamco.cd.kamcoback.postgres.repository.changedetection;

 import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto;
-import com.querydsl.core.Tuple;
-
 import java.util.List;

 public interface ChangeDetectionRepositoryCustom {
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java
@@ -1,5 +1,12 @@
 package com.kamco.cd.kamcoback.postgres.repository.changedetection;

+import static com.kamco.cd.kamcoback.postgres.entity.QImageryEntity.imageryEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapInkx5kEntity.mapInkx5kEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataEntity.mapSheetAnalDataEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataGeomEntity.mapSheetAnalDataGeomEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalEntity.mapSheetAnalEntity;
+import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalSttcEntity.mapSheetAnalSttcEntity;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,17 +18,9 @@ import com.querydsl.core.types.dsl.CaseBuilder;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.StringExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
-
 import java.util.List;
 import java.util.Objects;
-
-import static com.kamco.cd.kamcoback.postgres.entity.QImageryEntity.imageryEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QMapInkx5kEntity.mapInkx5kEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataEntity.mapSheetAnalDataEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataGeomEntity.mapSheetAnalDataGeomEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalEntity.mapSheetAnalEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalSttcEntity.mapSheetAnalSttcEntity;
+import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;

 public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
    implements ChangeDetectionRepositoryCustom {
@@ -51,74 +50,77 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
  @Override
  public List<ChangeDetectionDto.CountDto> getChangeDetectionClassCount(Long id) {
    return queryFactory
-      .select(Projections.constructor(
-        ChangeDetectionDto.CountDto.class,
-        mapSheetAnalSttcEntity.classAfterCd.toUpperCase(),
-        mapSheetAnalSttcEntity.id.classAfterName,
-        mapSheetAnalSttcEntity.classAfterCnt.sum()
-      ))
-      .from(mapSheetAnalEntity)
-      .innerJoin(mapSheetAnalDataEntity)
-      .on(mapSheetAnalDataEntity.analUid.eq(mapSheetAnalEntity.id))
-      .innerJoin(mapSheetAnalSttcEntity)
-      .on(mapSheetAnalSttcEntity.dataUid.eq(mapSheetAnalDataEntity.id))
-      .where(mapSheetAnalEntity.id.eq(id))
-      .groupBy(mapSheetAnalSttcEntity.classAfterCd, mapSheetAnalSttcEntity.id.classAfterName)
-      .fetch();
+        .select(
+            Projections.constructor(
+                ChangeDetectionDto.CountDto.class,
+                mapSheetAnalSttcEntity.classAfterCd.toUpperCase(),
+                mapSheetAnalSttcEntity.id.classAfterName,
+                mapSheetAnalSttcEntity.classAfterCnt.sum()))
+        .from(mapSheetAnalEntity)
+        .innerJoin(mapSheetAnalDataEntity)
+        .on(mapSheetAnalDataEntity.analUid.eq(mapSheetAnalEntity.id))
+        .innerJoin(mapSheetAnalSttcEntity)
+        .on(mapSheetAnalSttcEntity.dataUid.eq(mapSheetAnalDataEntity.id))
+        .where(mapSheetAnalEntity.id.eq(id))
+        .groupBy(mapSheetAnalSttcEntity.classAfterCd, mapSheetAnalSttcEntity.id.classAfterName)
+        .fetch();
  }

  @Override
  public ChangeDetectionDto.CogUrlDto getChangeDetectionCogUrl(ChangeDetectionDto.CogUrlReq req) {
-    Tuple result = queryFactory
-        .select(
-            makeCogUrl(req.getBeforeYear()).max().as("beforeCogUrl"),
-            makeCogUrl(req.getAfterYear()).max().as("afterCogUrl"),
-            Expressions.stringTemplate("ST_AsGeoJSON({0})", mapInkx5kEntity.geom).as("bbox")
-        )
-        .from(imageryEntity)
-        .innerJoin(mapInkx5kEntity)
-        .on(imageryEntity.scene5k.eq(mapInkx5kEntity.mapidcdNo))
-        .where(
-          imageryEntity.year.eq(req.getBeforeYear()).or(imageryEntity.year.eq(req.getAfterYear())),
-          imageryEntity.scene5k.eq(req.getMapSheetNum())
-        )
-        .groupBy(mapInkx5kEntity.geom)
-        .fetchOne();
+    Tuple result =
+        queryFactory
+            .select(
+                makeCogUrl(req.getBeforeYear()).max().as("beforeCogUrl"),
+                makeCogUrl(req.getAfterYear()).max().as("afterCogUrl"),
+                Expressions.stringTemplate("ST_AsGeoJSON({0})", mapInkx5kEntity.geom).as("bbox"))
+            .from(imageryEntity)
+            .innerJoin(mapInkx5kEntity)
+            .on(imageryEntity.scene5k.eq(mapInkx5kEntity.mapidcdNo))
+            .where(
+                imageryEntity
+                    .year
+                    .eq(req.getBeforeYear())
+                    .or(imageryEntity.year.eq(req.getAfterYear())),
+                imageryEntity.scene5k.eq(req.getMapSheetNum()))
+            .groupBy(mapInkx5kEntity.geom)
+            .fetchOne();

-    //Polygon -> JsonNode 로 변환
-    JsonNode geometryJson = changeGeometryJson(String.valueOf(Objects.requireNonNull(result).get(2, StringExpression.class)));
+    // Polygon -> JsonNode 로 변환
+    JsonNode geometryJson =
+        changeGeometryJson(
+            String.valueOf(Objects.requireNonNull(result).get(2, StringExpression.class)));

-    return new ChangeDetectionDto.CogUrlDto(result.get(0, String.class), result.get(1, String.class), geometryJson);
+    return new ChangeDetectionDto.CogUrlDto(
+        result.get(0, String.class), result.get(1, String.class), geometryJson);
  }

  @Override
  public List<ChangeDetectionDto.AnalYearList> getChangeDetectionYearList() {
    return queryFactory
        .select(
-          Projections.constructor(
-            ChangeDetectionDto.AnalYearList.class,
-            mapSheetAnalEntity.id,
-            mapSheetAnalEntity.analTitle,
-            mapSheetAnalEntity.compareYyyy.as("beforeYear"),
-            mapSheetAnalEntity.targetYyyy.as("afterYear"),
-            mapSheetAnalEntity.baseMapSheetNum
-          )
-        )
+            Projections.constructor(
+                ChangeDetectionDto.AnalYearList.class,
+                mapSheetAnalEntity.id,
+                mapSheetAnalEntity.analTitle,
+                mapSheetAnalEntity.compareYyyy.as("beforeYear"),
+                mapSheetAnalEntity.targetYyyy.as("afterYear"),
+                mapSheetAnalEntity.baseMapSheetNum))
        .from(mapSheetAnalEntity)
        .orderBy(mapSheetAnalEntity.id.asc())
-        .fetch()
-      ;
+        .fetch();
  }

  private StringExpression makeCogUrl(Integer year) {
    return new CaseBuilder()
-      .when(imageryEntity.year.eq(year))
-      .then(Expressions.stringTemplate("{0} || {1}",imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
-      .otherwise("")
-      ;
+        .when(imageryEntity.year.eq(year))
+        .then(
+            Expressions.stringTemplate(
+                "{0} || {1}", imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
+        .otherwise("");
  }

-  private JsonNode changeGeometryJson(String geometry){
+  private JsonNode changeGeometryJson(String geometry) {
    ObjectMapper mapper = new ObjectMapper();
    try {
      return mapper.readTree(geometry);