학습데이터 등록 로직 커밋

2026-02-10 16:15:21 +09:00
parent 89744d2aa1
commit 0e9fa80092
9 changed files with 331 additions and 148 deletions
--- a/src/main/java/com/kamco/cd/training/postgres/core/DatasetCoreService.java
+++ b/src/main/java/com/kamco/cd/training/postgres/core/DatasetCoreService.java
@@ -229,4 +229,8 @@ public class DatasetCoreService
  public String getFilePathByUUIDPathType(UUID uuid, String pathType) {
    return datasetObjRepository.getFilePathByUUIDPathType(uuid, pathType);
  }
+
+  public void insertDatasetTestObj(DatasetObjRegDto objRegDto) {
+    datasetObjRepository.insertDatasetTestObj(objRegDto);
+  }
 }
--- a/src/main/java/com/kamco/cd/training/postgres/entity/DatasetObjEntity.java
+++ b/src/main/java/com/kamco/cd/training/postgres/entity/DatasetObjEntity.java
@@ -10,7 +10,6 @@ import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
-import java.math.BigDecimal;
 import java.time.ZonedDateTime;
 import java.util.UUID;
 import lombok.Getter;
@@ -18,6 +17,7 @@ import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.type.SqlTypes;
+import org.locationtech.jts.geom.Geometry;

@Getter
@Setter
@@ -86,19 +86,16 @@ public class DatasetObjEntity {
  @Column(name = "uid")
  private String uid;

-  @Column(precision = 5, scale = 2)
-  private BigDecimal chnDtctP;
-
-  @Column(precision = 5, scale = 2)
-  private BigDecimal bfClsPro;
-
-  @Column(precision = 5, scale = 2)
-  private BigDecimal afClsPro;
-
  @JdbcTypeCode(SqlTypes.JSON)
  @Column(name = "geo_jsonb", columnDefinition = "jsonb")
  private String geoJsonb;

+  @Column(name = "file_name")
+  private String fileName;
+
+  @Column(name = "geom", columnDefinition = "geometry")
+  private Geometry geom;
+
  public Basic toDto() {
    return new DatasetObjDto.Basic(
        this.objId,
--- a/src/main/java/com/kamco/cd/training/postgres/entity/DatasetTestObjEntity.java
+++ b/src/main/java/com/kamco/cd/training/postgres/entity/DatasetTestObjEntity.java
@@ -0,0 +1,117 @@
+package com.kamco.cd.training.postgres.entity;
+
+import com.kamco.cd.training.dataset.dto.DatasetObjDto.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.time.ZonedDateTime;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+import org.locationtech.jts.geom.Geometry;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "tb_dataset_test_obj")
+public class DatasetTestObjEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "obj_id", nullable = false)
+  private Long objId;
+
+  @NotNull
+  @Column(name = "dataset_uid", nullable = false)
+  private Long datasetUid;
+
+  @Column(name = "target_yyyy")
+  private Integer targetYyyy;
+
+  @Size(max = 255)
+  @Column(name = "target_class_cd")
+  private String targetClassCd;
+
+  @Column(name = "compare_yyyy")
+  private Integer compareYyyy;
+
+  @Size(max = 255)
+  @Column(name = "compare_class_cd")
+  private String compareClassCd;
+
+  @Size(max = 255)
+  @Column(name = "target_path")
+  private String targetPath;
+
+  @Size(max = 255)
+  @Column(name = "compare_path")
+  private String comparePath;
+
+  @Size(max = 255)
+  @Column(name = "label_path")
+  private String labelPath;
+
+  @Size(max = 255)
+  @Column(name = "geojson_path")
+  private String geojsonPath;
+
+  @Size(max = 255)
+  @Column(name = "map_sheet_num")
+  private String mapSheetNum;
+
+  @ColumnDefault("now()")
+  @Column(name = "created_dttm")
+  private ZonedDateTime createdDttm;
+
+  @Column(name = "created_uid")
+  private Long createdUid;
+
+  @ColumnDefault("false")
+  @Column(name = "deleted")
+  private Boolean deleted;
+
+  @Column(name = "uuid")
+  private UUID uuid;
+
+  @Size(max = 32)
+  @Column(name = "uid")
+  private String uid;
+
+  @JdbcTypeCode(SqlTypes.JSON)
+  @Column(name = "geo_jsonb", columnDefinition = "jsonb")
+  private String geoJsonb;
+
+  @Column(name = "file_name")
+  private String fileName;
+
+  @Column(name = "geom", columnDefinition = "geometry")
+  private Geometry geom;
+
+  public Basic toDto() {
+    return new Basic(
+        this.objId,
+        this.datasetUid,
+        this.targetYyyy,
+        this.targetClassCd,
+        this.compareYyyy,
+        this.compareClassCd,
+        this.targetPath,
+        this.comparePath,
+        this.labelPath,
+        this.geojsonPath,
+        this.mapSheetNum,
+        this.createdDttm,
+        this.createdUid,
+        this.deleted,
+        this.uuid,
+        this.geoJsonb);
+  }
+}
--- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetObjRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetObjRepositoryCustom.java
@@ -20,4 +20,6 @@ public interface DatasetObjRepositoryCustom {
  void insertDatasetObj(DatasetObjRegDto objRegDto);

  String getFilePathByUUIDPathType(UUID uuid, String pathType);
+
+  void insertDatasetTestObj(DatasetObjRegDto objRegDto);
 }
--- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetObjRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetObjRepositoryImpl.java
@@ -25,12 +25,15 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.locationtech.jts.geom.Geometry;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;

+@Slf4j
@Repository
@RequiredArgsConstructor
 public class DatasetObjRepositoryImpl implements DatasetObjRepositoryCustom {
@@ -50,6 +53,50 @@ public class DatasetObjRepositoryImpl implements DatasetObjRepositoryCustom {
            .fetchOne());
  }

+  @Override
+  public void insertDatasetTestObj(DatasetObjRegDto objRegDto) {
+    ObjectMapper objectMapper = new ObjectMapper();
+    String json;
+    Geometry geometry;
+    String geometryJson;
+    try {
+      json = objectMapper.writeValueAsString(objRegDto.getGeojson());
+      geometryJson =
+          objectMapper.writeValueAsString(
+              objRegDto.getGeojson().path("features").get(0).path("geometry"));
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
+    }
+
+    try {
+      em.createNativeQuery(
+              """
+            insert into tb_dataset_test_obj
+          (dataset_uid, target_yyyy, target_class_cd,
+           compare_yyyy, compare_class_cd,
+           target_path, compare_path, label_path, geo_jsonb, map_sheet_num, file_name, geom, geojson_path)
+          values
+          (?, ?, ?, ?, ?, ?, ?, ?, cast(? as jsonb), ?, ?, ST_SetSRID(ST_GeomFromGeoJSON(?), 5186), ?)
+          """)
+          .setParameter(1, objRegDto.getDatasetUid())
+          .setParameter(2, objRegDto.getTargetYyyy())
+          .setParameter(3, objRegDto.getTargetClassCd())
+          .setParameter(4, objRegDto.getCompareYyyy())
+          .setParameter(5, objRegDto.getCompareClassCd())
+          .setParameter(6, objRegDto.getTargetPath())
+          .setParameter(7, objRegDto.getComparePath())
+          .setParameter(8, objRegDto.getLabelPath())
+          .setParameter(9, json)
+          .setParameter(10, objRegDto.getMapSheetNum())
+          .setParameter(11, objRegDto.getFileName())
+          .setParameter(12, geometryJson)
+          .setParameter(13, objRegDto.getGeojsonPath())
+          .executeUpdate();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
  @Override
  public Page<DatasetObjEntity> searchDatasetObjectList(SearchReq searchReq) {
    Pageable pageable = searchReq.toPageable();
@@ -137,55 +184,43 @@ public class DatasetObjRepositoryImpl implements DatasetObjRepositoryCustom {
  public void insertDatasetObj(DatasetObjRegDto objRegDto) {
    ObjectMapper objectMapper = new ObjectMapper();
    String json;
+    String geometryJson;
    try {
      json = objectMapper.writeValueAsString(objRegDto.getGeojson());
+      geometryJson =
+          objectMapper.writeValueAsString(
+              objRegDto.getGeojson().path("features").get(0).path("geometry"));
    } catch (JsonProcessingException e) {
      throw new RuntimeException(e);
    }
-    //    queryFactory
-    //        .insert(datasetObjEntity)
-    //        .columns(
-    //            datasetObjEntity.datasetUid,
-    //            datasetObjEntity.targetYyyy,
-    //            datasetObjEntity.targetClassCd,
-    //            datasetObjEntity.compareYyyy,
-    //            datasetObjEntity.compareClassCd,
-    //            datasetObjEntity.targetPath,
-    //            datasetObjEntity.comparePath,
-    //            datasetObjEntity.labelPath,
-    //            datasetObjEntity.geoJsonb)
-    //        .values(
-    //            objRegDto.getDatasetUid(),
-    //            objRegDto.getTargetYyyy(),
-    //            objRegDto.getTargetClassCd(),
-    //            objRegDto.getCompareYyyy(),
-    //            objRegDto.getCompareClassCd(),
-    //            objRegDto.getTargetPath(),
-    //            objRegDto.getComparePath(),
-    //            objRegDto.getLabelPath(),
-    //            Expressions.stringTemplate("cast({0} as jsonb)", json))
-    //        .execute();

-    em.createNativeQuery(
-            """
-        insert into tb_dataset_obj
-        (dataset_uid, target_yyyy, target_class_cd,
-         compare_yyyy, compare_class_cd,
-         target_path, compare_path, label_path, geo_jsonb, map_sheet_num)
-        values
-        (?, ?, ?, ?, ?, ?, ?, ?, cast(? as jsonb), ?)
-        """)
-        .setParameter(1, objRegDto.getDatasetUid())
-        .setParameter(2, objRegDto.getTargetYyyy())
-        .setParameter(3, objRegDto.getTargetClassCd())
-        .setParameter(4, objRegDto.getCompareYyyy())
-        .setParameter(5, objRegDto.getCompareClassCd())
-        .setParameter(6, objRegDto.getTargetPath())
-        .setParameter(7, objRegDto.getComparePath())
-        .setParameter(8, objRegDto.getLabelPath())
-        .setParameter(9, json)
-        .setParameter(10, objRegDto.getMapSheetNum())
-        .executeUpdate();
+    try {
+      em.createNativeQuery(
+              """
+            insert into tb_dataset_obj
+          (dataset_uid, target_yyyy, target_class_cd,
+           compare_yyyy, compare_class_cd,
+           target_path, compare_path, label_path, geo_jsonb, map_sheet_num, file_name, geom, geojson_path)
+          values
+          (?, ?, ?, ?, ?, ?, ?, ?, cast(? as jsonb), ?, ?, ST_SetSRID(ST_GeomFromGeoJSON(?), 5186), ?)
+          """)
+          .setParameter(1, objRegDto.getDatasetUid())
+          .setParameter(2, objRegDto.getTargetYyyy())
+          .setParameter(3, objRegDto.getTargetClassCd())
+          .setParameter(4, objRegDto.getCompareYyyy())
+          .setParameter(5, objRegDto.getCompareClassCd())
+          .setParameter(6, objRegDto.getTargetPath())
+          .setParameter(7, objRegDto.getComparePath())
+          .setParameter(8, objRegDto.getLabelPath())
+          .setParameter(9, json)
+          .setParameter(10, objRegDto.getMapSheetNum())
+          .setParameter(11, objRegDto.getFileName())
+          .setParameter(12, geometryJson)
+          .setParameter(13, objRegDto.getGeojsonPath())
+          .executeUpdate();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
  }

  @Override
--- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java
@@ -233,12 +233,10 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
            mngRegDto.getDatasetPath())
        .execute();

-    Long datasetUid =
-        queryFactory
-            .select(dataset.id)
-            .from(dataset)
-            .where(dataset.uid.eq(mngRegDto.getUid()))
-            .fetchOne();
-    return datasetUid;
+    return queryFactory
+        .select(dataset.id)
+        .from(dataset)
+        .where(dataset.uid.eq(mngRegDto.getUid()))
+        .fetchOne();
  }
 }