Merge pull request '[KC-108] 추론실행 파라미터 변경' (#214) from feat/infer_dev_260107 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/214
This commit is contained in:
@@ -26,6 +26,7 @@ import com.kamco.cd.kamcoback.model.dto.ModelMngDto.Basic;
|
|||||||
import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService;
|
import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService;
|
||||||
import com.kamco.cd.kamcoback.postgres.core.MapSheetMngCoreService;
|
import com.kamco.cd.kamcoback.postgres.core.MapSheetMngCoreService;
|
||||||
import com.kamco.cd.kamcoback.postgres.core.ModelMngCoreService;
|
import com.kamco.cd.kamcoback.postgres.core.ModelMngCoreService;
|
||||||
|
import jakarta.persistence.EntityNotFoundException;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import java.time.ZonedDateTime;
|
import java.time.ZonedDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -100,6 +101,10 @@ public class InferenceResultService {
|
|||||||
req.setMapSheetNum(this.createdMngDto(req, targetList));
|
req.setMapSheetNum(this.createdMngDto(req, targetList));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (req.getMapSheetNum().isEmpty()) {
|
||||||
|
throw new EntityNotFoundException("분석 대상 정보가 부족합니다.");
|
||||||
|
}
|
||||||
|
|
||||||
// 추론 테이블 저장
|
// 추론 테이블 저장
|
||||||
UUID uuid = inferenceResultCoreService.saveInferenceInfo(req);
|
UUID uuid = inferenceResultCoreService.saveInferenceInfo(req);
|
||||||
this.startInference(req, uuid);
|
this.startInference(req, uuid);
|
||||||
|
|||||||
@@ -64,8 +64,12 @@ public class InferenceResultCoreService {
|
|||||||
* @param req
|
* @param req
|
||||||
*/
|
*/
|
||||||
public UUID saveInferenceInfo(InferenceResultDto.RegReq req) {
|
public UUID saveInferenceInfo(InferenceResultDto.RegReq req) {
|
||||||
|
|
||||||
String mapSheetName =
|
String mapSheetName =
|
||||||
req.getMapSheetNum().get(0).getMapSheetName() + " 외 " + req.getMapSheetNum().size() + "건";
|
req.getMapSheetNum().get(0).getMapSheetName()
|
||||||
|
+ " 외 "
|
||||||
|
+ (req.getMapSheetNum().size() - 1)
|
||||||
|
+ "건";
|
||||||
|
|
||||||
if (req.getMapSheetNum().size() == 1) {
|
if (req.getMapSheetNum().size() == 1) {
|
||||||
mapSheetName =
|
mapSheetName =
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ public class MapSheetInferenceJobService {
|
|||||||
// 종료시간
|
// 종료시간
|
||||||
this.updateProcessingEndTimeByModel(batchSheet.getUuid(), ZonedDateTime.now(), "M1");
|
this.updateProcessingEndTimeByModel(batchSheet.getUuid(), ZonedDateTime.now(), "M1");
|
||||||
} else if (type.equals("M2")) {
|
} else if (type.equals("M2")) {
|
||||||
// M1 완료되었으면 M3 실행
|
// M2 완료되었으면 M3 실행
|
||||||
this.startInference(
|
this.startInference(
|
||||||
batchSheet.getId(), batchSheet.getUuid(), "M3", batchSheet.getM3ModelUuid());
|
batchSheet.getId(), batchSheet.getUuid(), "M3", batchSheet.getM3ModelUuid());
|
||||||
// 종료시간
|
// 종료시간
|
||||||
|
|||||||
Reference in New Issue
Block a user