feat: fix

This commit is contained in:
2025-12-02 17:04:10 +09:00
parent 199d3bcac7
commit 7def1e4e90
4 changed files with 110 additions and 22 deletions

View File

@@ -1,7 +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.Clazz;
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Clazzes;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
@@ -14,6 +15,7 @@ import jakarta.persistence.SequenceGenerator;
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;
@@ -36,6 +38,9 @@ public class MapSheetAnalDataGeomEntity {
@Column(name = "geo_uid", nullable = false)
private Long id;
@Column(name = "uuid")
private UUID uuid;
@Column(name = "cd_prob")
private Double cdProb;
@@ -144,8 +149,10 @@ public class MapSheetAnalDataGeomEntity {
private Geometry geomCenter;
public InferenceResultDto.DetailListEntity toEntity() {
Clazz comparedClazz = new Clazz(classBeforeCd, classBeforeProb);
Clazz targetClazz = new Clazz(classAfterCd, classAfterProb);
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;
InferenceResultDto.Coordinate coordinate = null;
@@ -155,6 +162,6 @@ public class MapSheetAnalDataGeomEntity {
}
return new InferenceResultDto.DetailListEntity(
cdProb, comparedClazz, targetClazz, mapSheet, coordinate, createdDttm);
uuid, cdProb, comparedClazz, targetClazz, mapSheet, coordinate, createdDttm);
}
}