diff --git a/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.bin b/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.bin index 036dbfa..20041b4 100644 Binary files a/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.bin and b/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.bin differ diff --git a/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.lock b/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.lock index 9b406d3..5d85d48 100644 Binary files a/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.lock and b/gukyuin/stblt-check/.gradle/8.14/executionHistory/executionHistory.lock differ diff --git a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin index 69eef77..0422740 100644 Binary files a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin and b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.bin differ diff --git a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock index 4a5b15a..8e5df33 100644 Binary files a/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock and b/gukyuin/stblt-check/.gradle/8.14/fileHashes/fileHashes.lock differ diff --git a/gukyuin/stblt-check/.gradle/8.14/fileHashes/resourceHashesCache.bin b/gukyuin/stblt-check/.gradle/8.14/fileHashes/resourceHashesCache.bin index e5906a8..13d24f8 100644 Binary files a/gukyuin/stblt-check/.gradle/8.14/fileHashes/resourceHashesCache.bin and b/gukyuin/stblt-check/.gradle/8.14/fileHashes/resourceHashesCache.bin differ diff --git a/gukyuin/stblt-check/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/gukyuin/stblt-check/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 46fc264..1db6bc0 100644 Binary files a/gukyuin/stblt-check/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/gukyuin/stblt-check/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/gukyuin/stblt-check/.gradle/file-system.probe b/gukyuin/stblt-check/.gradle/file-system.probe index 1090183..a8df0b5 100644 Binary files a/gukyuin/stblt-check/.gradle/file-system.probe and b/gukyuin/stblt-check/.gradle/file-system.probe differ diff --git a/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.class b/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.class index e48ea2b..a4eb495 100644 Binary files a/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.class and b/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.class differ diff --git a/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.class b/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.class index a7c28c8..00cf91a 100644 Binary files a/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.class and b/gukyuin/stblt-check/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.class differ diff --git a/gukyuin/stblt-check/build/libs/stblt-check.jar b/gukyuin/stblt-check/build/libs/stblt-check.jar index bcb0ac9..72bc312 100644 Binary files a/gukyuin/stblt-check/build/libs/stblt-check.jar and b/gukyuin/stblt-check/build/libs/stblt-check.jar differ diff --git a/gukyuin/stblt-check/build/tmp/compileJava/previous-compilation-data.bin b/gukyuin/stblt-check/build/tmp/compileJava/previous-compilation-data.bin index 6b69933..1f5d8ad 100644 Binary files a/gukyuin/stblt-check/build/tmp/compileJava/previous-compilation-data.bin and b/gukyuin/stblt-check/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.java b/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.java index ef23816..927f7c6 100644 --- a/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.java +++ b/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinStbltJobRepositoryImpl.java @@ -98,9 +98,9 @@ public class GukYuinStbltJobRepositoryImpl implements GukYuinStbltJobRepositoryC .update(mapSheetAnalDataInferenceGeomEntity) .set( mapSheetAnalDataInferenceGeomEntity.fitState, - stbResult.getStbltYn().equals("Y") + stbResult.getStbltYn().equals("N") ? ImageryFitStatus.UNFIT.getId() - : ImageryFitStatus.FIT.getId()) // 적합여부가 Y 이면 부적합인 것, N 이면 적합한 것이라고 함 + : ImageryFitStatus.FIT.getId()) // 적합여부가 N 이면 부적합인 것, Y 이면 적합한 것이라고 함 .set(mapSheetAnalDataInferenceGeomEntity.fitStateDttm, ZonedDateTime.now()) .set(mapSheetAnalDataInferenceGeomEntity.fitStateCmmnt, stbResult.getIncyCmnt()) .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(resultUid)) diff --git a/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.java b/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.java index c18ac2b..5dc095c 100644 --- a/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.java +++ b/gukyuin/stblt-check/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiStbltJobService.java @@ -183,18 +183,21 @@ public class GukYuinApiStbltJobService { resultUid, pnuList == null ? 0 : pnuList.size()); - boolean hasY = pnuList.stream().anyMatch(v -> "Y".equals(v.getStbltYn())); - String fitYn = hasY ? "Y" : "N"; + boolean hasN = pnuList.stream().anyMatch(v -> "N".equals(v.getStbltYn())); + String fitYn = hasN ? "N" : "Y"; + log.info("=== 한 객체에 여러 개 pnu 있을 때, 하나라도 부적합 N이 있으면 N"); + log.info("=== N이 없으면 적합 Y"); + log.info("=== 적합여부 fitYn={}", fitYn); RlbDtctMastDto selected = - hasY + hasN ? pnuList.stream() - .filter(v -> "Y".equals(v.getStbltYn())) + .filter(v -> "N".equals(v.getStbltYn())) .findFirst() .orElse(null) : pnuList.stream() - .filter(v -> "N".equals(v.getStbltYn())) + .filter(v -> "Y".equals(v.getStbltYn())) .findFirst() .orElse(null);