msg

.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.jsqlparser:jsqlparser:1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

cloud-model/pom.xml

@@ -29,6 +29,12 @@
             <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>-->
+
         <!-- mybatis-plus依赖 -->
         <dependency>
             <groupId>com.baomidou</groupId>

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-07-25
  */
 @RestController
-@RequestMapping("/dictionary-data")
+@RequestMapping("/dictionarydata")
 public class DictionaryDataController {
 
 }

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

@@ -2,20 +2,25 @@ package com.hssx.cloudmodel.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.entity.Role;
 import com.hssx.cloudmodel.entity.SysUser;
 import com.hssx.cloudmodel.service.RoleService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
+import com.hssx.cloudmodel.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * <p>
@@ -75,12 +80,10 @@ public class RoleController {
     @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<Role> qw = new QueryWrapper<>();
-        qw.like("role_name",keyName);
-        msg.data = roleService.list(qw);
+        msg = roleService.pageList(page,keyName);
         return msg;
     }
 }

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

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

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

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

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

@@ -1,14 +1,21 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.entity.Role;
 import com.hssx.cloudmodel.mapper.RoleMapper;
 import com.hssx.cloudmodel.service.RoleService;
 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 +49,21 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
         return msg;
 
     }
+
+    @Override
+    public HttpRespMsg pageList(PageUtil page, String keyName) {
+        HttpRespMsg msg = new HttpRespMsg();
+        QueryWrapper<Role> qw = new QueryWrapper<>();
+        Integer start = (page.getCurrentPage()-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());
+        List<Role> list = roleMapper.getListByKeyName(keyName, start, page.getPageSize());
+        page.setList(list);
+        msg.data = page;
+        return msg;
+    }
 }

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

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_factory");
+        strategy.setInclude("tb_project");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -0,0 +1,58 @@
+package com.hssx.cloudmodel.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 07 - 27 9:25
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class PageUtil<T> {
+    private Integer currentPage = 1;
+    private Integer totalCount;
+    private Integer pageSize = 10;
+    private Integer totalPage;
+    private List<T> list = new ArrayList<>();
+
+    public Integer getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public Integer getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(Integer totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getTotalPage() {
+        return totalPage;
+    }
+
+    public void setTotalPage(Integer totalCount) {
+        this.totalPage = totalCount % this.pageSize == 0 ? totalCount / this.pageSize : totalCount / this.pageSize + 1;
+    }
+
+    public List<T> getList() {
+        return list;
+    }
+
+    public void setList(List<T> list) {
+        this.list = list;
+    }
+}

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

@@ -1,6 +1,6 @@
 # ####################################################################################################
 # 服务端配置
-server.port=8098
+server.port=8099
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 # ####################################################################################################
@@ -21,7 +21,7 @@ spring.datasource.password=p011430seya10
 mybatis.mapper-locations=mappers/*Mapper.xml
 mybatis.type-aliases-package=com.hssx.cloudmodel.entity/*
 # 控制台输出SQL语句
-logging.level.com.hssx.cloud.dao.*=debug
+logging.level.com.hssx.cloudmodel.mapper = debug
 # ####################################################################################################
 #配置Session
 spring.session.store-type=none

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

@@ -27,4 +27,10 @@ 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/RoleMapper.xml

@@ -17,5 +17,16 @@
     <sql id="Base_Column_List">
         id, role_name, dowload_power, upload_power, view_power, approval_power, indate
     </sql>
-
+    <select id="getListByKeyName" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from
+          tb_role
+        <where>
+        <if test="keyName != null and keyName != ''">
+            role_name like concat('%',#{keyName},'%')
+        </if>
+        </where>
+        Limit #{start},#{pageSize}
+    </select>
 </mapper>

cloud-model/src/test/java/com/hssx/cloudmodel/CloudModelApplicationTests.java

@@ -1,16 +1,37 @@
 package com.hssx.cloudmodel;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hssx.cloudmodel.entity.Role;
+import com.hssx.cloudmodel.service.RoleService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.List;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class CloudModelApplicationTests {
-
+    @Autowired
+    private RoleService roleService;
     @Test
     public void contextLoads() {
+        QueryWrapper<Role> qw = new QueryWrapper<>();
+//
+//        if (cif (keyName != null) {
+////            qw.like("role_name", keyName);
+////        }urrentPage == null || currentPage <= 0) {
+//            currentPage = 1;
+//        }
+        PageHelper.startPage(1,5);
+        List<Role> roles = roleService.list(qw);
+        PageInfo page = new PageInfo(roles);
+        System.out.println("CloudModelApplicationTests.contextLoads"+page);
+
     }
 
 }

pom.xml

@@ -32,6 +32,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <!--<dependency>-->
+        <!--<groupId>com.github.pagehelper</groupId>-->
+        <!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
+        <!--<version>1.2.5</version>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
@@ -60,12 +66,8 @@
             <version>1.5.15</version>
         </dependency>
 
-        <!--&lt;!&ndash; https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper-spring-boot-starter &ndash;&gt;-->
-        <!--<dependency>-->
-            <!--<groupId>com.github.pagehelper</groupId>-->
-            <!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
-            <!--<version>1.2.10</version>-->
-        <!--</dependency>-->
+        <!-- https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper-spring-boot-starter -->
+        <!-- https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper-spring-boot-starter -->
     </dependencies>
 
     <build>