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

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

@@ -7,11 +7,15 @@ import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ChnDetectMastReqDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ChngDetectMastSearchDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LabelSendDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResReturn;
 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;
@@ -39,6 +43,10 @@ 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 = "탐지결과 등록")
@@ -74,7 +82,7 @@ public class GukYuinApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   @PostMapping("/chn/mast/remove")
-  public ApiResponseDto<ResReturn> remove(
+  public ApiResponseDto<ChngDetectMastDto.RemoveResDto> remove(
       @RequestBody @Valid ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
     return ApiResponseDto.ok(gukYuinApiService.remove(chnDetectMastReq));
   }
@@ -262,7 +270,7 @@ public class GukYuinApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   @PostMapping("/rlb/objt/{chnDtctObjtId}/lbl/{lblYn}")
-  public ApiResponseDto<ResReturn> updateChnDtctObjtLabelingYn(
+  public ApiResponseDto<ChngDetectContDto.ResultLabelDto> updateChnDtctObjtLabelingYn(
       @PathVariable String chnDtctObjtId, @PathVariable String lblYn) {
     return ApiResponseDto.ok(gukYuinApiService.updateChnDtctObjtLabelingYn(chnDtctObjtId, lblYn));
   }
@@ -298,8 +306,10 @@ public class GukYuinApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   public ApiResponseDto<ChngDetectMastDto.RlbDtctDto> findRlbDtctList(
-      @PathVariable String chnDtctId) {
+      @PathVariable String chnDtctId,
-    return ApiResponseDto.ok(gukYuinApiService.findRlbDtctList(chnDtctId));
+      @Parameter(description = "날짜(기본은 어제 날짜)") @RequestParam(defaultValue = "20260205")
+          String yyyymmdd) {
+    return ApiResponseDto.ok(gukYuinApiService.findRlbDtctList(chnDtctId, yyyymmdd));
   }
 
   @Operation(summary = "탐지객체 적합여부 조회 (객체별 조회)", description = "탐지객체 적합여부 조회 (객체별 조회)")
@@ -320,4 +330,36 @@ 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,4 +114,27 @@ 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/dto/ChngDetectMastDto.java

@@ -288,4 +288,17 @@ public class ChngDetectMastDto {
     private String chgIp;
     private String delYn; // 삭제여부
   }
+
+  @Schema(name = "RemoveResDto", description = "remove 후 리턴 형태")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class RemoveResDto {
+
+    private Integer code;
+    private String message;
+    private Boolean result;
+    private Boolean success;
+  }
 }

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

@@ -11,13 +11,13 @@ 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;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ChnDetectMastReqDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ErrorResDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LabelSendDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResReturn;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResultDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkFacts;
@@ -55,6 +55,7 @@ public class GukYuinApiService {
   private final UserUtil userUtil;
   private final AuditLogRepository auditLogRepository;
   private final ObjectMapper objectMapper;
+  private final String myip = netUtils.getLocalIP();
 
   @Value("${spring.profiles.active:local}")
   private String profile;
@@ -65,13 +66,15 @@ public class GukYuinApiService {
   @Value("${gukyuin.cdi}")
   private String gukyuinCdiUrl;
 
+  @Value("${file.dataset-dir}")
+  private String datasetDir;
+
   @Transactional
   public ChngDetectMastDto.RegistResDto regist(
       ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
 
     String url = gukyuinCdiUrl + "/chn/mast/regist";
 
-    String myip = netUtils.getLocalIP();
     chnDetectMastReq.setReqIp(myip);
     chnDetectMastReq.setReqEpno(userUtil.getEmployeeNo());
 
@@ -89,6 +92,12 @@ public class GukYuinApiService {
       ChngDetectMastDto.Basic registRes = resultBody.getResult();
 
       success = resultBody.getSuccess();
+
+      // 이미 등록한 경우에는 result가 없음
+      if (resultBody.getResult() == null) {
+        return resultBody;
+      }
+
       // 추론 회차에 applyStatus, applyStatusDttm 업데이트
       gukyuinCoreService.updateGukYuinMastRegResult(registRes);
 
@@ -122,23 +131,30 @@ public class GukYuinApiService {
   }
 
   @Transactional
-  public ResReturn remove(ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
+  public ChngDetectMastDto.RemoveResDto remove(
+      ChngDetectMastDto.ChnDetectMastReqDto chnDetectMastReq) {
     String url = gukyuinCdiUrl + "/chn/mast/remove";
 
-    String myip = netUtils.getLocalIP();
     chnDetectMastReq.setReqIp(myip);
     chnDetectMastReq.setReqEpno(userUtil.getEmployeeNo());
 
-    ExternalCallResult<ChngDetectMastDto.Basic> result =
+    boolean success = false;
+    ExternalCallResult<ChngDetectMastDto.RemoveResDto> result =
         externalHttpClient.call(
             url,
             HttpMethod.POST,
             chnDetectMastReq,
             netUtils.jsonHeaders(),
-            ChngDetectMastDto.Basic.class);
+            ChngDetectMastDto.RemoveResDto.class);
 
-    ChngDetectMastDto.Basic resultBody = result.body();
+    ChngDetectMastDto.RemoveResDto resultBody = result.body();
-    gukyuinCoreService.updateGukYuinMastRegRemove(resultBody);
+    if (resultBody != null && resultBody.getSuccess() != null) {
+
+      success = resultBody.getSuccess();
+      if (resultBody.getSuccess()) {
+        gukyuinCoreService.updateGukYuinMastRegRemove(chnDetectMastReq.getChnDtctId());
+      }
+    }
 
     this.insertGukyuinAuditLog(
         EventType.REMOVE.getId(),
@@ -146,14 +162,22 @@ public class GukYuinApiService {
         userUtil.getId(),
         url.replace(gukyuinUrl, ""),
         chnDetectMastReq,
-        true); // TODO : successFail 여부
+        success);
-    return new ResReturn("success", "탐지결과 삭제 되었습니다.");
+
+    return resultBody;
   }
 
   // 등록목록 1개 확인
   public ChngDetectMastDto.ResultDto detail(String chnDtctMstId) {
 
-    String url = gukyuinCdiUrl + "/chn/mast/list/" + chnDtctMstId;
+    String url =
+        gukyuinCdiUrl
+            + "/chn/mast/list/"
+            + chnDtctMstId
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -172,9 +196,15 @@ public class GukYuinApiService {
   // 등록목록 비교년도,기준년도,차수 조합해서 n개 확인
   public ChngDetectMastDto.ResultDto listYearStage(
       ChngDetectMastDto.ChngDetectMastSearchDto searchDto) {
-
     String queryString = netUtils.dtoToQueryString(searchDto, null);
-    String url = gukyuinCdiUrl + "/chn/mast" + queryString;
+    String url =
+        gukyuinCdiUrl
+            + "/chn/mast"
+            + queryString
+            + "&reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -238,7 +268,11 @@ public class GukYuinApiService {
             + "?pageIndex="
             + pageIndex
             + "&pageSize="
-            + pageSize;
+            + pageSize
+            + "&reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectContDto.ResultContDto> result =
         externalHttpClient.call(
@@ -257,20 +291,6 @@ public class GukYuinApiService {
           result.body().getSuccess());
     }
 
-    for (ContBasic cont : contList) {
-      String[] pnuList = cont.getPnuList();
-      long pnuCnt = pnuList == null ? 0 : pnuList.length;
-      if (cont.getChnDtctObjtId() != null) {
-        gukyuinCoreService.updateInferenceGeomDataPnuCnt(cont.getChnDtctObjtId(), pnuCnt);
-
-        if (pnuCnt > 0) {
-          Long geoUid =
-              gukyuinCoreService.findMapSheetAnalDataInferenceGeomUid(cont.getChnDtctObjtId());
-          gukyuinCoreService.insertGeoUidPnuData(geoUid, pnuList);
-        }
-      }
-    }
-
     this.insertGukyuinAuditLog(
         EventType.LIST.getId(),
         netUtils.getLocalIP(),
@@ -283,7 +303,16 @@ public class GukYuinApiService {
   }
 
   public ResultPnuDto findPnuObjMgmtList(String chnDtctId, String chnDtctObjtId) {
-    String url = gukyuinCdiUrl + "/chn/pnu/" + chnDtctId + "/objt/" + chnDtctObjtId;
+    String url =
+        gukyuinCdiUrl
+            + "/chn/pnu/"
+            + chnDtctId
+            + "/objt/"
+            + chnDtctObjtId
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectContDto.ResultPnuDto> result =
         externalHttpClient.call(
@@ -304,18 +333,21 @@ public class GukYuinApiService {
     return result.body();
   }
 
-  public ResReturn updateChnDtctObjtLabelingYn(String chnDtctObjtId, String lblYn) {
+  public ChngDetectContDto.ResultLabelDto updateChnDtctObjtLabelingYn(
+      String chnDtctObjtId, String lblYn) {
     String url = gukyuinCdiUrl + "/rlb/objt/" + chnDtctObjtId + "/lbl/" + lblYn;
 
-    ExternalCallResult<ChngDetectContDto.ResultPnuDto> result =
+    ReqInfo info = new ReqInfo();
+    info.setReqIp(myip);
+    info.setReqEpno(userUtil.getEmployeeNo());
+
+    ExternalCallResult<ChngDetectContDto.ResultLabelDto> result =
         externalHttpClient.call(
             url,
             HttpMethod.POST,
-            null,
+            info,
             netUtils.jsonHeaders(),
-            ChngDetectContDto.ResultPnuDto.class);
+            ChngDetectContDto.ResultLabelDto.class);
-
-    ChngDetectContDto.ResultPnuDto dto = result.body();
 
     this.insertGukyuinAuditLog(
         EventType.MODIFIED.getId(),
@@ -325,11 +357,21 @@ public class GukYuinApiService {
         null,
         result.body().getSuccess());
 
-    return new ResReturn(dto.getCode() > 200000 ? "fail" : "success", dto.getMessage());
+    return result.body();
   }
 
   public ResultContDto findChnPnuToContList(String chnDtctId, String pnu) {
-    String url = gukyuinCdiUrl + "/chn/cont/" + chnDtctId + "/pnu/" + pnu;
+
+    String url =
+        gukyuinCdiUrl
+            + "/chn/cont/"
+            + chnDtctId
+            + "/pnu/"
+            + pnu
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectContDto.ResultContDto> result =
         externalHttpClient.call(
@@ -350,7 +392,14 @@ public class GukYuinApiService {
   }
 
   public ResultDto listChnDtctId(String chnDtctId) {
-    String url = gukyuinCdiUrl + "/chn/mast/" + chnDtctId;
+    String url =
+        gukyuinCdiUrl
+            + "/chn/mast/"
+            + chnDtctId
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -407,6 +456,16 @@ 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()));
@@ -415,10 +474,7 @@ public class GukYuinApiService {
     reqDto.setChnDtctId(info.getUid());
     reqDto.setPathNm("/kamco-nfs/dataset/export/" + info.getUid());
 
-    log.info("reqDto.setPathNm: {} ", Path.of("/kamco-nfs/dataset/export/" + reqDto.getPathNm()));
+    if (!Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid()))) {
-    log.info("Path of: {} ", 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, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다.");
     }
@@ -448,7 +504,11 @@ public class GukYuinApiService {
             + "?pageIndex="
             + pageIndex
             + "&pageSize="
-            + pageSize;
+            + pageSize
+            + "&reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectContDto.ResultContDto> result =
         externalHttpClient.call(
@@ -468,9 +528,18 @@ public class GukYuinApiService {
     return result.body();
   }
 
-  public ChngDetectMastDto.RlbDtctDto findRlbDtctList(String chnDtctId) {
+  public ChngDetectMastDto.RlbDtctDto findRlbDtctList(String chnDtctId, String yyyymmdd) {
 
-    String url = gukyuinCdiUrl + "/rlb/dtct/" + chnDtctId;
+    String url =
+        gukyuinCdiUrl
+            + "/rlb/dtct/"
+            + chnDtctId
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo()
+            + "&yyyymmdd="
+            + yyyymmdd;
 
     ExternalCallResult<ChngDetectMastDto.RlbDtctDto> result =
         externalHttpClient.call(
@@ -487,8 +556,14 @@ public class GukYuinApiService {
   }
 
   public RlbDtctDto findRlbDtctObject(String chnDtctObjtId) {
-
+    String url =
-    String url = gukyuinCdiUrl + "/rlb/objt/" + chnDtctObjtId;
+        gukyuinCdiUrl
+            + "/rlb/objt/"
+            + chnDtctObjtId
+            + "?reqIp="
+            + myip
+            + "&reqEpno="
+            + userUtil.getEmployeeNo();
 
     ExternalCallResult<ChngDetectMastDto.RlbDtctDto> result =
         externalHttpClient.call(

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

@@ -33,8 +33,8 @@ public class GukYuinCoreService {
     gukYuinRepository.updateGukYuinMastRegResult(resultBody);
   }
 
-  public void updateGukYuinMastRegRemove(Basic resultBody) {
+  public void updateGukYuinMastRegRemove(String chnDtctId) {
-    gukYuinRepository.updateGukYuinMastRegRemove(resultBody);
+    gukYuinRepository.updateGukYuinMastRegRemove(chnDtctId);
   }
 
   public void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt) {
@@ -45,8 +45,8 @@ public class GukYuinCoreService {
     return gukYuinRepository.findMapSheetAnalDataInferenceGeomUid(chnDtctObjtId);
   }
 
-  public void insertGeoUidPnuData(Long geoUid, String[] pnuList) {
+  public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
-    gukYuinRepository.insertGeoUidPnuData(geoUid, pnuList);
+    gukYuinRepository.insertGeoUidPnuData(geoUid, pnuList, chnDtctObjtId);
   }
 
   public LearnInfo findMapSheetLearnInfo(UUID uuid) {
@@ -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/GukYuinJobCoreService.java

@@ -5,6 +5,7 @@ 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 {
@@ -15,6 +16,7 @@ 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,6 +4,7 @@ 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 {
@@ -18,6 +19,7 @@ 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,6 +5,7 @@ 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 {
@@ -27,6 +28,7 @@ public class GukYuinPnuJobCoreService {
     return gukYuinPnuRepository.upsertMapSheetDataAnalGeomPnu(chnDtctObjtId, pnuList);
   }
 
+  @Transactional
   public void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt) {
     gukYuinPnuRepository.updateInferenceGeomDataPnuCnt(chnDtctObjtId, pnuCnt);
   }
@@ -35,7 +37,8 @@ public class GukYuinPnuJobCoreService {
     return gukYuinPnuRepository.findMapSheetAnalDataInferenceGeomUid(chnDtctObjtId);
   }
 
-  public void insertGeoUidPnuData(Long geoUid, String[] pnuList) {
+  @Transactional
-    gukYuinPnuRepository.insertGeoUidPnuData(geoUid, pnuList);
+  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

@@ -1,9 +1,13 @@
 package com.kamco.cd.kamcoback.postgres.core;
 
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctMastDto;
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
 import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinStbltJobRepository;
+import java.time.ZonedDateTime;
 import java.util.List;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class GukYuinStbltJobCoreService {
@@ -18,7 +22,54 @@ public class GukYuinStbltJobCoreService {
     return gukYuinStbltRepository.findGukYuinEligibleForSurveyList(status);
   }
 
-  public void updateGukYuinEligibleForSurvey(String resultUid, String stbltYn, String lockYn) {
+  @Transactional
-    gukYuinStbltRepository.updateGukYuinEligibleForSurvey(resultUid, stbltYn, lockYn);
+  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.setChgIp(stbltDto.getChgIp());
+      entity.setDelYn(stbltDto.getDelYn().equals("Y"));
+
+      entity.setCreatedDttm(ZonedDateTime.now());
+      gukYuinStbltRepository.save(entity);
+
+      //
+    }
   }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/entity/PnuEntity.java

@@ -12,7 +12,7 @@ import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
-import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;
@@ -39,7 +39,7 @@ public class PnuEntity {
   private String pnu;
 
   @Column(name = "created_dttm")
-  private OffsetDateTime createdDttm;
+  private ZonedDateTime createdDttm;
 
   @Column(name = "created_uid")
   private Long createdUid;
@@ -47,4 +47,140 @@ public class PnuEntity {
   @ColumnDefault("false")
   @Column(name = "del_yn")
   private Boolean delYn;
+
+  @Size(max = 40)
+  @Column(name = "pnu_dtct_id", length = 40)
+  private String pnuDtctId;
+
+  @Size(max = 10)
+  @Column(name = "lrm_sync_ymd", length = 10)
+  private String lrmSyncYmd;
+
+  @Size(max = 10)
+  @Column(name = "pnu_sync_ymd", length = 10)
+  private String pnuSyncYmd;
+
+  @Size(max = 20)
+  @Column(name = "mpqd_no", length = 20)
+  private String mpqdNo;
+
+  @Size(max = 10)
+  @Column(name = "cprs_yr", length = 10)
+  private String cprsYr;
+
+  @Size(max = 10)
+  @Column(name = "crtr_yr", length = 10)
+  private String crtrYr;
+
+  @Size(max = 255)
+  @Column(name = "chn_dtct_id")
+  private String chnDtctId;
+
+  @Size(max = 10)
+  @Column(name = "chn_dtct_mst_id", length = 10)
+  private String chnDtctMstId;
+
+  @Size(max = 255)
+  @Column(name = "chn_dtct_objt_id")
+  private String chnDtctObjtId;
+
+  @Size(max = 255)
+  @Column(name = "chn_dtct_cont_id")
+  private String chnDtctContId;
+
+  @Size(max = 50)
+  @Column(name = "chn_cd", length = 50)
+  private String chnCd;
+
+  @Size(max = 50)
+  @Column(name = "chn_dtct_prob", length = 50)
+  private String chnDtctProb;
+
+  @Size(max = 50)
+  @Column(name = "bf_cls_cd", length = 50)
+  private String bfClsCd;
+
+  @Size(max = 50)
+  @Column(name = "bf_cls_prob", length = 50)
+  private String bfClsProb;
+
+  @Size(max = 50)
+  @Column(name = "af_cls_cd", length = 50)
+  private String afClsCd;
+
+  @Size(max = 50)
+  @Column(name = "af_cls_prob", length = 50)
+  private String afClsProb;
+
+  @Size(max = 100)
+  @Column(name = "pnu_sqms", length = 100)
+  private String pnuSqms;
+
+  @Size(max = 100)
+  @Column(name = "pnu_dtct_sqms", length = 100)
+  private String pnuDtctSqms;
+
+  @Size(max = 100)
+  @Column(name = "chn_dtct_sqms", length = 100)
+  private String chnDtctSqms;
+
+  @Size(max = 1)
+  @Column(name = "stblt_yn", length = 1)
+  private String stbltYn;
+
+  @Size(max = 30)
+  @Column(name = "incy_cd", length = 30)
+  private String incyCd;
+
+  @Size(max = 255)
+  @Column(name = "incy_rsn_cont")
+  private String incyRsnCont;
+
+  @Size(max = 1)
+  @Column(name = "lock_yn", length = 1)
+  private String lockYn;
+
+  @Size(max = 1)
+  @Column(name = "lbl_yn", length = 1)
+  private String lblYn;
+
+  @Size(max = 1)
+  @Column(name = "chg_yn", length = 1)
+  private String chgYn;
+
+  @Size(max = 50)
+  @Column(name = "rsatct_no", length = 50)
+  private String rsatctNo;
+
+  @Size(max = 100)
+  @Column(name = "rmk", length = 100)
+  private String rmk;
+
+  @Size(max = 20)
+  @Column(name = "crt_dt", length = 20)
+  private String crtDt;
+
+  @Size(max = 20)
+  @Column(name = "crt_epno", length = 20)
+  private String crtEpno;
+
+  @Size(max = 20)
+  @Column(name = "crt_ip", length = 20)
+  private String crtIp;
+
+  @Size(max = 20)
+  @Column(name = "chg_dt", length = 20)
+  private String chgDt;
+
+  @Size(max = 20)
+  @Column(name = "chg_epno", length = 20)
+  private String chgEpno;
+
+  @Size(max = 20)
+  @Column(name = "chg_ip", length = 20)
+  private String chgIp;
+
+  @Size(max = 10)
+  @Column(name = "chn_dtct_sno", length = 10)
+  private String chnDtctSno;
 }

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

@@ -30,13 +30,19 @@ 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(yesterdayStart)
+            .goe(todayStart)
-            .and(labelingAssignmentEntity.inspectStatDttm.lt(todayStart));
+            .and(labelingAssignmentEntity.inspectStatDttm.lt(tomorrowStart));
 
     return queryFactory
         .select(

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

@@ -10,7 +10,7 @@ public interface GukYuinPnuJobRepositoryCustom {
 
   Long findMapSheetAnalDataInferenceGeomUid(String chnDtctObjtId);
 
-  void insertGeoUidPnuData(Long geoUid, String[] pnuList);
+  void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId);
 
   void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status);
 

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

@@ -6,6 +6,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity;
 
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
 import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
@@ -42,15 +43,23 @@ public class GukYuinPnuJobRepositoryImpl implements GukYuinPnuJobRepositoryCusto
   }
 
   @Override
-  public void insertGeoUidPnuData(Long geoUid, String[] pnuList) {
+  public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
     for (String pnu : pnuList) {
+      PnuEntity entity =
+          queryFactory
+              .selectFrom(pnuEntity)
+              .where(pnuEntity.pnu.eq(pnu), pnuEntity.chnDtctObjtId.eq(chnDtctObjtId))
+              .fetchOne();
+      if (entity == null) {
         queryFactory
             .insert(pnuEntity)
-          .columns(pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm)
+            .columns(
-          .values(geoUid, pnu, ZonedDateTime.now())
+                pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm, pnuEntity.chnDtctObjtId)
+            .values(geoUid, pnu, ZonedDateTime.now(), chnDtctObjtId)
             .execute();
       }
     }
+  }
 
   @Override
   public List<LearnKeyDto> findGukyuinApplyStatusUidList(List<String> status) {
@@ -87,8 +96,12 @@ public class GukYuinPnuJobRepositoryImpl implements GukYuinPnuJobRepositoryCusto
       long result =
           queryFactory
               .insert(pnuEntity)
-              .columns(pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm)
+              .columns(
-              .values(geoUid, pnu, ZonedDateTime.now())
+                  pnuEntity.geo.geoUid,
+                  pnuEntity.pnu,
+                  pnuEntity.createdDttm,
+                  pnuEntity.chnDtctObjtId)
+              .values(geoUid, pnu, ZonedDateTime.now(), chnDtctObjtId)
               .execute();
       if (result > 0) {
         succCnt++;

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

@@ -14,13 +14,13 @@ public interface GukYuinRepositoryCustom {
 
   void updateGukYuinMastRegResult(Basic resultBody);
 
-  void updateGukYuinMastRegRemove(Basic resultBody);
+  void updateGukYuinMastRegRemove(String chnDtctId);
 
   void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt);
 
   Long findMapSheetAnalDataInferenceGeomUid(String chnDtctObjtId);
 
-  void insertGeoUidPnuData(Long geoUid, String[] pnuList);
+  void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId);
 
   void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status);
 
@@ -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,8 @@ 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;
 import com.querydsl.core.types.dsl.Expressions;
@@ -59,12 +61,13 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
   }
 
   @Override
-  public void updateGukYuinMastRegRemove(Basic resultBody) {
+  public void updateGukYuinMastRegRemove(String chnDtctId) {
     queryFactory
         .update(mapSheetLearnEntity)
         .set(mapSheetLearnEntity.applyStatus, GukYuinStatus.CANCELED.getId())
         .set(mapSheetLearnEntity.applyStatusDttm, ZonedDateTime.now())
-        .where(mapSheetLearnEntity.uid.eq(resultBody.getChnDtctId()))
+        .set(mapSheetLearnEntity.applyYn, false)
+        .where(mapSheetLearnEntity.uid.eq(chnDtctId))
         .execute();
   }
 
@@ -87,15 +90,27 @@ public class GukYuinRepositoryImpl implements GukYuinRepositoryCustom {
   }
 
   @Override
-  public void insertGeoUidPnuData(Long geoUid, String[] pnuList) {
+  public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
     for (String pnu : pnuList) {
+      PnuEntity entity =
+          queryFactory
+              .selectFrom(pnuEntity)
+              .where(
+                  pnuEntity.geo.geoUid.eq(geoUid),
+                  pnuEntity.pnu.eq(pnu),
+                  pnuEntity.chnDtctObjtId.eq(chnDtctObjtId))
+              .fetchOne();
+
+      if (entity == null) {
         queryFactory
             .insert(pnuEntity)
-          .columns(pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm)
+            .columns(
-          .values(geoUid, pnu, ZonedDateTime.now())
+                pnuEntity.geo.geoUid, pnuEntity.pnu, pnuEntity.createdDttm, pnuEntity.chnDtctObjtId)
+            .values(geoUid, pnu, ZonedDateTime.now(), chnDtctObjtId)
             .execute();
       }
     }
+  }
 
   @Override
   public List<LearnKeyDto> findGukyuinApplyStatusUidList(List<String> status) {
@@ -190,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();
   }
@@ -269,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/GukYuinStbltJobRepository.java

@@ -1,7 +1,7 @@
 package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
 
-import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity;
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface GukYuinStbltJobRepository
-    extends JpaRepository<MapSheetLearnEntity, Long>, GukYuinStbltJobRepositoryCustom {}
+    extends JpaRepository<PnuEntity, Long>, GukYuinStbltJobRepositoryCustom {}

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

@@ -1,11 +1,15 @@
 package com.kamco.cd.kamcoback.postgres.repository.gukyuin;
 
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
+import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctMastDto;
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
 import java.util.List;
 
 public interface GukYuinStbltJobRepositoryCustom {
 
   List<LearnKeyDto> findGukYuinEligibleForSurveyList(String status);
 
-  void updateGukYuinEligibleForSurvey(String resultUid, String stbltYn, String lockYn);
+  void updateGukYuinEligibleForSurvey(String resultUid, RlbDtctMastDto stbltDto);
+
+  PnuEntity findPnuEntityByResultUid(String resultUid, String pnu);
 }

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

@@ -4,10 +4,14 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceE
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
 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;
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceGeomEntity;
+import com.kamco.cd.kamcoback.postgres.entity.PnuEntity;
 import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
@@ -42,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))
@@ -50,15 +54,40 @@ public class GukYuinStbltJobRepositoryImpl implements GukYuinStbltJobRepositoryC
   }
 
   @Override
-  public void updateGukYuinEligibleForSurvey(String resultUid, String stbltYn, String lockYn) {
+  public void updateGukYuinEligibleForSurvey(String resultUid, RlbDtctMastDto stbltDto) {
+
+    MapSheetAnalDataInferenceGeomEntity geomEntity =
+        queryFactory
+            .selectFrom(mapSheetAnalDataInferenceGeomEntity)
+            .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(resultUid))
+            .fetchOne();
+
+    if (geomEntity != null) {
+      PnuEntity pnuEt =
+          queryFactory
+              .selectFrom(pnuEntity)
+              .where(pnuEntity.chnDtctObjtId.eq(resultUid))
+              .fetchFirst();
+
       queryFactory
           .update(mapSheetAnalDataInferenceGeomEntity)
           .set(
               mapSheetAnalDataInferenceGeomEntity.fitState,
-            stbltYn.equals("Y") ? ImageryFitStatus.FIT.getId() : ImageryFitStatus.UNFIT.getId())
+              pnuEt.getStbltYn().equals("Y")
+                  ? ImageryFitStatus.UNFIT.getId()
+                  : ImageryFitStatus.FIT.getId()) // 적합여부가 Y 이면 부적합인 것, N 이면 적합한 것이라고 함
           .set(mapSheetAnalDataInferenceGeomEntity.fitStateDttm, ZonedDateTime.now())
-        .set(mapSheetAnalDataInferenceGeomEntity.lockYn, lockYn)
+          .set(mapSheetAnalDataInferenceGeomEntity.lockYn, stbltDto.getLockYn())
           .where(mapSheetAnalDataInferenceGeomEntity.resultUid.eq(resultUid))
           .execute();
     }
   }
+
+  @Override
+  public PnuEntity findPnuEntityByResultUid(String resultUid, String pnu) {
+    return queryFactory
+        .selectFrom(pnuEntity)
+        .where(pnuEntity.pnu.eq(pnu), pnuEntity.chnDtctObjtId.eq(resultUid))
+        .fetchOne();
+  }
+}

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),
@@ -126,8 +129,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, pnu)
+             work_state, assign_group_id, anal_uid)
-            values (?, ?, ?, ?, ?, ?, ?)
+            values (?, ?, ?, ?, ?, ?)
             """;
 
           try (PreparedStatement ps = connection.prepareStatement(sql)) {
@@ -140,7 +143,6 @@ 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++;
@@ -190,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();
@@ -381,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();
@@ -555,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();
     }
 
@@ -576,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 =
@@ -602,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())
@@ -614,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) {
@@ -621,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;
     }
@@ -658,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)
@@ -740,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())
@@ -549,7 +556,19 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
   @Override
   public LabelWorkMngDetail findLabelWorkMngDetail(UUID uuid) {
 
-    NumberExpression<Long> labelTotCnt = mapSheetAnalDataInferenceGeomEntity.geoUid.count();
+    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> labelerCnt = labelingAssignmentEntity.workerUid.count();
     NumberExpression<Long> reviewerCnt = labelingAssignmentEntity.inspectorUid.count();
 

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

@@ -1,27 +1,15 @@
 package com.kamco.cd.kamcoback.scheduler.service;
 
-import com.kamco.cd.kamcoback.common.utils.NetUtils;
-import com.kamco.cd.kamcoback.common.utils.UserUtil;
-import com.kamco.cd.kamcoback.config.api.ApiLogFunction;
-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.ResultPnuDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
-import com.kamco.cd.kamcoback.log.dto.EventStatus;
+import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
-import com.kamco.cd.kamcoback.log.dto.EventType;
 import com.kamco.cd.kamcoback.postgres.core.GukYuinLabelJobCoreService;
-import com.kamco.cd.kamcoback.postgres.entity.AuditLogEntity;
-import com.kamco.cd.kamcoback.postgres.repository.log.AuditLogRepository;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpMethod;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 @Log4j2
 @Service
@@ -29,22 +17,11 @@ import org.springframework.transaction.annotation.Transactional;
 public class GukYuinApiLabelJobService {
 
   private final GukYuinLabelJobCoreService gukYuinLabelJobCoreService;
-
+  private final GukYuinApiService gukYuinApiService;
-  private final ExternalHttpClient externalHttpClient;
-  private final NetUtils netUtils = new NetUtils();
-  private final AuditLogRepository auditLogRepository;
-
-  private final UserUtil userUtil;
 
   @Value("${spring.profiles.active}")
   private String profile;
 
-  @Value("${gukyuin.url}")
-  private String gukyuinUrl;
-
-  @Value("${gukyuin.cdi}")
-  private String gukyuinCdiUrl;
-
   /**
    * 실행중인 profile
    *
@@ -67,57 +44,12 @@ public class GukYuinApiLabelJobService {
     }
 
     for (GeomUidDto gto : list) {
-      String url = gukyuinCdiUrl + "/rlb/objt/" + gto.getResultUid() + "/lbl/" + "Y";
+      ChngDetectContDto.ResultLabelDto dto =
-
+          gukYuinApiService.updateChnDtctObjtLabelingYn(gto.getResultUid(), "Y");
-      ExternalCallResult<ResultPnuDto> result =
+      if (dto.getSuccess()) {
-          externalHttpClient.call(
-              url,
-              HttpMethod.POST,
-              null,
-              netUtils.jsonHeaders(),
-              ChngDetectContDto.ResultPnuDto.class);
-
-      ChngDetectContDto.ResultPnuDto dto = result.body();
-
-      this.insertGukyuinAuditLog(
-          EventType.MODIFIED.getId(),
-          netUtils.getLocalIP(),
-          userUtil.getId(),
-          url.replace(gukyuinUrl, ""),
-          null,
-          result.body().getSuccess());
-
         // inference_geom 에 label_send_dttm 업데이트 하기
         gukYuinLabelJobCoreService.updateAnalDataInferenceGeomSendDttm(gto.getGeoUid());
       }
     }
-
-  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-  public void insertGukyuinAuditLog(
-      String actionType,
-      String myIp,
-      Long userUid,
-      String requestUri,
-      Object requestBody,
-      boolean successFail) {
-    try {
-      AuditLogEntity log =
-          new AuditLogEntity(
-              userUid,
-              EventType.fromName(actionType),
-              successFail ? EventStatus.SUCCESS : EventStatus.FAILED,
-              "GUKYUIN", // 메뉴도 국유인으로 하나 따기
-              myIp,
-              requestUri,
-              requestBody == null ? null : ApiLogFunction.cutRequestBody(requestBody.toString()),
-              null,
-              null,
-              null);
-      auditLogRepository.save(log);
-
-    } catch (Exception e) {
-      log.error(e.getMessage());
-      throw e;
-    }
   }
 }

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

@@ -1,31 +1,19 @@
 package com.kamco.cd.kamcoback.scheduler.service;
 
-import com.kamco.cd.kamcoback.common.utils.NetUtils;
-import com.kamco.cd.kamcoback.common.utils.UserUtil;
-import com.kamco.cd.kamcoback.config.api.ApiLogFunction;
-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.ResultContDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResultDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
-import com.kamco.cd.kamcoback.log.dto.EventStatus;
+import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
-import com.kamco.cd.kamcoback.log.dto.EventType;
 import com.kamco.cd.kamcoback.postgres.core.GukYuinPnuJobCoreService;
-import com.kamco.cd.kamcoback.postgres.entity.AuditLogEntity;
-import com.kamco.cd.kamcoback.postgres.repository.log.AuditLogRepository;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpMethod;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 @Log4j2
 @Service
@@ -33,21 +21,11 @@ import org.springframework.transaction.annotation.Transactional;
 public class GukYuinApiPnuJobService {
 
   private final GukYuinPnuJobCoreService gukYuinPnuJobCoreService;
-  private final ExternalHttpClient externalHttpClient;
+  private final GukYuinApiService gukYuinApiService;
-  private final NetUtils netUtils = new NetUtils();
-  private final AuditLogRepository auditLogRepository;
-
-  private final UserUtil userUtil;
 
   @Value("${spring.profiles.active}")
   private String profile;
 
-  @Value("${gukyuin.url}")
-  private String gukyuinUrl;
-
-  @Value("${gukyuin.cdi}")
-  private String gukyuinCdiUrl;
-
   /**
    * 실행중인 profile
    *
@@ -73,14 +51,9 @@ public class GukYuinApiPnuJobService {
 
     for (LearnKeyDto dto : list) {
       try {
-        long succCnt = processUid(dto.getChnDtctMstId(), dto.getUid());
+        processUid(dto.getUid(), dto.getUid());
-        if (succCnt > 0) {
         gukYuinPnuJobCoreService.updateGukYuinApplyStateComplete(
             dto.getId(), GukYuinStatus.PNU_COMPLETED);
-        } else {
-          gukYuinPnuJobCoreService.updateGukYuinApplyStateComplete(
-              dto.getId(), GukYuinStatus.PNU_FAILED);
-        }
       } catch (Exception e) {
         log.error("[GUKYUIN] failed uid={}", dto.getUid(), e);
         gukYuinPnuJobCoreService.updateGukYuinApplyStateComplete(
@@ -89,31 +62,16 @@ public class GukYuinApiPnuJobService {
     }
   }
 
-  private long processUid(String chnDtctMstId, String uid) {
+  private void processUid(String chnDtctId, String uid) {
-    long succCnt = 0;
+    ResultDto result = gukYuinApiService.listChnDtctId(chnDtctId);
-    String url = gukyuinCdiUrl + "/chn/mast/list/" + chnDtctMstId;
-
-    ExternalCallResult<ResultDto> response =
-        externalHttpClient.call(
-            url, HttpMethod.GET, null, netUtils.jsonHeaders(), ChngDetectMastDto.ResultDto.class);
-
-    this.insertGukyuinAuditLog(
-        EventType.DETAIL.getId(),
-        netUtils.getLocalIP(),
-        userUtil.getId(),
-        url.replace(gukyuinUrl, ""),
-        null,
-        response.body().getSuccess());
-
-    ResultDto result = response.body();
     if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
-      return succCnt;
+      return;
     }
 
     ChngDetectMastDto.Basic basic = result.getResult().get(0);
     String chnDtctCnt = basic.getChnDtctCnt();
     if (chnDtctCnt == null || chnDtctCnt.isEmpty()) {
-      return succCnt;
+      return;
     }
 
     // page 계산
@@ -122,30 +80,18 @@ public class GukYuinApiPnuJobService {
     int totalPages = (totalCount + pageSize - 1) / pageSize;
 
     for (int page = 0; page < totalPages; page++) {
-      succCnt += processPage(uid, page, pageSize);
+      processPage(uid, page, pageSize);
+    }
   }
 
-    return succCnt;
+  private void processPage(String uid, int page, int pageSize) {
-  }
+    ResultContDto resContList = gukYuinApiService.findChnContList(uid, page, pageSize);
-
+
-  private long processPage(String uid, int page, int pageSize) {
+    if (resContList.getResult() == null || resContList.getResult().isEmpty()) {
-    long result = 0;
+      return; // 외부 API 이상 방어
-    String url =
-        gukyuinCdiUrl + "/chn/cont/" + uid + "?pageIndex=" + page + "&pageSize=" + pageSize;
-
-    ExternalCallResult<ChngDetectContDto.ResultContDto> response =
-        externalHttpClient.call(
-            url,
-            HttpMethod.GET,
-            null,
-            netUtils.jsonHeaders(),
-            ChngDetectContDto.ResultContDto.class);
-
-    List<ContBasic> contList = response.body().getResult();
-    if (contList == null || contList.isEmpty()) {
-      return 0;
     }
 
+    List<ContBasic> contList = resContList.getResult();
     for (ContBasic cont : contList) {
       String[] pnuList = cont.getPnuList();
       long pnuCnt = pnuList == null ? 0 : pnuList.length;
@@ -156,65 +102,9 @@ public class GukYuinApiPnuJobService {
           Long geoUid =
               gukYuinPnuJobCoreService.findMapSheetAnalDataInferenceGeomUid(
                   cont.getChnDtctObjtId());
-          gukYuinPnuJobCoreService.insertGeoUidPnuData(geoUid, pnuList);
+          gukYuinPnuJobCoreService.insertGeoUidPnuData(geoUid, pnuList, cont.getChnDtctObjtId());
         }
       }
     }
-
-    this.insertGukyuinAuditLog(
-        EventType.LIST.getId(),
-        netUtils.getLocalIP(),
-        userUtil.getId(),
-        url.replace(gukyuinUrl, ""),
-        null,
-        response.body().getSuccess());
-
-    ResultContDto cont = response.body();
-    if (cont == null || cont.getResult().isEmpty()) {
-      return result; // 외부 API 이상 방어
-    }
-
-    // pnuList 업데이트
-    for (ChngDetectContDto.ContBasic contBasic : cont.getResult()) {
-      if (contBasic.getPnuList() == null || contBasic.getChnDtctObjtId() == null) {
-        return 0;
-      }
-
-      long upsertCnt =
-          gukYuinPnuJobCoreService.upsertMapSheetDataAnalGeomPnu(
-              contBasic.getChnDtctObjtId(), contBasic.getPnuList());
-      result += upsertCnt;
-    }
-
-    return result;
-  }
-
-  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-  public void insertGukyuinAuditLog(
-      String actionType,
-      String myIp,
-      Long userUid,
-      String requestUri,
-      Object requestBody,
-      boolean successFail) {
-    try {
-      AuditLogEntity log =
-          new AuditLogEntity(
-              userUid,
-              EventType.fromName(actionType),
-              successFail ? EventStatus.SUCCESS : EventStatus.FAILED,
-              "GUKYUIN", // 메뉴도 국유인으로 하나 따기
-              myIp,
-              requestUri,
-              requestBody == null ? null : ApiLogFunction.cutRequestBody(requestBody.toString()),
-              null,
-              null,
-              null);
-      auditLogRepository.save(log);
-
-    } catch (Exception e) {
-      log.error(e.getMessage());
-      throw e;
-    }
   }
 }

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

@@ -1,52 +1,28 @@
 package com.kamco.cd.kamcoback.scheduler.service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.kamco.cd.kamcoback.common.utils.NetUtils;
-import com.kamco.cd.kamcoback.common.utils.UserUtil;
-import com.kamco.cd.kamcoback.config.api.ApiLogFunction;
-import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient;
-import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResultDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
-import com.kamco.cd.kamcoback.log.dto.EventStatus;
+import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
-import com.kamco.cd.kamcoback.log.dto.EventType;
 import com.kamco.cd.kamcoback.postgres.core.GukYuinJobCoreService;
-import com.kamco.cd.kamcoback.postgres.entity.AuditLogEntity;
-import com.kamco.cd.kamcoback.postgres.repository.log.AuditLogRepository;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpMethod;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 @Log4j2
 @Service
 @RequiredArgsConstructor
 public class GukYuinApiStatusJobService {
 
-  private final ExternalHttpClient externalHttpClient;
-  private final NetUtils netUtils = new NetUtils();
   private final GukYuinJobCoreService gukYuinJobCoreService;
-  private final AuditLogRepository auditLogRepository;
+  private final GukYuinApiService gukYuinApiService;
-
-  private final UserUtil userUtil;
-  private final ObjectMapper objectMapper;
 
   @Value("${spring.profiles.active}")
   private String profile;
 
-  @Value("${gukyuin.url}")
-  private String gukyuinUrl;
-
-  @Value("${gukyuin.cdi}")
-  private String gukyuinCdiUrl;
-
   /**
    * 실행중인 profile
    *
@@ -72,32 +48,14 @@ public class GukYuinApiStatusJobService {
 
     for (LearnKeyDto dto : list) {
       try {
-        String url = gukyuinCdiUrl + "/chn/mast/list/" + dto.getChnDtctMstId();
+        ChngDetectMastDto.ResultDto result = gukYuinApiService.listChnDtctId(dto.getUid());
-
-        ExternalCallResult<ResultDto> response =
-            externalHttpClient.call(
-                url,
-                HttpMethod.GET,
-                null,
-                netUtils.jsonHeaders(),
-                ChngDetectMastDto.ResultDto.class);
-
-        this.insertGukyuinAuditLog(
-            EventType.DETAIL.getId(),
-            netUtils.getLocalIP(),
-            userUtil.getId(),
-            url.replace(gukyuinUrl, ""),
-            null,
-            response.body().getSuccess());
-
-        ResultDto result = response.body();
 
         if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
           log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId());
           continue;
         }
 
-        ChngDetectMastDto.Basic basic = result.getResult().get(0);
+        ChngDetectMastDto.Basic basic = result.getResult().getFirst();
 
         Integer progress =
             basic.getExcnPgrt() == null ? null : Integer.parseInt(basic.getExcnPgrt().trim());
@@ -110,33 +68,4 @@ public class GukYuinApiStatusJobService {
       }
     }
   }
-
-  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-  public void insertGukyuinAuditLog(
-      String actionType,
-      String myIp,
-      Long userUid,
-      String requestUri,
-      Object requestBody,
-      boolean successFail) {
-    try {
-      AuditLogEntity log =
-          new AuditLogEntity(
-              userUid,
-              EventType.fromName(actionType),
-              successFail ? EventStatus.SUCCESS : EventStatus.FAILED,
-              "GUKYUIN", // 메뉴도 국유인으로 하나 따기
-              myIp,
-              requestUri,
-              requestBody == null ? null : ApiLogFunction.cutRequestBody(requestBody.toString()),
-              null,
-              null,
-              null);
-      auditLogRepository.save(log);
-
-    } catch (Exception e) {
-      log.error(e.getMessage());
-      throw e;
-    }
-  }
 }

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

@@ -1,51 +1,32 @@
 package com.kamco.cd.kamcoback.scheduler.service;
 
-import com.kamco.cd.kamcoback.common.utils.NetUtils;
-import com.kamco.cd.kamcoback.common.utils.UserUtil;
-import com.kamco.cd.kamcoback.config.api.ApiLogFunction;
-import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient;
-import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult;
-import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.LearnKeyDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctMastDto;
 import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
-import com.kamco.cd.kamcoback.log.dto.EventStatus;
+import com.kamco.cd.kamcoback.gukyuin.service.GukYuinApiService;
-import com.kamco.cd.kamcoback.log.dto.EventType;
 import com.kamco.cd.kamcoback.postgres.core.GukYuinStbltJobCoreService;
-import com.kamco.cd.kamcoback.postgres.entity.AuditLogEntity;
+import java.time.LocalDate;
-import com.kamco.cd.kamcoback.postgres.repository.log.AuditLogRepository;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpMethod;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 @Log4j2
 @Service
 @RequiredArgsConstructor
 public class GukYuinApiStbltJobService {
 
-  private final ExternalHttpClient externalHttpClient;
-  private final NetUtils netUtils = new NetUtils();
   private final GukYuinStbltJobCoreService gukYuinStbltJobCoreService;
-  private final AuditLogRepository auditLogRepository;
+  private final GukYuinApiService gukYuinApiService;
-
-  private final UserUtil userUtil;
 
   @Value("${spring.profiles.active}")
   private String profile;
 
-  @Value("${gukyuin.url}")
-  private String gukyuinUrl;
-
-  @Value("${gukyuin.cdi}")
-  private String gukyuinCdiUrl;
-
   /**
    * 실행중인 profile
    *
@@ -56,7 +37,7 @@ public class GukYuinApiStbltJobService {
   }
 
   /** 국유인 연동 후, 실태조사 적합여부 확인하여 update */
-  @Scheduled(cron = "0 0 3 * * *")
+  @Scheduled(cron = "0 0 3 * * *") // 0 0 3 * * *
   public void findGukYuinEligibleForSurvey() {
     if (isLocalProfile()) {
       return;
@@ -71,25 +52,11 @@ public class GukYuinApiStbltJobService {
 
     for (LearnKeyDto dto : list) {
       try {
-        String url = gukyuinCdiUrl + "/rlb/dtct/" + dto.getUid();
+        String yesterday =
-
+            LocalDate.now(ZoneId.of("Asia/Seoul"))
-        ExternalCallResult<RlbDtctDto> response =
+                .minusDays(1)
-            externalHttpClient.call(
+                .format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-                url,
+        RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), yesterday);
-                HttpMethod.GET,
-                null,
-                netUtils.jsonHeaders(),
-                ChngDetectMastDto.RlbDtctDto.class);
-
-        this.insertGukyuinAuditLog(
-            EventType.LIST.getId(),
-            netUtils.getLocalIP(),
-            userUtil.getId(),
-            url.replace(gukyuinUrl, ""),
-            null,
-            response.body().getSuccess());
-
-        RlbDtctDto result = response.body();
 
         if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
           log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId());
@@ -98,41 +65,12 @@ public class GukYuinApiStbltJobService {
 
         for (RlbDtctMastDto stbltDto : result.getResult()) {
           String resultUid = stbltDto.getChnDtctObjtId();
-          gukYuinStbltJobCoreService.updateGukYuinEligibleForSurvey(
+          gukYuinStbltJobCoreService.updateGukYuinEligibleForSurvey(resultUid, stbltDto);
-              resultUid, stbltDto.getStbltYn(), stbltDto.getLockYn());
         }
+
       } catch (Exception e) {
         log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), e);
       }
     }
   }
-
-  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-  public void insertGukyuinAuditLog(
-      String actionType,
-      String myIp,
-      Long userUid,
-      String requestUri,
-      Object requestBody,
-      boolean successFail) {
-    try {
-      AuditLogEntity log =
-          new AuditLogEntity(
-              userUid,
-              EventType.fromName(actionType),
-              successFail ? EventStatus.SUCCESS : EventStatus.FAILED,
-              "GUKYUIN", // 메뉴도 국유인으로 하나 따기
-              myIp,
-              requestUri,
-              requestBody == null ? null : ApiLogFunction.cutRequestBody(requestBody.toString()),
-              null,
-              null,
-              null);
-      auditLogRepository.save(log);
-
-    } catch (Exception e) {
-      log.error(e.getMessage());
-      throw e;
-    }
-  }
 }