MVPTeam/kamco-cd-api
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

변화탐지 selected polygon, point 조건 수정

Browse Source
This commit is contained in:
Gina(박가연)
2026-03-04 22:59:59 +09:00
parent 5a3370d5fb
commit 66b78022a9
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java
View File

@@ -401,15 +401,15 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
// pnu가 들어온 경우 // pnu가 들어온 경우
boolean hasPnu = pnu != null && !pnu.isBlank(); boolean hasPnu = pnu != null && !pnu.isBlank();
// pnu 가 없을 때
if (!hasPnu) { if (!hasPnu) {
builder.and( builder.and(
mapSheetAnalDataInferenceGeomEntity mapSheetAnalDataInferenceGeomEntity
.resultUid .resultUid
.eq(chnDtctId) .eq(cdObjectId)
.or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds))); .or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds)));
} }
// List<ChangeDetectionDto.PolygonQueryData> list =
JPAQuery<PolygonQueryData> query = JPAQuery<PolygonQueryData> query =
queryFactory queryFactory
.select( .select(
@@ -436,11 +436,8 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
.on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid)) .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
.innerJoin(mapSheetLearnEntity) .innerJoin(mapSheetLearnEntity)
.on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId)); .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId));
// .where(builder)
// .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc());
// .fetch();
// 🔥 pnu 조건이면 tb_pnu join 추가 // pnu 조건이면 tb_pnu join 추가
if (hasPnu) { if (hasPnu) {
query query
.innerJoin(pnuEntity) .innerJoin(pnuEntity)
@@ -499,15 +496,15 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
// pnu가 들어온 경우 // pnu가 들어온 경우
boolean hasPnu = pnu != null && !pnu.isBlank(); boolean hasPnu = pnu != null && !pnu.isBlank();
// pnu 가 없을 때
if (!hasPnu) { if (!hasPnu) {
builder.and( builder.and(
mapSheetAnalDataInferenceGeomEntity mapSheetAnalDataInferenceGeomEntity
.resultUid .resultUid
.eq(chnDtctId) .eq(cdObjectId)
.or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds))); .or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds)));
} }
// List<ChangeDetectionDto.PointQueryData> list =
JPAQuery<PointQueryData> query = JPAQuery<PointQueryData> query =
queryFactory queryFactory
.select( .select(
@@ -528,10 +525,8 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
.on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid)) .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
.innerJoin(mapSheetLearnEntity) .innerJoin(mapSheetLearnEntity)
.on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId)); .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId));
// .where(builder)
// .fetch();
// 🔥 pnu 조건이면 tb_pnu join 추가 // pnu 조건이면 tb_pnu join 추가
if (hasPnu) { if (hasPnu) {
query query
.innerJoin(pnuEntity) .innerJoin(pnuEntity)