Merge remote-tracking branch 'origin/feat/demo-20251205' into feat/demo-20251205

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,

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<String, Object> hyperParams;
+
+  @Column(name = "ver_cntnt", columnDefinition = "TEXT")
+  private String verCntnt;
+
   public ModelVerEntity(
       Long id,
       Long modelUid,

src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryImpl.java

@@ -52,10 +52,10 @@ 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,
+              Expressions.stringTemplate("fn_codenm_to_misc({0}, {1})", 52, modelVerEntity.deployState),   //배포상태 한글 명칭
               modelVerEntity.modelPath))
         .from(modelMngEntity)
         .innerJoin(modelVerEntity)
@@ -82,8 +82,8 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport
                     Expressions.stringTemplate(
                             "to_char({0}, 'YYYY-MM-DD')", modelVerEntity.createdDate)
                         .as("createdDttm"),
-                    modelVerEntity.usedState,
-                    modelVerEntity.deployState,
+                  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")))