修改注释

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

@@ -66,7 +66,7 @@ public class CompanyController {
 
     /**
      * 公司列表
-     * 参数：currentPage 当前页码，pageSize 每页条数 keyName 关键字查询
+     * 参数：pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
      * @return
      */
     @ApiOperation("公司列表")

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

@@ -67,7 +67,7 @@ public class FactoryController {
 
     /**
      * 工厂列表
-     * 参数: currentPage 当前页码，pageSize 每页条数 keyName 关键字查询
+     * 参数: pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
      * @return
      */
     @ApiOperation("工厂列表")

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

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

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

@@ -53,10 +53,10 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         if(keyName !=null && !"".equals(keyName)){
             qw.like("company_name", keyName);
         }
-        Integer start = (page.getCurrentPage()-1)*page.getPageSize();
+        Integer start = (page.getPageNum()-1)*page.getPageSize();
         Integer count = companyMapper.selectCount(qw);
-        page.setTotalCount(count);
-        page.setTotalPage(page.getTotalCount());
+        page.setTotal(count);
+        page.setPages(page.getTotal());
         List<Company> list = companyMapper.getListByKeyName(keyName, start, page.getPageSize());
         page.setList(list);
         msg.data = page;

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

@@ -55,7 +55,7 @@ public class FactoryServiceImpl extends ServiceImpl<FactoryMapper, Factory> impl
         if(keyName !=null && !"".equals(keyName)){
             qw.like("factory_name",keyName);
         }
-        PageHelper.startPage(page.getCurrentPage(),page.getPageSize());
+        PageHelper.startPage(page.getPageNum(),page.getPageSize());
         List<Factory> factories = factoryMapper.selectList(qw);
         PageInfo<Factory>pageInfos = new PageInfo<>(factories);
         msg.data = pageInfos;

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() {