diff --git a/infrastructure/repository/src/main/resources/sqlmapper/CategoryMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/CategoryMapper.xml
index 33c9002..8ef2388 100644
--- a/infrastructure/repository/src/main/resources/sqlmapper/CategoryMapper.xml
+++ b/infrastructure/repository/src/main/resources/sqlmapper/CategoryMapper.xml
@@ -49,7 +49,7 @@
SELECT LAST_INSERT_ID()
- insert into ed_data_info (id,
+ replace into ed_data_info (id,
category_type_id, parent_id, category_id,
category_name, category_status,
creator, creator_name, gmt_create,
diff --git a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml
index 619da42..9519cf3 100644
--- a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml
+++ b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml
@@ -38,7 +38,7 @@
SELECT LAST_INSERT_ID()
- insert into ed_data_info (category_id,
+ replace into ed_data_info (category_id,
data_id, data_no, data_name,
data_type, file_type, version,
content, implant_json, data_status,
diff --git a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
index dda5b8a..d8f2f1e 100644
--- a/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
+++ b/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java
@@ -228,7 +228,7 @@ public class EDDataFacadeImpl implements EDDataFacade {
Map result = new HashMap<>();
List dataIdList = Arrays.asList(dataIdArr.split(","));
- if(dataIdList.size() > 0) {
+ if(!dataIdList.isEmpty()) {
String filePath = edDataService.exportData(dataIdList);
Assert.isTrue(FileUtil.exist(filePath), "下载文件不存在。");
@@ -313,13 +313,12 @@ public class EDDataFacadeImpl implements EDDataFacade {
return new ArrayList<>();
}
- List uploadedFileChunkNums = FileUtil.listFileNames(destPath)
+ return FileUtil.listFileNames(destPath)
.stream()
.filter(e -> !e.endsWith(".comac"))
.map(e -> e.replace(UPLOAD_FILE_CHUNK_SUFFIX, ""))
.map(Integer::parseInt)
.collect(Collectors.toList());
- return uploadedFileChunkNums;
}
// TODO 需要验证如果一个分片上传一半网络断开,则该分片的存储情况。