feature:服务资源列表接口自测完成

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/app/vo/ServiceResourceVo.java → src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/app/vo/ServiceResourceBaseVo.java

@@ -12,7 +12,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "服务资源Vo")
-public class ServiceResourceVo extends ResourceVo {
+public class ServiceResourceBaseVo extends ResourceVo {
 
     /**
      * 服务在用状态

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/AppFunInfoController.java

@@ -134,13 +134,6 @@ public class AppFunInfoController  {
 
 
 
-
-
-
-
-
-
-
     public List<TreeInfoVO> getChildTreeObjects(List<TreeInfoVO> list,
                                                 String parentCode) {
         List<TreeInfoVO> returnList = new ArrayList<TreeInfoVO>();

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/ServiceResourceController.java

@@ -2,7 +2,8 @@ package com.dragoninfo.dcuc.authweb.restcontroller.auth;
 
 import com.dragoninfo.dcuc.app.entity.ServiceResource;
 import com.dragoninfo.dcuc.app.facade.IServiceResourceFacade;
-import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.ServiceResourceVo;
+import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
+import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.ServiceResourceBaseVo;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
@@ -36,19 +37,28 @@ public class ServiceResourceController {
     @ApiOperation(value = "服务资源列表")
     @ApiImplicitParam(name = "serviceName", value = "查询条件")
     @PostMapping(value = "search/drop")
-    public Result droplist(@RequestBody ServiceResourceVo vo) {
+    public Result droplist(@RequestBody ServiceResourceBaseVo vo) {
         SearchDTO searchDTO = new SearchDTO();
         searchDTO.setSize("100");
         searchDTO.setPage("0");
         Searchable searchable = Searchable.toSearchable(searchDTO);
         searchable.addSearchFilter("serviceName", SearchOperator.like, vo.getServiceName());
         Page<ServiceResource> serviceResources = serviceResourceFacade.resourcePages(searchable.toSearchDTO());
-        List<ServiceResourceVo> list = new ArrayList<>();
+        List<ServiceResourceBaseVo> list = new ArrayList<>();
         serviceResources.getContent().forEach(item -> {
-            ServiceResourceVo resourceVo = new ServiceResourceVo();
+            ServiceResourceBaseVo resourceVo = new ServiceResourceBaseVo();
             BeanUtils.copyProperties(item, resourceVo);
             list.add(resourceVo);
         });
         return Result.success(list);
     }
+
+
+    @ApiOperation(value = "服务资源分页列表")
+    @ApiImplicitParam(name = "serviceName", value = "查询条件")
+    @PostMapping(value = "/search")
+    public Result page(Searchable searchable) {
+        Page<ServiceResourceVo> page = serviceResourceFacade.page(searchable.toSearchDTO());
+        return Result.success(page.getTotalElements(), page.getContent());
+    }
 }