Merge branch 'feat/infer_dev_260107' of https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice into feat/infer_dev_260107

src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java

@@ -85,7 +85,6 @@ public class InferenceResultService {
   @Value("${inference.inference-server-name}")
   private String inferenceServerName;
 
-
   @Value("${file.dataset-dir}")
   private String datasetDir;
 
@@ -550,9 +549,8 @@ public class InferenceResultService {
         String srvNm = serverNames[k];
         String srvNmChk = "N";
 
-        Optional<InferenceServerStatusDto> matchingDto = dtoList.stream()
+        Optional<InferenceServerStatusDto> matchingDto =
-          .filter(dto -> srvNm.equals(dto.getServerName()))
+            dtoList.stream().filter(dto -> srvNm.equals(dto.getServerName())).findFirst();
-          .findFirst();
 
         /*
         int serverChekcCnt =
@@ -569,14 +567,10 @@ public class InferenceResultService {
           dto.setKbmemused(0L);
           dto.setGpuUtil(0);
           serverStatusList.add(dto);
-        }
+        } else {
-        else
-        {
           serverStatusList.add(matchingDto.get());
         }
-
       }
-
     }
 
     serverStatusList.sort(Comparator.comparing(InferenceServerStatusDto::getServerName));

src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java

@@ -152,8 +152,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                     systemMetricEntity.cpuSystem,
                     systemMetricEntity.memused,
                     systemMetricEntity.kbmemused,
-                    gpuMetricEntity.gpuUtil
+                    gpuMetricEntity.gpuUtil))
-                    ))
             .from(systemMetricEntity)
             .leftJoin(gpuMetricEntity)
             .on(
@@ -161,8 +160,9 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                     .timestamp
                     .in(latestGpuIds)
                     .and(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName)))
-            .where(systemMetricEntity.timestamp.in(latestIds)
+            .where(
-              //.and(systemMetricEntity.serverName.ne("server2"))
+                systemMetricEntity.timestamp.in(latestIds)
+                // .and(systemMetricEntity.serverName.ne("server2"))
                 ) // In 절 사용
             .orderBy(systemMetricEntity.serverName.asc())
             .limit(4)

src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java

@@ -137,7 +137,8 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
                     ChangeDetectionDto.CogUrlData.class,
                     makeCogUrl(req.getBeforeYear()).max().as("beforeCogUrl"),
                     makeCogUrl(req.getAfterYear()).max().as("afterCogUrl"),
-                    Expressions.stringTemplate("ST_AsGeoJSON({0})", mapInkx5kEntity.geom)
+                    Expressions.stringTemplate(
+                            "ST_AsGeoJSON(ST_Transform({0}, 5186))", mapInkx5kEntity.geom)
                         .as("bbox")))
             .from(imageryEntity)
             .innerJoin(mapInkx5kEntity)

src/main/resources/application-prod.yml

@@ -64,6 +64,7 @@ inference:
   batch-url: http://10.100.0.11:8000/batches
   geojson-dir: /kamco-nfs/requests/
   jar-path: /kamco-nfs/dataset/shp_exporter-1.0.0.jar
+  inference-server-name: server1,server2,server3,server4
 
 gukyuin:
   #url:  http://localhost:8080