MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

추론결과 상세 geom-list 분석도엽 검색 like 로 수정

Browse Source
This commit is contained in:
Gina(박가연)
2026-01-19 17:55:50 +09:00
parent 1d910a22f9
commit c8cb64fbea
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java
View File

@@ -386,7 +386,7 @@ public class InferenceResultApiController {
@Parameter(description = "비교년도 분류", example = "waste") @RequestParam(required = false) @Parameter(description = "비교년도 분류", example = "waste") @RequestParam(required = false)
String compareClass, String compareClass,
@Parameter(description = "5000:1 도엽번호 37801011,37801012") @RequestParam(required = false) @Parameter(description = "5000:1 도엽번호 37801011,37801012") @RequestParam(required = false)
List<Long> mapSheetNum, Long mapSheetNum,
@Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0") @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
int page, int page,
@Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20") @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")

3
src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiV2Controller.java
View File

@@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
@@ -50,7 +49,7 @@ public class InferenceResultApiV2Controller {
@Parameter(description = "비교년도 분류", example = "waste") @RequestParam(required = false) @Parameter(description = "비교년도 분류", example = "waste") @RequestParam(required = false)
String compareClass, String compareClass,
@Parameter(description = "5000:1 도협번호 37801011,37801012") @RequestParam(required = false) @Parameter(description = "5000:1 도협번호 37801011,37801012") @RequestParam(required = false)
List<Long> mapSheetNum, Long mapSheetNum,
@Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0") @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
int page, int page,
@Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20") @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")

2
src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java
View File

@@ -384,7 +384,7 @@ public class InferenceDetailDto {
// 비교년도 // 비교년도
private String compareClass; private String compareClass;
// 분석도엽 // 분석도엽
private List<Long> mapSheetNum; private Long mapSheetNum;
// 페이징 파라미터 // 페이징 파라미터
private int page = 0; private int page = 0;

11
src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetAnalDataInferenceRepositoryImpl.java
View File

@@ -1,5 +1,6 @@
package com.kamco.cd.kamcoback.postgres.repository.Inference; package com.kamco.cd.kamcoback.postgres.repository.Inference;
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto; import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto;
@@ -252,9 +253,9 @@ public class MapSheetAnalDataInferenceRepositoryImpl
} }
// 분석도엽 // 분석도엽
if (searchGeoReq.getMapSheetNum() != null && !searchGeoReq.getMapSheetNum().isEmpty()) { if (searchGeoReq.getMapSheetNum() != null) {
List<Long> mapSheetNum = searchGeoReq.getMapSheetNum(); Long mapSheetNum = searchGeoReq.getMapSheetNum();
builder.and(MapSheetAnalDataInferenceGeomEntity.mapSheetNum.in(mapSheetNum)); builder.and(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.like("%" + mapSheetNum + "%"));
} }
List<InferenceDetailDto.Geom> content = List<InferenceDetailDto.Geom> content =
@@ -368,8 +369,8 @@ public class MapSheetAnalDataInferenceRepositoryImpl
} }
private BooleanExpression containsMapSheetNum( private BooleanExpression containsMapSheetNum(
QMapSheetAnalDataInferenceGeomEntity detectedEntity, List<Long> mapSheet) { QMapSheetAnalDataInferenceGeomEntity detectedEntity, Long mapSheet) {
if (mapSheet == null || mapSheet.isEmpty()) { if (mapSheet == null) {
return null; return null;
} }

6
src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java
View File

@@ -391,9 +391,9 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
} }
// 분석도엽 // 분석도엽
if (searchGeoReq.getMapSheetNum() != null && !searchGeoReq.getMapSheetNum().isEmpty()) { if (searchGeoReq.getMapSheetNum() != null) {
List<Long> mapSheetNum = searchGeoReq.getMapSheetNum(); Long mapSheetNum = searchGeoReq.getMapSheetNum();
builder.and(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.in(mapSheetNum)); builder.and(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.like("%" + mapSheetNum + "%"));
} }
List<Geom> content = List<Geom> content =