diff --git a/backend/src/main/java/ai/basic/x1/usecase/UploadDataUseCase.java b/backend/src/main/java/ai/basic/x1/usecase/UploadDataUseCase.java index 2b78c457..2ba401e0 100644 --- a/backend/src/main/java/ai/basic/x1/usecase/UploadDataUseCase.java +++ b/backend/src/main/java/ai/basic/x1/usecase/UploadDataUseCase.java @@ -484,6 +484,7 @@ public void commonParseUploadFile(DataInfoUploadBO dataInfoUploadBO, BiConsumer< .parentId(sceneId) .status(DataStatusEnum.VALID) .annotationStatus(DataAnnotationStatusEnum.NOT_ANNOTATED) + .splitType(NOT_SPLIT) .createdAt(OffsetDateTime.now()) .updatedAt(OffsetDateTime.now()) .createdBy(userId) @@ -497,16 +498,24 @@ public void commonParseUploadFile(DataInfoUploadBO dataInfoUploadBO, BiConsumer< subDataNameList.forEach(dataName -> { var dataFiles = this.getSingleDataFiles(sceneFile, dataName, errorBuilder, datasetType); if (CollectionUtil.isNotEmpty(dataFiles)) { + log.info("dataStart,dataName:{},dataFiles:{}",dataName,dataFiles.stream().map(File::getName).collect(Collectors.toList())); var tempDataId = ByteUtil.bytesToLong(SecureUtil.md5().digest(UUID.randomUUID().toString())); - var dataAnnotationObjectBO = dataAnnotationObjectBOBuilder.dataId(tempDataId).build(); + var dataAnnotationObjectBO = dataAnnotationObjectBOBuilder.build(); + dataAnnotationObjectBO.setDataId(tempDataId); handleDataResult(sceneFile, dataName, dataAnnotationObjectBO, dataAnnotationObjectBOList, errorBuilder); var fileNodeList = this.assembleContent(dataFiles, rootPath, dataInfoUploadBO); log.info("Get data content,frameName:{},content:{} ", dataName, JSONUtil.toJsonStr(fileNodeList)); - var dataInfoBO = dataInfoBOBuilder.name(dataName).orderName(NaturalSortUtil.convert(dataName)).content(fileNodeList).splitType(NOT_SPLIT).tempDataId(tempDataId).build(); + var dataInfoBO = dataInfoBOBuilder.build(); + dataInfoBO.setName(dataName); + dataInfoBO.setOrderName(NaturalSortUtil.convert(dataName)); + dataInfoBO.setContent(fileNodeList); + dataInfoBO.setTempDataId(tempDataId); dataInfoBOList.add(dataInfoBO); } }); if (CollectionUtil.isNotEmpty(dataInfoBOList)) { + log.info("dataInfoBOList:{}",dataInfoBOList.stream().map(DataInfoBO::getTempDataId).collect(Collectors.toList())); + log.info("dataAnnotationObjectBOList:{}",dataAnnotationObjectBOList.stream().map(DataAnnotationObjectBO::getDataId).collect(Collectors.toList())); var resDataInfoList = this.insertBatch(dataInfoBOList, datasetId, errorBuilder, sceneId); this.saveBatchDataResult(resDataInfoList, dataAnnotationObjectBOList); } @@ -651,6 +660,7 @@ public void handleDataResult(File file, String dataName, DataAnnotationObjectBO .filter(fc -> fc.getName().toUpperCase().endsWith(JSON_SUFFIX) && dataName.equals(FileUtil.getPrefix(fc)) && fc.getParentFile().getName().equalsIgnoreCase(RESULT)).findFirst(); if (resultFile.isPresent()) { + log.info("dataResult,dataName:{},resultFileName:{}",dataName,resultFile.get().getName()); try { var resultJson = JSONUtil.readJSON(resultFile.get(), Charset.defaultCharset()); var result = new DataImportResultBO(); diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 464ea5bb..27b8ff9a 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -3,7 +3,7 @@ debug: false logging: level: org.springframework.web.filter.CommonsRequestLoggingFilter: debug - ai.basic.basicai.user.adapter.port.dao.mybatis.mapper: debug + ai.basic.x1.adapter.port.dao.mybatis.mapper: debug request: maxPayloadLength: 100000 diff --git a/deploy/mysql/migration/V2__Init_data.sql b/deploy/mysql/migration/V2__Init_data.sql index 86a71ab8..44be6cc6 100644 --- a/deploy/mysql/migration/V2__Init_data.sql +++ b/deploy/mysql/migration/V2__Init_data.sql @@ -3,7 +3,7 @@ INSERT INTO `model`(`id`, `name`, `version`, `description`, `scenario`, `dataset INSERT INTO `user`(`id`,`username`, `password`, `nickname`) VALUES (1,'admin', '$2a$10$0qk8vIkREsV6KYPeYJLU..C/JxJZc/ccfZIcEmFcnS8W9DtOD/y5K', 'admin'); INSERT INTO `model_class`(`model_id`, `name`, `code`, `created_at`, `created_by`, `updated_at`, `updated_by`) VALUES (2, 'Person', 'person', current_timestamp, 1, NULL, NULL); INSERT INTO `model_class`(`model_id`, `name`, `code`, `created_at`, `created_by`, `updated_at`, `updated_by`) VALUES (2, 'Bicycle', 'bicycle', current_timestamp, 1, NULL, NULL); -INSERT INTO `model_class`(`model_id`, `name`, `code`, `created_at`, `created_by`, `updated_at`, `updated_by`) VALUES (2, 'Car', 'CAR', current_timestamp, 1, NULL, NULL); +INSERT INTO `model_class`(`model_id`, `name`, `code`, `created_at`, `created_by`, `updated_at`, `updated_by`) VALUES (2, 'Car', 'car', current_timestamp, 1, NULL, NULL); INSERT INTO `model_class`(`model_id`, `name`, `code`, `created_at`, `created_by`, `updated_at`, `updated_by`) VALUES (2, 'Motorcycle', 'motorcycle', current_timestamp, 1, NULL, NULL); INSERT INTO `model_class`(`model_id`, `name`, `code`, `created_at`, `created_by`, `updated_at`, `updated_by`) VALUES (2, 'Airplane', 'airplane', current_timestamp, 1, NULL, NULL); INSERT INTO `model_class`(`model_id`, `name`, `code`, `created_at`, `created_by`, `updated_at`, `updated_by`) VALUES (2, 'Train', 'train', current_timestamp, 1, NULL, NULL);