[KC-99] 추론 진행여부 api 추가, spotless 적용
This commit is contained in:
@@ -96,7 +96,14 @@ public class MapSheetInferenceJobService {
|
||||
String json = result.body();
|
||||
JobStatusDto dto = objectMapper.readValue(json, JobStatusDto.class);
|
||||
|
||||
if ("COMPLETED".equals(dto.getStatus())) {
|
||||
int totalJobs = dto.getTotalJobs();
|
||||
int completedJobs = dto.getCompletedJobs();
|
||||
int failedJobs = dto.getFailedJobs();
|
||||
|
||||
// 성공, 실패 값 더해서 total 과 같으면 완료
|
||||
String inferStatus = this.setStatus(totalJobs, completedJobs, failedJobs);
|
||||
|
||||
if ("COMPLETED".equals(inferStatus)) {
|
||||
String type = batchSheet.getRunningModelType();
|
||||
|
||||
if (type.equals("M1")) {
|
||||
@@ -122,18 +129,11 @@ public class MapSheetInferenceJobService {
|
||||
// 종료시간
|
||||
this.updateProcessingEndTimeByModel(batchSheet.getUuid(), ZonedDateTime.now(), "M3");
|
||||
}
|
||||
} else if ("COMPLETED_WITH_FAILURES".equals(dto.getStatus())) {
|
||||
SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
|
||||
saveInferenceAiDto.setUuid(batchSheet.getUuid());
|
||||
saveInferenceAiDto.setStatus(Status.END.getId());
|
||||
saveInferenceAiDto.setInferEndDttm(ZonedDateTime.now());
|
||||
saveInferenceAiDto.setType(batchSheet.getRunningModelType());
|
||||
inferenceResultCoreService.update(saveInferenceAiDto);
|
||||
} else {
|
||||
SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
|
||||
saveInferenceAiDto.setUuid(batchSheet.getUuid());
|
||||
saveInferenceAiDto.setStatus(Status.IN_PROGRESS.getId());
|
||||
saveInferenceAiDto.setDetectEndCnt(dto.getCompletedJobs().longValue());
|
||||
saveInferenceAiDto.setDetectEndCnt((long) (completedJobs + failedJobs));
|
||||
saveInferenceAiDto.setType(batchSheet.getRunningModelType());
|
||||
inferenceResultCoreService.update(saveInferenceAiDto);
|
||||
}
|
||||
@@ -236,4 +236,11 @@ public class MapSheetInferenceJobService {
|
||||
saveInferenceAiDto.setType(type);
|
||||
inferenceResultCoreService.update(saveInferenceAiDto);
|
||||
}
|
||||
|
||||
private String setStatus(int totalJobs, int completedJobs, int failedJobs) {
|
||||
if (totalJobs <= (completedJobs + failedJobs)) {
|
||||
return "COMPLETED";
|
||||
}
|
||||
return "PROCESSING";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user