국유인 배치 수정, 라벨링툴 적합여부 수정
This commit is contained in:
@@ -69,6 +69,7 @@ public class GukYuinStbltJobCoreService {
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void updateGukYuinObjectStbltYn(String resultUid, StbltResult stbResult) {
|
||||
gukYuinStbltRepository.updateGukYuinObjectStbltYn(resultUid, stbResult);
|
||||
}
|
||||
|
||||
@@ -524,12 +524,17 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
|
||||
.build();
|
||||
|
||||
var inspectionResultInfo =
|
||||
InspectionResultInfo.builder()
|
||||
.verificationResult(convertInspectState(assignment.toDto().getInspectState()))
|
||||
.inappropriateReason("")
|
||||
// .memo(assignment.toDto().getInspectMemo() != null ?
|
||||
// assignment.toDto().getInspectMemo() : "")
|
||||
.build();
|
||||
queryFactory
|
||||
.select(
|
||||
Projections.constructor(
|
||||
InspectionResultInfo.class,
|
||||
mapSheetAnalDataInferenceGeomEntity.fitState,
|
||||
mapSheetAnalDataInferenceGeomEntity.fitStateCmmnt))
|
||||
.from(mapSheetAnalDataInferenceGeomEntity)
|
||||
.where(
|
||||
mapSheetAnalDataInferenceGeomEntity.geoUid.eq(
|
||||
mapSheetAnalDataInferenceGeomEntityEntity.getGeoUid()))
|
||||
.fetchOne();
|
||||
|
||||
// 6. Geometry를 GeoJSON으로 변환
|
||||
InferenceDataGeometry inferData =
|
||||
|
||||
@@ -24,7 +24,6 @@ import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.DetailRes;
|
||||
import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.GeoFeatureRequest.Properties;
|
||||
import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.InferenceDataGeometry;
|
||||
import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.InferenceDataGeometry.InferenceProperties;
|
||||
import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.InspectionResultInfo;
|
||||
import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.LearnDataGeometry;
|
||||
import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.LearnDataGeometry.LearnProperties;
|
||||
import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.ReviewGeometryInfo;
|
||||
@@ -553,11 +552,17 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
|
||||
.build();
|
||||
|
||||
var inspectionResultInfo =
|
||||
InspectionResultInfo.builder()
|
||||
.verificationResult(convertInspectState(assignment.toDto().getInspectState()))
|
||||
.inappropriateReason("")
|
||||
.memo("")
|
||||
.build();
|
||||
queryFactory
|
||||
.select(
|
||||
Projections.constructor(
|
||||
TrainingDataReviewDto.InspectionResultInfo.class,
|
||||
mapSheetAnalDataInferenceGeomEntity.fitState,
|
||||
mapSheetAnalDataInferenceGeomEntity.fitStateCmmnt))
|
||||
.from(mapSheetAnalDataInferenceGeomEntity)
|
||||
.where(
|
||||
mapSheetAnalDataInferenceGeomEntity.geoUid.eq(
|
||||
mapSheetAnalDataInferenceGeomEntityEntity.getGeoUid()))
|
||||
.fetchOne();
|
||||
|
||||
// 6. Geometry를 GeoJSON으로 변환
|
||||
InferenceDataGeometry inferData =
|
||||
|
||||
@@ -105,10 +105,7 @@ public class GukYuinApiStbltJobService {
|
||||
fitYn, selected.getIncyCd(), selected.getIncyRsnCont());
|
||||
}));
|
||||
|
||||
resultMap.forEach(
|
||||
(resultUid, StbltResult) -> {
|
||||
gukYuinStbltJobCoreService.updateGukYuinObjectStbltYn(resultUid, StbltResult);
|
||||
});
|
||||
resultMap.forEach(gukYuinStbltJobCoreService::updateGukYuinObjectStbltYn);
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), e);
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
|
||||
import com.kamco.cd.kamcoback.common.utils.geometry.GeometryDeserializer;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.List;
|
||||
@@ -382,9 +383,7 @@ public class TrainingDataLabelDto {
|
||||
@Schema(name = "InspectionResultInfo", description = "실태조사결과정보")
|
||||
@Getter
|
||||
@Setter
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public static class InspectionResultInfo {
|
||||
|
||||
@Schema(description = "검증결과 (미확인/제외/완료)", example = "미확인")
|
||||
@@ -395,6 +394,11 @@ public class TrainingDataLabelDto {
|
||||
|
||||
@Schema(description = "메모")
|
||||
private String memo;
|
||||
|
||||
public InspectionResultInfo(String verificationResult, String inappropriateReason) {
|
||||
this.verificationResult = ImageryFitStatus.fromCode(verificationResult).getText();
|
||||
this.inappropriateReason = inappropriateReason;
|
||||
}
|
||||
}
|
||||
|
||||
@Schema(name = "SummaryRes", description = "작업 통계 응답")
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus;
|
||||
import com.kamco.cd.kamcoback.common.utils.geometry.GeometryDeserializer;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.List;
|
||||
@@ -378,9 +379,7 @@ public class TrainingDataReviewDto {
|
||||
@Schema(name = "InspectionResultInfo", description = "실태조사결과정보")
|
||||
@Getter
|
||||
@Setter
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public static class InspectionResultInfo {
|
||||
|
||||
@Schema(description = "검증결과 (미확인/제외/완료)", example = "미확인")
|
||||
@@ -391,6 +390,11 @@ public class TrainingDataReviewDto {
|
||||
|
||||
@Schema(description = "메모")
|
||||
private String memo;
|
||||
|
||||
public InspectionResultInfo(String verificationResult, String inappropriateReason) {
|
||||
this.verificationResult = ImageryFitStatus.fromCode(verificationResult).getText();
|
||||
this.inappropriateReason = inappropriateReason;
|
||||
}
|
||||
}
|
||||
|
||||
@Schema(name = "SummaryRes", description = "작업 통계 응답")
|
||||
|
||||
Reference in New Issue
Block a user