Merge pull request 'feat/infer_dev_260107' (#45) from feat/infer_dev_260107 into develop

Reviewed-on: #45

Dockerfile-prod

@@ -0,0 +1,24 @@
+# 1단계에서 만든 로컬 베이스 이미지를 사용
+FROM 192.168.2.73:18082/kamco-cd/base-java21-gdal:1.0
+FROM 192.168.2.73:18082/kamco-cd/base-java21-gdal:1.0
+
+# 사용자 설정 (앱 별로 다를 수 있으므로 여기에 유지)
+ARG UID=1000
+ARG GID=1000
+
+RUN groupadd -g ${GID} kcomu \
+ && useradd -u ${UID} -g ${GID} -m kcomu
+
+USER kcomu
+
+# 작업 디렉토리 설정
+WORKDIR /app
+
+# JAR 파일 복사 (Jenkins에서 빌드된 ROOT.jar)
+COPY build/libs/ROOT.jar app.jar
+
+# 포트 노출
+EXPOSE 8080
+# 애플리케이션 실행
+# dev 프로파일로 실행
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "app.jar"]

docker-compose-prod.yml

@@ -0,0 +1,35 @@
+services:
+  kamco-changedetection-api:
+    build:
+      context: .
+      dockerfile: Dockerfile-prod
+      args:
+        UID: 1000        # manager01 UID
+        GID: 1000        # manager01 GID
+    image: kamco-changedetection-api:${IMAGE_TAG:-latest}
+    container_name: kamco-changedetection-api
+    user: "1000:1000"
+    ports:
+      - "7100:8080"
+    environment:
+      - SPRING_PROFILES_ACTIVE=dev
+      - TZ=Asia/Seoul
+    volumes:
+      - /mnt/nfs_share/images:/app/original-images
+      - /mnt/nfs_share/model_output:/app/model-outputs
+      - /mnt/nfs_share/train_dataset:/app/train-dataset
+      - /mnt/nfs_share/tmp:/app/tmp
+      - /kamco-nfs:/kamco-nfs
+    networks:
+      - kamco-cds
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:8080/monitor/health" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 40s
+
+networks:
+  kamco-cds:
+    external: true

src/main/java/com/kamco/cd/kamcoback/gukyuin/GukYuinApiController.java

@@ -11,11 +11,6 @@ import com.kamco.cd.kamcoback.gukyuin.dto.DetectMastDto.Basic;
 import com.kamco.cd.kamcoback.gukyuin.dto.DetectMastDto.DetectMastReq;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkableRes;
 import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
-import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiLabelJobService;
-import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiPnuJobService;
-import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiStatusJobService;
-import com.kamco.cd.kamcoback.scheduler.service.GukYuinApiStbltJobService;
-import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -43,10 +38,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class GukYuinApiController {
 
   private final GukYuinApiService gukYuinApiService;
-  private final GukYuinApiPnuJobService gukYuinApiPnuJobService;
-  private final GukYuinApiStatusJobService gukYuinApiStatusJobService;
-  private final GukYuinApiLabelJobService gukYuinApiLabelJobService;
-  private final GukYuinApiStbltJobService gukYuinApiStbltJobService;
 
   /** 탐지결과 등록 */
   @Operation(summary = "탐지결과 등록", description = "탐지결과 등록")
@@ -270,7 +261,7 @@ public class GukYuinApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   @PostMapping("/rlb/objt/{chnDtctObjtId}/lbl/{lblYn}")
-  public ApiResponseDto<ChngDetectContDto.ResultLabelDto> updateChnDtctObjtLabelingYn(
+  public ApiResponseDto<ChngDetectContDto.ResultPnuDto> updateChnDtctObjtLabelingYn(
       @PathVariable String chnDtctObjtId, @PathVariable String lblYn) {
     return ApiResponseDto.ok(gukYuinApiService.updateChnDtctObjtLabelingYn(chnDtctObjtId, lblYn));
   }
@@ -306,10 +297,8 @@ public class GukYuinApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   public ApiResponseDto<ChngDetectMastDto.RlbDtctDto> findRlbDtctList(
-      @PathVariable String chnDtctId,
-      @Parameter(description = "날짜(기본은 어제 날짜)") @RequestParam(defaultValue = "20260205")
-          String yyyymmdd) {
-    return ApiResponseDto.ok(gukYuinApiService.findRlbDtctList(chnDtctId, yyyymmdd));
+      @PathVariable String chnDtctId) {
+    return ApiResponseDto.ok(gukYuinApiService.findRlbDtctList(chnDtctId));
   }
 
   @Operation(summary = "탐지객체 적합여부 조회 (객체별 조회)", description = "탐지객체 적합여부 조회 (객체별 조회)")
@@ -330,36 +319,4 @@ public class GukYuinApiController {
       @PathVariable String chnDtctObjtId) {
     return ApiResponseDto.ok(gukYuinApiService.findRlbDtctObject(chnDtctObjtId));
   }
-
-  @Hidden
-  @Operation(summary = "job test pnu", description = "job test pnu")
-  @GetMapping("/job-test/pnu")
-  public ApiResponseDto<Void> findGukYuinContListPnuUpdate() {
-    gukYuinApiPnuJobService.findGukYuinContListPnuUpdate();
-    return ApiResponseDto.ok(null);
-  }
-
-  @Hidden
-  @Operation(summary = "job test status", description = "job test status")
-  @GetMapping("/job-test/status")
-  public ApiResponseDto<Void> findGukYuinMastCompleteYn() {
-    gukYuinApiStatusJobService.findGukYuinMastCompleteYn();
-    return ApiResponseDto.ok(null);
-  }
-
-  @Hidden
-  @Operation(summary = "job test label", description = "job test label")
-  @GetMapping("/job-test/label")
-  public ApiResponseDto<Void> findLabelingCompleteSend() {
-    gukYuinApiLabelJobService.findLabelingCompleteSend();
-    return ApiResponseDto.ok(null);
-  }
-
-  @Hidden
-  @Operation(summary = "job test stblt", description = "job test stblt")
-  @GetMapping("/job-test/stblt")
-  public ApiResponseDto<Void> findGukYuinEligibleForSurvey() {
-    gukYuinApiStbltJobService.findGukYuinEligibleForSurvey();
-    return ApiResponseDto.ok(null);
-  }
 }

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

@@ -114,27 +114,4 @@ public class ChngDetectContDto {
     private List<DtoPnuDetectMpng> result;
     private Boolean success;
   }
-
-  @Schema(name = "ResultLabelDto", description = "ResultLabelDto list 리턴 형태")
-  @Getter
-  @Setter
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class ResultLabelDto {
-
-    private Integer code;
-    private String message;
-    private DtoPnuDetectMpng result;
-    private Boolean success;
-  }
-
-  @Getter
-  @Setter
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class ReqInfo {
-
-    private String reqIp;
-    private String reqEpno;
-  }
 }

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

@@ -11,7 +11,6 @@ import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient;
 import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ContBasic;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ReqInfo;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ResultContDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto.ResultPnuDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto;
@@ -333,21 +332,17 @@ public class GukYuinApiService {
     return result.body();
   }
 
-  public ChngDetectContDto.ResultLabelDto updateChnDtctObjtLabelingYn(
+  public ChngDetectContDto.ResultPnuDto updateChnDtctObjtLabelingYn(
       String chnDtctObjtId, String lblYn) {
     String url = gukyuinCdiUrl + "/rlb/objt/" + chnDtctObjtId + "/lbl/" + lblYn;
 
-    ReqInfo info = new ReqInfo();
-    info.setReqIp(myip);
-    info.setReqEpno(userUtil.getEmployeeNo());
-
-    ExternalCallResult<ChngDetectContDto.ResultLabelDto> result =
+    ExternalCallResult<ChngDetectContDto.ResultPnuDto> result =
         externalHttpClient.call(
             url,
             HttpMethod.POST,
-            info,
+            null,
             netUtils.jsonHeaders(),
-            ChngDetectContDto.ResultLabelDto.class);
+            ChngDetectContDto.ResultPnuDto.class);
 
     this.insertGukyuinAuditLog(
         EventType.MODIFIED.getId(),
@@ -456,25 +451,15 @@ public class GukYuinApiService {
     Integer maxStage =
         gukyuinCoreService.findMapSheetLearnYearStage(info.getCompareYyyy(), info.getTargetYyyy());
 
-    // 1회차를 종료 상태로 처리하고 2회차를 보내야 함
-    // 추론(learn), 학습데이터(inference) 둘 다 종료 처리
-    if (maxStage > 0) {
-      Long learnId =
-          gukyuinCoreService.findMapSheetLearnInfoByYyyy(
-              info.getCompareYyyy(), info.getTargetYyyy(), maxStage);
-      gukyuinCoreService.updateMapSheetLearnGukyuinEndStatus(learnId);
-      gukyuinCoreService.updateMapSheetInferenceLabelEndStatus(learnId);
-    }
-
     // reqDto 셋팅
     ChnDetectMastReqDto reqDto = new ChnDetectMastReqDto();
     reqDto.setCprsYr(String.valueOf(info.getCompareYyyy()));
     reqDto.setCrtrYr(String.valueOf(info.getTargetYyyy()));
     reqDto.setChnDtctSno(String.valueOf(maxStage + 1));
     reqDto.setChnDtctId(info.getUid());
-    reqDto.setPathNm("/kamco-nfs/dataset/export/" + info.getUid());
+    reqDto.setPathNm(datasetDir + info.getUid());
 
-    if (!Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid()))) {
+    if (Files.isDirectory(Path.of(datasetDir + info.getUid()))) {
       return new ResponseObj(
           ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다.");
     }
@@ -528,7 +513,7 @@ public class GukYuinApiService {
     return result.body();
   }
 
-  public ChngDetectMastDto.RlbDtctDto findRlbDtctList(String chnDtctId, String yyyymmdd) {
+  public ChngDetectMastDto.RlbDtctDto findRlbDtctList(String chnDtctId) {
 
     String url =
         gukyuinCdiUrl
@@ -537,9 +522,7 @@ public class GukYuinApiService {
             + "?reqIp="
             + myip
             + "&reqEpno="
-            + userUtil.getEmployeeNo()
-            + "&yyyymmdd="
-            + yyyymmdd;
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectMastDto.RlbDtctDto> result =
         externalHttpClient.call(

src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinCoreService.java

@@ -64,17 +64,4 @@ public class GukYuinCoreService {
   public List<LabelSendDto> findLabelingCompleteSendList(LocalDate yesterday) {
     return gukYuinRepository.findLabelingCompleteSendList(yesterday);
   }
-
-  public Long findMapSheetLearnInfoByYyyy(
-      Integer compareYyyy, Integer targetYyyy, Integer maxStage) {
-    return gukYuinRepository.findMapSheetLearnInfoByYyyy(compareYyyy, targetYyyy, maxStage);
-  }
-
-  public void updateMapSheetLearnGukyuinEndStatus(Long learnId) {
-    gukYuinRepository.updateMapSheetLearnGukyuinEndStatus(learnId);
-  }
-
-  public void updateMapSheetInferenceLabelEndStatus(Long learnId) {
-    gukYuinRepository.updateMapSheetInferenceLabelEndStatus(learnId);
-  }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinJobCoreService.java

@@ -5,7 +5,6 @@ import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
 import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinRepository;
 import java.util.List;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class GukYuinJobCoreService {
@@ -16,7 +15,6 @@ public class GukYuinJobCoreService {
     this.gukYuinRepository = gukYuinRepository;
   }
 
-  @Transactional
   public void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status) {
     gukYuinRepository.updateGukYuinApplyStateComplete(id, status);
   }

src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinLabelJobCoreService.java

@@ -4,7 +4,6 @@ import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
 import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinLabelJobRepository;
 import java.util.List;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class GukYuinLabelJobCoreService {
@@ -19,7 +18,6 @@ public class GukYuinLabelJobCoreService {
     return gukYuinLabelRepository.findYesterdayLabelingCompleteList();
   }
 
-  @Transactional
   public void updateAnalDataInferenceGeomSendDttm(Long geoUid) {
     gukYuinLabelRepository.updateAnalDataInferenceGeomSendDttm(geoUid);
   }

src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinPnuJobCoreService.java

@@ -5,7 +5,6 @@ import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
 import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinPnuJobRepository;
 import java.util.List;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class GukYuinPnuJobCoreService {
@@ -28,7 +27,6 @@ public class GukYuinPnuJobCoreService {
     return gukYuinPnuRepository.upsertMapSheetDataAnalGeomPnu(chnDtctObjtId, pnuList);
   }
 
-  @Transactional
   public void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt) {
     gukYuinPnuRepository.updateInferenceGeomDataPnuCnt(chnDtctObjtId, pnuCnt);
   }
@@ -37,7 +35,6 @@ public class GukYuinPnuJobCoreService {
     return gukYuinPnuRepository.findMapSheetAnalDataInferenceGeomUid(chnDtctObjtId);
   }
 
-  @Transactional
   public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
     gukYuinPnuRepository.insertGeoUidPnuData(geoUid, pnuList, chnDtctObjtId);
   }

src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinStbltJobCoreService.java

@@ -7,7 +7,6 @@ import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinStbltJobReposit
 import java.time.ZonedDateTime;
 import java.util.List;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class GukYuinStbltJobCoreService {
@@ -22,54 +21,47 @@ public class GukYuinStbltJobCoreService {
     return gukYuinStbltRepository.findGukYuinEligibleForSurveyList(status);
   }
 
-  @Transactional
   public void updateGukYuinEligibleForSurvey(String resultUid, RlbDtctMastDto stbltDto) {
-    String chnDtctObjtId = "";
     PnuEntity entity =
         gukYuinStbltRepository.findPnuEntityByResultUid(resultUid, stbltDto.getPnu());
 
-    if (entity != null) {
-      chnDtctObjtId = resultUid;
+    entity.setPnuDtctId(stbltDto.getPnuDtctId());
+    entity.setPnu(stbltDto.getPnu());
+    entity.setLrmSyncYmd(stbltDto.getLrmSyncYmd());
+    entity.setPnuSyncYmd(stbltDto.getPnuSyncYmd());
+    entity.setMpqdNo(stbltDto.getMpqdNo());
+    entity.setCprsYr(stbltDto.getCprsYr());
+    entity.setCrtrYr(stbltDto.getCrtrYr());
+    entity.setChnDtctSno(stbltDto.getChnDtctSno());
+    entity.setChnDtctId(stbltDto.getChnDtctId());
+    entity.setChnDtctMstId(stbltDto.getChnDtctMstId());
+    entity.setChnDtctObjtId(stbltDto.getChnDtctObjtId());
+    entity.setChnDtctContId(stbltDto.getChnDtctContId());
+    entity.setChnCd(stbltDto.getChnCd());
+    entity.setBfClsCd(stbltDto.getBfClsCd());
+    entity.setBfClsProb(stbltDto.getBfClsProb());
+    entity.setAfClsCd(stbltDto.getAfClsCd());
+    entity.setAfClsProb(stbltDto.getAfClsProb());
+    entity.setPnuSqms(stbltDto.getPnuSqms());
+    entity.setPnuDtctSqms(stbltDto.getPnuDtctSqms());
+    entity.setChnDtctSqms(stbltDto.getChnDtctSqms());
+    entity.setStbltYn(stbltDto.getStbltYn());
+    entity.setIncyCd(stbltDto.getIncyCd());
+    entity.setIncyRsnCont(stbltDto.getIncyRsnCont());
+    entity.setLockYn(stbltDto.getLockYn());
+    entity.setLblYn(stbltDto.getLblYn());
+    entity.setChgYn(stbltDto.getChgYn());
+    entity.setRsatctNo(stbltDto.getRsatctNo());
+    entity.setRmk(stbltDto.getRmk());
+    entity.setCrtDt(stbltDto.getCrtDt());
+    entity.setCrtEpno(stbltDto.getCrtEpno());
+    entity.setCrtIp(stbltDto.getCrtIp());
+    entity.setChgDt(stbltDto.getChgDt());
+    entity.setChgEpno(stbltDto.getChgEpno());
+    entity.setChgIp(stbltDto.getChgIp());
+    entity.setDelYn(stbltDto.getDelYn().equals("Y"));
 
-      entity.setPnuDtctId(stbltDto.getPnuDtctId());
-      entity.setPnu(stbltDto.getPnu());
-      entity.setLrmSyncYmd(stbltDto.getLrmSyncYmd());
-      entity.setPnuSyncYmd(stbltDto.getPnuSyncYmd());
-      entity.setMpqdNo(stbltDto.getMpqdNo());
-      entity.setCprsYr(stbltDto.getCprsYr());
-      entity.setCrtrYr(stbltDto.getCrtrYr());
-      entity.setChnDtctSno(stbltDto.getChnDtctSno());
-      entity.setChnDtctId(stbltDto.getChnDtctId());
-      entity.setChnDtctMstId(stbltDto.getChnDtctMstId());
-      entity.setChnDtctObjtId(stbltDto.getChnDtctObjtId());
-      entity.setChnDtctContId(stbltDto.getChnDtctContId());
-      entity.setChnCd(stbltDto.getChnCd());
-      entity.setBfClsCd(stbltDto.getBfClsCd());
-      entity.setBfClsProb(stbltDto.getBfClsProb());
-      entity.setAfClsCd(stbltDto.getAfClsCd());
-      entity.setAfClsProb(stbltDto.getAfClsProb());
-      entity.setPnuSqms(stbltDto.getPnuSqms());
-      entity.setPnuDtctSqms(stbltDto.getPnuDtctSqms());
-      entity.setChnDtctSqms(stbltDto.getChnDtctSqms());
-      entity.setStbltYn(stbltDto.getStbltYn());
-      entity.setIncyCd(stbltDto.getIncyCd());
-      entity.setIncyRsnCont(stbltDto.getIncyRsnCont());
-      entity.setLockYn(stbltDto.getLockYn());
-      entity.setLblYn(stbltDto.getLblYn());
-      entity.setChgYn(stbltDto.getChgYn());
-      entity.setRsatctNo(stbltDto.getRsatctNo());
-      entity.setRmk(stbltDto.getRmk());
-      entity.setCrtDt(stbltDto.getCrtDt());
-      entity.setCrtEpno(stbltDto.getCrtEpno());
-      entity.setCrtIp(stbltDto.getCrtIp());
-      entity.setChgDt(stbltDto.getChgDt());
-      entity.setChgIp(stbltDto.getChgIp());
-      entity.setDelYn(stbltDto.getDelYn().equals("Y"));
-
-      entity.setCreatedDttm(ZonedDateTime.now());
-      gukYuinStbltRepository.save(entity);
-
-      //
-    }
+    entity.setCreatedDttm(ZonedDateTime.now());
+    gukYuinStbltRepository.save(entity);
   }
 }

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

@@ -30,19 +30,13 @@ public class GukYuinLabelJobRepositoryImpl implements GukYuinLabelJobRepositoryC
   public List<GeomUidDto> findYesterdayLabelingCompleteList() {
     ZoneId zone = ZoneId.of("Asia/Seoul");
     ZonedDateTime todayStart = ZonedDateTime.now(zone).toLocalDate().atStartOfDay(zone);
-    ZonedDateTime tomorrowStart = todayStart.plusDays(1);
     ZonedDateTime yesterdayStart = todayStart.minusDays(1);
 
-    //    BooleanExpression isYesterday =
-    //        labelingAssignmentEntity
-    //            .inspectStatDttm
-    //            .goe(yesterdayStart)
-    //            .and(labelingAssignmentEntity.inspectStatDttm.lt(todayStart));
     BooleanExpression isYesterday =
         labelingAssignmentEntity
             .inspectStatDttm
-            .goe(todayStart)
-            .and(labelingAssignmentEntity.inspectStatDttm.lt(tomorrowStart));
+            .goe(yesterdayStart)
+            .and(labelingAssignmentEntity.inspectStatDttm.lt(todayStart));
 
     return queryFactory
         .select(

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

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

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

@@ -39,10 +39,4 @@ public interface GukYuinRepositoryCustom {
   void updateAnalDataInferenceGeomSendDttm(Long geoUid);
 
   List<LabelSendDto> findLabelingCompleteSendList(LocalDate yesterday);
-
-  Long findMapSheetLearnInfoByYyyy(Integer compareYyyy, Integer targetYyyy, Integer maxStage);
-
-  void updateMapSheetLearnGukyuinEndStatus(Long learnId);
-
-  void updateMapSheetInferenceLabelEndStatus(Long learnId);
 }

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

@@ -13,7 +13,6 @@ import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.LearnInfo;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
-import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
 import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
@@ -205,7 +204,6 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
         .update(mapSheetAnalInferenceEntity)
         .set(mapSheetAnalInferenceEntity.gukyuinUsed, "Y")
         .set(mapSheetAnalInferenceEntity.gukyuinApplyDttm, ZonedDateTime.now())
-        .set(mapSheetAnalInferenceEntity.stage, Integer.parseInt(registRes.getChnDtctSno()))
         .where(mapSheetAnalInferenceEntity.learnId.eq(learnId))
         .execute();
   }
@@ -285,39 +283,6 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
         .fetch();
   }
 
-  @Override
-  public Long findMapSheetLearnInfoByYyyy(
-      Integer compareYyyy, Integer targetYyyy, Integer maxStage) {
-    return queryFactory
-        .select(mapSheetLearnEntity.id)
-        .from(mapSheetLearnEntity)
-        .where(
-            mapSheetLearnEntity.compareYyyy.eq(compareYyyy),
-            mapSheetLearnEntity.targetYyyy.eq(targetYyyy),
-            mapSheetLearnEntity.stage.eq(maxStage))
-        .fetchOne();
-  }
-
-  @Override
-  public void updateMapSheetLearnGukyuinEndStatus(Long learnId) {
-    queryFactory
-        .update(mapSheetLearnEntity)
-        .set(mapSheetLearnEntity.applyStatus, GukYuinStatus.END.getId())
-        .set(mapSheetLearnEntity.applyStatusDttm, ZonedDateTime.now())
-        .where(mapSheetLearnEntity.id.eq(learnId))
-        .execute();
-  }
-
-  @Override
-  public void updateMapSheetInferenceLabelEndStatus(Long learnId) {
-    queryFactory
-        .update(mapSheetAnalInferenceEntity)
-        .set(mapSheetAnalInferenceEntity.analState, LabelMngState.FINISH.getId())
-        .set(mapSheetAnalInferenceEntity.updatedDttm, ZonedDateTime.now())
-        .where(mapSheetAnalInferenceEntity.learnId.eq(learnId))
-        .execute();
-  }
-
   @Override
   @Transactional
   public void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status) {

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

@@ -6,7 +6,6 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntit
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity;
 
-import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctMastDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
@@ -16,7 +15,6 @@ import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
-import java.time.ZonedDateTime;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
@@ -46,7 +44,7 @@ public class GukYuinStbltJobRepositoryImpl implements GukYuinStbltJobRepositoryC
         .on(mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid))
         .where(
             mapSheetLearnEntity.applyStatus.eq(GukYuinStatus.PNU_COMPLETED.getId()),
-            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
             mapSheetAnalDataInferenceGeomEntity.fitState.isNull())
         .groupBy(mapSheetLearnEntity.id, mapSheetLearnEntity.uid, mapSheetLearnEntity.chnDtctMstId)
         .having(mapSheetAnalDataInferenceGeomEntity.geoUid.count().gt(1L))
@@ -66,21 +64,54 @@ public class GukYuinStbltJobRepositoryImpl implements GukYuinStbltJobRepositoryC
       PnuEntity pnuEt =
           queryFactory
               .selectFrom(pnuEntity)
-              .where(pnuEntity.chnDtctObjtId.eq(resultUid))
-              .fetchFirst();
-
-      queryFactory
-          .update(mapSheetAnalDataInferenceGeomEntity)
-          .set(
-              mapSheetAnalDataInferenceGeomEntity.fitState,
-              pnuEt.getStbltYn().equals("Y")
-                  ? ImageryFitStatus.UNFIT.getId()
-                  : ImageryFitStatus.FIT.getId()) // 적합여부가 Y 이면 부적합인 것, N 이면 적합한 것이라고 함
-          .set(mapSheetAnalDataInferenceGeomEntity.fitStateDttm, ZonedDateTime.now())
-          .set(mapSheetAnalDataInferenceGeomEntity.lockYn, stbltDto.getLockYn())
-          .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(resultUid))
-          .execute();
+              .where(pnuEntity.pnu.eq(stbltDto.getPnu()), pnuEntity.chnDtctObjtId.eq(resultUid))
+              .fetchOne();
+      if (pnuEt != null) {
+        // update
+        queryFactory
+            .update(pnuEntity)
+            .set(pnuEntity.pnuDtctId, stbltDto.getPnuDtctId())
+            .set(pnuEntity.lrmSyncYmd, stbltDto.getLrmSyncYmd())
+            .set(pnuEntity.pnuSyncYmd, stbltDto.getPnuSyncYmd())
+            .set(pnuEntity.mpqdNo, stbltDto.getMpqdNo())
+            .set(pnuEntity.cprsYr, stbltDto.getCprsYr())
+            .set(pnuEntity.crtrYr, stbltDto.getCrtrYr())
+            .set(pnuEntity.chnDtctId, stbltDto.getChnDtctId())
+            .set(pnuEntity.chnDtctMstId, stbltDto.getChnDtctMstId())
+            .set(pnuEntity.chnDtctObjtId, stbltDto.getChnDtctObjtId())
+            .set(pnuEntity.chnDtctContId, stbltDto.getChnDtctContId())
+            .set(pnuEntity.chnCd, stbltDto.getChnCd())
+            .set(pnuEntity.chnDtctProb, stbltDto.getChnDtctProb())
+            .set(pnuEntity.bfClsCd, stbltDto.getBfClsCd())
+            .set(pnuEntity.bfClsProb, stbltDto.getBfClsProb())
+            .set(pnuEntity.afClsCd, stbltDto.getAfClsCd())
+            .set(pnuEntity.afClsProb, stbltDto.getAfClsProb())
+            .set(pnuEntity.pnuSqms, stbltDto.getPnuSqms())
+            .set(pnuEntity.pnuDtctSqms, stbltDto.getPnuDtctSqms())
+            .set(pnuEntity.chnDtctSqms, stbltDto.getChnDtctSqms())
+            .set(pnuEntity.stbltYn, stbltDto.getStbltYn())
+            .set(pnuEntity.incyCd, stbltDto.getIncyCd())
+            .set(pnuEntity.incyRsnCont, stbltDto.getIncyRsnCont())
+            .where(
+                pnuEntity.geo.geoUid.eq(geomEntity.getGeoUid()),
+                pnuEntity.chnDtctObjtId.eq(resultUid))
+            .execute();
+      } else {
+        // insert
+      }
     }
+    //    queryFactory
+    //      .update(mapSheetAnalDataInferenceGeomEntity)
+    //      .set(
+    //        mapSheetAnalDataInferenceGeomEntity.fitState,
+    //        stbltDto.getStbltYn().equals("Y") ? ImageryFitStatus.FIT.getId() :
+    // ImageryFitStatus.UNFIT.getId())
+    //      .set(mapSheetAnalDataInferenceGeomEntity.fitStateDttm, ZonedDateTime.now())
+    //      .set(mapSheetAnalDataInferenceGeomEntity.lockYn, stbltDto.getLockYn())
+    //      .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(resultUid))
+    //      .execute();
+
+    // TODO
   }
 
   @Override

src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java

@@ -8,7 +8,6 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceG
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity;
 
-import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
 import com.kamco.cd.kamcoback.common.enums.StatusType;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto;
@@ -83,9 +82,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .innerJoin(mapSheetAnalDataInferenceGeomEntity)
         .on(
             mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
-            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
-            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
-            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()),
+            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
             mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
         .where(
             mapSheetAnalInferenceEntity.uuid.eq(uuid),
@@ -129,8 +126,8 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
               """
             insert into tb_labeling_assignment
             (assignment_uid, inference_geom_uid, worker_uid,
-             work_state, assign_group_id, anal_uid)
-            values (?, ?, ?, ?, ?, ?)
+             work_state, assign_group_id, anal_uid, pnu)
+            values (?, ?, ?, ?, ?, ?, ?)
             """;
 
           try (PreparedStatement ps = connection.prepareStatement(sql)) {
@@ -143,6 +140,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
               ps.setString(4, LabelState.ASSIGNED.getId());
               ps.setString(5, String.valueOf(info.getMapSheetNum()));
               ps.setLong(6, analEntity.getId());
+              ps.setLong(7, info.getPnu());
 
               ps.addBatch();
               batchSize++;
@@ -192,9 +190,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .innerJoin(mapSheetAnalDataInferenceGeomEntity)
         .on(
             mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
-            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
-            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
-            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()),
+            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
             mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
         .where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
         .fetchOne();
@@ -385,10 +381,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
                   mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(analEntity.getCompareYyyy()),
                   mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(analEntity.getTargetYyyy()),
                   mapSheetAnalDataInferenceGeomEntity.stage.eq(analEntity.getStage()),
-                  //                  mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
-                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
-                  mapSheetAnalDataInferenceGeomEntity.fitState.eq(
-                      ImageryFitStatus.UNFIT.getId()) // TODO:
+                  mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+                  //                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L)
+                  //                  mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()  //TODO:
                   // 추후 라벨링 대상 조건 수정하기
                   )
               .fetchOne();
@@ -560,9 +555,11 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
                       mapSheetAnalDataInferenceGeomEntity.dataUid))
               .where(
                   mapSheetAnalInferenceEntity.uuid.eq(targetUuid),
-                  //            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
-                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
-                  mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()))
+                  mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+                  //            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
+                  //            mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()  //TODO: 추후 라벨링
+                  // 대상 조건 수정하기
+                  )
               .fetchOne();
     }
 
@@ -579,7 +576,8 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         queryFactory
             .select(labelingAssignmentEntity.count())
             .from(labelingAssignmentEntity)
-            .where(analUidCondition, labelingAssignmentEntity.workState.in("SKIP", "DONE"))
+            .where(
+                analUidCondition, labelingAssignmentEntity.workState.in("ASSIGNED", "SKIP", "DONE"))
             .fetchOne();
 
     Long skipCount =
@@ -604,13 +602,6 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
             .where(analUidCondition, labelingAssignmentEntity.inspectState.eq("COMPLETE"))
             .fetchOne();
 
-    Long inspectionExcept =
-        queryFactory
-            .select(labelingAssignmentEntity.count())
-            .from(labelingAssignmentEntity)
-            .where(analUidCondition, labelingAssignmentEntity.inspectState.eq("EXCEPT"))
-            .fetchOne();
-
     Long inspectorCount =
         queryFactory
             .select(labelingAssignmentEntity.inspectorUid.countDistinct())
@@ -623,7 +614,6 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
     long labelCompleted = labelingCompleted != null ? labelingCompleted : 0L;
     long inspectCompleted = inspectionCompleted != null ? inspectionCompleted : 0L;
     long skipped = skipCount != null ? skipCount : 0L;
-    long inspectExcepted = inspectionExcept != null ? inspectionExcept : 0L;
 
     long labelingRemaining = labelingTotal - labelCompleted - skipped;
     if (labelingRemaining < 0) {
@@ -631,7 +621,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
     }
 
     long inspectionTotal = labelingTotal;
-    long inspectionRemaining = inspectionTotal - inspectCompleted - inspectExcepted;
+    long inspectionRemaining = inspectionTotal - inspectCompleted - skipped;
     if (inspectionRemaining < 0) {
       inspectionRemaining = 0;
     }
@@ -668,7 +658,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .inspectionStatus(inspectionStatus)
         .inspectionTotalCount(inspectionTotal)
         .inspectionCompletedCount(inspectCompleted)
-        .inspectionSkipCount(inspectExcepted)
+        .inspectionSkipCount(skipped) // TODO
         .inspectionRemainingCount(inspectionRemaining)
         .inspectorCount(inspectorCount != null ? inspectorCount : 0L)
         .progressRate(labelingRate)
@@ -750,9 +740,11 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
             mapSheetAnalInferenceEntity.targetYyyy.eq(
                 mapSheetAnalDataInferenceGeomEntity.targetYyyy),
             mapSheetAnalInferenceEntity.stage.eq(mapSheetAnalDataInferenceGeomEntity.stage),
-            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
-            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
-            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()))
+            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+            //        mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            //        mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()    //TODO: 추후 라벨링 대상 조건
+            // 수정하기
+            )
         .where(mapSheetAnalInferenceEntity.id.eq(analEntity.getId()))
         .groupBy(
             mapSheetAnalInferenceEntity.analTitle,

src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java

@@ -2,7 +2,6 @@ package com.kamco.cd.kamcoback.postgres.repository.label;
 
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
 
-import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
 import com.kamco.cd.kamcoback.label.dto.LabelWorkDto;
@@ -295,14 +294,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
 
     if (searchReq.getSearchVal() != null && !searchReq.getSearchVal().isEmpty()) {
       whereSubBuilder.and(
-          Expressions.stringTemplate("{0}", memberEntity.employeeNo)
+          Expressions.stringTemplate("{0}", memberEntity.userId)
               .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
               .or(
                   Expressions.stringTemplate("{0}", memberEntity.name)
                       .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")));
     }
 
-    whereSubBuilder.and(labelingAssignmentEntity.workerUid.eq(memberEntity.employeeNo));
+    whereSubBuilder.and(labelingAssignmentEntity.workerUid.eq(memberEntity.userId));
 
     // 공통 조건 추출
     BooleanExpression doneStateCondition =
@@ -345,7 +344,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     WorkerState.class,
                     memberEntity.userRole,
                     memberEntity.name,
-                    memberEntity.employeeNo,
+                    memberEntity.userId,
                     assignedCnt.as("assignedCnt"),
                     doneCnt.as("doneCnt"),
                     skipCnt.as("skipCnt"),
@@ -364,10 +363,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .on(whereSubBuilder)
             .where(whereBuilder)
             .groupBy(
-                memberEntity.userRole,
-                memberEntity.name,
-                memberEntity.employeeNo,
-                memberEntity.status)
+                memberEntity.userRole, memberEntity.name, memberEntity.userId, memberEntity.status)
             .orderBy(orderSpecifiers.toArray(new OrderSpecifier[0]))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
@@ -445,14 +441,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
 
     if (searchReq.getSearchVal() != null && !searchReq.getSearchVal().isEmpty()) {
       whereSubBuilder.and(
-          Expressions.stringTemplate("{0}", memberEntity.employeeNo)
+          Expressions.stringTemplate("{0}", memberEntity.userId)
               .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
               .or(
                   Expressions.stringTemplate("{0}", memberEntity.name)
                       .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")));
     }
 
-    whereSubBuilder.and(labelingAssignmentEntity.inspectorUid.eq(memberEntity.employeeNo));
+    whereSubBuilder.and(labelingAssignmentEntity.inspectorUid.eq(memberEntity.userId));
 
     // 공통 조건 추출
     BooleanExpression doneStateCondition =
@@ -496,7 +492,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     WorkerState.class,
                     memberEntity.userRole,
                     memberEntity.name,
-                    memberEntity.employeeNo,
+                    memberEntity.userId,
                     assignedCnt.as("assignedCnt"),
                     doneCnt.as("doneCnt"),
                     skipCnt.as("skipCnt"),
@@ -515,10 +511,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .on(whereSubBuilder)
             .where(whereBuilder)
             .groupBy(
-                memberEntity.userRole,
-                memberEntity.name,
-                memberEntity.employeeNo,
-                memberEntity.status)
+                memberEntity.userRole, memberEntity.name, memberEntity.userId, memberEntity.status)
             .orderBy(orderSpecifiers.toArray(new OrderSpecifier[0]))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
@@ -556,19 +549,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
   @Override
   public LabelWorkMngDetail findLabelWorkMngDetail(UUID uuid) {
 
-    NumberExpression<Long> labelTotCnt =
-        new CaseBuilder()
-            //            .when(mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull())
-            .when(
-                mapSheetAnalDataInferenceGeomEntity
-                    .pnu
-                    .gt(0)
-                    .and(
-                        mapSheetAnalDataInferenceGeomEntity.fitState.eq(
-                            ImageryFitStatus.UNFIT.getId())))
-            .then(1L)
-            .otherwise(0L)
-            .sum();
+    NumberExpression<Long> labelTotCnt = mapSheetAnalDataInferenceGeomEntity.geoUid.count();
     NumberExpression<Long> labelerCnt = labelingAssignmentEntity.workerUid.count();
     NumberExpression<Long> reviewerCnt = labelingAssignmentEntity.inspectorUid.count();
 

src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiLabelJobService.java

@@ -44,7 +44,7 @@ public class GukYuinApiLabelJobService {
     }
 
     for (GeomUidDto gto : list) {
-      ChngDetectContDto.ResultLabelDto dto =
+      ChngDetectContDto.ResultPnuDto dto =
           gukYuinApiService.updateChnDtctObjtLabelingYn(gto.getResultUid(), "Y");
       if (dto.getSuccess()) {
         // inference_geom 에 label_send_dttm 업데이트 하기

src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiPnuJobService.java

@@ -36,7 +36,7 @@ public class GukYuinApiPnuJobService {
   }
 
   /** 국유인 등록 완료 후, 탐지객체 조회해서 PNU 업데이트 하는 스케줄링 하루 1번 새벽 1시에 실행 */
-  @Scheduled(cron = "0 0 1 * * *")
+  @Scheduled(cron = "0 * * * * *") // 0 0 1 * * *
   public void findGukYuinContListPnuUpdate() {
     if (isLocalProfile()) {
       return;

src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStatusJobService.java

@@ -33,7 +33,7 @@ public class GukYuinApiStatusJobService {
   }
 
   /** 국유인 연동 후, 100% 되었는지 확인하는 스케줄링 매 10분마다 호출 */
-  @Scheduled(cron = "0 0/10 * * * *")
+  @Scheduled(cron = "0 0/10 * * * *") // 0 0/10 * * * *
   public void findGukYuinMastCompleteYn() {
     if (isLocalProfile()) {
       return;

src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStbltJobService.java

@@ -6,9 +6,6 @@ import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctMastDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
 import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
 import com.kamco.cd.kamcoback.postgres.core.GukYuinStbltJobCoreService;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -37,7 +34,7 @@ public class GukYuinApiStbltJobService {
   }
 
   /** 국유인 연동 후, 실태조사 적합여부 확인하여 update */
-  @Scheduled(cron = "0 0 3 * * *") // 0 0 3 * * *
+  @Scheduled(cron = "0 * * * * *") // 0 0 3 * * *
   public void findGukYuinEligibleForSurvey() {
     if (isLocalProfile()) {
       return;
@@ -52,11 +49,7 @@ public class GukYuinApiStbltJobService {
 
     for (LearnKeyDto dto : list) {
       try {
-        String yesterday =
-            LocalDate.now(ZoneId.of("Asia/Seoul"))
-                .minusDays(1)
-                .format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-        RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), yesterday);
+        RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid());
 
         if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
           log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId());
@@ -67,7 +60,6 @@ public class GukYuinApiStbltJobService {
           String resultUid = stbltDto.getChnDtctObjtId();
           gukYuinStbltJobCoreService.updateGukYuinEligibleForSurvey(resultUid, stbltDto);
         }
-
       } catch (Exception e) {
         log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), e);
       }