feat: fix
This commit is contained in:
@@ -0,0 +1,46 @@
|
|||||||
|
package com.kamco.cd.kamcoback.common.api;
|
||||||
|
|
||||||
|
import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheet;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.LearningModelResultDto.BatchProcessResponse;
|
||||||
|
import com.kamco.cd.kamcoback.inference.service.InferenceResultService;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
|
import io.swagger.v3.oas.annotations.media.Content;
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||||
|
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/demo/api/scene")
|
||||||
|
public class SceneDemoApiController {
|
||||||
|
|
||||||
|
private final InferenceResultService inferenceResultService;
|
||||||
|
|
||||||
|
@Operation(summary = "추론된 도엽 목록", description = "추론된 도엽 목록 5000:1")
|
||||||
|
@ApiResponses(
|
||||||
|
value = {
|
||||||
|
@ApiResponse(
|
||||||
|
responseCode = "200",
|
||||||
|
description = "검색 성공",
|
||||||
|
content =
|
||||||
|
@Content(
|
||||||
|
mediaType = "application/json",
|
||||||
|
schema = @Schema(implementation = BatchProcessResponse.class))),
|
||||||
|
@ApiResponse(responseCode = "400", description = "잘못된 요청", content = @Content),
|
||||||
|
@ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
|
||||||
|
})
|
||||||
|
@GetMapping("/sheets/train-set/{id}")
|
||||||
|
public ApiResponseDto<List<MapSheet>> listGetScenes5k(
|
||||||
|
@Parameter(description = "분석결과 id", example = "1") @PathVariable Long id) {
|
||||||
|
List<MapSheet> mapSheets = inferenceResultService.listGetScenes5k(id);
|
||||||
|
return ApiResponseDto.ok(mapSheets);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.inference.service;
|
|||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Dashboard;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Dashboard;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Detail;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Detail;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheet;
|
||||||
import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService;
|
import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -100,4 +101,8 @@ public class InferenceResultService {
|
|||||||
public List<String> getSheets(Long id) {
|
public List<String> getSheets(Long id) {
|
||||||
return inferenceResultCoreService.getSheets(id).stream().map(String::valueOf).toList();
|
return inferenceResultCoreService.getSheets(id).stream().map(String::valueOf).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<MapSheet> listGetScenes5k(Long id) {
|
||||||
|
return inferenceResultCoreService.listGetScenes5k(id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,9 +2,12 @@ package com.kamco.cd.kamcoback.postgres.core;
|
|||||||
|
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Dashboard;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Dashboard;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheet;
|
||||||
|
import com.kamco.cd.kamcoback.postgres.entity.MapInkx5kEntity;
|
||||||
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataEntity;
|
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataEntity;
|
||||||
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataGeomEntity;
|
import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataGeomEntity;
|
||||||
import com.kamco.cd.kamcoback.postgres.repository.Inference.InferenceResultRepository;
|
import com.kamco.cd.kamcoback.postgres.repository.Inference.InferenceResultRepository;
|
||||||
|
import com.kamco.cd.kamcoback.postgres.repository.scene.MapInkx5kRepository;
|
||||||
import jakarta.persistence.EntityNotFoundException;
|
import jakarta.persistence.EntityNotFoundException;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -18,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
public class InferenceResultCoreService {
|
public class InferenceResultCoreService {
|
||||||
|
|
||||||
private final InferenceResultRepository inferenceResultRepository;
|
private final InferenceResultRepository inferenceResultRepository;
|
||||||
|
private final MapInkx5kRepository mapInkx5kRepository;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 추론관리 > 분석결과 목록 조회
|
* 추론관리 > 분석결과 목록 조회
|
||||||
@@ -95,4 +99,17 @@ public class InferenceResultCoreService {
|
|||||||
public List<Long> getSheets(Long id) {
|
public List<Long> getSheets(Long id) {
|
||||||
return inferenceResultRepository.getSheets(id);
|
return inferenceResultRepository.getSheets(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public List<MapSheet> listGetScenes5k(Long analyId) {
|
||||||
|
List<String> sceneCodes =
|
||||||
|
inferenceResultRepository.listAnalyGeom(analyId).stream()
|
||||||
|
.mapToLong(MapSheetAnalDataEntity::getMapSheetNum)
|
||||||
|
.mapToObj(String::valueOf)
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
return mapInkx5kRepository.listGetScenes5k(sceneCodes).stream()
|
||||||
|
.map(MapInkx5kEntity::toEntity)
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package com.kamco.cd.kamcoback.postgres.repository.scene;
|
||||||
|
|
||||||
|
import com.kamco.cd.kamcoback.postgres.entity.MapInkx5kEntity;
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
public interface MapInkx5kRepository
|
||||||
|
extends JpaRepository<MapInkx5kEntity, Long>, MapInkx5kRepositoryCustom {}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package com.kamco.cd.kamcoback.postgres.repository.scene;
|
||||||
|
|
||||||
|
import com.kamco.cd.kamcoback.postgres.entity.MapInkx5kEntity;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface MapInkx5kRepositoryCustom {
|
||||||
|
|
||||||
|
List<MapInkx5kEntity> listGetScenes5k(List<String> codes);
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package com.kamco.cd.kamcoback.postgres.repository.scene;
|
||||||
|
|
||||||
|
import com.kamco.cd.kamcoback.postgres.entity.MapInkx5kEntity;
|
||||||
|
import com.kamco.cd.kamcoback.postgres.entity.QMapInkx5kEntity;
|
||||||
|
import com.querydsl.jpa.impl.JPAQueryFactory;
|
||||||
|
import java.util.List;
|
||||||
|
import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
|
||||||
|
|
||||||
|
public class MapInkx5kRepositoryImpl extends QuerydslRepositorySupport
|
||||||
|
implements MapInkx5kRepositoryCustom {
|
||||||
|
|
||||||
|
private final JPAQueryFactory queryFactory;
|
||||||
|
|
||||||
|
public MapInkx5kRepositoryImpl(JPAQueryFactory queryFactory) {
|
||||||
|
super(MapInkx5kEntity.class);
|
||||||
|
this.queryFactory = queryFactory;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<MapInkx5kEntity> listGetScenes5k(List<String> codes) {
|
||||||
|
QMapInkx5kEntity map5k = QMapInkx5kEntity.mapInkx5kEntity;
|
||||||
|
|
||||||
|
return queryFactory
|
||||||
|
.selectFrom(map5k)
|
||||||
|
.where(map5k.mapidcdNo.in(codes))
|
||||||
|
.orderBy(map5k.mapidcdNo.asc())
|
||||||
|
.fetch();
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user