diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java index 40cb1d97..98bef0ea 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java @@ -47,6 +47,9 @@ public class ModelMngEntity extends CommonDateEntity { @Column(name = "model_cntnt", columnDefinition = "TEXT") private String modelCntnt; + @Column(name = "bbone_ver") + private String bboneVer; + public ModelMngEntity( String modelNm, String modelCate, diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelVerEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelVerEntity.java index 153db221..59756568 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelVerEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelVerEntity.java @@ -9,6 +9,10 @@ import jakarta.validation.constraints.Size; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; + +import java.util.Map; @Getter @Setter @@ -63,8 +67,34 @@ public class ModelVerEntity extends CommonDateEntity { @Column(name = "updated_uid") private Long updatedUid; + @Column(name = "deleted") private Boolean deleted = false; + @Column(name = "leaning_rate", columnDefinition = "float8[]") + private Double[] leaningRate; + + @Column(name = "batch_size", columnDefinition = "float8[]") + private Double[] batchSize; + + @Column(name = "dropout_rate", columnDefinition = "float8[]") + private Double[] dropoutRate; + + @Column(name = "number_of_filters", columnDefinition = "float8[]") + private Double[] numberOfFilters; + + @Column(name = "best_state") + private String bestState; + + @Column(name = "copy_state") + private String copyState; + + @Column(name = "hyper_params") + @JdbcTypeCode(SqlTypes.JSON) + private Map hyperParams; + + @Column(name = "ver_cntnt", columnDefinition = "TEXT") + private String verCntnt; + public ModelVerEntity( Long id, Long modelUid, diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java index 80f69151..41fdc6d8 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java @@ -52,11 +52,11 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport modelMngEntity.modelCate, modelVerEntity.id.as("modelVerUid"), modelVerEntity.modelVer, - modelVerEntity.usedState, - modelVerEntity.modelState, + Expressions.stringTemplate("fn_codenm_to_misc({0}, {1})", 51, modelVerEntity.usedState), //사용여부 한글 명칭 + Expressions.stringTemplate("fn_codenm_to_misc({0}, {1})", 51, modelVerEntity.modelState), //모델상태 한글 명칭 modelVerEntity.qualityProb, - modelVerEntity.deployState, - modelVerEntity.modelPath)) + Expressions.stringTemplate("fn_codenm_to_misc({0}, {1})", 52, modelVerEntity.deployState), //배포상태 한글 명칭 + modelVerEntity.modelPath)) .from(modelMngEntity) .innerJoin(modelVerEntity) .on(modelMngEntity.id.eq(modelVerEntity.modelUid)) @@ -82,9 +82,9 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport Expressions.stringTemplate( "to_char({0}, 'YYYY-MM-DD')", modelVerEntity.createdDate) .as("createdDttm"), - modelVerEntity.usedState, - modelVerEntity.deployState, - Expressions.stringTemplate( + Expressions.stringTemplate("fn_codenm_to_misc({0}, {1})", 51, modelVerEntity.usedState), //사용여부 한글 명칭 + Expressions.stringTemplate("fn_codenm_to_misc({0}, {1})", 52, modelVerEntity.deployState), //배포상태 한글 명칭 + Expressions.stringTemplate( "to_char({0}, 'YYYY-MM-DD')", modelDeployHstEntity.deployDttm) .as("deployDttm"))) .from(modelMngEntity)