국유인 수정, 라벨대상 건수 수정

Dockerfile-prod

@@ -1,24 +0,0 @@
-# 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

@@ -1,35 +0,0 @@
-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

@@ -15,6 +15,7 @@ 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;
@@ -330,6 +331,7 @@ public class GukYuinApiController {
     return ApiResponseDto.ok(gukYuinApiService.findRlbDtctObject(chnDtctObjtId));
   }
 
+  @Hidden
   @Operation(summary = "job test pnu", description = "job test pnu")
   @GetMapping("/job-test/pnu")
   public ApiResponseDto<Void> findGukYuinContListPnuUpdate() {
@@ -337,6 +339,7 @@ public class GukYuinApiController {
     return ApiResponseDto.ok(null);
   }
 
+  @Hidden
   @Operation(summary = "job test status", description = "job test status")
   @GetMapping("/job-test/status")
   public ApiResponseDto<Void> findGukYuinMastCompleteYn() {
@@ -344,6 +347,7 @@ public class GukYuinApiController {
     return ApiResponseDto.ok(null);
   }
 
+  @Hidden
   @Operation(summary = "job test label", description = "job test label")
   @GetMapping("/job-test/label")
   public ApiResponseDto<Void> findLabelingCompleteSend() {
@@ -351,6 +355,7 @@ public class GukYuinApiController {
     return ApiResponseDto.ok(null);
   }
 
+  @Hidden
   @Operation(summary = "job test stblt", description = "job test stblt")
   @GetMapping("/job-test/stblt")
   public ApiResponseDto<Void> findGukYuinEligibleForSurvey() {

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

@@ -456,8 +456,15 @@ public class GukYuinApiService {
     Integer maxStage =
         gukyuinCoreService.findMapSheetLearnYearStage(info.getCompareYyyy(), info.getTargetYyyy());
 
-    // TODO : 1회차를 종료 상태로 처리하고 2회차를 보내야 함
+    // 1회차를 종료 상태로 처리하고 2회차를 보내야 함
-    // TODO : learn, inference 둘다 종료 처리
+    // 추론(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();
@@ -467,22 +474,18 @@ 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()));
+    if (!Files.isDirectory(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);
+    ChngDetectMastDto.RegistResDto result = this.regist(reqDto);
-    //    if (result.getSuccess()) {
+    if (result.getSuccess()) {
-    return new ResponseObj(ApiResponseCode.OK, "연동되었습니다.");
+      return new ResponseObj(ApiResponseCode.OK, "연동되었습니다.");
-    //    } else {
+    } else {
-    //      return new ResponseObj(ApiResponseCode.INTERNAL_SERVER_ERROR, result.getMessage());
+      return new ResponseObj(ApiResponseCode.INTERNAL_SERVER_ERROR, result.getMessage());
-    //    }
+    }
   }
 
   public List<LabelSendDto> findLabelingCompleteSendList(LocalDate yesterday) {

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

@@ -64,4 +64,17 @@ 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/GukYuinStbltJobCoreService.java

@@ -24,10 +24,12 @@ public class GukYuinStbltJobCoreService {
 
   @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());
@@ -66,6 +68,8 @@ public class GukYuinStbltJobCoreService {
 
       entity.setCreatedDttm(ZonedDateTime.now());
       gukYuinStbltRepository.save(entity);
+
+      //
     }
   }
 }

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

@@ -39,4 +39,10 @@ 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,6 +13,7 @@ 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;
@@ -204,6 +205,7 @@ 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();
   }
@@ -283,6 +285,39 @@ 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

@@ -46,7 +46,7 @@ public class GukYuinStbltJobRepositoryImpl implements GukYuinStbltJobRepositoryC
         .on(mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid))
         .where(
             mapSheetLearnEntity.applyStatus.eq(GukYuinStatus.PNU_COMPLETED.getId()),
-            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
+            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
             mapSheetAnalDataInferenceGeomEntity.fitState.isNull())
         .groupBy(mapSheetLearnEntity.id, mapSheetLearnEntity.uid, mapSheetLearnEntity.chnDtctMstId)
         .having(mapSheetAnalDataInferenceGeomEntity.geoUid.count().gt(1L))

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

@@ -8,6 +8,7 @@ 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;
@@ -82,7 +83,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .innerJoin(mapSheetAnalDataInferenceGeomEntity)
         .on(
             mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
-            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
+            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
+            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()),
             mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
         .where(
             mapSheetAnalInferenceEntity.uuid.eq(uuid),
@@ -189,7 +192,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .innerJoin(mapSheetAnalDataInferenceGeomEntity)
         .on(
             mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
-            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
+            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
+            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()),
             mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
         .where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
         .fetchOne();
@@ -380,9 +385,10 @@ 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.isNotNull()
-                  //                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L)
+                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
-                  //                  mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()  //TODO:
+                  mapSheetAnalDataInferenceGeomEntity.fitState.eq(
+                      ImageryFitStatus.UNFIT.getId()) // TODO:
                   // 추후 라벨링 대상 조건 수정하기
                   )
               .fetchOne();
@@ -554,11 +560,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
                       mapSheetAnalDataInferenceGeomEntity.dataUid))
               .where(
                   mapSheetAnalInferenceEntity.uuid.eq(targetUuid),
-                  mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+                  //            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
-                  //            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
+                  mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L),
-                  //            mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()  //TODO: 추후 라벨링
+                  mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()))
-                  // 대상 조건 수정하기
-                  )
               .fetchOne();
     }
 
@@ -575,8 +579,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         queryFactory
             .select(labelingAssignmentEntity.count())
             .from(labelingAssignmentEntity)
-            .where(
+            .where(analUidCondition, labelingAssignmentEntity.workState.in("SKIP", "DONE"))
-                analUidCondition, labelingAssignmentEntity.workState.in("ASSIGNED", "SKIP", "DONE"))
             .fetchOne();
 
     Long skipCount =
@@ -601,6 +604,13 @@ 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())
@@ -613,6 +623,7 @@ 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) {
@@ -620,7 +631,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
     }
 
     long inspectionTotal = labelingTotal;
-    long inspectionRemaining = inspectionTotal - inspectCompleted - skipped;
+    long inspectionRemaining = inspectionTotal - inspectCompleted - inspectExcepted;
     if (inspectionRemaining < 0) {
       inspectionRemaining = 0;
     }
@@ -657,7 +668,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
         .inspectionStatus(inspectionStatus)
         .inspectionTotalCount(inspectionTotal)
         .inspectionCompletedCount(inspectCompleted)
-        .inspectionSkipCount(skipped) // TODO
+        .inspectionSkipCount(inspectExcepted)
         .inspectionRemainingCount(inspectionRemaining)
         .inspectorCount(inspectorCount != null ? inspectorCount : 0L)
         .progressRate(labelingRate)
@@ -739,11 +750,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
             mapSheetAnalInferenceEntity.targetYyyy.eq(
                 mapSheetAnalDataInferenceGeomEntity.targetYyyy),
             mapSheetAnalInferenceEntity.stage.eq(mapSheetAnalDataInferenceGeomEntity.stage),
-            mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
+            //        mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull()
-            //        mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
-            //        mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()    //TODO: 추후 라벨링 대상 조건
+            mapSheetAnalDataInferenceGeomEntity.fitState.eq(ImageryFitStatus.UNFIT.getId()))
-            // 수정하기
-            )
         .where(mapSheetAnalInferenceEntity.id.eq(analEntity.getId()))
         .groupBy(
             mapSheetAnalInferenceEntity.analTitle,

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

@@ -2,6 +2,7 @@ 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;
@@ -294,14 +295,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
 
     if (searchReq.getSearchVal() != null && !searchReq.getSearchVal().isEmpty()) {
       whereSubBuilder.and(
-          Expressions.stringTemplate("{0}", memberEntity.userId)
+          Expressions.stringTemplate("{0}", memberEntity.employeeNo)
               .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
               .or(
                   Expressions.stringTemplate("{0}", memberEntity.name)
                       .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")));
     }
 
-    whereSubBuilder.and(labelingAssignmentEntity.workerUid.eq(memberEntity.userId));
+    whereSubBuilder.and(labelingAssignmentEntity.workerUid.eq(memberEntity.employeeNo));
 
     // 공통 조건 추출
     BooleanExpression doneStateCondition =
@@ -344,7 +345,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     WorkerState.class,
                     memberEntity.userRole,
                     memberEntity.name,
-                    memberEntity.userId,
+                    memberEntity.employeeNo,
                     assignedCnt.as("assignedCnt"),
                     doneCnt.as("doneCnt"),
                     skipCnt.as("skipCnt"),
@@ -363,7 +364,10 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .on(whereSubBuilder)
             .where(whereBuilder)
             .groupBy(
-                memberEntity.userRole, memberEntity.name, memberEntity.userId, memberEntity.status)
+                memberEntity.userRole,
+                memberEntity.name,
+                memberEntity.employeeNo,
+                memberEntity.status)
             .orderBy(orderSpecifiers.toArray(new OrderSpecifier[0]))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
@@ -441,14 +445,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
 
     if (searchReq.getSearchVal() != null && !searchReq.getSearchVal().isEmpty()) {
       whereSubBuilder.and(
-          Expressions.stringTemplate("{0}", memberEntity.userId)
+          Expressions.stringTemplate("{0}", memberEntity.employeeNo)
               .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")
               .or(
                   Expressions.stringTemplate("{0}", memberEntity.name)
                       .likeIgnoreCase("%" + searchReq.getSearchVal() + "%")));
     }
 
-    whereSubBuilder.and(labelingAssignmentEntity.inspectorUid.eq(memberEntity.userId));
+    whereSubBuilder.and(labelingAssignmentEntity.inspectorUid.eq(memberEntity.employeeNo));
 
     // 공통 조건 추출
     BooleanExpression doneStateCondition =
@@ -492,7 +496,7 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                     WorkerState.class,
                     memberEntity.userRole,
                     memberEntity.name,
-                    memberEntity.userId,
+                    memberEntity.employeeNo,
                     assignedCnt.as("assignedCnt"),
                     doneCnt.as("doneCnt"),
                     skipCnt.as("skipCnt"),
@@ -511,7 +515,10 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
             .on(whereSubBuilder)
             .where(whereBuilder)
             .groupBy(
-                memberEntity.userRole, memberEntity.name, memberEntity.userId, memberEntity.status)
+                memberEntity.userRole,
+                memberEntity.name,
+                memberEntity.employeeNo,
+                memberEntity.status)
             .orderBy(orderSpecifiers.toArray(new OrderSpecifier[0]))
             .offset(pageable.getOffset())
             .limit(pageable.getPageSize())
@@ -551,7 +558,14 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
 
     NumberExpression<Long> labelTotCnt =
         new CaseBuilder()
-            .when(mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull())
+            //            .when(mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull())
+            .when(
+                mapSheetAnalDataInferenceGeomEntity
+                    .pnu
+                    .gt(0)
+                    .and(
+                        mapSheetAnalDataInferenceGeomEntity.fitState.eq(
+                            ImageryFitStatus.UNFIT.getId())))
             .then(1L)
             .otherwise(0L)
             .sum();

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

@@ -8,6 +8,7 @@ import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -31,11 +32,11 @@ public class GukYuinApiLabelJobService {
   }
 
   /** 어제 라벨링 검수 완료된 것 -> 국유인에 전송 */
-  //  @Scheduled(cron = "0 0 2 * * *")
+  @Scheduled(cron = "0 0 2 * * *")
   public void findLabelingCompleteSend() {
-    //    if (isLocalProfile()) {
+    if (isLocalProfile()) {
-    //      return;
+      return;
-    //    }
+    }
 
     List<GeomUidDto> list = gukYuinLabelJobCoreService.findYesterdayLabelingCompleteList();
     if (list.isEmpty()) {

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

@@ -12,6 +12,7 @@ import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -35,11 +36,11 @@ public class GukYuinApiPnuJobService {
   }
 
   /** 국유인 등록 완료 후, 탐지객체 조회해서 PNU 업데이트 하는 스케줄링 하루 1번 새벽 1시에 실행 */
-  //  @Scheduled(cron = "0 0/10 * * * *") // 0 0 1 * * *
+  @Scheduled(cron = "0 0 1 * * *")
   public void findGukYuinContListPnuUpdate() {
-    //    if (isLocalProfile()) {
+    if (isLocalProfile()) {
-    //      return;
+      return;
-    //    }
+    }
 
     List<LearnKeyDto> list =
         gukYuinPnuJobCoreService.findGukyuinApplyStatusUidList(

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

@@ -9,6 +9,7 @@ import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -32,11 +33,11 @@ public class GukYuinApiStatusJobService {
   }
 
   /** 국유인 연동 후, 100% 되었는지 확인하는 스케줄링 매 10분마다 호출 */
-  //  @Scheduled(cron = "0 0/10 * * * *") // 0 0/10 * * * *
+  @Scheduled(cron = "0 0/10 * * * *")
   public void findGukYuinMastCompleteYn() {
-    //    if (isLocalProfile()) {
+    if (isLocalProfile()) {
-    //      return;
+      return;
-    //    }
+    }
 
     List<LearnKeyDto> list =
         gukYuinJobCoreService.findGukyuinApplyStatusUidList(

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

@@ -13,6 +13,7 @@ import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -36,11 +37,11 @@ public class GukYuinApiStbltJobService {
   }
 
   /** 국유인 연동 후, 실태조사 적합여부 확인하여 update */
-  //  @Scheduled(cron = "0 * * * * *") // 0 0 3 * * *
+  @Scheduled(cron = "0 0 3 * * *") // 0 0 3 * * *
   public void findGukYuinEligibleForSurvey() {
-    //    if (isLocalProfile()) {
+    if (isLocalProfile()) {
-    //      return;
+      return;
-    //    }
+    }
 
     List<LearnKeyDto> list =
         gukYuinStbltJobCoreService.findGukYuinEligibleForSurveyList(
@@ -51,12 +52,11 @@ public class GukYuinApiStbltJobService {
 
     for (LearnKeyDto dto : list) {
       try {
-        String today =
+        String yesterday =
-            LocalDate.now(ZoneId.of("Asia/Seoul")).format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+            LocalDate.now(ZoneId.of("Asia/Seoul"))
-        //        String yesterday =
+                .minusDays(1)
-        // LocalDate.now(ZoneId.of("Asia/Seoul")).minusDays(1).format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+                .format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-        RlbDtctDto result =
+        RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), yesterday);
-            gukYuinApiService.findRlbDtctList(dto.getUid(), today); // todo : test 다 끝내고 어제로 바꿔야 함
 
         if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
           log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId());
@@ -67,6 +67,7 @@ public class GukYuinApiStbltJobService {
           String resultUid = stbltDto.getChnDtctObjtId();
           gukYuinStbltJobCoreService.updateGukYuinEligibleForSurvey(resultUid, stbltDto);
         }
+
       } catch (Exception e) {
         log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), e);
       }