物务资源分页接口

src/main/java/com/zhiqiyun/open/router/apis/CategoryApi.java

@@ -1,6 +1,8 @@
 package com.zhiqiyun.open.router.apis;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dliyun.oap.framework.annotation.ServiceMethod;
 import com.dliyun.oap.framework.annotation.ServiceMethodBean;
 import com.dliyun.oap.framework.response.OapResponse;
@@ -11,10 +13,7 @@ import com.zhiqiyun.open.core.service.CategoryMaterialService;
 import com.zhiqiyun.open.core.service.CategoryOccupationService;
 import com.zhiqiyun.open.core.service.CategoryOrganizationService;
 import com.zhiqiyun.open.core.service.SequenceService;
-import com.zhiqiyun.open.router.request.category.CategoryMaterialRequest;
-import com.zhiqiyun.open.router.request.category.CategoryOccupationRequest;
-import com.zhiqiyun.open.router.request.category.CategoryOrganizationRequest;
-import com.zhiqiyun.open.router.request.category.CategoryOrganizationSaveRequest;
+import com.zhiqiyun.open.router.request.category.*;
 import com.zhiqiyun.open.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -61,15 +60,31 @@ public class CategoryApi {
         if (StringUtils.isNotBlank(request.getName())) {
             queryWrapper.like("name", request.getName());
         }
-
+        if (request.getId() != null) {
+            queryWrapper.eq("id", request.getId());
+        }
         queryWrapper.orderByDesc("sort_number");
         queryWrapper.orderByDesc("id");
-
         List<CategoryMaterial> listData = this.categoryMaterialService.list(queryWrapper);
-
         return OapResponse.success().setBody(listData);
     }
 
+    @ServiceMethod(method = "list.category.material.page", title = "物务资源分页目录")
+    public OapResponse listPageMaterialPage(CategoryMaterialPageRequest request) {
+        QueryWrapper<CategoryMaterial> wrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(request.getName())) {
+            wrapper.like("name", request.getName());
+        }
+        if (request.getId() != null) {
+            wrapper.eq("id", request.getId());
+        }
+        Page<CategoryMaterial> page = new Page<>(request.getCurrent(), request.getPageSize());
+        page.addOrder(OrderItem.asc("sort_number"));
+        page.addOrder(OrderItem.desc("id"));
+        Page<CategoryMaterial> resultData = this.categoryMaterialService.page(page, wrapper);
+        return OapResponse.success().setBody(resultData);
+    }
+
     @ServiceMethod(method = "list.category.organization", title = "机构列表")
     public OapResponse listPageOrganization(CategoryOrganizationRequest request) {
         QueryWrapper<CategoryOrganization> queryWrapper = new QueryWrapper<>();

src/main/java/com/zhiqiyun/open/router/request/category/CategoryMaterialPageRequest.java

@@ -0,0 +1,21 @@
+package com.zhiqiyun.open.router.request.category;
+
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CategoryMaterialPageRequest extends CategoryMaterialRequest {
+
+    @NotNull
+    @ServiceParamField(describe = "页数")
+    private Integer current = 1;
+
+    @NotNull
+    @ServiceParamField(describe = "每页条数")
+    private Integer pageSize = 10;
+}

src/main/java/com/zhiqiyun/open/router/request/category/CategoryMaterialRequest.java

@@ -8,6 +8,10 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class CategoryMaterialRequest extends AbstractOapRequest {
+
+    @ServiceParamField(describe = "id")
+    private Long id;
+
     @ServiceParamField(describe = "物务资源目录名称(模糊查询)")
     private String name;
 }