代码修改

web/backmanagerconfig/src/main/java/com/gyee/backconfig/config/MyPage.java

@@ -1,55 +0,0 @@
-package com.gyee.backconfig.config;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import java.util.List;
-
-public class MyPage<T>  extends Page<T> {
-
-    //返回数据
-    public List<T> getdata() {
-        return super.getRecords();
-    }
-
-    //一共多少条
-    public long getCount() {
-        return super.total;
-    }
-
-    //一共多少页
-    public long getTotalPages() {
-        return super.getPages();
-    }
-
-    //每页数量
-    public long getPageSize() {
-        return super.size;
-    }
-
-    //  当前页码
-    public long getCurrentPage() {
-        return super.current;
-    }
-
-
-    public MyPage() {
-
-    }
-
-    //构造
-    public MyPage(long current, long size) {
-        super(current, size);
-    }
-
-    public MyPage(long current, long size, long total) {
-        super(current, size, total);
-    }
-
-    public MyPage(long current, long size, boolean isSearchCount) {
-        super(current, size, isSearchCount);
-    }
-
-    public MyPage(long current, long size, long total, boolean isSearchCount) {
-        super(current, size, total, isSearchCount);
-    }
-}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/ProjectController.java

@@ -2,10 +2,8 @@ package com.gyee.backconfig.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.backconfig.config.MyPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Project;
-import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.service.BackConfigService;
 import com.gyee.backconfig.service.auto.IProjectService;
 import com.gyee.backconfig.vo.Projectvo;
@@ -124,9 +122,9 @@ public class ProjectController {
                       @RequestParam(value = "companyid",required = false) String companyid,
                       @RequestParam(value = "pageNum",required = true) String pageNum,
                       @RequestParam(value = "pageSize",required = true) String pageSize){
-        MyPage<Project> list = projectService.getList(id,name,code,companyid,pageNum,pageSize);
+        List<Project> list = projectService.getList(id,name,code,companyid,pageNum,pageSize);
         if (null != list){
-            return R.ok().data(list);
+            return R.ok(list.size()).data(list);
         }else {
             return R.error().data("查询失败！");
         }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/WindpowerstationController.java

@@ -2,7 +2,6 @@ package com.gyee.backconfig.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.backconfig.config.MyPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.service.BackConfigService;
@@ -131,9 +130,9 @@ public class WindpowerstationController {
                       @RequestParam(value = "companyid",required = false) String companyid,
                       @RequestParam(value = "pageNum",required = true) String pageNum,
                       @RequestParam(value = "pageSize",required = true) String pageSize){
-        MyPage<Windpowerstation> list = windpowerstationService.getList(id,name,code,companyid,pageNum,pageSize);
+        List<Windpowerstation> list = windpowerstationService.getList(id,name,code,companyid,pageNum,pageSize);
         if (null != list){
-            return R.ok().data(list);
+            return R.ok(list.size()).data(list);
         }else {
             return R.error().data("查询失败！");
         }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IProjectService.java

@@ -1,9 +1,9 @@
 package com.gyee.backconfig.service.auto;
 
-import com.gyee.backconfig.config.MyPage;
 import com.gyee.backconfig.model.auto.Project;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.backconfig.model.auto.Windpowerstation;
+
+import java.util.List;
 
 /**
  * <p>
@@ -16,7 +16,7 @@ import com.gyee.backconfig.model.auto.Windpowerstation;
 public interface IProjectService extends IService<Project> {
 
 
-    MyPage<Project> getList(String id, String name, String code, String stationid, String pageNum, String pageSize);
+    List<Project> getList(String id, String name, String code, String stationid, String pageNum, String pageSize);
 
     Project getOne(String id);
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IWindpowerstationService.java

@@ -1,7 +1,5 @@
 package com.gyee.backconfig.service.auto;
 
-import com.gyee.backconfig.config.MyPage;
-import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -18,7 +16,7 @@ import java.util.List;
 public interface IWindpowerstationService extends IService<Windpowerstation> {
 
 
-    MyPage<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize);
+    List<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize);
 
     Windpowerstation getOne(String id);
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/ProjectServiceImpl.java

@@ -1,16 +1,16 @@
 package com.gyee.backconfig.service.auto.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.backconfig.config.MyPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.Project;
 import com.gyee.backconfig.mapper.auto.ProjectMapper;
-import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.service.auto.IProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -24,7 +24,7 @@ import java.util.Arrays;
 public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements IProjectService {
 
     @Override
-    public MyPage<Project> getList(String id, String name, String code, String stationid, String pageNum, String pageSize) {
+    public List<Project> getList(String id, String name, String code, String stationid, String pageNum, String pageSize) {
         QueryWrapper<Project> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
@@ -42,10 +42,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (StringUtils.isNotEmpty(name)){
             qw.eq("windpowerstationid",stationid);
         }
-        MyPage<Project> page = new MyPage<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        MyPage<Project> pageData = baseMapper.selectPage(page, qw);
 
-        return pageData;
+        Page<Project> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<Project> companysPage = getBaseMapper().selectPage(page, qw);
+        List<Project> list = companysPage.getRecords();
+
+        return list;
     }
 
     @Override

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindpowerstationServiceImpl.java

@@ -1,7 +1,7 @@
 package com.gyee.backconfig.service.auto.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.backconfig.config.MyPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.mapper.auto.WindpowerstationMapper;
 import com.gyee.backconfig.service.auto.IWindpowerstationService;
@@ -10,6 +10,7 @@ import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -24,7 +25,7 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
 
 
     @Override
-    public MyPage<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize) {
+    public List<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize) {
 
         QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
 
@@ -43,10 +44,12 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
         if (StringUtils.isNotEmpty(name)){
             qw.eq("companyid",companyid);
         }
-        MyPage<Windpowerstation> page = new MyPage<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        MyPage<Windpowerstation> pageData = baseMapper.selectPage(page, qw);
 
-        return pageData;
+        Page<Windpowerstation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<Windpowerstation> companysPage = getBaseMapper().selectPage(page, qw);
+        List<Windpowerstation> list = companysPage.getRecords();
+        return list;
+
     }
 
     @Override