Merge pull request '국유인 연동 경로 확인 TEST' (#52) from feat/infer_dev_260107 into develop

Reviewed-on: #52

src/main/java/com/kamco/cd/kamcoback/gukyuin/dto/ChngDetectContDto.java

@@ -124,7 +124,7 @@ public class ChngDetectContDto {
 
     private Integer code;
     private String message;
-    private List<Boolean> result;
+    private DtoPnuDetectMpng result;
     private Boolean success;
   }
 

src/main/java/com/kamco/cd/kamcoback/gukyuin/service/GukYuinApiService.java

@@ -456,6 +456,9 @@ public class GukYuinApiService {
     Integer maxStage =
         gukyuinCoreService.findMapSheetLearnYearStage(info.getCompareYyyy(), info.getTargetYyyy());
 
+    // TODO : 1회차를 종료 상태로 처리하고 2회차를 보내야 함
+    // TODO : learn, inference 둘다 종료 처리
+
     // reqDto 셋팅
     ChnDetectMastReqDto reqDto = new ChnDetectMastReqDto();
     reqDto.setCprsYr(String.valueOf(info.getCompareYyyy()));
@@ -464,18 +467,22 @@ public class GukYuinApiService {
     reqDto.setChnDtctId(info.getUid());
     reqDto.setPathNm("/kamco-nfs/dataset/export/" + info.getUid());
 
+    log.info("### path : " + Path.of("/kamco-nfs/dataset/export/" + info.getUid()));
+    log.info(
+        "#### isDirectory : "
+            + Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid())));
     if (Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid()))) {
       return new ResponseObj(
           ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다.");
     }
 
     // 국유인 /chn/mast/regist 전송
-    ChngDetectMastDto.RegistResDto result = this.regist(reqDto);
-    if (result.getSuccess()) {
-      return new ResponseObj(ApiResponseCode.OK, "연동되었습니다.");
-    } else {
-      return new ResponseObj(ApiResponseCode.INTERNAL_SERVER_ERROR, result.getMessage());
-    }
+    //    ChngDetectMastDto.RegistResDto result = this.regist(reqDto);
+    //    if (result.getSuccess()) {
+    return new ResponseObj(ApiResponseCode.OK, "연동되었습니다.");
+    //    } else {
+    //      return new ResponseObj(ApiResponseCode.INTERNAL_SERVER_ERROR, result.getMessage());
+    //    }
   }
 
   public List<LabelSendDto> findLabelingCompleteSendList(LocalDate yesterday) {

src/main/java/com/kamco/cd/kamcoback/postgres/repository/gukyuin/GukYuinPnuJobRepositoryImpl.java

@@ -53,8 +53,9 @@ public class GukYuinPnuJobRepositoryImpl implements GukYuinPnuJobRepositoryCusto
       if (entity == null) {
         queryFactory
             .insert(pnuEntity)
-            .columns(pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm)
-            .values(geoUid, pnu, ZonedDateTime.now())
+            .columns(
+                pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm, pnuEntity.chnDtctObjtId)
+            .values(geoUid, pnu, ZonedDateTime.now(), chnDtctObjtId)
             .execute();
       }
     }