更新数据集版本数据量个数。

application-webadmin/src/main/java/com/yice/webadmin/app/controller/DatasetDataController.java

@@ -17,13 +17,16 @@ import com.yice.webadmin.app.constant.DatasetConstant;
 import com.yice.webadmin.app.data.DatasetData;
 import com.yice.webadmin.app.dto.DatasetDataDto;
 import com.yice.webadmin.app.dto.DatasetDataSummaryDto;
+import com.yice.webadmin.app.model.DatasetVersion;
 import com.yice.webadmin.app.service.DatasetDataService;
+import com.yice.webadmin.app.service.DatasetVersionService;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -40,6 +43,8 @@ public class DatasetDataController {
 
     @Autowired
     private DatasetDataService datasetDataService;
+    @Autowired
+    private DatasetVersionService datasetVersionService;
 
     /**
      * 更新数据集版本数据。
@@ -85,6 +90,12 @@ public class DatasetDataController {
         if(result == 0) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_DELETE_ARGUMENT);
         }
+        DatasetVersion datasetVersion = datasetVersionService.getById(versionId);
+        if(null != datasetVersion) {
+            datasetVersion.setUpdateTime(new Date());
+            datasetVersion.setDataVolume(datasetVersion.getDataVolume() - 1);
+            datasetVersionService.updateById(datasetVersion);
+        }
         return ResponseResult.success();
     }
 

application-webadmin/src/main/java/com/yice/webadmin/app/controller/DatasetVersionController.java

 package com.yice.webadmin.app.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.BooleanUtil;
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.pagehelper.page.PageMethod;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.yice.common.core.annotation.MyRequestBody;
@@ -19,7 +16,6 @@ import com.yice.common.core.util.MyModelUtil;
 import com.yice.common.core.util.MyPageUtil;
 import com.yice.common.log.annotation.OperationLog;
 import com.yice.common.log.model.constant.SysOperationLogType;
-import com.yice.webadmin.app.config.PythonConfig;
 import com.yice.webadmin.app.constant.DatasetConstant;
 import com.yice.webadmin.app.data.DatasetData;
 import com.yice.webadmin.app.dto.DatasetVersionDto;
@@ -37,6 +33,7 @@ import org.springframework.core.io.UrlResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -62,8 +59,6 @@ public class DatasetVersionController {
     @Autowired
     private DatasetVersionService datasetVersionService;
     @Autowired
-    private PythonConfig pythonConfig;
-    @Autowired
     private DatasetDataService datasetDataService;
     @Autowired
     private DatasetOutputService datasetOutputService;

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

@@ -381,6 +381,9 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
 
                 //批量添加数据集列表
                 this.datasetDataService.updateBatch(newDataList, datasetId);
+
+                //更新数据集版本量
+                updateVersionVolumn(datasetId);
             }
         }catch (JsonProcessingException ex){
             log.error("deal with dataset node data:", ex);
@@ -388,6 +391,20 @@ public class DatasetCleanServiceImpl extends BaseService<DatasetClean, Long> imp
         return newDataList;
     }
 
+    /**
+     * 更新版本数据量
+     * @param versionId 版本标识
+     */
+    private void updateVersionVolumn(Long versionId) {
+        DatasetVersion datasetVersion = datasetVersionService.getById(versionId);
+        if(null != datasetVersion) {
+            Long dataVolume = datasetDataService.count(versionId);
+            datasetVersion.setUpdateTime(new Date());
+            datasetVersion.setDataVolume(dataVolume);
+            datasetVersionService.updateById(datasetVersion);
+        }
+    }
+
     /**
      * 创建新的数据节点
      * @param json Json对象