Merge pull request '[KC-116] shp 파일 생성 기능 수정' (#266) from feat/infer_dev_260107 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/266
This commit is contained in:
@@ -1,7 +1,5 @@
|
|||||||
package com.kamco.cd.kamcoback.common.service;
|
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.BufferedReader;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
@@ -17,28 +15,8 @@ import org.springframework.stereotype.Component;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class ExternalJarRunner {
|
public class ExternalJarRunner {
|
||||||
|
|
||||||
private final InferenceResultCoreService inferenceResultCoreService;
|
|
||||||
|
|
||||||
public void run(String jarPath, String batchIds, String inferenceId, String mapIds) {
|
public void run(String jarPath, String batchIds, String inferenceId, String mapIds) {
|
||||||
|
|
||||||
List<Long> batch = new ArrayList<>();
|
|
||||||
batch.add(285L);
|
|
||||||
batch.add(286L);
|
|
||||||
batch.add(287L);
|
|
||||||
List<InferenceResultsTestingDto.ShpDto> 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();
|
StringBuilder out = new StringBuilder();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -237,8 +237,10 @@ public class MapSheetInferenceJobService {
|
|||||||
String mapIds = sb.toString();
|
String mapIds = sb.toString();
|
||||||
String batchId = sheet.getM1BatchId() + "," + sheet.getM2BatchId() + "," + sheet.getM3BatchId();
|
String batchId = sheet.getM1BatchId() + "," + sheet.getM2BatchId() + "," + sheet.getM3BatchId();
|
||||||
|
|
||||||
|
// uid 기준 도엽별 shp, geojson 파일 생성
|
||||||
externalJarRunner.run(jarPath, batchId, inferenceId, mapIds);
|
externalJarRunner.run(jarPath, batchId, inferenceId, mapIds);
|
||||||
|
|
||||||
|
// uid 기준 merge shp, geojson 파일 생성
|
||||||
externalJarRunner.run(jarPath, batchId, inferenceId, "");
|
externalJarRunner.run(jarPath, batchId, inferenceId, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user