모델 M1,M2,M3를 G1,G2,G3 으로 변경(추론실행 포함)

This commit is contained in:
2026-02-19 16:07:59 +09:00
parent 778e87383c
commit 3f1bb8f082
9 changed files with 73 additions and 72 deletions

View File

@@ -60,10 +60,10 @@ select msldge1_0.geo_uid,
st_asgeojson(msldge1_0.geom),
case
when (msldge1_0.class_after_cd in ('building', 'container'))
then cast('M1' as varchar)
then cast('G1' as varchar)
when (msldge1_0.class_after_cd = 'waste')
then cast('M2' as varchar)
else 'M3'
then cast('G2' as varchar)
else 'G3'
end,
msldge1_0.class_before_cd,
msldge1_0.class_after_cd

View File

@@ -122,7 +122,7 @@ public class MapSheetInferenceJobService {
* @return
*/
private Long resolveBatchId(InferenceBatchSheet sheet) {
// M3 > M2 > M1
// G3 > G2 > G1
if (sheet.getM3BatchId() != null) {
return sheet.getM3BatchId();
}
@@ -216,12 +216,12 @@ public class MapSheetInferenceJobService {
updateProcessingEndTimeByModel(job, sheet.getUuid(), now, currentType);
// M3이면 전체 종료
if ("M3".equals(currentType)) {
if ("G3".equals(currentType)) {
endAll(sheet, now);
return;
}
// 다음 모델 실행 (M1->M2, M2->M3)
// 다음 모델 실행 (G1->G2, G2->G3)
String nextType = nextModelType(currentType);
UUID nextModelUuid = resolveModelUuid(sheet, nextType);
@@ -266,11 +266,11 @@ public class MapSheetInferenceJobService {
* @return
*/
private String nextModelType(String currentType) {
if ("M1".equals(currentType)) {
return "M2";
if ("G1".equals(currentType)) {
return "G2";
}
if ("M2".equals(currentType)) {
return "M3";
if ("G2".equals(currentType)) {
return "G3";
}
throw new IllegalArgumentException("Unknown runningModelType: " + currentType);
}
@@ -283,13 +283,13 @@ public class MapSheetInferenceJobService {
* @return
*/
private UUID resolveModelUuid(InferenceBatchSheet sheet, String type) {
if ("M1".equals(type)) {
if ("G1".equals(type)) {
return sheet.getM1ModelUuid();
}
if ("M2".equals(type)) {
if ("G2".equals(type)) {
return sheet.getM2ModelUuid();
}
if ("M3".equals(type)) {
if ("G3".equals(type)) {
return sheet.getM3ModelUuid();
}
throw new IllegalArgumentException("Unknown type: " + type);
@@ -379,13 +379,13 @@ public class MapSheetInferenceJobService {
* @return String
*/
private String modelToInferenceType(String type) {
if ("M1".equals(type)) {
if ("G1".equals(type)) {
return "G1";
}
if ("M2".equals(type)) {
if ("G2".equals(type)) {
return "G2";
}
if ("M3".equals(type)) {
if ("G3".equals(type)) {
return "G3";
}
throw new IllegalArgumentException("Unknown type: " + type);