diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java index 10d7faa7..bc9aac3a 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java @@ -74,19 +74,18 @@ public class InferenceResultService { mapSheetIds.add(mapInkx5kEntity.getMapidcdNo()); }); req.setMapSheetNum(mapSheetIds); - System.out.println(mapSheetIds); } - // UUID uuid = inferenceResultCoreService.saveInferenceInfo(req); + UUID uuid = inferenceResultCoreService.saveInferenceInfo(req); // TODO tif 없으면 전년도 파일 조회 쿼리 추가해야함 // TODO 도엽 개수를 target 기준으로 맞춰야함 - // this.getSceneInference(String.valueOf(req.getCompareYyyy()), req.getMapSheetNum()); - // this.getSceneInference(String.valueOf(req.getTargetYyyy()), req.getMapSheetNum()); - // - // InferenceSendDto m1 = this.getModelInfo(req.getModel1Uuid()); - // InferenceSendDto m2 = this.getModelInfo(req.getModel2Uuid()); - // InferenceSendDto m3 = this.getModelInfo(req.getModel3Uuid()); + this.getSceneInference(String.valueOf(req.getCompareYyyy()), req.getMapSheetNum()); + this.getSceneInference(String.valueOf(req.getTargetYyyy()), req.getMapSheetNum()); + + InferenceSendDto m1 = this.getModelInfo(req.getModel1Uuid()); + InferenceSendDto m2 = this.getModelInfo(req.getModel2Uuid()); + InferenceSendDto m3 = this.getModelInfo(req.getModel3Uuid()); // // ensureAccepted(m1); // ensureAccepted(m2); @@ -134,12 +133,12 @@ public class InferenceResultService { /** * 모델정보 조회 dto 생성 후 반환 * - * @param id + * @param uuid * @return */ - private InferenceSendDto getModelInfo(Long id) { + private InferenceSendDto getModelInfo(UUID uuid) { - Basic modelInfo = modelMngCoreService.findByModelUuid(id); + Basic modelInfo = modelMngCoreService.findByModelUuid(uuid); InferenceSendDto sendDto = new InferenceSendDto(); sendDto.setModel_version(modelInfo.getModelVer()); diff --git a/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java b/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java index 6d3eda9c..342ccd45 100644 --- a/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java @@ -5,7 +5,6 @@ import com.kamco.cd.kamcoback.common.utils.enums.CodeExpose; import com.kamco.cd.kamcoback.common.utils.enums.EnumType; import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm; import io.swagger.v3.oas.annotations.media.Schema; -import java.math.BigDecimal; import java.time.ZonedDateTime; import java.util.UUID; import lombok.AllArgsConstructor; @@ -126,11 +125,11 @@ public class ModelMngDto { private String fileName; private String modelType; private String createCompleteDttm; - private BigDecimal f1Score; - private BigDecimal precision; - private BigDecimal recall; - private BigDecimal accuracy; - private BigDecimal iou; + private Double f1Score; + private Double precision; + private Double recall; + private Double accuracy; + private Double iou; private String memo; private Boolean deleted; private UUID uuid; diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java index e28de297..52339a4e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java @@ -209,7 +209,7 @@ public class InferenceResultCoreService { .toList(); } - public List findByMapidList(Search5kReq req) { + public List findByMapidList(Search5kReq req) { return mapInkx5kRepository.findByMapidList(req); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java index 86d5306d..989e4fba 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/ModelMngCoreService.java @@ -91,4 +91,12 @@ public class ModelMngCoreService { .orElseThrow(() -> new EntityNotFoundException("모델 정보가 없습니다.")); return entity.toDto(); } + + public ModelMngDto.Basic findByModelUuid(UUID id) { + ModelMngEntity entity = + modelMngRepository + .findByModelId(id) + .orElseThrow(() -> new EntityNotFoundException("모델 정보가 없습니다.")); + return entity.toDto(); + } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java index bba1c4fe..e6268a39 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/model/ModelMngRepositoryCustom.java @@ -27,4 +27,6 @@ public interface ModelMngRepositoryCustom { void insertModelResultMetric(ModelMngDto.ModelMetricAddReq addReq); Optional findByModelId(Long id); + + Optional findByModelId(UUID id); } 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 c7740dec..55d39be3 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 @@ -74,11 +74,11 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport modelMngEntity.modelType, Expressions.stringTemplate( "to_char({0}, 'YYYY-MM-DD')", modelMngEntity.createCompleteDttm), - roundNumericToPercent(modelResultMetricEntity.f1Score), - roundNumericToPercent(modelResultMetricEntity.precision), - roundNumericToPercent(modelResultMetricEntity.recall), - roundNumericToPercent(modelResultMetricEntity.loss), - roundNumericToPercent(modelResultMetricEntity.iou), + modelResultMetricEntity.f1Score, + modelResultMetricEntity.precision, + modelResultMetricEntity.recall, + modelResultMetricEntity.loss, + modelResultMetricEntity.iou, modelMngEntity.memo, modelMngEntity.deleted, modelMngEntity.uuid, @@ -237,4 +237,10 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport return Optional.ofNullable( queryFactory.selectFrom(modelMngEntity).where(modelMngEntity.modelUid.eq(id)).fetchOne()); } + + @Override + public Optional findByModelId(UUID uuid) { + return Optional.ofNullable( + queryFactory.selectFrom(modelMngEntity).where(modelMngEntity.uuid.eq(uuid)).fetchOne()); + } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryCustom.java index dccfb1ea..7bffc281 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryCustom.java @@ -27,5 +27,5 @@ public interface MapInkx5kRepositoryCustom { List findByMapSheetNumInAndUseInference( List mapSheetNums, CommonUseStatus use); - List findByMapidList(Search5kReq search5kReq); + List findByMapidList(Search5kReq search5kReq); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryImpl.java index 205411ec..c7ad0018 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/scene/MapInkx5kRepositoryImpl.java @@ -146,7 +146,7 @@ public class MapInkx5kRepositoryImpl extends QuerydslRepositorySupport } @Override - public List findByMapidList(Search5kReq search5kReq) { + public List findByMapidList(Search5kReq search5kReq) { BooleanBuilder builder = new BooleanBuilder(); if (StringUtils.isNotBlank(search5kReq.getMapidcdNo())) { @@ -162,7 +162,7 @@ public class MapInkx5kRepositoryImpl extends QuerydslRepositorySupport return queryFactory .select( Projections.constructor( - MapInkxMngDto.Basic.class, + MapInkxMngDto.MapInkList.class, mapInkx5kEntity.fid, mapInkx5kEntity.mapidcdNo, mapInkx5kEntity.mapidNm, diff --git a/src/main/java/com/kamco/cd/kamcoback/scene/dto/MapInkxMngDto.java b/src/main/java/com/kamco/cd/kamcoback/scene/dto/MapInkxMngDto.java index c949bc90..188acbc0 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scene/dto/MapInkxMngDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/scene/dto/MapInkxMngDto.java @@ -70,7 +70,7 @@ public class MapInkxMngDto { private String mapidcdNo; private String mapidNm; private Geometry geom; - private String useInference; + private CommonUseStatus useInference; } @Getter