merge develop

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

@@ -0,0 +1,79 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+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.locationtech.jts.geom.Geometry;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "inference_results")
+public class InferenceResultEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "uid", nullable = false)
+  private Long id;
+
+  @NotNull
+  @ColumnDefault("uuid_generate_v4()")
+  @Column(name = "uuid", nullable = false)
+  private UUID uuid;
+
+  @Column(name = "stage")
+  private Integer stage;
+
+  @Column(name = "cd_prob")
+  private Float cdProb;
+
+  @Column(name = "input1")
+  private Integer input1;
+
+  @Column(name = "input2")
+  private Integer input2;
+
+  @Column(name = "map_id")
+  private Long mapId;
+
+  @Size(max = 20)
+  @Column(name = "before_class", length = 20)
+  private String beforeClass;
+
+  @Column(name = "before_probability")
+  private Float beforeProbability;
+
+  @Size(max = 20)
+  @Column(name = "after_class", length = 20)
+  private String afterClass;
+
+  @Column(name = "after_probability")
+  private Float afterProbability;
+
+  @ColumnDefault("st_area(geometry)")
+  @Column(name = "area")
+  private Float area;
+
+  @NotNull
+  @ColumnDefault("now()")
+  @Column(name = "created_dttm", nullable = false)
+  private ZonedDateTime createdDttm;
+
+  @NotNull
+  @ColumnDefault("now()")
+  @Column(name = "updated_dttm", nullable = false)
+  private ZonedDateTime updatedDttm;
+
+  @Column(name = "geometry", columnDefinition = "geometry not null")
+  private Geometry geometry;
+}

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

@@ -1,7 +1,15 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
-import jakarta.persistence.*;
+import com.kamco.cd.kamcoback.postgres.CommonDateEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.locationtech.jts.geom.Geometry;
 
@@ -9,7 +17,9 @@ import org.locationtech.jts.geom.Geometry;
 @Setter
 @Table(name = "tb_map_inkx_50k")
 @Entity
-public class MapInkx50kEntity {
+@NoArgsConstructor
+public class MapInkx50kEntity extends CommonDateEntity {
+
   @Id
   @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tb_map_inkx_50k_fid_seq_gen")
   @SequenceGenerator(
@@ -29,4 +39,11 @@ public class MapInkx50kEntity {
 
   @Column(name = "geom")
   private Geometry geom;
+
+  public MapInkx50kEntity(String mapidcdNo, String mapidNm, String mapidNo, Geometry geom) {
+    this.mapidcdNo = mapidcdNo;
+    this.mapidNm = mapidNm;
+    this.mapidNo = mapidNo;
+    this.geom = geom;
+  }
 }

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

@@ -2,14 +2,19 @@ package com.kamco.cd.kamcoback.postgres.entity;
 
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheet;
+import com.kamco.cd.kamcoback.postgres.CommonDateEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Table;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.locationtech.jts.geom.Geometry;
 
@@ -17,7 +22,8 @@ import org.locationtech.jts.geom.Geometry;
 @Setter
 @Table(name = "tb_map_inkx_5k")
 @Entity
-public class MapInkx5kEntity {
+@NoArgsConstructor
+public class MapInkx5kEntity extends CommonDateEntity {
 
   @Id
   @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tb_map_inkx_5k_fid_seq_gen")
@@ -36,8 +42,29 @@ public class MapInkx5kEntity {
   @Column(name = "geom")
   private Geometry geom;
 
-  @Column(name = "fid_k50")
-  private Long fidK50;
+  @ManyToOne(fetch = FetchType.LAZY)
+  @JoinColumn(name = "fid_k50", referencedColumnName = "fid")
+  private MapInkx50kEntity mapInkx50k;
+
+  @Column(name = "use_inference")
+  private String useInference;
+
+  public MapInkx5kEntity(
+      String mapidcdNo,
+      String mapidNm,
+      Geometry geom,
+      MapInkx50kEntity mapInkx50k,
+      String useInference) {
+    this.mapidcdNo = mapidcdNo;
+    this.mapidNm = mapidNm;
+    this.geom = geom;
+    this.mapInkx50k = mapInkx50k;
+    this.useInference = useInference;
+  }
+
+  public void updateUseInference(String useInference) {
+    this.useInference = useInference;
+  }
 
   public InferenceResultDto.MapSheet toEntity() {
     return new MapSheet(mapidcdNo, mapidNm);

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

@@ -0,0 +1,167 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+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.Size;
+import java.time.ZonedDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "tb_map_sheet_anal_data_inference")
+public class MapSheetAnalDataInferenceEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "data_uid", nullable = false)
+  private Long id;
+
+  @Size(max = 128)
+  @Column(name = "data_name", length = 128)
+  private String dataName;
+
+  @Size(max = 255)
+  @Column(name = "data_path")
+  private String dataPath;
+
+  @Size(max = 128)
+  @Column(name = "data_type", length = 128)
+  private String dataType;
+
+  @Size(max = 128)
+  @Column(name = "data_crs_type", length = 128)
+  private String dataCrsType;
+
+  @Size(max = 255)
+  @Column(name = "data_crs_type_name")
+  private String dataCrsTypeName;
+
+  @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")
+  private Long updatedUid;
+
+  @Column(name = "compare_yyyy")
+  private Integer compareYyyy;
+
+  @Column(name = "target_yyyy")
+  private Integer targetYyyy;
+
+  @Column(name = "data_json", length = Integer.MAX_VALUE)
+  private String dataJson;
+
+  @Size(max = 20)
+  @ColumnDefault("'0'")
+  @Column(name = "data_state", length = 20)
+  private String dataState;
+
+  @ColumnDefault("now()")
+  @Column(name = "data_state_dttm")
+  private ZonedDateTime dataStateDttm;
+
+  @Column(name = "anal_strt_dttm")
+  private ZonedDateTime analStrtDttm;
+
+  @Column(name = "anal_end_dttm")
+  private ZonedDateTime analEndDttm;
+
+  @ColumnDefault("0")
+  @Column(name = "anal_sec")
+  private Long analSec;
+
+  @Size(max = 20)
+  @Column(name = "anal_state", length = 20)
+  private String analState;
+
+  @Column(name = "anal_uid")
+  private Long analUid;
+
+  @Column(name = "map_sheet_num")
+  private Long mapSheetNum;
+
+  @ColumnDefault("0")
+  @Column(name = "detecting_cnt")
+  private Long detectingCnt;
+
+  @ColumnDefault("0")
+  @Column(name = "pnu")
+  private Long pnu;
+
+  @Size(max = 20)
+  @Column(name = "down_state", length = 20)
+  private String downState;
+
+  @Column(name = "down_state_dttm")
+  private ZonedDateTime downStateDttm;
+
+  @Size(max = 20)
+  @Column(name = "fit_state", length = 20)
+  private String fitState;
+
+  @Column(name = "fit_state_dttm")
+  private ZonedDateTime fitStateDttm;
+
+  @Column(name = "labeler_uid")
+  private Long labelerUid;
+
+  @Size(max = 20)
+  @ColumnDefault("NULL")
+  @Column(name = "label_state", length = 20)
+  private String labelState;
+
+  @Column(name = "label_state_dttm")
+  private ZonedDateTime labelStateDttm;
+
+  @Column(name = "tester_uid")
+  private Long testerUid;
+
+  @Size(max = 20)
+  @Column(name = "test_state", length = 20)
+  private String testState;
+
+  @Column(name = "test_state_dttm")
+  private ZonedDateTime testStateDttm;
+
+  @Column(name = "fit_state_cmmnt", length = Integer.MAX_VALUE)
+  private String fitStateCmmnt;
+
+  @Column(name = "ref_map_sheet_num")
+  private Long refMapSheetNum;
+
+  @Column(name = "stage")
+  private Integer stage;
+
+  @Column(name = "file_created_yn")
+  private Boolean fileCreatedYn;
+
+  @Size(max = 100)
+  @Column(name = "m1", length = 100)
+  private String m1;
+
+  @Size(max = 100)
+  @Column(name = "m2", length = 100)
+  private String m2;
+
+  @Size(max = 100)
+  @Column(name = "m3", length = 100)
+  private String m3;
+
+  @Column(name = "file_created_dttm")
+  private ZonedDateTime fileCreatedDttm;
+}

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

@@ -0,0 +1,149 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+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.Size;
+import java.time.ZonedDateTime;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+import org.locationtech.jts.geom.Geometry;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "tb_map_sheet_anal_data_inference_geom")
+public class MapSheetAnalDataInferenceGeomEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "geo_uid")
+  private Long geoUid;
+
+  @Column(name = "cd_prob")
+  private Float cdProb;
+
+  @Size(max = 40)
+  @Column(name = "class_before_cd", length = 40)
+  private String classBeforeCd;
+
+  @Column(name = "class_before_prob")
+  private Float classBeforeProb;
+
+  @Size(max = 40)
+  @Column(name = "class_after_cd", length = 40)
+  private String classAfterCd;
+
+  @Column(name = "class_after_prob")
+  private Float classAfterProb;
+
+  @Column(name = "map_sheet_num")
+  private Long mapSheetNum;
+
+  @Column(name = "compare_yyyy")
+  private Integer compareYyyy;
+
+  @Column(name = "target_yyyy")
+  private Integer targetYyyy;
+
+  @Column(name = "area")
+  private Float area;
+
+  @Size(max = 100)
+  @Column(name = "geo_type", length = 100)
+  private String geoType;
+
+  @Column(name = "data_uid")
+  private Long dataUid;
+
+  @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")
+  private Long updatedUid;
+
+  @ColumnDefault("0")
+  @Column(name = "geom_cnt")
+  private Long geomCnt;
+
+  @ColumnDefault("0")
+  @Column(name = "pnu")
+  private Long pnu;
+
+  @Size(max = 20)
+  @ColumnDefault("'0'")
+  @Column(name = "fit_state", length = 20)
+  private String fitState;
+
+  @ColumnDefault("now()")
+  @Column(name = "fit_state_dttm")
+  private ZonedDateTime fitStateDttm;
+
+  @Column(name = "labeler_uid")
+  private Long labelerUid;
+
+  @Size(max = 20)
+  @ColumnDefault("'0'")
+  @Column(name = "label_state", length = 20)
+  private String labelState;
+
+  @ColumnDefault("now()")
+  @Column(name = "label_state_dttm")
+  private ZonedDateTime labelStateDttm;
+
+  @Column(name = "tester_uid")
+  private Long testerUid;
+
+  @Size(max = 20)
+  @ColumnDefault("'0'")
+  @Column(name = "test_state", length = 20)
+  private String testState;
+
+  @ColumnDefault("now()")
+  @Column(name = "test_state_dttm")
+  private ZonedDateTime testStateDttm;
+
+  @Column(name = "fit_state_cmmnt", length = Integer.MAX_VALUE)
+  private String fitStateCmmnt;
+
+  @Column(name = "ref_map_sheet_num")
+  private Long refMapSheetNum;
+
+  @ColumnDefault("uuid_generate_v4()")
+  @Column(name = "uuid")
+  private UUID uuid;
+
+  @Column(name = "stage")
+  private Integer stage;
+
+  @Column(name = "map_5k_id")
+  private Long map5kId;
+
+  @Column(name = "file_created_yn")
+  private Boolean fileCreatedYn;
+
+  @Column(name = "geom", columnDefinition = "geometry")
+  private Geometry geom;
+
+  @Column(name = "geom_center", columnDefinition = "geometry")
+  private Geometry geomCenter;
+
+  @Column(name = "before_geom", columnDefinition = "geometry")
+  private Geometry beforeGeom;
+
+  @Column(name = "file_created_dttm")
+  private ZonedDateTime fileCreatedDttm;
+}

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

@@ -10,6 +10,7 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
 
 @Getter
 @Setter
@@ -54,4 +55,9 @@ public class MapSheetMngFileEntity {
   @Size(max = 20)
   @Column(name = "file_state", length = 20)
   private String fileState;
+
+  @NotNull
+  @ColumnDefault("false")
+  @Column(name = "file_del", nullable = false)
+  private Boolean fileDel = false;
 }