MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '[KC-103] 추론 실행 배치 오류 수정' (#223) from feat/infer_dev_260107 into develop

Browse Source 
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/223
This commit is contained in:
teddy.kim
2026-01-13 14:41:52 +09:00
parent 8d385a2fc7 c3e3d2889c
commit 4a3a156bdb
5 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceProgressDto.java
View File

@@ -19,7 +19,7 @@ public class InferenceProgressDto {
private String cdModelClsPath;
private String cdModelClsFileName;
private String clsModelVersion;
private Integer priority;
private Double priority;
public InferenceProgressDto(
InferenceProgressDto.pred_requests_areas pred_requests_areas,
@@ -31,7 +31,7 @@ public class InferenceProgressDto {
String cdModelClsPath,
String cdModelClsFileName,
String clsModelVersion,
Integer priority) {
Double priority) {
this.pred_requests_areas = pred_requests_areas;
this.modelVersion = modelVersion;
this.cdModelPath = cdModelPath;

2
src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java
View File

@@ -18,7 +18,7 @@ public class InferenceSendDto {
private String cls_model_path;
private String cls_model_version;
private String cd_model_type;
private Integer priority;
private Double priority;
@Getter
@Setter

2
src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
View File

@@ -326,7 +326,7 @@ public class InferenceResultService {
sendDto.setCls_model_path(cdClsModelPath);
sendDto.setCls_model_version(modelInfo.getModelVer());
sendDto.setCd_model_type(modelType);
sendDto.setPriority(modelInfo.getPriority().intValue());
sendDto.setPriority(modelInfo.getPriority());
return sendDto;
}

3
src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java
View File

@@ -217,7 +217,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
model.cdModelConfigFileName.as("cdModelConfigFileName"),
model.clsModelPath,
model.clsModelFileName,
model.clsModelVersion))
model.clsModelVersion,
model.priority))
.from(mapSheetLearnEntity)
.join(model)
.on(model.uuid.eq(modelUuid))

19
src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java
View File

@@ -54,7 +54,7 @@ public class MapSheetInferenceJobService {
public void runBatch() {
if ("local".equalsIgnoreCase(profile)) {
return;
// return;
}
try {
@@ -149,6 +149,16 @@ public class MapSheetInferenceJobService {
InferenceProgressDto progressDto =
inferenceResultCoreService.getInferenceAiResultById(id, type, modelUuid);
String inferenceType = "";
if (type.equals("M1")) {
inferenceType = "G1";
} else if (type.equals("M2")) {
inferenceType = "G2";
} else if (type.equals("M3")) {
inferenceType = "G3";
}
pred_requests_areas predRequestsAreas = new pred_requests_areas();
predRequestsAreas.setInput1_year(progressDto.getPred_requests_areas().getInput1_year());
predRequestsAreas.setInput2_year(progressDto.getPred_requests_areas().getInput2_year());
@@ -158,6 +168,7 @@ public class MapSheetInferenceJobService {
progressDto.getPred_requests_areas().getInput2_scene_path());
InferenceSendDto m = new InferenceSendDto();
m.setPred_requests_areas(predRequestsAreas);
m.setModel_version(progressDto.getModelVersion());
m.setCd_model_path(progressDto.getCdModelPath() + "/" + progressDto.getCdModelFileName());
m.setCd_model_config(
@@ -165,7 +176,7 @@ public class MapSheetInferenceJobService {
m.setCls_model_path(
progressDto.getCdModelClsPath() + "/" + progressDto.getCdModelClsFileName());
m.setCls_model_version(progressDto.getClsModelVersion());
m.setCd_model_type(type);
m.setCd_model_type(inferenceType);
m.setPriority(progressDto.getPriority());
// 추론 다음모델 실행
@@ -195,6 +206,10 @@ public class MapSheetInferenceJobService {
// TODO 추후 삭제
if ("local".equals(profile)) {
if (dto.getPred_requests_areas() == null) {
dto.setPred_requests_areas(new InferenceSendDto.pred_requests_areas());
}
dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson");
dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson");
}