在组织模块添加分页测试

cloud-service/organization-center/src/main/java/com/cloud/organization/controller/CloudOrgController.java

 package com.cloud.organization.controller;
 
 
+import com.cloud.common.page.PageUtils;
+import com.cloud.common.response.Result;
+import com.cloud.model.organization.CloudOrg;
+import com.cloud.organization.query.OrgQuery;
+import com.cloud.organization.service.CloudOrgService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
@@ -13,9 +25,16 @@ import org.springframework.stereotype.Controller;
  * @author lgh
  * @since 2019-04-28
  */
-@Controller
+@RestController
 @RequestMapping("/cloudOrg")
+@Api(value="组织机构",description="组织机构关接口信息")
 public class CloudOrgController {
-
+    @Autowired
+    private CloudOrgService cloudOrgService;
+    @PostMapping("queryPage")
+    @ApiOperation(value = "查询所有数据，带分页、排序", notes = "参数格式：{'pageSize':10,'pageNum':1,'queryColumn':{'name':'xxx'}}")
+    public Result<Object> queryPage(HttpServletRequest req) {
+        return cloudOrgService.queryPage(new PageUtils<>(OrgQuery.class, req));
+    }
 }
 

cloud-service/organization-center/src/main/java/com/cloud/organization/query/OrgQuery.java

@@ -22,7 +22,7 @@ import lombok.Data;
 @Data
 public class OrgQuery implements java.io.Serializable{
     @ApiModelProperty(value="创建时间")
-    private String createTime="createTime";
+    private String createTime="org_create_date";
     @ApiModelProperty(value="排序类别（ ASC DESC）")
     private String sortOrder="asc";
     /**
@@ -39,15 +39,15 @@ public class OrgQuery implements java.io.Serializable{
         QueryWrapper<CloudOrg> column = new QueryWrapper<CloudOrg>();
         if(!StringUtils.isEmpty(orgName)) column.like("org_name", orgName);
         if(!StringUtils.isEmpty(orgPath)) column.like("org_path", orgPath);
-        if (!StringUtils.isEmpty(createTime)) {
+        /*if (!StringUtils.isEmpty(createTime)) {
             if ("ASC".equals(sortOrder.toUpperCase())) {
                 column.orderByAsc(MyStringUtils.CoverLineStr(createTime));
             } else {
                 column.orderByDesc(MyStringUtils.CoverLineStr(createTime));
             }
         }else {
-            column.orderByDesc("createTime");
-        }
+            column.orderByDesc("org_create_date");
+        }*/
         return column;
     }
 }

cloud-service/organization-center/src/main/java/com/cloud/organization/service/CloudOrgService.java

 package com.cloud.organization.service;
 
+import com.cloud.common.page.PageUtils;
+import com.cloud.common.response.Result;
 import com.cloud.model.organization.CloudOrg;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cloud.organization.query.OrgQuery;
 
 /**
  * <p>
@@ -12,4 +15,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2019-04-28
  */
 public interface CloudOrgService extends IService<CloudOrg> {
+    /**
+     * 组织分页
+     * @param page
+     * @return
+     */
+    public Result<Object> queryPage(PageUtils<OrgQuery> page);
 }

cloud-service/organization-center/src/main/java/com/cloud/organization/service/impl/CloudOrgServiceImpl.java

 package com.cloud.organization.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cloud.common.page.PageUtils;
+import com.cloud.common.response.ResponseUtil;
+import com.cloud.common.response.Result;
 import com.cloud.model.organization.CloudOrg;
 import com.cloud.organization.mapper.CloudOrgDao;
+import com.cloud.organization.query.OrgQuery;
 import com.cloud.organization.service.CloudOrgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +24,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CloudOrgServiceImpl extends ServiceImpl<CloudOrgDao, CloudOrg> implements CloudOrgService {
-
+    @Resource
+    private CloudOrgDao cloudorgdao;
+    @Override
+    public Result<Object> queryPage(PageUtils<OrgQuery> page) {
+        IPage<CloudOrg> selectPage = cloudorgdao.selectPage(new Page<CloudOrg>(page.getPageNum(),page.getPageSize()), page.getQueryColumn().queryWrap());
+        return ResponseUtil.ok(page.getResultMap(selectPage.getRecords(), selectPage.getTotal()));
+    }
 }

cloud-service/organization-center/src/test/java/com/cloud/organization/OrganizationTest.java

 package com.cloud.organization;
 
+import com.cloud.common.page.PageUtils;
 import com.cloud.model.organization.CloudOrg;
 
+import com.cloud.organization.query.OrgQuery;
 import com.cloud.organization.service.CloudOrgService;
 
 import org.junit.Test;
@@ -10,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.servlet.http.HttpServletRequest;
+
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
@@ -24,10 +28,16 @@ public void  inserOrg(){
       coudOrgService.save(org);
    }
 }
-
 @Test
 public void getOrg(){
    CloudOrg org=coudOrgService.getById(2);
    System.out.println(org.getOrgName());
 }
+@Test
+public  void queryPage(){
+   PageUtils<OrgQuery> page=new PageUtils<OrgQuery>();
+   OrgQuery org=new OrgQuery();
+   page.setQueryColumn(org);
+   coudOrgService.queryPage(page);
+}
 }