移除数据源分页查询并调整数据管理服务接口

src/main/java/com/hisense/dataservice/controller/DataServiceManagementController.java

@@ -29,16 +29,12 @@ public class DataServiceManagementController {
     @Autowired
     private DataApiServiceManagementService dataApiServiceManagementService;
 
-//    @PostMapping("/")
-//    public Result<Boolean> createOrUpdateDataApiService(DataApiModelDto dataApiModelDto){
-//        return dataApiServiceManagementService.createOrUpdateDataApi(dataApiModelDto);
-//    }
 
-    @ApiOperation(value = "数据服务管理-创建数据服务（草稿状态）",notes = "返回数据模型ID")
+    @ApiOperation(value = "数据服务管理-创建或修改数据服务（草稿状态）",notes = "返回数据模型ID")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "environment", value = "环境", required = true)
     })
-    @PostMapping("/{environment}")
+    @PostMapping("/createDataApiService/{environment}")
     public Result<Long> createDataApiService(@PathVariable String environment, @RequestBody DataApiModelDto dataApiModelDto){
         return dataApiServiceManagementService.createDataApi(environment,dataApiModelDto);
     }
@@ -48,8 +44,8 @@ public class DataServiceManagementController {
             @ApiImplicitParam(name = "environment", value = "环境", required = true),
             @ApiImplicitParam(name = "modelId", value = "数据服务ID", required = true)
     })
-    @PostMapping("/{environment}/{modelId}")
-    public Result<Boolean> publishDataApi(@PathVariable String environment,
+    @PostMapping("/publishDataApiService/{environment}/{modelId}")
+    public Result<Boolean> publishDataApiService(@PathVariable String environment,
                                  @PathVariable Long modelId) {
         return dataApiServiceManagementService.publishDataApi(environment, modelId);
     }
@@ -60,14 +56,6 @@ public class DataServiceManagementController {
     }
 
 
-
-    @PatchMapping("/{environment}")
-    public Object updateDataApi(@PathVariable String environment) {
-        return null;
-    }
-
-
-
     @GetMapping("/dataFileDownload/{environment}/{pattern}/{fileId}")
     public Object dataFileDownload(@PathVariable String environment, @PathVariable String pattern, @PathVariable String fileId) {
         return null;

src/main/java/com/hisense/dataservice/controller/DataSourceManagementController.java

@@ -31,26 +31,6 @@ public class DataSourceManagementController extends BaseController {
     @Autowired
     private DataApiDataSourceManagementService dataSourceManagementService;
 
-    @ApiOperation(value = "数据源管理-数据源列表（分页）")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "environment", value = "环境", required = true),
-            @ApiImplicitParam(name = "type", value = "类型", required = true),
-            @ApiImplicitParam(name = "pageSize", value = "指定返回结果中每页显示的记录数量", defaultValue = "10", required = false),
-            @ApiImplicitParam(name = "page", value = "指定显示返回结果中的第几页", defaultValue = "1", required = false),
-            @ApiImplicitParam(name = "sortProperty", value = "根据哪个字段排序", required = false, allowableValues = "id,createdTime,updateTime"),
-            @ApiImplicitParam(name = "sortOrder", value = "排序方向", required = false, allowableValues = "ASC,DESC")
-    })
-
-    @GetMapping("/{environment}/pageList/{type}")
-    public Result<PageData<DataSourceVo>> getDataSourceList(@PathVariable String environment,
-                                                            @PathVariable String type,
-                                                            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                                            @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
-                                                            @RequestParam(value = "sortProperty", required = false) String sortProperty,
-                                                            @RequestParam(value = "sortOrder", required = false) String sortOrder) {
-        DataSourceTypeEnum dataSourceType = DataSourceTypeEnum.valueOf(type);
-        return dataSourceManagementService.pageQueryDataSourceListByType(environment, dataSourceType, createPageLink(pageSize, page, "", sortProperty, sortOrder));
-    }
 
     @ApiOperation(value = "数据源管理-数据源列表")
     @ApiImplicitParams({
@@ -65,26 +45,6 @@ public class DataSourceManagementController extends BaseController {
     }
 
 
-    @ApiOperation(value = "数据源管理-数据表列表（分页）", notes = "根据数据源查询对应的数据表列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "environment", value = "环境", required = true),
-            @ApiImplicitParam(name = "dataSourceId", value = "数据源ID", required = true),
-            @ApiImplicitParam(name = "pageSize", value = "指定返回结果中每页显示的记录数量", defaultValue = "10", required = false),
-            @ApiImplicitParam(name = "page", value = "指定显示返回结果中的第几页", defaultValue = "1", required = false),
-            @ApiImplicitParam(name = "sortProperty", value = "根据哪个字段排序", required = false, allowableValues = "id,createdTime,updateTime"),
-            @ApiImplicitParam(name = "sortOrder", value = "排序方向", required = false, allowableValues = "ASC,DESC")
-    })
-    @GetMapping("/{environment}/{dataSourceId}/pageTables")
-    public Result<PageData<DataTableVo>> getDataTableList(@PathVariable String environment,
-                                                          @PathVariable Long dataSourceId,
-                                                          @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                                          @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
-                                                          @RequestParam(value = "sortProperty", required = false) String sortProperty,
-                                                          @RequestParam(value = "sortOrder", required = false) String sortOrder) {
-
-        return dataSourceManagementService.pageQueryDataTableListByDataSource(environment, dataSourceId, createPageLink(pageSize, page, "", sortProperty, sortOrder));
-    }
-
     @ApiOperation(value = "数据源管理-数据表列表", notes = "根据数据源查询对应的数据表列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "environment", value = "环境", required = true),
@@ -97,27 +57,6 @@ public class DataSourceManagementController extends BaseController {
     }
 
 
-    @ApiOperation(value = "数据源管理-数据字段列表（分页）", notes = "根据数据表查询对应的数据字段列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "environment", value = "环境", required = true),
-            @ApiImplicitParam(name = "tableId", value = "数据表ID", required = true),
-            @ApiImplicitParam(name = "pageSize", value = "指定返回结果中每页显示的记录数量", defaultValue = "10",required = false),
-            @ApiImplicitParam(name = "page", value = "指定显示返回结果中的第几页", defaultValue = "1", required = false),
-            @ApiImplicitParam(name = "sortProperty", value = "根据哪个字段排序", required = false, allowableValues = "id,createdTime,updateTime"),
-            @ApiImplicitParam(name = "sortOrder", value = "排序方向", required = false, allowableValues = "ASC,DESC")
-    })
-
-    @GetMapping("/{environment}/{tableId}/pageFields")
-    public Result<PageData<DataFieldVo>> getDataTableColumn(@PathVariable String environment,
-                                                        @PathVariable Long tableId,
-                                                        @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                                        @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
-                                                        @RequestParam(value = "sortProperty", required = false) String sortProperty,
-                                                        @RequestParam(value = "sortOrder", required = false) String sortOrder) {
-
-        return dataSourceManagementService.pageQueryDataFieldListByTable(environment, tableId, createPageLink(pageSize, page, "", sortProperty, sortOrder));
-    }
-
     @ApiOperation(value = "数据源管理-数据字段列表", notes = "根据数据表查询对应的数据字段列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "environment", value = "环境", required = true),

src/main/java/com/hisense/dataservice/service/DataApiDataSourceManagementService.java

@@ -16,17 +16,10 @@ import java.util.List;
  **/
 public interface DataApiDataSourceManagementService extends BaseService {
 
-    Result<List<String>> queryDataSourceTypeList(String environment);
-
     Result<List<DataSourceVo>> queryDataSourceListByType(String environment, DataSourceTypeEnum dataSourceType);
 
-    Result<PageData<DataSourceVo>> pageQueryDataSourceListByType(String environment, DataSourceTypeEnum dataSourceType, PageLink pageLink);
-
     Result<List<DataTableVo>> queryDataTableListByDataSource(String environment, Long dataSourceId);
 
-    Result<PageData<DataTableVo>> pageQueryDataTableListByDataSource(String environment, Long dataSourceId, PageLink pageLink);
-
     Result<List<DataFieldVo>> queryDataFieldListByTable(String environment, Long tableId);
 
-    Result<PageData<DataFieldVo>> pageQueryDataFieldListByTable(String environment, Long tableId, PageLink pageLink);
 }

src/main/java/com/hisense/dataservice/service/impl/DataApiDataSourceManagementServiceImpl.java

@@ -8,21 +8,15 @@ import com.hisense.dataservice.repository.DataApiColumnRepository;
 import com.hisense.dataservice.repository.DataApiDataSourceRepository;
 import com.hisense.dataservice.repository.DataApiTableRepository;
 import com.hisense.dataservice.service.DataApiDataSourceManagementService;
-import com.hisense.dataservice.library.model.page.PageData;
-import com.hisense.dataservice.library.model.page.PageLink;
 import com.hisense.dataservice.vo.DataFieldVo;
 import com.hisense.dataservice.vo.DataSourceVo;
 import com.hisense.dataservice.vo.DataTableVo;
 import com.hisense.dataservice.library.model.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
-import javax.persistence.criteria.Predicate;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -43,13 +37,6 @@ public class DataApiDataSourceManagementServiceImpl implements DataApiDataSource
     private DataApiColumnRepository dataApiColumnRepository;
 
     @Override
-    public Result<List<String>> queryDataSourceTypeList(String environment) {
-        List<String> sourceTypeList = dataApiDataSourceRepository.findAllSourceType();
-        return success(sourceTypeList);
-    }
-
-    // TODO 放入缓存
-    @Override
     public Result<List<DataSourceVo>> queryDataSourceListByType(String environment, DataSourceTypeEnum dataSourceType) {
         List<DataSourceVo> results = new ArrayList<>();
 
@@ -60,28 +47,6 @@ public class DataApiDataSourceManagementServiceImpl implements DataApiDataSource
         return success(results);
     }
 
-    @Override
-    public Result<PageData<DataSourceVo>> pageQueryDataSourceListByType(String environment, DataSourceTypeEnum dataSourceType, PageLink pageLink) {
-        Specification<DataApiDataSource> spec = (root, query, builder) -> {
-            List<Predicate> andList = new LinkedList<>();
-
-            andList.add(builder.equal((root.get("type").as(DataSourceTypeEnum.class)), dataSourceType));
-            andList.add(builder.equal((root.get("deleted").as(Boolean.class)), Boolean.FALSE));
-
-            return builder.and(andList.toArray(new Predicate[0]));
-        };
-
-        Page<DataApiDataSource> dataApiDataSourcePage = dataApiDataSourceRepository.findAll(spec, toPageable(pageLink));
-
-        PageData<DataSourceVo> result = pageToPageData(dataApiDataSourcePage);
-        List<DataSourceVo> dataSourceVos = new ArrayList<>();
-        for (DataApiDataSource dataApiDataSource : dataApiDataSourcePage.getContent()) {
-            dataSourceVos.add(dataApiDataSource.toItem());
-        }
-        result.setData(dataSourceVos);
-
-        return success(result);
-    }
 
     @Override
     public Result<List<DataTableVo>> queryDataTableListByDataSource(String environment, Long dataSourceId) {
@@ -93,25 +58,6 @@ public class DataApiDataSourceManagementServiceImpl implements DataApiDataSource
         return success(results);
     }
 
-    @Override
-    public Result<PageData<DataTableVo>> pageQueryDataTableListByDataSource(String environment, Long dataSourceId, PageLink pageLink) {
-        Specification<DataApiTable> spec = (root, query, builder) -> {
-            List<Predicate> andList = new LinkedList<>();
-
-            andList.add(builder.equal((root.get("dataSourceId").as(Long.class)), dataSourceId));
-            andList.add(builder.equal((root.get("deleted").as(Boolean.class)), Boolean.FALSE));
-
-            return builder.and(andList.toArray(new Predicate[0]));
-        };
-        Page<DataApiTable> dataApiTablePage = dataApiTableRepository.findAll(spec, toPageable(pageLink));
-        PageData<DataTableVo> result = pageToPageData(dataApiTablePage);
-        List<DataTableVo> data = new ArrayList<>();
-        for (DataApiTable dataApiTable : dataApiTablePage.getContent()) {
-            data.add(dataApiTable.toItem());
-        }
-        result.setData(data);
-        return success(result);
-    }
 
     @Override
     public Result<List<DataFieldVo>> queryDataFieldListByTable(String environment, Long dataTableId) {
@@ -122,24 +68,4 @@ public class DataApiDataSourceManagementServiceImpl implements DataApiDataSource
         }
         return success(results);
     }
-
-    @Override
-    public Result<PageData<DataFieldVo>> pageQueryDataFieldListByTable(String environment, Long tableId, PageLink pageLink) {
-        Specification<DataApiColumn> spec = (root, query, builder) -> {
-            List<Predicate> andList = new LinkedList<>();
-
-            andList.add(builder.equal((root.get("dataTableId").as(Long.class)), tableId));
-            andList.add(builder.equal((root.get("deleted").as(Boolean.class)), Boolean.FALSE));
-
-            return builder.and(andList.toArray(new Predicate[0]));
-        };
-        Page<DataApiColumn> dataApiColumnPage = dataApiColumnRepository.findAll(spec, toPageable(pageLink));
-        PageData result = pageToPageData(dataApiColumnPage);
-        List<DataFieldVo> data = new ArrayList<>();
-        for (DataApiColumn dataApiColumn : dataApiColumnPage.getContent()) {
-            data.add(dataApiColumn.toItem());
-        }
-        result.setData(data);
-        return success(result);
-    }
 }

src/test/java/com/hisense/dataservice/utils/ExcelTest.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import org.junit.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.rmi.server.UID;
 import java.util.*;
 
 @SpringBootTest