Merge pull request 'feat/infer_dev_260211' (#91) from feat/infer_dev_260211 into develop

Reviewed-on: #91

src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepositoryImpl.java

@@ -142,8 +142,8 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                 Projections.constructor(
                     LayerDto.TileUrlDto.class,
                     mapSheetMngTileEntity.mngYyyy,
-                    mapSheetMngTileEntity.tag,
                     mapSheetMngTileEntity.url,
+                    mapSheetMngTileEntity.tag,
                     mapSheetMngTileEntity.minLon,
                     mapSheetMngTileEntity.minLat,
                     mapSheetMngTileEntity.maxLon,
@@ -168,8 +168,8 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
                 Projections.constructor(
                     LayerDto.TileUrlDto.class,
                     mapSheetMngTileEntity.mngYyyy,
-                    mapSheetMngTileEntity.tag,
                     mapSheetMngTileEntity.url,
+                    mapSheetMngTileEntity.tag,
                     mapSheetMngTileEntity.minLon,
                     mapSheetMngTileEntity.minLat,
                     mapSheetMngTileEntity.maxLon,
@@ -202,8 +202,8 @@ public class MapLayerRepositoryImpl implements MapLayerRepositoryCustom {
             Projections.constructor(
                 LayerDto.TileUrlDto.class,
                 mapSheetMngTileEntity.mngYyyy,
-                mapSheetMngTileEntity.tag,
                 mapSheetMngTileEntity.url,
+                mapSheetMngTileEntity.tag,
                 mapSheetMngTileEntity.minLon,
                 mapSheetMngTileEntity.minLat,
                 mapSheetMngTileEntity.maxLon,

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

@@ -9,7 +9,6 @@ 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,16 +31,16 @@ public class GukYuinApiLabelJobService {
     return "local".equalsIgnoreCase(profile);
   }
 
-  @Scheduled(cron = "0 0 2 * * *")
+  //  @Scheduled(cron = "0 0 2 * * *")
   public void runTask() {
     findLabelingCompleteSend(null);
   }
 
   /** 어제 라벨링 검수 완료된 것 -> 국유인에 전송 */
   public void findLabelingCompleteSend(LocalDate baseDate) {
-    if (isLocalProfile()) {
+    //    if (isLocalProfile()) {
-      return;
+    //      return;
-    }
+    //    }
 
     List<GeomUidDto> list = gukYuinLabelJobCoreService.findYesterdayLabelingCompleteList(baseDate);
     if (list.isEmpty()) {

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

@@ -12,7 +12,6 @@ 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 +35,11 @@ public class GukYuinApiPnuJobService {
   }
 
   /** 국유인 등록 완료 후, 탐지객체 조회해서 PNU 업데이트 하는 스케줄링 하루 1번 새벽 1시에 실행 */
-  @Scheduled(cron = "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,7 +9,6 @@ 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
@@ -33,11 +32,11 @@ public class GukYuinApiStatusJobService {
   }
 
   /** 국유인 연동 후, 100% 되었는지 확인하는 스케줄링 매 10분마다 호출 */
-  @Scheduled(cron = "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

@@ -16,7 +16,6 @@ import java.util.stream.Collectors;
 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
@@ -39,16 +38,16 @@ public class GukYuinApiStbltJobService {
     return "local".equalsIgnoreCase(profile);
   }
 
-  @Scheduled(cron = "0 0 3 * * *")
+  //  @Scheduled(cron = "0 0 3 * * *")
   public void runTask() {
     findGukYuinEligibleForSurvey(null);
   }
 
   /** 국유인 연동 후, 실태조사 적합여부 확인하여 update */
   public void findGukYuinEligibleForSurvey(LocalDate baseDate) {
-    if (isLocalProfile()) {
+    //    if (isLocalProfile()) {
-      return;
+    //      return;
-    }
+    //    }
 
     List<LearnKeyDto> list =
         gukYuinStbltJobCoreService.findGukYuinEligibleForSurveyList(

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

@@ -15,7 +15,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Log4j2
@@ -33,7 +32,7 @@ public class TrainingDataLabelJobService {
     return "local".equalsIgnoreCase(profile);
   }
 
-  @Scheduled(cron = "0 0 0 * * *")
+  //  @Scheduled(cron = "0 0 0 * * *")
   public void runTask() {
     // 프록시를 통해 호출해야 @Transactional이 적용됨
     applicationContext

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

@@ -19,7 +19,6 @@ import java.util.Objects;
 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
@@ -40,7 +39,7 @@ public class TrainingDataReviewJobService {
   }
 
   @Transactional
-  @Scheduled(cron = "0 0 2 * * *")
+  //  @Scheduled(cron = "0 0 2 * * *")
   public void runTask() {
     exportGeojsonLabelingGeom(null);
   }