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:
@@ -281,7 +281,6 @@ public class MapSheetMngApiController {
|
||||
return ApiResponseDto.createOK(mapSheetMngService.getFilesAll(srchDto));
|
||||
}
|
||||
|
||||
|
||||
@Operation(summary = "영상 데이터 관리 완료 년도 목록 조회", description = "영상 데이터 관리 완료 년도 목록 조회")
|
||||
@ApiResponses(
|
||||
value = {
|
||||
|
||||
@@ -23,7 +23,6 @@ import java.nio.file.Paths;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.data.domain.Page;
|
||||
@@ -343,7 +342,8 @@ public class MapSheetMngService {
|
||||
public List<Integer> findMapSheetMngDoneYyyyList() {
|
||||
|
||||
List<MngDto> mngList = mapSheetMngCoreService.findMapSheetMngList();
|
||||
List<Integer> yearList = mngList.stream()
|
||||
List<Integer> yearList =
|
||||
mngList.stream()
|
||||
.filter(dto -> "DONE".equals(dto.getMngState()))
|
||||
.map(dto -> dto.getMngYyyy()) // 날짜 객체에서 연도(int)만 추출
|
||||
.toList();
|
||||
|
||||
@@ -176,7 +176,6 @@ public class ModelMngDto {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Schema(name = "ModelMetricAddReq", description = "모델 등록 req")
|
||||
@Getter
|
||||
@Setter
|
||||
@@ -191,5 +190,4 @@ public class ModelMngDto {
|
||||
private double loss;
|
||||
private double iou;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
@@ -78,11 +74,8 @@ public class ModelMngCoreService {
|
||||
addEntity.setIou(addReq.getIou());
|
||||
*/
|
||||
|
||||
|
||||
modelMngRepository.insertModelResultMetric(addReq);
|
||||
// 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,7 +198,6 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport
|
||||
.execute();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void insertModelResultMetric(@Valid ModelMngDto.ModelMetricAddReq addReq) {
|
||||
long execCount =
|
||||
@@ -222,6 +221,4 @@ public class ModelMngRepositoryImpl extends QuerydslRepositorySupport
|
||||
addReq.getIou())
|
||||
.execute();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user