추론실행 수정, develop pull 반영, 국유인 파일경로 dir 하드코딩 수정 #103
@@ -1,57 +0,0 @@
|
|||||||
package com.kamco.cd.kamcoback.inference;
|
|
||||||
|
|
||||||
import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
|
|
||||||
import com.kamco.cd.kamcoback.inference.service.InferenceRunService;
|
|
||||||
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 io.swagger.v3.oas.annotations.tags.Tag;
|
|
||||||
import java.util.UUID;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.log4j.Log4j2;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
@Tag(name = "추론 실행", description = "추론 실행")
|
|
||||||
@Log4j2
|
|
||||||
@RequestMapping("/api/inference/run")
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@RestController
|
|
||||||
public class InferenceRunController {
|
|
||||||
|
|
||||||
private final InferenceRunService inferenceRunService;
|
|
||||||
|
|
||||||
@Operation(summary = "추론 진행 여부 확인", description = "어드민 홈 > 추론관리 > 추론관리 > 추론관리 목록")
|
|
||||||
@ApiResponses(
|
|
||||||
value = {
|
|
||||||
@ApiResponse(
|
|
||||||
responseCode = "200",
|
|
||||||
description = "검색 성공",
|
|
||||||
content =
|
|
||||||
@Content(
|
|
||||||
mediaType = "application/json",
|
|
||||||
schema =
|
|
||||||
@Schema(
|
|
||||||
description = "진행 여부 (UUID 있으면 진행중)",
|
|
||||||
type = "UUID",
|
|
||||||
example = "44709877-2e27-4fc5-bacb-8e0328c69b64"))),
|
|
||||||
@ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
|
|
||||||
@ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
|
|
||||||
})
|
|
||||||
@GetMapping
|
|
||||||
public ApiResponseDto<Void> getProcessing(
|
|
||||||
@Parameter(description = "비교년도", example = "2021") @RequestParam(required = false)
|
|
||||||
Integer compareYear,
|
|
||||||
@Parameter(description = "기준년도", example = "2022") @RequestParam(required = false)
|
|
||||||
Integer targetYear,
|
|
||||||
@Parameter(description = "모델 uuid") @RequestParam(required = false) UUID modelUuid) {
|
|
||||||
|
|
||||||
inferenceRunService.run(compareYear, targetYear, modelUuid);
|
|
||||||
return ApiResponseDto.ok(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -676,4 +676,13 @@ public class InferenceResultDto {
|
|||||||
private Long m2ModelBatchId;
|
private Long m2ModelBatchId;
|
||||||
private Long m3ModelBatchId;
|
private Long m3ModelBatchId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public static class MapSheetFallbackYearDto {
|
||||||
|
private String mapSheetNum;
|
||||||
|
private Integer mngYyyy;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ public class InferenceManualService {
|
|||||||
|
|
||||||
if (resultList.isEmpty()) {}
|
if (resultList.isEmpty()) {}
|
||||||
|
|
||||||
for (InferenceResultsTestingDto.Basic result : resultList) {}
|
for (InferenceResultsTestingDto.Basic result : resultList) {
|
||||||
|
System.out.println(result);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.DetectOption;
|
|||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceLearnDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceLearnDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceStatusDetailDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceStatusDetailDto;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetFallbackYearDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetNumDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetNumDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.ResultList;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.ResultList;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.SaveInferenceAiDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.SaveInferenceAiDto;
|
||||||
@@ -46,12 +47,14 @@ import java.util.ArrayList;
|
|||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.log4j.Log4j2;
|
import lombok.extern.log4j.Log4j2;
|
||||||
@@ -119,38 +122,120 @@ public class InferenceResultService {
|
|||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public UUID run(InferenceResultDto.RegReq req) {
|
public UUID run(InferenceResultDto.RegReq req) {
|
||||||
|
if (req.getDetectOption().equals(DetectOption.EXCL.getId())) {
|
||||||
|
return runExcl(req);
|
||||||
|
}
|
||||||
|
return runPrev(req);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 변화탐지 옵션 추론제외 실행
|
||||||
|
*
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public UUID runExcl(InferenceResultDto.RegReq req) {
|
||||||
List<MngListDto> targetDtoList = mapSheetMngCoreService.getHstMapSheetList(req);
|
List<MngListDto> targetDtoList = mapSheetMngCoreService.getHstMapSheetList(req);
|
||||||
List<String> compareList = mapSheetMngCoreService.getMapSheetMngHst(req.getCompareYyyy());
|
|
||||||
List<String> targetList =
|
List<String> targetList =
|
||||||
mapSheetMngCoreService.getHstMapSheetList(req).stream()
|
targetDtoList.stream()
|
||||||
.map(MngListDto::getMapSheetNum)
|
.map(MngListDto::getMapSheetNum)
|
||||||
.filter(Objects::nonNull)
|
.filter(Objects::nonNull)
|
||||||
.distinct()
|
.distinct()
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
log.info(
|
List<String> compareList =
|
||||||
"hst list count compareList = {}, targetList = {}", compareList.size(), targetList.size());
|
mapSheetMngCoreService.getMapSheetNumByHst(req.getCompareYyyy()).stream()
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.distinct()
|
||||||
|
.toList();
|
||||||
|
|
||||||
Set<String> compareSet = new HashSet<>(compareList);
|
Set<String> compareSet = new HashSet<>(compareList);
|
||||||
|
List<String> filteredTargetList = targetList.stream().filter(compareSet::contains).toList();
|
||||||
|
|
||||||
|
logYearComparison(targetList, compareList, filteredTargetList);
|
||||||
|
|
||||||
|
Scene compareScene =
|
||||||
|
getSceneInference(
|
||||||
|
req.getCompareYyyy().toString(),
|
||||||
|
filteredTargetList,
|
||||||
|
req.getMapSheetScope(),
|
||||||
|
req.getDetectOption());
|
||||||
|
|
||||||
|
Scene targetScene =
|
||||||
|
getSceneInference(
|
||||||
|
req.getTargetYyyy().toString(),
|
||||||
|
filteredTargetList,
|
||||||
|
req.getMapSheetScope(),
|
||||||
|
req.getDetectOption());
|
||||||
|
|
||||||
|
return executeInference(req, targetDtoList, filteredTargetList, compareScene, targetScene);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 변화탐지 옵션 이전 년도 도엽 사용 실행
|
||||||
|
*
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Transactional
|
||||||
|
public UUID runPrev(InferenceResultDto.RegReq req) {
|
||||||
|
List<MngListDto> targetDtoList = mapSheetMngCoreService.getHstMapSheetList(req);
|
||||||
|
|
||||||
|
List<String> targetList =
|
||||||
|
targetDtoList.stream()
|
||||||
|
.map(MngListDto::getMapSheetNum)
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.distinct()
|
||||||
|
.toList();
|
||||||
|
|
||||||
Set<String> targetSet = new HashSet<>(targetList);
|
Set<String> targetSet = new HashSet<>(targetList);
|
||||||
|
|
||||||
long intersectionCount =
|
List<MapSheetFallbackYearDto> compareDtoList =
|
||||||
targetSet.stream()
|
new ArrayList<>(mapSheetMngCoreService.getMapSheetNumDtoByHst(req.getCompareYyyy()));
|
||||||
.distinct()
|
|
||||||
.filter(compareSet::contains)
|
|
||||||
.count(); // compare와 target에 공통으로 존재하는 도협 수
|
|
||||||
|
|
||||||
long excludedTargetCount =
|
Set<String> compareSet =
|
||||||
targetSet.stream()
|
compareDtoList.stream()
|
||||||
.distinct()
|
.map(MapSheetFallbackYearDto::getMapSheetNum)
|
||||||
.filter(s -> !compareSet.contains(s))
|
.filter(Objects::nonNull)
|
||||||
.count(); // target 에만 존재하는 도협 수 (compare 에는 없음)
|
.collect(Collectors.toSet());
|
||||||
|
|
||||||
long onlyCompareCount =
|
List<String> remainingTargetList =
|
||||||
compareSet.stream()
|
targetList.stream().filter(s -> !compareSet.contains(s)).toList();
|
||||||
.distinct()
|
|
||||||
.filter(s -> !targetSet.contains(s))
|
List<MapSheetFallbackYearDto> fallbackYearDtoList =
|
||||||
.count(); // compare 에만 존재하는 도협 수 (target 에는 없음)
|
mapSheetMngCoreService.findFallbackCompareYearByMapSheets(
|
||||||
|
req.getTargetYyyy(), remainingTargetList);
|
||||||
|
|
||||||
|
compareDtoList.addAll(fallbackYearDtoList);
|
||||||
|
|
||||||
|
// mapSheetNum 기준 중복 제거(기존 compare 우선)
|
||||||
|
compareDtoList =
|
||||||
|
new ArrayList<>(
|
||||||
|
compareDtoList.stream()
|
||||||
|
.filter(d -> d.getMapSheetNum() != null)
|
||||||
|
.collect(
|
||||||
|
Collectors.toMap(
|
||||||
|
MapSheetFallbackYearDto::getMapSheetNum,
|
||||||
|
Function.identity(),
|
||||||
|
(existing, replacement) -> existing,
|
||||||
|
LinkedHashMap::new))
|
||||||
|
.values());
|
||||||
|
|
||||||
|
Set<String> availableCompareSheets =
|
||||||
|
compareDtoList.stream()
|
||||||
|
.map(MapSheetFallbackYearDto::getMapSheetNum)
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
|
||||||
|
List<String> filteredTargetList =
|
||||||
|
targetList.stream().filter(availableCompareSheets::contains).toList();
|
||||||
|
|
||||||
|
long compareOnlyCount =
|
||||||
|
compareDtoList.stream()
|
||||||
|
.map(MapSheetFallbackYearDto::getMapSheetNum)
|
||||||
|
.filter(s -> s != null && !targetSet.contains(s))
|
||||||
|
.count();
|
||||||
|
|
||||||
log.info(
|
log.info(
|
||||||
"""
|
"""
|
||||||
@@ -158,53 +243,67 @@ public class InferenceResultService {
|
|||||||
target Total: {}
|
target Total: {}
|
||||||
compare Total: {}
|
compare Total: {}
|
||||||
Intersection: {}
|
Intersection: {}
|
||||||
target Only (Excluded from compare): {}
|
target Only (Excluded): {}
|
||||||
compare Only: {}
|
compare Only: {}
|
||||||
====================================
|
====================================
|
||||||
""",
|
""",
|
||||||
targetSet.size(),
|
targetList.size(),
|
||||||
compareSet.size(),
|
compareDtoList.size(),
|
||||||
intersectionCount,
|
filteredTargetList.size(),
|
||||||
excludedTargetCount,
|
targetList.size() - filteredTargetList.size(),
|
||||||
onlyCompareCount);
|
compareOnlyCount);
|
||||||
|
|
||||||
List<String> filteredTargetList =
|
// compareDtoList도 filteredTargetList 기준으로 필터
|
||||||
targetSet.stream() // target 기준으로
|
Set<String> filteredTargetSet = new HashSet<>(filteredTargetList);
|
||||||
.filter(compareSet::contains) // compare에 있는 도협만 남김
|
List<MapSheetFallbackYearDto> filteredCompareDtoList =
|
||||||
|
compareDtoList.stream()
|
||||||
|
.filter(d -> d.getMapSheetNum() != null)
|
||||||
|
.filter(d -> filteredTargetSet.contains(d.getMapSheetNum()))
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
Scene modelComparePath =
|
Scene compareScene =
|
||||||
getSceneInference(req.getCompareYyyy().toString(), filteredTargetList, "", "");
|
getSceneInference(
|
||||||
|
filteredCompareDtoList,
|
||||||
|
req.getCompareYyyy().toString(),
|
||||||
|
req.getMapSheetScope(),
|
||||||
|
req.getDetectOption());
|
||||||
|
|
||||||
Scene modelTargetPath =
|
Scene targetScene =
|
||||||
getSceneInference(req.getTargetYyyy().toString(), filteredTargetList, "", "");
|
getSceneInference(
|
||||||
|
req.getTargetYyyy().toString(),
|
||||||
|
filteredTargetList,
|
||||||
|
req.getMapSheetScope(),
|
||||||
|
req.getDetectOption());
|
||||||
|
|
||||||
// 작은 쪽 기준으로 탐지건수/파일생성 리스트 결정
|
return executeInference(req, targetDtoList, filteredTargetList, compareScene, targetScene);
|
||||||
List<ImageFeature> imageFeatureList;
|
|
||||||
if (modelComparePath.getFeatures().size() <= modelTargetPath.getFeatures().size()) {
|
|
||||||
imageFeatureList = modelComparePath.getFeatures();
|
|
||||||
} else {
|
|
||||||
imageFeatureList = modelTargetPath.getFeatures();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// imageFeatureList 기준 sceneId Set
|
/**
|
||||||
Set<String> sceneIdSet =
|
* learn 테이블 저장 및 AI 추론 API 호출
|
||||||
imageFeatureList.stream()
|
*
|
||||||
.map(ImageFeature::getSceneId)
|
* @param req
|
||||||
.filter(Objects::nonNull)
|
* @param targetDtoList
|
||||||
.collect(Collectors.toSet());
|
* @param filteredTargetList
|
||||||
|
* @param modelComparePath
|
||||||
|
* @param modelTargetPath
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private UUID executeInference(
|
||||||
|
InferenceResultDto.RegReq req,
|
||||||
|
List<MngListDto> targetDtoList,
|
||||||
|
List<String> filteredTargetList,
|
||||||
|
Scene modelComparePath,
|
||||||
|
Scene modelTargetPath) {
|
||||||
|
Set<String> filteredSet = new HashSet<>(filteredTargetList);
|
||||||
|
|
||||||
// targetList(List<MngListDto>) 리턴용으로 필터링
|
|
||||||
List<MngListDto> newTargetList =
|
List<MngListDto> newTargetList =
|
||||||
targetDtoList.stream()
|
targetDtoList.stream()
|
||||||
.filter(m -> m.getMapSheetNum() != null)
|
.filter(m -> m.getMapSheetNum() != null)
|
||||||
.filter(m -> sceneIdSet.contains(m.getMapSheetNum()))
|
.filter(m -> filteredSet.contains(m.getMapSheetNum()))
|
||||||
.toList();
|
.toList();
|
||||||
|
|
||||||
// 목록 및 추론 대상 도엽정보 저장
|
|
||||||
UUID uuid = inferenceResultCoreService.saveInferenceInfo(req, newTargetList);
|
UUID uuid = inferenceResultCoreService.saveInferenceInfo(req, newTargetList);
|
||||||
|
|
||||||
// ai 서버에 전달할 파라미터 생성
|
|
||||||
pred_requests_areas predRequestsAreas = new pred_requests_areas();
|
pred_requests_areas predRequestsAreas = new pred_requests_areas();
|
||||||
predRequestsAreas.setInput1_year(req.getCompareYyyy());
|
predRequestsAreas.setInput1_year(req.getCompareYyyy());
|
||||||
predRequestsAreas.setInput2_year(req.getTargetYyyy());
|
predRequestsAreas.setInput2_year(req.getTargetYyyy());
|
||||||
@@ -215,12 +314,9 @@ public class InferenceResultService {
|
|||||||
m1.setPred_requests_areas(predRequestsAreas);
|
m1.setPred_requests_areas(predRequestsAreas);
|
||||||
|
|
||||||
log.info("[INFERENCE] Start m1 = {}", m1);
|
log.info("[INFERENCE] Start m1 = {}", m1);
|
||||||
m1.setPred_requests_areas(predRequestsAreas);
|
|
||||||
|
|
||||||
// ai 추론 실행 api 호출
|
|
||||||
Long batchId = ensureAccepted(m1);
|
Long batchId = ensureAccepted(m1);
|
||||||
|
|
||||||
// ai 추론 실행후 응답값 update
|
|
||||||
SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
|
SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
|
||||||
saveInferenceAiDto.setUuid(uuid);
|
saveInferenceAiDto.setUuid(uuid);
|
||||||
saveInferenceAiDto.setBatchId(batchId);
|
saveInferenceAiDto.setBatchId(batchId);
|
||||||
@@ -230,11 +326,42 @@ public class InferenceResultService {
|
|||||||
saveInferenceAiDto.setModelComparePath(modelComparePath.getFilePath());
|
saveInferenceAiDto.setModelComparePath(modelComparePath.getFilePath());
|
||||||
saveInferenceAiDto.setModelTargetPath(modelTargetPath.getFilePath());
|
saveInferenceAiDto.setModelTargetPath(modelTargetPath.getFilePath());
|
||||||
saveInferenceAiDto.setModelStartDttm(ZonedDateTime.now());
|
saveInferenceAiDto.setModelStartDttm(ZonedDateTime.now());
|
||||||
|
|
||||||
inferenceResultCoreService.update(saveInferenceAiDto);
|
inferenceResultCoreService.update(saveInferenceAiDto);
|
||||||
|
|
||||||
return uuid;
|
return uuid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EXCL 로그
|
||||||
|
*
|
||||||
|
* @param targetList
|
||||||
|
* @param compareList
|
||||||
|
* @param filteredTargetList
|
||||||
|
*/
|
||||||
|
private void logYearComparison(
|
||||||
|
List<String> targetList, List<String> compareList, List<String> filteredTargetList) {
|
||||||
|
Set<String> targetSet = new HashSet<>(targetList);
|
||||||
|
|
||||||
|
long compareOnlyCount = compareList.stream().filter(s -> !targetSet.contains(s)).count();
|
||||||
|
|
||||||
|
log.info(
|
||||||
|
"""
|
||||||
|
===== MapSheet Year Comparison =====
|
||||||
|
target Total: {}
|
||||||
|
compare Total: {}
|
||||||
|
Intersection: {}
|
||||||
|
target Only (Excluded): {}
|
||||||
|
compare Only: {}
|
||||||
|
====================================
|
||||||
|
""",
|
||||||
|
targetList.size(),
|
||||||
|
compareList.size(),
|
||||||
|
filteredTargetList.size(),
|
||||||
|
targetList.size() - filteredTargetList.size(),
|
||||||
|
compareOnlyCount);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 변화탐지 실행 정보 생성
|
* 변화탐지 실행 정보 생성
|
||||||
*
|
*
|
||||||
@@ -265,31 +392,31 @@ public class InferenceResultService {
|
|||||||
|
|
||||||
List<TotalListDto> totalNumList = new ArrayList<>();
|
List<TotalListDto> totalNumList = new ArrayList<>();
|
||||||
|
|
||||||
// if (DetectOption.EXCL.getId().equals(req.getDetectOption())) {
|
if (DetectOption.EXCL.getId().equals(req.getDetectOption())) {
|
||||||
// // "추론제외" 일때 전년도 이전 값이 있어도 전년도 도엽이 없으면 비교 안함
|
// "추론제외" 일때 전년도 이전 값이 있어도 전년도 도엽이 없으면 비교 안함
|
||||||
// for (MngListCompareDto dto : compareList) {
|
for (MngListCompareDto dto : compareList) {
|
||||||
// if (Objects.equals(dto.getBeforeYear(), req.getCompareYyyy())) {
|
if (Objects.equals(dto.getBeforeYear(), req.getCompareYyyy())) {
|
||||||
// TotalListDto totalDto = new TotalListDto();
|
TotalListDto totalDto = new TotalListDto();
|
||||||
// totalDto.setBeforeYear(dto.getBeforeYear() == null ? 0 : dto.getBeforeYear());
|
totalDto.setBeforeYear(dto.getBeforeYear() == null ? 0 : dto.getBeforeYear());
|
||||||
// totalDto.setMapSheetNum(dto.getMapSheetNum());
|
totalDto.setMapSheetNum(dto.getMapSheetNum());
|
||||||
// totalNumList.add(totalDto);
|
totalNumList.add(totalDto);
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// } else if (DetectOption.PREV.getId().equals(req.getDetectOption())) {
|
} else if (DetectOption.PREV.getId().equals(req.getDetectOption())) {
|
||||||
// // "이전 년도 도엽 사용" 이면 전년도 이전 도엽도 사용
|
// "이전 년도 도엽 사용" 이면 전년도 이전 도엽도 사용
|
||||||
// for (MngListCompareDto dto : compareList) {
|
for (MngListCompareDto dto : compareList) {
|
||||||
// if (dto.getBeforeYear() != 0) {
|
if (dto.getBeforeYear() != 0) {
|
||||||
// TotalListDto totalDto = new TotalListDto();
|
TotalListDto totalDto = new TotalListDto();
|
||||||
// totalDto.setBeforeYear(dto.getBeforeYear() == null ? 0 : dto.getBeforeYear());
|
totalDto.setBeforeYear(dto.getBeforeYear() == null ? 0 : dto.getBeforeYear());
|
||||||
// totalDto.setMapSheetNum(dto.getMapSheetNum());
|
totalDto.setMapSheetNum(dto.getMapSheetNum());
|
||||||
// totalNumList.add(totalDto);
|
totalNumList.add(totalDto);
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// if (totalNumList.isEmpty()) {
|
if (totalNumList.isEmpty()) {
|
||||||
// throw new CustomApiException("NOT_FOUND_COMPARE_YEAR", HttpStatus.NOT_FOUND);
|
throw new CustomApiException("NOT_FOUND_COMPARE_YEAR", HttpStatus.NOT_FOUND);
|
||||||
// }
|
}
|
||||||
|
|
||||||
// 사용할 영상파일 년도 기록 및 추론에 포함되는지 설정
|
// 사용할 영상파일 년도 기록 및 추론에 포함되는지 설정
|
||||||
for (MngListDto target : targetList) {
|
for (MngListDto target : targetList) {
|
||||||
@@ -568,6 +695,23 @@ public class InferenceResultService {
|
|||||||
yyyy, mapSheetNums, mapSheetScope, detectOption);
|
yyyy, mapSheetNums, mapSheetScope, detectOption);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 년도 별로 조회하여 geojson 파일 생성
|
||||||
|
*
|
||||||
|
* @param yearDtos
|
||||||
|
* @param year
|
||||||
|
* @param mapSheetScope
|
||||||
|
* @param detectOption
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private Scene getSceneInference(
|
||||||
|
List<MapSheetFallbackYearDto> yearDtos,
|
||||||
|
String year,
|
||||||
|
String mapSheetScope,
|
||||||
|
String detectOption) {
|
||||||
|
return mapSheetMngCoreService.getSceneInference(yearDtos, year, mapSheetScope, detectOption);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 분석결과 요약정보
|
* 분석결과 요약정보
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,220 +0,0 @@
|
|||||||
package com.kamco.cd.kamcoback.inference.service;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import com.fasterxml.jackson.core.type.TypeReference;
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.kamco.cd.kamcoback.common.exception.CustomApiException;
|
|
||||||
import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.Scene;
|
|
||||||
import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient;
|
|
||||||
import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult;
|
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceSendDto;
|
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceSendDto.pred_requests_areas;
|
|
||||||
import com.kamco.cd.kamcoback.model.dto.ModelMngDto.Basic;
|
|
||||||
import com.kamco.cd.kamcoback.model.dto.ModelMngDto.ModelType;
|
|
||||||
import com.kamco.cd.kamcoback.postgres.core.MapSheetMngCoreService;
|
|
||||||
import com.kamco.cd.kamcoback.postgres.core.ModelMngCoreService;
|
|
||||||
import java.nio.file.Paths;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.UUID;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.log4j.Log4j2;
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.http.HttpHeaders;
|
|
||||||
import org.springframework.http.HttpMethod;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.MediaType;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
@Log4j2
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class InferenceRunService {
|
|
||||||
private final ExternalHttpClient externalHttpClient;
|
|
||||||
private final MapSheetMngCoreService mapSheetMngCoreService;
|
|
||||||
private final ModelMngCoreService modelMngCoreService;
|
|
||||||
private final ObjectMapper objectMapper;
|
|
||||||
|
|
||||||
@Value("${inference.url}")
|
|
||||||
private String inferenceUrl;
|
|
||||||
|
|
||||||
public void run(Integer compareYear, Integer targetYear, UUID modelUuid) {
|
|
||||||
|
|
||||||
List<String> compareList = mapSheetMngCoreService.getMapSheetMngHst(compareYear);
|
|
||||||
List<String> targetList = mapSheetMngCoreService.getMapSheetMngHst(targetYear);
|
|
||||||
|
|
||||||
log.info(
|
|
||||||
"hst list count compareList = {}, targetList = {}", compareList.size(), targetList.size());
|
|
||||||
|
|
||||||
Set<String> compareSet = new HashSet<>(compareList);
|
|
||||||
Set<String> targetSet = new HashSet<>(targetList);
|
|
||||||
|
|
||||||
long intersectionCount =
|
|
||||||
targetSet.stream()
|
|
||||||
.distinct()
|
|
||||||
.filter(compareSet::contains)
|
|
||||||
.count(); // compare와 target에 공통으로 존재하는 도협 수
|
|
||||||
|
|
||||||
long excludedTargetCount =
|
|
||||||
targetSet.stream()
|
|
||||||
.distinct()
|
|
||||||
.filter(s -> !compareSet.contains(s))
|
|
||||||
.count(); // target 에만 존재하는 도협 수 (compare 에는 없음)
|
|
||||||
|
|
||||||
long onlyCompareCount =
|
|
||||||
compareSet.stream()
|
|
||||||
.distinct()
|
|
||||||
.filter(s -> !targetSet.contains(s))
|
|
||||||
.count(); // compare 에만 존재하는 도협 수 (target 에는 없음)
|
|
||||||
|
|
||||||
log.info(
|
|
||||||
"""
|
|
||||||
===== MapSheet Year Comparison =====
|
|
||||||
target Total: {}
|
|
||||||
compare Total: {}
|
|
||||||
Intersection: {}
|
|
||||||
target Only (Excluded from compare): {}
|
|
||||||
compare Only: {}
|
|
||||||
====================================
|
|
||||||
""",
|
|
||||||
targetSet.size(),
|
|
||||||
compareSet.size(),
|
|
||||||
intersectionCount,
|
|
||||||
excludedTargetCount,
|
|
||||||
onlyCompareCount);
|
|
||||||
|
|
||||||
List<String> filteredTargetList =
|
|
||||||
targetSet.stream() // target 기준으로
|
|
||||||
.filter(compareSet::contains) // compare에 있는 도협만 남김
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
Scene modelComparePath = getSceneInference(compareYear.toString(), filteredTargetList, "", "");
|
|
||||||
|
|
||||||
Scene modelTargetPath = getSceneInference(targetYear.toString(), filteredTargetList, "", "");
|
|
||||||
|
|
||||||
// ai 서버에 전달할 파라미터 생성
|
|
||||||
pred_requests_areas predRequestsAreas = new pred_requests_areas();
|
|
||||||
predRequestsAreas.setInput1_year(compareYear);
|
|
||||||
predRequestsAreas.setInput2_year(targetYear);
|
|
||||||
predRequestsAreas.setInput1_scene_path(modelComparePath.getFilePath());
|
|
||||||
predRequestsAreas.setInput2_scene_path(modelTargetPath.getFilePath());
|
|
||||||
|
|
||||||
InferenceSendDto m1 = this.getModelInfo(modelUuid);
|
|
||||||
m1.setPred_requests_areas(predRequestsAreas);
|
|
||||||
|
|
||||||
// ai 추론 실행 api 호출
|
|
||||||
Long batchId = ensureAccepted(m1);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Scene getSceneInference(
|
|
||||||
String yyyy, List<String> mapSheetNums, String mapSheetScope, String detectOption) {
|
|
||||||
return mapSheetMngCoreService.getSceneInference(
|
|
||||||
yyyy, mapSheetNums, mapSheetScope, detectOption);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 추론 AI API 호출
|
|
||||||
*
|
|
||||||
* @param dto
|
|
||||||
*/
|
|
||||||
private Long ensureAccepted(InferenceSendDto dto) {
|
|
||||||
|
|
||||||
if (dto == null) {
|
|
||||||
log.warn("not InferenceSendDto dto");
|
|
||||||
throw new CustomApiException("BAD_REQUEST", HttpStatus.BAD_REQUEST);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 1) 요청 로그
|
|
||||||
try {
|
|
||||||
log.debug("Inference request dto={}", objectMapper.writeValueAsString(dto));
|
|
||||||
} catch (JsonProcessingException e) {
|
|
||||||
log.warn("Failed to serialize inference dto", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 3) HTTP 호출
|
|
||||||
HttpHeaders headers = new HttpHeaders();
|
|
||||||
headers.setContentType(MediaType.APPLICATION_JSON);
|
|
||||||
headers.setAccept(List.of(MediaType.APPLICATION_JSON));
|
|
||||||
|
|
||||||
ExternalCallResult<String> result =
|
|
||||||
externalHttpClient.call(inferenceUrl, HttpMethod.POST, dto, headers, String.class);
|
|
||||||
|
|
||||||
if (result.statusCode() < 200 || result.statusCode() >= 300) {
|
|
||||||
log.error("Inference API failed. status={}, body={}", result.statusCode(), result.body());
|
|
||||||
throw new CustomApiException("BAD_GATEWAY", HttpStatus.BAD_GATEWAY);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 4) 응답 파싱
|
|
||||||
try {
|
|
||||||
List<Map<String, Object>> list =
|
|
||||||
objectMapper.readValue(result.body(), new TypeReference<>() {});
|
|
||||||
|
|
||||||
if (list.isEmpty()) {
|
|
||||||
throw new IllegalStateException("Inference response is empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
Object batchIdObj = list.get(0).get("batch_id");
|
|
||||||
if (batchIdObj == null) {
|
|
||||||
throw new IllegalStateException("batch_id not found in response");
|
|
||||||
}
|
|
||||||
|
|
||||||
return Long.valueOf(batchIdObj.toString());
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Failed to parse inference response. body={}", result.body(), e);
|
|
||||||
throw new CustomApiException("INVALID_INFERENCE_RESPONSE", HttpStatus.BAD_GATEWAY);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 모델정보 조회 dto 생성 후 반환
|
|
||||||
*
|
|
||||||
* @param uuid
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
private InferenceSendDto getModelInfo(UUID uuid) {
|
|
||||||
|
|
||||||
Basic modelInfo = modelMngCoreService.findByModelUuid(uuid);
|
|
||||||
|
|
||||||
String cdModelPath = "";
|
|
||||||
String cdModelConfigPath = "";
|
|
||||||
String cdClsModelPath = "";
|
|
||||||
|
|
||||||
if (modelInfo.getCdModelPath() != null && modelInfo.getCdModelFileName() != null) {
|
|
||||||
cdModelPath =
|
|
||||||
Paths.get(modelInfo.getCdModelPath(), modelInfo.getCdModelFileName()).toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (modelInfo.getCdModelConfig() != null && modelInfo.getCdModelConfigFileName() != null) {
|
|
||||||
cdModelConfigPath =
|
|
||||||
Paths.get(modelInfo.getCdModelConfig(), modelInfo.getCdModelConfigFileName()).toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (modelInfo.getClsModelPath() != null && modelInfo.getClsModelFileName() != null) {
|
|
||||||
cdClsModelPath =
|
|
||||||
Paths.get(modelInfo.getClsModelPath(), modelInfo.getClsModelFileName()).toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
String modelType = "";
|
|
||||||
|
|
||||||
if (modelInfo.getModelType().equals(ModelType.G1.getId())) {
|
|
||||||
modelType = ModelType.G1.getId();
|
|
||||||
} else if (modelInfo.getModelType().equals(ModelType.G2.getId())) {
|
|
||||||
modelType = ModelType.G2.getId();
|
|
||||||
} else {
|
|
||||||
modelType = ModelType.G3.getId();
|
|
||||||
}
|
|
||||||
|
|
||||||
InferenceSendDto sendDto = new InferenceSendDto();
|
|
||||||
sendDto.setModel_version(modelInfo.getModelVer());
|
|
||||||
sendDto.setCd_model_path(cdModelPath);
|
|
||||||
sendDto.setCd_model_config(cdModelConfigPath);
|
|
||||||
sendDto.setCls_model_path(cdClsModelPath);
|
|
||||||
sendDto.setCls_model_version(modelInfo.getModelVer());
|
|
||||||
sendDto.setCd_model_type(modelType);
|
|
||||||
sendDto.setPriority(modelInfo.getPriority());
|
|
||||||
return sendDto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,6 +7,7 @@ import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.ImageFeature;
|
|||||||
import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.Scene;
|
import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.Scene;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.DetectOption;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.DetectOption;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetFallbackYearDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope;
|
||||||
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
|
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
|
||||||
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListCompareDto;
|
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListCompareDto;
|
||||||
@@ -24,6 +25,7 @@ import java.nio.file.Files;
|
|||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -31,6 +33,7 @@ import java.util.Map;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
@@ -309,6 +312,95 @@ public class MapSheetMngCoreService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 년도별로 추론 실행에 필요한 geojson 파일 생성
|
||||||
|
*
|
||||||
|
* @param yearDtos
|
||||||
|
* @param yyyy
|
||||||
|
* @param mapSheetScope
|
||||||
|
* @param detectOption
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public Scene getSceneInference(
|
||||||
|
List<MapSheetFallbackYearDto> yearDtos,
|
||||||
|
String yyyy,
|
||||||
|
String mapSheetScope,
|
||||||
|
String detectOption) {
|
||||||
|
Map<String, Object> result = new HashMap<>();
|
||||||
|
boolean isAll = MapSheetScope.ALL.getId().equals(mapSheetScope);
|
||||||
|
|
||||||
|
String optionSuffix = "";
|
||||||
|
if (DetectOption.EXCL.getId().equals(detectOption)) {
|
||||||
|
optionSuffix = "_EXCL";
|
||||||
|
} else if (DetectOption.PREV.getId().equals(detectOption)) {
|
||||||
|
optionSuffix = "_PREV";
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1) 경로/파일명 결정
|
||||||
|
String targetDir =
|
||||||
|
"local".equals(activeEnv) ? System.getProperty("user.home") + "/geojson" : inferenceDir;
|
||||||
|
|
||||||
|
String filename =
|
||||||
|
isAll
|
||||||
|
? String.format("%s_%s_ALL%s.geojson", yyyy, activeEnv, optionSuffix)
|
||||||
|
: String.format("%s_%s%s.geojson", yyyy, activeEnv, optionSuffix);
|
||||||
|
|
||||||
|
Path outputPath = Paths.get(targetDir, filename);
|
||||||
|
|
||||||
|
// 3) 데이터 조회
|
||||||
|
Map<Integer, List<MapSheetFallbackYearDto>> groupedByYear =
|
||||||
|
yearDtos.stream().collect(Collectors.groupingBy(MapSheetFallbackYearDto::getMngYyyy));
|
||||||
|
|
||||||
|
List<ImageFeature> sceneInference = new ArrayList<>();
|
||||||
|
|
||||||
|
// 년도별로 루프 돌리기
|
||||||
|
for (Map.Entry<Integer, List<MapSheetFallbackYearDto>> entry : groupedByYear.entrySet()) {
|
||||||
|
|
||||||
|
Integer compareYear = entry.getKey();
|
||||||
|
List<MapSheetFallbackYearDto> listByYear = entry.getValue();
|
||||||
|
|
||||||
|
// 도엽번호만 추출
|
||||||
|
List<String> sheetNums =
|
||||||
|
listByYear.stream().map(MapSheetFallbackYearDto::getMapSheetNum).toList();
|
||||||
|
|
||||||
|
List<ImageFeature> tempSceneInference =
|
||||||
|
mapSheetMngRepository.getSceneInference(compareYear.toString(), sheetNums);
|
||||||
|
tempSceneInference.addAll(sceneInference);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sceneInference == null || sceneInference.isEmpty()) {
|
||||||
|
log.warn("NOT_FOUND_TARGET_YEAR: yyyy={}, isAll={}, scenesSize={}", yyyy, isAll, 0);
|
||||||
|
throw new CustomApiException("NOT_FOUND_TARGET_YEAR", HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4) 파일 생성
|
||||||
|
try {
|
||||||
|
log.info("create Directories outputPath: {}", outputPath);
|
||||||
|
log.info(
|
||||||
|
"activeEnv={}, inferenceDir={}, targetDir={}, filename={}",
|
||||||
|
activeEnv,
|
||||||
|
inferenceDir,
|
||||||
|
targetDir,
|
||||||
|
filename);
|
||||||
|
log.info("outputPath={}, parent={}", outputPath.toAbsolutePath(), outputPath.getParent());
|
||||||
|
Files.createDirectories(outputPath.getParent());
|
||||||
|
|
||||||
|
new GeoJsonFileWriter()
|
||||||
|
.exportToFile(sceneInference, "scene_inference_" + yyyy, 5186, outputPath.toString());
|
||||||
|
log.info("GeoJsonFileWriter: {}", "scene_inference_" + yyyy);
|
||||||
|
Scene scene = new Scene();
|
||||||
|
scene.setFeatures(sceneInference);
|
||||||
|
scene.setFilePath(outputPath.toString());
|
||||||
|
|
||||||
|
return scene;
|
||||||
|
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.error(
|
||||||
|
"FAIL_CREATE_MAP_SHEET_FILE: yyyy={}, isAll={}, path={}", yyyy, isAll, outputPath, e);
|
||||||
|
throw new CustomApiException("INTERNAL_SERVER_ERROR", HttpStatus.INTERNAL_SERVER_ERROR, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 변화탐지 실행 가능 기준 년도 조회
|
* 변화탐지 실행 가능 기준 년도 조회
|
||||||
*
|
*
|
||||||
@@ -343,8 +435,24 @@ public class MapSheetMngCoreService {
|
|||||||
return mapSheetMngYearRepository.findByHstMapSheetCompareList(mngYyyy, mapId);
|
return mapSheetMngYearRepository.findByHstMapSheetCompareList(mngYyyy, mapId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<String> getMapSheetMngHst(Integer year) {
|
public List<String> getMapSheetNumByHst(Integer year) {
|
||||||
List<MapSheetMngHstEntity> entity = mapSheetMngRepository.getMapSheetMngHst(year);
|
List<MapSheetMngHstEntity> entity = mapSheetMngRepository.getMapSheetMngHst(year);
|
||||||
return entity.stream().map(MapSheetMngHstEntity::getMapSheetNum).toList();
|
return entity.stream().map(MapSheetMngHstEntity::getMapSheetNum).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<MapSheetFallbackYearDto> getMapSheetNumDtoByHst(Integer year) {
|
||||||
|
List<MapSheetMngHstEntity> entity = mapSheetMngRepository.getMapSheetMngHst(year);
|
||||||
|
return entity.stream()
|
||||||
|
.map(
|
||||||
|
e ->
|
||||||
|
new MapSheetFallbackYearDto(
|
||||||
|
e.getMapSheetNum(), e.getMngYyyy() // 조회 기준 연도
|
||||||
|
))
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<MapSheetFallbackYearDto> findFallbackCompareYearByMapSheets(
|
||||||
|
Integer year, List<String> mapIds) {
|
||||||
|
return mapSheetMngRepository.findFallbackCompareYearByMapSheets(year, mapIds);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.postgres.repository.mapsheet;
|
|||||||
|
|
||||||
import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.ImageFeature;
|
import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.ImageFeature;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetFallbackYearDto;
|
||||||
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
|
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
|
||||||
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.AddReq;
|
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.AddReq;
|
||||||
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListDto;
|
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListDto;
|
||||||
@@ -82,4 +83,7 @@ public interface MapSheetMngRepositoryCustom {
|
|||||||
void insertMapSheetMngTile(@Valid AddReq addReq);
|
void insertMapSheetMngTile(@Valid AddReq addReq);
|
||||||
|
|
||||||
List<MapSheetMngHstEntity> getMapSheetMngHst(Integer year);
|
List<MapSheetMngHstEntity> getMapSheetMngHst(Integer year);
|
||||||
|
|
||||||
|
List<MapSheetFallbackYearDto> findFallbackCompareYearByMapSheets(
|
||||||
|
Integer year, List<String> mapIds);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,12 +5,14 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngEntity.mapSheet
|
|||||||
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngFileEntity.mapSheetMngFileEntity;
|
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngFileEntity.mapSheetMngFileEntity;
|
||||||
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngHstEntity.mapSheetMngHstEntity;
|
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngHstEntity.mapSheetMngHstEntity;
|
||||||
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngTileEntity.mapSheetMngTileEntity;
|
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngTileEntity.mapSheetMngTileEntity;
|
||||||
|
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngYearYnEntity.mapSheetMngYearYnEntity;
|
||||||
import static com.kamco.cd.kamcoback.postgres.entity.QYearEntity.yearEntity;
|
import static com.kamco.cd.kamcoback.postgres.entity.QYearEntity.yearEntity;
|
||||||
import static com.querydsl.core.types.dsl.Expressions.nullExpression;
|
import static com.querydsl.core.types.dsl.Expressions.nullExpression;
|
||||||
|
|
||||||
import com.kamco.cd.kamcoback.common.enums.CommonUseStatus;
|
import com.kamco.cd.kamcoback.common.enums.CommonUseStatus;
|
||||||
import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.ImageFeature;
|
import com.kamco.cd.kamcoback.common.geometry.GeoJsonFileWriter.ImageFeature;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetFallbackYearDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope;
|
||||||
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
|
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
|
||||||
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.AddReq;
|
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.AddReq;
|
||||||
@@ -1119,4 +1121,24 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
|
|||||||
.and(mapSheetMngFileEntity.fileExt.eq("tif")))
|
.and(mapSheetMngFileEntity.fileExt.eq("tif")))
|
||||||
.fetch();
|
.fetch();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<MapSheetFallbackYearDto> findFallbackCompareYearByMapSheets(
|
||||||
|
Integer year, List<String> mapIds) {
|
||||||
|
BooleanBuilder builder = new BooleanBuilder();
|
||||||
|
builder.and(mapSheetMngYearYnEntity.id.mapSheetNum.in(mapIds));
|
||||||
|
builder.and(mapSheetMngYearYnEntity.id.mngYyyy.lt(year));
|
||||||
|
builder.and(mapSheetMngYearYnEntity.yn.eq("Y"));
|
||||||
|
|
||||||
|
return queryFactory
|
||||||
|
.select(
|
||||||
|
Projections.constructor(
|
||||||
|
MapSheetFallbackYearDto.class,
|
||||||
|
mapSheetMngYearYnEntity.id.mapSheetNum,
|
||||||
|
mapSheetMngYearYnEntity.id.mngYyyy.max()))
|
||||||
|
.from(mapSheetMngYearYnEntity)
|
||||||
|
.where(builder)
|
||||||
|
.groupBy(mapSheetMngYearYnEntity.id.mapSheetNum)
|
||||||
|
.fetch();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user