Merge branch 'xiaohucoding'

# Conflicts:
#	pom.xml

src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/DatasetController.java

@@ -2,7 +2,6 @@ package com.bipt.intelligentapplicationorchestrationservice.controller;
 
 import com.bipt.intelligentapplicationorchestrationservice.pojo.*;
 import com.bipt.intelligentapplicationorchestrationservice.service.DatasetService;
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -28,6 +27,11 @@ public class DatasetController {
         return OptResult.success();
     }
 
+    /**
+     * 分页查询
+     * @param dataSetPageQueryDTO
+     * @return
+     */
     @GetMapping("/page")
     public OptResult<PageResult> page(DatasetPageQueryDTO dataSetPageQueryDTO) {
         log.info("数据集分页查询:{}", dataSetPageQueryDTO);
@@ -38,32 +42,28 @@ public class DatasetController {
 
     /**
      * 修改数据集
-     * @param datasetEntity
+     * @param datasetDTO
      * @return
      */
     @PutMapping
-    public OptResult update(@RequestBody DatasetEntity datasetEntity){
-        log.info("修改数据集",datasetEntity);
-        datasetService.update(datasetEntity);
+    public OptResult update(@RequestBody DatasetDTO datasetDTO){
+        log.info("修改数据集",datasetDTO);
+        datasetService.update(datasetDTO);
         return OptResult.success();
     }
 
+
+
     /**
      * 批量删除数据集
      * @param datasetIds 数据集ID列表
      * @return 操作结果
      */
     @DeleteMapping
-    public OptResult<String> deleteBatch(@RequestBody List<Integer> datasetIds) {
+    public OptResult<String> deleteBatch(@RequestBody List<Long> datasetIds) {
         log.info("批量删除数据集，ID列表：{}", datasetIds);
         datasetService.deleteBatch(datasetIds);
         return OptResult.success("批量删除成功");
     }
 
-
-
-
-
-
-
 }