Merge remote-tracking branch 'origin/feat/infer_dev_260107' into feat/infer_dev_260107
# Conflicts: # src/main/java/com/kamco/cd/kamcoback/postgres/entity/ModelMngEntity.java
This commit is contained in:
@@ -1,11 +1,7 @@
|
||||
package com.kamco.cd.kamcoback.postgres.core;
|
||||
|
||||
import static com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity.modelMngEntity;
|
||||
|
||||
import com.kamco.cd.kamcoback.model.dto.ModelMngDto;
|
||||
import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelMetricAddReq;
|
||||
import com.kamco.cd.kamcoback.postgres.entity.ModelMngEntity;
|
||||
import com.kamco.cd.kamcoback.postgres.entity.ModelResultMetricEntity;
|
||||
import com.kamco.cd.kamcoback.postgres.repository.model.ModelMngRepository;
|
||||
import java.time.LocalDate;
|
||||
import java.util.UUID;
|
||||
@@ -44,7 +40,7 @@ public class ModelMngCoreService {
|
||||
|
||||
public Long insertModel(ModelMngDto.AddReq addReq) {
|
||||
|
||||
ModelMngEntity addEntity = new ModelMngEntity();
|
||||
ModelMngEntity addEntity = new ModelMngEntity();
|
||||
addEntity.setModelVer(addReq.getModelVer());
|
||||
addEntity.setModelType(addReq.getModelType());
|
||||
addEntity.setFilePath(addReq.getFilePath());
|
||||
@@ -60,7 +56,7 @@ public class ModelMngCoreService {
|
||||
addEntity.setClsModelFileName(addReq.getClsModelFileName());
|
||||
addEntity.setDeleted(false);
|
||||
|
||||
//modelMngRepository.insertModel(addReq);
|
||||
// modelMngRepository.insertModel(addReq);
|
||||
ModelMngEntity entity = modelMngRepository.save(addEntity);
|
||||
return entity.getModelUid();
|
||||
}
|
||||
@@ -78,11 +74,8 @@ public class ModelMngCoreService {
|
||||
addEntity.setIou(addReq.getIou());
|
||||
*/
|
||||
|
||||
|
||||
modelMngRepository.insertModelResultMetric(addReq);
|
||||
//ModelMngEntity entity = modelMngRepository.save(addEntity);
|
||||
//return entity.getMetricUid();
|
||||
// ModelMngEntity entity = modelMngRepository.save(addEntity);
|
||||
// return entity.getMetricUid();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -3,15 +3,11 @@ package com.kamco.cd.kamcoback.postgres.entity;
|
||||
import jakarta.persistence.*;
|
||||
import java.time.ZonedDateTime;
|
||||
import java.util.Map;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import org.hibernate.annotations.JdbcTypeCode;
|
||||
import org.hibernate.type.SqlTypes;
|
||||
|
||||
|
||||
@Table(name = "tb_model_result_metric")
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
@@ -25,6 +25,4 @@ public interface ModelMngRepositoryCustom {
|
||||
void deleteByModelUuid(UUID uuid);
|
||||
|
||||
void insertModelResultMetric(ModelMngDto.ModelMetricAddReq addReq);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -198,30 +198,27 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport
|
||||
.execute();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void insertModelResultMetric(@Valid ModelMngDto.ModelMetricAddReq addReq) {
|
||||
long execCount =
|
||||
queryFactory
|
||||
.insert(modelResultMetricEntity)
|
||||
.columns(
|
||||
modelResultMetricEntity.modelUid,
|
||||
modelResultMetricEntity.modelVerUid,
|
||||
modelResultMetricEntity.f1Score,
|
||||
modelResultMetricEntity.precision,
|
||||
modelResultMetricEntity.recall,
|
||||
modelResultMetricEntity.loss,
|
||||
modelResultMetricEntity.iou)
|
||||
.values(
|
||||
addReq.getModelUid(),
|
||||
addReq.getModelVerUid(),
|
||||
addReq.getF1Score(),
|
||||
addReq.getPrecision(),
|
||||
addReq.getRecall(),
|
||||
addReq.getLoss(),
|
||||
addReq.getIou())
|
||||
.execute();
|
||||
queryFactory
|
||||
.insert(modelResultMetricEntity)
|
||||
.columns(
|
||||
modelResultMetricEntity.modelUid,
|
||||
modelResultMetricEntity.modelVerUid,
|
||||
modelResultMetricEntity.f1Score,
|
||||
modelResultMetricEntity.precision,
|
||||
modelResultMetricEntity.recall,
|
||||
modelResultMetricEntity.loss,
|
||||
modelResultMetricEntity.iou)
|
||||
.values(
|
||||
addReq.getModelUid(),
|
||||
addReq.getModelVerUid(),
|
||||
addReq.getF1Score(),
|
||||
addReq.getPrecision(),
|
||||
addReq.getRecall(),
|
||||
addReq.getLoss(),
|
||||
addReq.getIou())
|
||||
.execute();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user