Merge branch 'feat/infer_dev_260107' of https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice into feat/infer_dev_260107
This commit is contained in:
@@ -53,8 +53,11 @@ public class MapSheetInferenceJobService {
|
||||
@Value("${inference.jar-path}")
|
||||
private String jarPath;
|
||||
|
||||
/** 추론 진행 배치 1분 */
|
||||
@Scheduled(fixedDelay = 60_000)
|
||||
@Value("${file.dataset-dir}")
|
||||
private String datasetDir;
|
||||
|
||||
/** 추론 진행 배치 1분 60_000 */
|
||||
@Scheduled(fixedDelay = 30_000)
|
||||
public void runBatch() {
|
||||
if (isLocalProfile()) {
|
||||
return;
|
||||
@@ -242,6 +245,10 @@ public class MapSheetInferenceJobService {
|
||||
|
||||
// uid 기준 merge shp, geojson 파일 생성
|
||||
externalJarRunner.run(jarPath, batchId, inferenceId, "");
|
||||
|
||||
// uid 기준 도엽별 shp 파일 geoserver 등록
|
||||
String register = datasetDir + "/" + inferenceId + "/" + "merge" + "/" + inferenceId + ".shp";
|
||||
externalJarRunner.run(jarPath, register, inferenceId);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -80,8 +80,10 @@ public class TrainingDataReviewJobService {
|
||||
|
||||
List<UUID> assignmentUids =
|
||||
assignedTasks.stream().map(Tasks::getAssignmentUid).toList();
|
||||
|
||||
trainingDataReviewJobCoreService.assignReviewerBatch(assignmentUids, reviewerId);
|
||||
|
||||
List<Long> geomUids = assignedTasks.stream().map(Tasks::getInferenceUid).toList();
|
||||
trainingDataReviewJobCoreService.updateGeomUidTestState(geomUids);
|
||||
});
|
||||
}
|
||||
} catch (Exception e) {
|
||||
@@ -108,7 +110,7 @@ public class TrainingDataReviewJobService {
|
||||
return result;
|
||||
}
|
||||
|
||||
// 라벨러 완료,SKIP 시 호출
|
||||
// 라벨러 완료,SKIP 시 호출 -> 미사용
|
||||
@Transactional
|
||||
public void assignRealtime(String assignmentUid) {
|
||||
Tasks task = trainingDataReviewJobCoreService.findAssignmentTask(assignmentUid);
|
||||
@@ -127,5 +129,9 @@ public class TrainingDataReviewJobService {
|
||||
trainingDataReviewJobCoreService.lockInspectors(analUid, order);
|
||||
|
||||
trainingDataReviewJobCoreService.assignReviewer(task.getAssignmentUid(), order.getFirst());
|
||||
|
||||
List<Long> geomUids = new ArrayList<>();
|
||||
geomUids.add(task.getInferenceUid());
|
||||
trainingDataReviewJobCoreService.updateGeomUidTestState(geomUids);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user