Merge pull request 'feat/infer_dev_260107' (#250) from feat/infer_dev_260107 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/250
This commit is contained in:
@@ -367,7 +367,7 @@ public class InferenceResultApiController {
|
|||||||
public ApiResponseDto<Page<InferenceDetailDto.Geom>> getInferenceGeomList(
|
public ApiResponseDto<Page<InferenceDetailDto.Geom>> getInferenceGeomList(
|
||||||
@Parameter(description = "회차 uuid", example = "8584e8d4-53b3-4582-bde2-28a81495a626")
|
@Parameter(description = "회차 uuid", example = "8584e8d4-53b3-4582-bde2-28a81495a626")
|
||||||
@RequestParam(required = true)
|
@RequestParam(required = true)
|
||||||
String uuid,
|
UUID uuid,
|
||||||
@Parameter(description = "기준년도 분류", example = "land") @RequestParam(required = false)
|
@Parameter(description = "기준년도 분류", example = "land") @RequestParam(required = false)
|
||||||
String targetClass,
|
String targetClass,
|
||||||
@Parameter(description = "비교년도 분류", example = "waste") @RequestParam(required = false)
|
@Parameter(description = "비교년도 분류", example = "waste") @RequestParam(required = false)
|
||||||
|
|||||||
@@ -502,7 +502,7 @@ public class InferenceResultService {
|
|||||||
return inferenceResultCoreService.getInferenceClassCountList(uuid);
|
return inferenceResultCoreService.getInferenceClassCountList(uuid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Page<Geom> getInferenceGeomList(String uuid, SearchGeoReq searchGeoReq) {
|
public Page<Geom> getInferenceGeomList(UUID uuid, SearchGeoReq searchGeoReq) {
|
||||||
return inferenceResultCoreService.getInferenceGeomList(uuid, searchGeoReq);
|
return inferenceResultCoreService.getInferenceGeomList(uuid, searchGeoReq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -411,7 +411,7 @@ public class InferenceResultCoreService {
|
|||||||
return mapSheetLearnRepository.getInferenceClassCountList(uuid);
|
return mapSheetLearnRepository.getInferenceClassCountList(uuid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Page<Geom> getInferenceGeomList(String uuid, SearchGeoReq searchGeoReq) {
|
public Page<Geom> getInferenceGeomList(UUID uuid, SearchGeoReq searchGeoReq) {
|
||||||
return mapSheetLearnRepository.getInferenceGeomList(uuid, searchGeoReq);
|
return mapSheetLearnRepository.getInferenceGeomList(uuid, searchGeoReq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,5 +36,5 @@ public interface MapSheetLearnRepositoryCustom {
|
|||||||
|
|
||||||
List<Dashboard> getInferenceClassCountList(String uuid);
|
List<Dashboard> getInferenceClassCountList(String uuid);
|
||||||
|
|
||||||
Page<Geom> getInferenceGeomList(String uuid, SearchGeoReq searchGeoReq);
|
Page<Geom> getInferenceGeomList(UUID uuid, SearchGeoReq searchGeoReq);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -357,7 +357,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Page<Geom> getInferenceGeomList(String uuid, SearchGeoReq searchGeoReq) {
|
public Page<Geom> getInferenceGeomList(UUID uuid, SearchGeoReq searchGeoReq) {
|
||||||
Pageable pageable = searchGeoReq.toPageable();
|
Pageable pageable = searchGeoReq.toPageable();
|
||||||
BooleanBuilder builder = new BooleanBuilder();
|
BooleanBuilder builder = new BooleanBuilder();
|
||||||
|
|
||||||
@@ -365,7 +365,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
|
|||||||
MapSheetAnalInferenceEntity analEntity =
|
MapSheetAnalInferenceEntity analEntity =
|
||||||
queryFactory
|
queryFactory
|
||||||
.selectFrom(mapSheetAnalInferenceEntity)
|
.selectFrom(mapSheetAnalInferenceEntity)
|
||||||
.where(mapSheetAnalInferenceEntity.uuid.eq(UUID.fromString(uuid)))
|
.where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
|
||||||
.fetchOne();
|
.fetchOne();
|
||||||
|
|
||||||
if (Objects.isNull(analEntity)) {
|
if (Objects.isNull(analEntity)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user