feat/infer_dev_260211 #137

Merged
gina merged 3 commits from feat/infer_dev_260211 into develop 2026-03-06 17:15:21 +09:00
Showing only changes of commit a413de4b93 - Show all commits

View File

@@ -6,7 +6,6 @@ import static com.kamco.cd.kamcoback.postgres.entity.QLabelingLabelerEntity.labe
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity.mapSheetAnalDataInferenceEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity.mapSheetAnalDataInferenceEntity;
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity;
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity;
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnDataGeomEntity.mapSheetLearnDataGeomEntity;
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity;
@@ -490,17 +489,21 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
inspectionStatus = inspectionRemaining > 0 ? "진행중" : "완료"; inspectionStatus = inspectionRemaining > 0 ? "진행중" : "완료";
} }
ZoneId zoneId = ZoneId.of("Asia/Seoul");
LocalDate targetDate = LocalDate.now(zoneId);
ZonedDateTime end = targetDate.plusDays(1).atStartOfDay(zoneId);
Long downloadPolygonCnt = Long downloadPolygonCnt =
queryFactory queryFactory
.select(mapSheetLearnDataGeomEntity.geoUid.count()) .select(labelingAssignmentEntity.inferenceGeomUid.count())
.from(mapSheetLearnDataGeomEntity) .from(labelingAssignmentEntity)
.innerJoin(labelingAssignmentEntity)
.on(labelingAssignmentEntity.inferenceGeomUid.eq(mapSheetLearnDataGeomEntity.geoUid))
.innerJoin(mapSheetAnalInferenceEntity) .innerJoin(mapSheetAnalInferenceEntity)
.on( .on(
labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id), labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
mapSheetAnalInferenceEntity.id.eq(analUid)) mapSheetAnalInferenceEntity.id.eq(analUid))
.where(mapSheetLearnDataGeomEntity.fileCreateYn.isTrue()) .where(
labelingAssignmentEntity.inspectState.eq(InspectState.COMPLETE.getId()),
labelingAssignmentEntity.inspectStatDttm.lt(end))
.fetchOne(); .fetchOne();
return WorkProgressInfo.builder() return WorkProgressInfo.builder()
@@ -670,17 +673,21 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
inspectionStatus = inspectionRemaining > 0 ? "진행중" : "완료"; inspectionStatus = inspectionRemaining > 0 ? "진행중" : "완료";
} }
ZoneId zoneId = ZoneId.of("Asia/Seoul");
LocalDate targetDate = LocalDate.now(zoneId);
ZonedDateTime end = targetDate.plusDays(1).atStartOfDay(zoneId);
Long downloadPolygonCnt = Long downloadPolygonCnt =
queryFactory queryFactory
.select(mapSheetLearnDataGeomEntity.geoUid.count()) .select(labelingAssignmentEntity.inferenceGeomUid.count())
.from(mapSheetLearnDataGeomEntity) .from(labelingAssignmentEntity)
.innerJoin(labelingAssignmentEntity)
.on(labelingAssignmentEntity.inferenceGeomUid.eq(mapSheetLearnDataGeomEntity.geoUid))
.innerJoin(mapSheetAnalInferenceEntity) .innerJoin(mapSheetAnalInferenceEntity)
.on( .on(
labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id), labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id),
mapSheetAnalInferenceEntity.uuid.eq(targetUuid)) mapSheetAnalInferenceEntity.uuid.eq(targetUuid))
.where(mapSheetLearnDataGeomEntity.fileCreateYn.isTrue()) .where(
labelingAssignmentEntity.inspectState.eq(InspectState.COMPLETE.getId()),
labelingAssignmentEntity.inspectStatDttm.lt(end))
.fetchOne(); .fetchOne();
return WorkProgressInfo.builder() return WorkProgressInfo.builder()