|
|
|
@@ -17,6 +17,7 @@ import javax.annotation.Nullable; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Optional; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@RequestMapping("newdataset") |
|
|
|
@@ -71,15 +72,15 @@ public class NewDatasetFromGitController { |
|
|
|
|
|
|
|
@GetMapping("/queryDatasets") |
|
|
|
@ApiOperation("数据集广场公开数据集分页查询,根据data_type,data_tag筛选,true公开false私有") |
|
|
|
public AjaxResult queryDatasets(@RequestParam("page") int page, |
|
|
|
@RequestParam("size") int size, |
|
|
|
public AjaxResult queryDatasets(@RequestParam(value = "page", required = false) @Nullable Integer page, |
|
|
|
@RequestParam(value = "size", required = false) @Nullable Integer size, |
|
|
|
@RequestParam(value = "is_public", required = false) @Nullable Boolean isPublic, |
|
|
|
@RequestParam(value = "data_type", required = false) String dataType, |
|
|
|
@RequestParam(value = "data_tag", required = false) String dataTag, |
|
|
|
@RequestParam(value = "name", required = false) String name) throws Exception { |
|
|
|
if (isPublic == null) { |
|
|
|
isPublic = false; |
|
|
|
} |
|
|
|
page = Optional.ofNullable(page).orElse(0); // 默认 page 为 0 |
|
|
|
size = Optional.ofNullable(size).orElse(10000); // 默认 size 为 10000 |
|
|
|
isPublic = Optional.ofNullable(isPublic).orElse(false); |
|
|
|
PageRequest pageRequest = PageRequest.of(page, size); |
|
|
|
Dataset dataset = new Dataset(); |
|
|
|
dataset.setDataTag(dataTag); |
|
|
|
|