Commit 24c63253 authored by pengxin's avatar pengxin

数据集添加继承版本功调整。

parent 9735901a
......@@ -142,18 +142,19 @@ public class DatasetVersionServiceImpl extends BaseService<DatasetVersion, Long>
*/
private DatasetVersion dealWithWriteAndSave(Long datasetId, Integer hisVersion,
Long versionId, String datasetName) throws IOException {
DatasetVersion datasetVersion = null;
if (hisVersion > 0) {
DatasetVersion filter = new DatasetVersion();
filter.setDatasetVersion(hisVersion);
filter.setDatasetId(datasetId);
DatasetVersion datasetVersion = this.getOne(filter);
if(null == datasetVersion) return null;
datasetVersion = this.getOne(filter);
if (null != datasetVersion && StringUtils.isNotBlank(datasetVersion.getFileUrl())) {
String fileUrl = datasetVersion.getFileUrl();
if(StringUtils.isNotBlank(fileUrl)) {
//获取新的json存放地址
String newFileName = this.extractFileName(fileUrl) + datasetName + ".json";
//写入到新的json文件格式中
byte [] bytes = writeAndSaveFileDetail(newFileName, fileUrl, versionId);
byte[] bytes = writeAndSaveFileDetail(newFileName, fileUrl, versionId);
//再存储数据集配置文件
this.saveDatasetInfo(datasetName);
//重新赋值参数
......@@ -161,6 +162,7 @@ public class DatasetVersionServiceImpl extends BaseService<DatasetVersion, Long>
datasetVersion.setInputStatus(1);
datasetVersion.setDataVolume(Long.valueOf(JSON.parseArray(new String(bytes, StandardCharsets.UTF_8)).size()));
}
}
return datasetVersion;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment