diff --git a/src/main/java/com/kamco/cd/kamcoback/common/service/ExternalJarRunner.java b/src/main/java/com/kamco/cd/kamcoback/common/service/ExternalJarRunner.java index eb7d830a..8c665423 100644 --- a/src/main/java/com/kamco/cd/kamcoback/common/service/ExternalJarRunner.java +++ b/src/main/java/com/kamco/cd/kamcoback/common/service/ExternalJarRunner.java @@ -1,7 +1,5 @@ package com.kamco.cd.kamcoback.common.service; -import com.kamco.cd.kamcoback.inference.dto.InferenceResultsTestingDto; -import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService; import java.io.BufferedReader; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; @@ -17,28 +15,8 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ExternalJarRunner { - private final InferenceResultCoreService inferenceResultCoreService; - public void run(String jarPath, String batchIds, String inferenceId, String mapIds) { - List batch = new ArrayList<>(); - batch.add(285L); - batch.add(286L); - batch.add(287L); - List resultList = - inferenceResultCoreService.getInferenceResults(batch); - StringBuilder sb = new StringBuilder(); - mapIds = sb.toString(); - for (InferenceResultsTestingDto.ShpDto dto : resultList) { - if (dto.getMapId() == null) { - continue; - } - if (!sb.isEmpty()) { - sb.append(","); - } - sb.append("\"").append(dto.getMapId()).append("\""); - } - StringBuilder out = new StringBuilder(); try { diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java index 791038bf..bc4e1cf7 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java @@ -237,8 +237,10 @@ public class MapSheetInferenceJobService { String mapIds = sb.toString(); String batchId = sheet.getM1BatchId() + "," + sheet.getM2BatchId() + "," + sheet.getM3BatchId(); + // uid 기준 도엽별 shp, geojson 파일 생성 externalJarRunner.run(jarPath, batchId, inferenceId, mapIds); + // uid 기준 merge shp, geojson 파일 생성 externalJarRunner.run(jarPath, batchId, inferenceId, ""); }