修改公司列表

cloud-model/pom.xml

@@ -29,11 +29,11 @@
             <scope>test</scope>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>com.github.pagehelper</groupId>-->
-            <!--<artifactId>pagehelper</artifactId>-->
-            <!--<version>4.1.0</version>  &lt;!&ndash;我这里用的是4.1.0版本&ndash;&gt;-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>4.1.0</version>  <!--我这里用的是4.1.0版本-->
+        </dependency>
 
         <!-- mybatis-plus依赖 -->
         <dependency>

cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java

@@ -1,9 +1,13 @@
 package com.hssx.cloudmodel;
 
+import com.github.pagehelper.PageHelper;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Bean;
+
+import java.util.Properties;
 
 @SpringBootApplication
 @MapperScan("com.hssx.cloudmodel.mapper")
@@ -13,4 +17,16 @@ public class CloudModelApplication {
         SpringApplication.run(CloudModelApplication.class, args);
     }
 
+    @Bean
+    public PageHelper pageHelper(){
+        PageHelper pageHelper = new PageHelper();
+        Properties properties = new Properties();
+        properties.setProperty("offsetAsPageNum","true");
+        properties.setProperty("rowBoundsWithCount","true");
+        properties.setProperty("reasonable","true");
+        properties.setProperty("dialect","mysql");    //配置mysql数据库的方言
+        pageHelper.setProperties(properties);
+        return pageHelper;
+    }
+
 }

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

@@ -76,7 +76,7 @@ public class CompanyController {
     public HttpRespMsg deleteRole(@RequestParam(required = false)String keyName, HttpServletRequest request,
                                   HttpServletResponse response, PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = companyService.pageList(page,keyName);
+        msg = companyService.pageList(page,keyName);
         return msg;
     }
 

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

@@ -7,6 +7,7 @@ import com.hssx.cloudmodel.entity.Factory;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.hssx.cloudmodel.service.FactoryService;
 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;
@@ -76,11 +77,9 @@ public class FactoryController {
     @RequestMapping("/list")
     @ResponseBody
     public HttpRespMsg deleteRole(String keyName, HttpServletRequest request,
-                                  HttpServletResponse response) {
+                                  HttpServletResponse response,PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<Factory> qw = new QueryWrapper<>();
-        qw.like("factory_name",keyName);
-        msg.data = factoryService.list(qw);
+        msg.data = factoryService.pageList(page,keyName);
         return msg;
     }
 

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

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.Factory;
 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 FactoryService extends IService<Factory> {
 
     HttpRespMsg addAndUpdateRole(Factory factory, Integer flag);
+
+    HttpRespMsg pageList(PageUtil page, String keyName);
 }

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

@@ -1,15 +1,20 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Factory;
 import com.hssx.cloudmodel.mapper.FactoryMapper;
 import com.hssx.cloudmodel.service.FactoryService;
 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 +47,18 @@ public class FactoryServiceImpl extends ServiceImpl<FactoryMapper, Factory> impl
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg pageList(PageUtil page, String keyName) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<Factory> qw = new QueryWrapper<>();
+        if(keyName !=null && !"".equals(keyName)){
+            qw.like("factory_name",keyName);
+        }
+        PageHelper.startPage(page.getCurrentPage(),page.getPageSize());
+        List<Factory> factories = factoryMapper.selectList(qw);
+        PageInfo<Factory>pageInfos = new PageInfo<>(factories);
+        msg.data = factories;
+        return null;
+    }
 }

cloud-model/src/main/resources/application.yml

@@ -27,10 +27,4 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
-  pagehelper:
-      reasonable: false
-      support-methods-arguments: true
-      params: count=countSql
-      row-bounds-with-count: true
-      helper-dialect: mysql