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

application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/DatasetVersionServiceImpl.java

@@ -142,24 +142,26 @@ public class DatasetVersionServiceImpl extends BaseService<DatasetVersion, Long>
      */
     private DatasetVersion dealWithWriteAndSave(Long datasetId, Integer hisVersion,
                                                 Long versionId, String datasetName) throws IOException {
-        DatasetVersion filter = new DatasetVersion();
-        filter.setDatasetVersion(hisVersion);
-        filter.setDatasetId(datasetId);
-        DatasetVersion datasetVersion = this.getOne(filter);
-        if(null == datasetVersion) return null;
+        DatasetVersion datasetVersion = null;
+        if (hisVersion > 0) {
+            DatasetVersion filter = new DatasetVersion();
+            filter.setDatasetVersion(hisVersion);
+            filter.setDatasetId(datasetId);
+            datasetVersion = this.getOne(filter);
 
-        String fileUrl = datasetVersion.getFileUrl();
-        if(StringUtils.isNotBlank(fileUrl)) {
-            //获取新的json存放地址
-            String newFileName = this.extractFileName(fileUrl) + datasetName + ".json";
-            //写入到新的json文件格式中
-            byte [] bytes = writeAndSaveFileDetail(newFileName, fileUrl, versionId);
-            //再存储数据集配置文件
-            this.saveDatasetInfo(datasetName);
-            //重新赋值参数
-            datasetVersion.setFileUrl(newFileName);
-            datasetVersion.setInputStatus(1);
-            datasetVersion.setDataVolume(Long.valueOf(JSON.parseArray(new String(bytes, StandardCharsets.UTF_8)).size()));
+            if (null != datasetVersion && StringUtils.isNotBlank(datasetVersion.getFileUrl())) {
+                String fileUrl = datasetVersion.getFileUrl();
+                //获取新的json存放地址
+                String newFileName = this.extractFileName(fileUrl) + datasetName + ".json";
+                //写入到新的json文件格式中
+                byte[] bytes = writeAndSaveFileDetail(newFileName, fileUrl, versionId);
+                //再存储数据集配置文件
+                this.saveDatasetInfo(datasetName);
+                //重新赋值参数
+                datasetVersion.setFileUrl(newFileName);
+                datasetVersion.setInputStatus(1);
+                datasetVersion.setDataVolume(Long.valueOf(JSON.parseArray(new String(bytes, StandardCharsets.UTF_8)).size()));
+            }
         }
         return datasetVersion;
     }