Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

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

@@ -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,16 @@ public class CompanyController {
 
     /**
      * 公司列表
-     * @param keyName 关键字查询 根据公司名称检索
+     * 参数：pageNum 当前页码，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 = companyService.pageList(page,keyName);
         return msg;
     }
 

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

@@ -7,11 +7,13 @@ 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;
 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;
@@ -19,7 +21,6 @@ import javax.servlet.http.HttpServletResponse;
 
 
 /**
- *
  * @author 吴涛涛
  * @since 2019-07-26
  */
@@ -34,10 +35,10 @@ public class FactoryController {
 
     /**
      * 添加/修改工厂
-     * @param factory
-     * 参数：factoryName 工厂名 factoryArea 公司地址
-     * yLng 经度  xLat 纬度
-     * @param flag 0-添加，1-修改
+     *
+     * @param factory 参数：factoryName 工厂名 factoryArea 公司地址
+     *                yLng 经度  xLat 纬度
+     * @param flag    0-添加，1-修改
      * @return
      */
     @ApiOperation("添加/修改工厂")
@@ -46,14 +47,12 @@ public class FactoryController {
     public HttpRespMsg addAndUpdateRole(Factory factory, HttpServletRequest request, Integer flag,
                                         HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = factoryService.addAndUpdateRole(factory,flag);
+        msg = factoryService.addAndUpdateRole(factory, flag);
         return msg;
     }
 
     /**
-     *
-     * @param factory
-     * 参数：id 工厂id
+     * @param factory 参数：id 工厂id
      * @return
      */
     @ApiOperation("删除公司")
@@ -68,19 +67,16 @@ public class FactoryController {
 
     /**
      * 工厂列表
-     * @param keyName
-     * 参数: 关键字
+     * 参数: pageNum 当前页码，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<Factory> qw = new QueryWrapper<>();
-        qw.like("factory_name",keyName);
-        msg.data = factoryService.list(qw);
+        msg = factoryService.pageList(page, keyName);
         return msg;
     }
 

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

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

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

@@ -25,6 +25,10 @@ public class SysUserController {
     @Autowired
     SysUserService sysUserService;
 
+    /**
+     * 參數 ：username 用戶名 password 密碼
+     * @return
+     */
     @ApiOperation(value = "系统管理员登录", notes = "登录方法")
     @RequestMapping("login")
     @ResponseBody

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/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/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.getPageNum()-1)*page.getPageSize();
+        Integer count = companyMapper.selectCount(qw);
+        page.setTotal(count);
+        page.setPages(page.getTotal());
+        List<Company> list = companyMapper.getListByKeyName(keyName, start, page.getPageSize());
+        page.setList(list);
+        msg.data = page;
+        return msg;
+    }
 }

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.getPageNum(),page.getPageSize());
+        List<Factory> factories = factoryMapper.selectList(qw);
+        PageInfo<Factory>pageInfos = new PageInfo<>(factories);
+        msg.data = pageInfos;
+        return msg;
+    }
 }

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

@@ -50,13 +50,13 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     public HttpRespMsg pageList(PageUtil page, String keyName) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<Role> qw = new QueryWrapper<>();
-        Integer start = (page.getCurrentPage()-1)*page.getPageSize();
+        Integer start = (page.getPageNum()-1)*page.getPageSize();
         if(keyName !=null && !"".equals(keyName)){
             qw.like("role_name",keyName);
         }
         Integer count = roleMapper.selectCount(qw);
-        page.setTotalCount(count);
-        page.setTotalPage(page.getTotalCount());
+        page.setTotal(count);
+        page.setPages(page.getTotal());
         List<Role> list = roleMapper.getListByKeyName(keyName, start, page.getPageSize());
         page.setList(list);
         msg.data = page;

cloud-model/src/main/java/com/hssx/cloudmodel/util/PageUtil.java

@@ -10,26 +10,26 @@ import java.util.List;
  * Version: 1.0
  */
 public class PageUtil<T> {
-    private Integer currentPage = 1;
-    private Integer totalCount;
+    private Integer pageNum = 1;
+    private Integer total;
     private Integer pageSize = 10;
-    private Integer totalPage;
+    private Integer pages;
     private List<T> list = new ArrayList<>();
 
-    public Integer getCurrentPage() {
-        return currentPage;
+    public Integer getPageNum() {
+        return pageNum;
     }
 
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
     }
 
-    public Integer getTotalCount() {
-        return totalCount;
+    public Integer getTotal() {
+        return total;
     }
 
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
+    public void setTotal(Integer total) {
+        this.total = total;
     }
 
     public Integer getPageSize() {
@@ -40,12 +40,12 @@ public class PageUtil<T> {
         this.pageSize = pageSize;
     }
 
-    public Integer getTotalPage() {
-        return totalPage;
+    public Integer getPages() {
+        return pages;
     }
 
-    public void setTotalPage(Integer totalCount) {
-        this.totalPage = totalCount % this.pageSize == 0 ? totalCount / this.pageSize : totalCount / this.pageSize + 1;
+    public void setPages(Integer total) {
+        this.pages = total % this.pageSize == 0 ? total / this.pageSize : total / this.pageSize + 1;;
     }
 
     public List<T> getList() {

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
 

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>