Merge pull request '국유인 배치일 때 reqEpno BATCH로 하기' (#85) from feat/infer_dev_260211 into develop

Reviewed-on: #85

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

@@ -128,7 +128,7 @@ public class GukYuinApiController {
       })
   public ApiResponseDto<ChngDetectMastDto.ResultDto> selectChangeDetectionDtctIdList(
       @RequestParam(required = false) String chnDtctId) {
-    return ApiResponseDto.ok(gukYuinApiService.listChnDtctId(chnDtctId));
+    return ApiResponseDto.ok(gukYuinApiService.listChnDtctId(chnDtctId, ""));
   }
 
   @Operation(summary = "탐지결과 등록목록 조회(1건 조회)", description = "탐지결과 등록목록 조회")
@@ -192,7 +192,7 @@ public class GukYuinApiController {
       @PathVariable String chnDtctId,
       @RequestParam(defaultValue = "0") Integer pageIndex,
       @RequestParam(defaultValue = "10") Integer pageSize) {
-    return ApiResponseDto.ok(gukYuinApiService.findChnContList(chnDtctId, pageIndex, pageSize));
+    return ApiResponseDto.ok(gukYuinApiService.findChnContList(chnDtctId, pageIndex, pageSize, ""));
   }
 
   @Operation(summary = "탐지객체 조회 (탐지객체 1건 조회)", description = "탐지객체 조회 (탐지객체 1건 조회)")
@@ -272,7 +272,8 @@ public class GukYuinApiController {
   @PostMapping("/rlb/objt/{chnDtctObjtId}/lbl/{lblYn}")
   public ApiResponseDto<ChngDetectContDto.ResultLabelDto> updateChnDtctObjtLabelingYn(
       @PathVariable String chnDtctObjtId, @PathVariable String lblYn) {
-    return ApiResponseDto.ok(gukYuinApiService.updateChnDtctObjtLabelingYn(chnDtctObjtId, lblYn));
+    return ApiResponseDto.ok(
+        gukYuinApiService.updateChnDtctObjtLabelingYn(chnDtctObjtId, lblYn, ""));
   }
 
   @Operation(summary = "국유in연동 등록", description = "국유in연동 등록")
@@ -309,7 +310,7 @@ public class GukYuinApiController {
       @PathVariable String chnDtctId,
       @Parameter(description = "날짜(기본은 어제 날짜)") @RequestParam(defaultValue = "20260205")
           String yyyymmdd) {
-    return ApiResponseDto.ok(gukYuinApiService.findRlbDtctList(chnDtctId, yyyymmdd));
+    return ApiResponseDto.ok(gukYuinApiService.findRlbDtctList(chnDtctId, yyyymmdd, ""));
   }
 
   @Operation(summary = "탐지객체 적합여부 조회 (객체별 조회)", description = "탐지객체 적합여부 조회 (객체별 조회)")

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

@@ -259,7 +259,8 @@ public class GukYuinApiService {
   }
 
   // 탐지객체 리스트 조회
-  public ResultContDto findChnContList(String chnDtctId, Integer pageIndex, Integer pageSize) {
+  public ResultContDto findChnContList(
+      String chnDtctId, Integer pageIndex, Integer pageSize, String batchYn) {
 
     String url =
         gukyuinCdiUrl
@@ -272,7 +273,7 @@ public class GukYuinApiService {
             + "&reqIp="
             + myip
             + "&reqEpno="
-            + userUtil.getEmployeeNo();
+            + ("Y".equals(batchYn) ? "BATCH" : userUtil.getEmployeeNo());
 
     ExternalCallResult<ChngDetectContDto.ResultContDto> result =
         externalHttpClient.call(
@@ -334,12 +335,12 @@ public class GukYuinApiService {
   }
 
   public ChngDetectContDto.ResultLabelDto updateChnDtctObjtLabelingYn(
-      String chnDtctObjtId, String lblYn) {
+      String chnDtctObjtId, String lblYn, String batchYn) {
     String url = gukyuinCdiUrl + "/rlb/objt/" + chnDtctObjtId + "/lbl/" + lblYn;
 
     ReqInfo info = new ReqInfo();
     info.setReqIp(myip);
-    info.setReqEpno(userUtil.getEmployeeNo());
+    info.setReqEpno("Y".equals(batchYn) ? "BATCH" : userUtil.getEmployeeNo());
 
     ExternalCallResult<ChngDetectContDto.ResultLabelDto> result =
         externalHttpClient.call(
@@ -391,7 +392,7 @@ public class GukYuinApiService {
     return result.body();
   }
 
-  public ResultDto listChnDtctId(String chnDtctId) {
+  public ResultDto listChnDtctId(String chnDtctId, String batchYn) {
     String url =
         gukyuinCdiUrl
             + "/chn/mast/"
@@ -399,7 +400,7 @@ public class GukYuinApiService {
             + "?reqIp="
             + myip
             + "&reqEpno="
-            + userUtil.getEmployeeNo();
+            + ("Y".equals(batchYn) ? "BATCH" : userUtil.getEmployeeNo());
 
     ExternalCallResult<ChngDetectMastDto.ResultDto> result =
         externalHttpClient.call(
@@ -528,7 +529,8 @@ public class GukYuinApiService {
     return result.body();
   }
 
-  public ChngDetectMastDto.RlbDtctDto findRlbDtctList(String chnDtctId, String yyyymmdd) {
+  public ChngDetectMastDto.RlbDtctDto findRlbDtctList(
+      String chnDtctId, String yyyymmdd, String batchYn) {
 
     String url =
         gukyuinCdiUrl
@@ -537,7 +539,7 @@ public class GukYuinApiService {
             + "?reqIp="
             + myip
             + "&reqEpno="
-            + userUtil.getEmployeeNo()
+            + ("Y".equals(batchYn) ? "BATCH" : userUtil.getEmployeeNo())
             + "&yyyymmdd="
             + yyyymmdd;
 

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

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

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

@@ -63,7 +63,7 @@ public class GukYuinApiPnuJobService {
   }
 
   private void processUid(String chnDtctId, String uid) {
-    ResultDto result = gukYuinApiService.listChnDtctId(chnDtctId);
+    ResultDto result = gukYuinApiService.listChnDtctId(chnDtctId, "Y");
     if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
       return;
     }
@@ -85,7 +85,7 @@ public class GukYuinApiPnuJobService {
   }
 
   private void processPage(String uid, int page, int pageSize) {
-    ResultContDto resContList = gukYuinApiService.findChnContList(uid, page, pageSize);
+    ResultContDto resContList = gukYuinApiService.findChnContList(uid, page, pageSize, "Y");
 
     if (resContList.getResult() == null || resContList.getResult().isEmpty()) {
       return; // 외부 API 이상 방어

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

@@ -48,7 +48,7 @@ public class GukYuinApiStatusJobService {
 
     for (LearnKeyDto dto : list) {
       try {
-        ChngDetectMastDto.ResultDto result = gukYuinApiService.listChnDtctId(dto.getUid());
+        ChngDetectMastDto.ResultDto result = gukYuinApiService.listChnDtctId(dto.getUid(), "Y");
 
         if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
           log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId());

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

@@ -59,7 +59,7 @@ public class GukYuinApiStbltJobService {
             LocalDate.now(ZoneId.of("Asia/Seoul"))
                 .minusDays(1)
                 .format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-        RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), yesterday);
+        RlbDtctDto result = gukYuinApiService.findRlbDtctList(dto.getUid(), yesterday, "Y");
 
         if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
           log.warn("[GUKYUIN] empty result chnDtctMstId={}", dto.getChnDtctMstId());