msg

cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java

@@ -6,11 +6,13 @@ import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Role;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +20,6 @@ import javax.servlet.http.HttpServletResponse;
 
 
 /**
- *
  * @author 吴涛涛
  * @since 2019-07-26
  */
@@ -32,9 +33,9 @@ public class CompanyController {
 
     /**
      * 添加/修改公司
-     * @param company
-     * 参数：companyName 公司名 companyAddress 公司地址
-     * @param flag 0-添加，1-修改
+     *
+     * @param company 参数：companyName 公司名 companyAddress 公司地址
+     * @param flag    0-添加，1-修改
      * @return
      */
     @ApiOperation("添加/修改公司")
@@ -43,21 +44,21 @@ public class CompanyController {
     public HttpRespMsg addAndUpdateRole(Company company, HttpServletRequest request, Integer flag,
                                         HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = companyService.addAndUpdateRole(company,flag);
+        msg = companyService.addAndUpdateRole(company, flag);
         return msg;
     }
 
     /**
      * 删除公司
-     * @param company
-     * 参数 id 公司id
+     *
+     * @param company 参数 id 公司id
      * @return
      */
     @ApiOperation("删除公司")
     @RequestMapping("/delete")
     @ResponseBody
     public HttpRespMsg delete(Company company, HttpServletRequest request,
-                                        HttpServletResponse response) {
+                              HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
         msg.data = companyService.removeById(company.getId());
         return msg;
@@ -65,18 +66,17 @@ public class CompanyController {
 
     /**
      * 公司列表
-     * @param keyName 关键字查询 根据公司名称检索
+     * @param keyName
+     * 参数：currentPage 当前页码，pageSize 每页条数 keyName 关键字查询
      * @return
      */
     @ApiOperation("公司列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg deleteRole(String keyName, HttpServletRequest request,
-                                  HttpServletResponse response) {
+    public HttpRespMsg deleteRole(@RequestParam(required = false)String keyName, HttpServletRequest request,
+                                  HttpServletResponse response, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<Company> qw = new QueryWrapper<>();
-        qw.like("company_name",keyName);
-        msg.data = companyService.list(qw);
+        msg.data = companyService.pageList(page,keyName);
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/controller/RoleController.java

@@ -68,7 +68,8 @@ public class RoleController {
 
     /**
      * 角色列表
-     * @param keyName 关键字查询
+     * @param keyName
+     * 参数：currentPage 当前页码，pageSize 每页条数 keyName 关键字查询
      * @return
      */
     @ApiOperation("角色列表")

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/CompanyMapper.java

@@ -2,6 +2,10 @@ package com.hssx.cloudmodel.mapper;
 
 import com.hssx.cloudmodel.entity.Company;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.cloudmodel.entity.Role;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CompanyMapper extends BaseMapper<Company> {
 
+    List<Company> getListByKeyName(@Param("keyName") String keyName, @Param("start")Integer start, @Param("pageSize") Integer pageSize);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/CompanyService.java

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 
 /**
  * <p>
@@ -15,4 +16,6 @@ import com.hssx.cloudmodel.util.HttpRespMsg;
 public interface CompanyService extends IService<Company> {
 
     HttpRespMsg addAndUpdateRole(Company company, Integer flag);
+
+    HttpRespMsg pageList(PageUtil page, String keyName);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -7,9 +7,12 @@ import com.hssx.cloudmodel.mapper.CompanyMapper;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -42,4 +45,21 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg pageList(PageUtil page, String keyName) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<Company> qw = new QueryWrapper<>();
+        if(keyName !=null && !"".equals(keyName)){
+            qw.like("company_name", keyName);
+        }
+        Integer start = (page.getCurrentPage()-1)*page.getPageSize();
+        Integer count = companyMapper.selectCount(qw);
+        page.setTotalCount(count);
+        page.setTotalPage(page.getTotalCount());
+        List<Company> list = companyMapper.getListByKeyName(keyName, start, page.getPageSize());
+        page.setList(list);
+        msg.data = page;
+        return msg;
+    }
 }

cloud-model/src/main/resources/mapper/CompanyMapper.xml

@@ -13,5 +13,16 @@
     <sql id="Base_Column_List">
         id, company_name, company_address
     </sql>
-
+    <select id="getListByKeyName" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from
+          tb_company
+        <where>
+            <if test="keyName != null and keyName != ''">
+                company_name like concat('%',#{keyName},'%')
+            </if>
+        </where>
+        Limit #{start},#{pageSize}
+    </select>
 </mapper>