Merge branch 'feat/infer_dev_260107' of https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice into feat/infer_dev_260107

# Conflicts:
#	src/main/resources/application.yml

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

@@ -1,6 +1,6 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheet;
+import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.MapSheet;
 import com.kamco.cd.kamcoback.postgres.CommonDateEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

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

@@ -1,8 +1,8 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
 import com.kamco.cd.kamcoback.common.enums.CommonUseStatus;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheet;
+import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto;
+import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.MapSheet;
 import com.kamco.cd.kamcoback.postgres.CommonDateEntity;
 import com.kamco.cd.kamcoback.scene.dto.MapInkxMngDto.MapListEntity;
 import jakarta.persistence.Column;
@@ -71,7 +71,7 @@ public class MapInkx5kEntity extends CommonDateEntity {
     this.useInference = useInference;
   }
 
-  public InferenceResultDto.MapSheet toEntity() {
+  public InferenceDetailDto.MapSheet toEntity() {
     return new MapSheet(mapidcdNo, mapidNm);
   }
 

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

@@ -1,8 +1,8 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
 import com.kamco.cd.kamcoback.common.enums.DetectionClassification;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
-import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Clazzes;
+import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto;
+import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.Clazzes;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -160,20 +160,20 @@ public class MapSheetAnalDataInferenceGeomEntity {
   @JoinColumn(name = "map_5k_id", referencedColumnName = "fid")
   private MapInkx5kEntity map5k;
 
-  public InferenceResultDto.DetailListEntity toEntity() {
+  public InferenceDetailDto.DetailListEntity toEntity() {
     DetectionClassification classification = DetectionClassification.fromString(classBeforeCd);
     Clazzes comparedClazz = new Clazzes(classification, classBeforeProb);
     DetectionClassification classification1 = DetectionClassification.fromString(classAfterCd);
     Clazzes targetClazz = new Clazzes(classification1, classAfterProb);
-    InferenceResultDto.MapSheet mapSheet = map5k != null ? map5k.toEntity() : null;
+    InferenceDetailDto.MapSheet mapSheet = map5k != null ? map5k.toEntity() : null;
 
-    InferenceResultDto.Coordinate coordinate = null;
+    InferenceDetailDto.Coordinate coordinate = null;
     if (geomCenter != null) {
       org.locationtech.jts.geom.Point point = (org.locationtech.jts.geom.Point) geomCenter;
-      coordinate = new InferenceResultDto.Coordinate(point.getX(), point.getY());
+      coordinate = new InferenceDetailDto.Coordinate(point.getX(), point.getY());
     }
 
-    return new InferenceResultDto.DetailListEntity(
+    return new InferenceDetailDto.DetailListEntity(
         uuid, cdProb, comparedClazz, targetClazz, mapSheet, coordinate, createdDttm);
   }
 }

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

@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -7,6 +8,7 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import java.time.ZonedDateTime;
 import java.util.UUID;
@@ -31,7 +33,16 @@ public class MapSheetLearnEntity {
 
   @ColumnDefault("gen_random_uuid()")
   @Column(name = "uuid")
-  private UUID uuid = UUID.randomUUID();
+  private UUID uuid;
+
+  @Size(max = 200)
+  @NotNull
+  @Column(name = "title", nullable = false, length = 200)
+  private String title;
+
+  @Size(max = 10)
+  @Column(name = "status", length = 10)
+  private String status;
 
   @Column(name = "m1_model_uid")
   private Long m1ModelUid;
@@ -52,6 +63,10 @@ public class MapSheetLearnEntity {
   @Column(name = "detect_option", length = 20)
   private String detectOption;
 
+  @Size(max = 100)
+  @Column(name = "map_sheet_cnt", length = 100)
+  private String mapSheetCnt;
+
   @Size(max = 20)
   @Column(name = "map_sheet_scope", length = 20)
   private String mapSheetScope;
@@ -59,6 +74,12 @@ public class MapSheetLearnEntity {
   @Column(name = "detecting_cnt")
   private Long detectingCnt;
 
+  @Column(name = "infer_start_dttm")
+  private ZonedDateTime inferStartDttm;
+
+  @Column(name = "infer_end_dttm")
+  private ZonedDateTime inferEndDttm;
+
   @Column(name = "elapsed_time")
   private ZonedDateTime elapsedTime;
 
@@ -70,7 +91,7 @@ public class MapSheetLearnEntity {
 
   @ColumnDefault("now()")
   @Column(name = "created_dttm")
-  private ZonedDateTime createdDttm = ZonedDateTime.now();
+  private ZonedDateTime createdDttm;
 
   @Column(name = "created_uid")
   private Long createdUid;
@@ -81,4 +102,18 @@ public class MapSheetLearnEntity {
 
   @Column(name = "updated_uid")
   private Long updatedUid;
+
+  public InferenceResultDto.ResultList toDto() {
+    return new InferenceResultDto.ResultList(
+        this.uuid,
+        this.title,
+        this.status,
+        this.mapSheetCnt,
+        this.detectingCnt,
+        this.inferStartDttm,
+        this.inferEndDttm,
+        this.elapsedTime,
+        this.applyYn,
+        this.applyDttm);
+  }
 }