提交

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

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Line;
 import com.gyee.backconfig.service.BackConfigService;
+import com.gyee.backconfig.service.auto.ILineService;
 import com.gyee.backconfig.vo.Linevo;
 import com.gyee.common.model.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -23,6 +26,8 @@ import javax.annotation.Resource;
 public class LineController {
     @Resource
     private BackConfigService backConfigService;
+    @Resource
+    private ILineService lineService;
 
     @GetMapping("/listByPage")
     @ResponseBody
@@ -79,7 +84,7 @@ public class LineController {
     }
 
     //新增或者更新
-    @PostMapping("/add-Linevo")
+    @PostMapping("/add-Line")
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R addModifyProjectPlan(@RequestBody Line Line){
         boolean saveOrUpdate = backConfigService.saveOrUpdate(Line);
@@ -89,4 +94,33 @@ public class LineController {
             return R.error().message("保存失败");
         }
     }
+
+    /**
+     * 批量删除
+     * @param ids
+     * @return
+     */
+//    @DeleteMapping(value = "/{remove-ids}")
+//    public  R deleteAll(@PathVariable("ids") String ids){
+//        boolean b = lineService.removeByIds(ids);
+//        if (b){
+//            return R.ok().data(b);
+//        }else {
+//            return R.error().data("删除失败！");
+//        }
+//    }
+
+    @DeleteMapping(value = "/remove-lines/{ids}")
+    public  R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+
+        boolean  b = lineService.removeByIds(Arrays.asList(strings));
+
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.gyee.backconfig.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Project;
@@ -122,9 +123,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){
-        List<Project> list = projectService.getList(id,name,code,companyid,pageNum,pageSize);
+        IPage<Project> list = projectService.getList(id,name,code,companyid,pageNum,pageSize);
         if (null != list){
-            return R.ok(list.size()).data(list);
+            return R.ok().data(list);
         }else {
             return R.error().data("查询失败！");
         }

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

@@ -102,7 +102,6 @@ public class ProjectplanController {
 
         boolean  b = projectplanService.removeByIds(Arrays.asList(strings));
 
-
         if (b) {
             return R.ok().data(b);
         } else {

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

@@ -2,10 +2,12 @@ package com.gyee.backconfig.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.service.auto.IRegionService;
 import com.gyee.common.model.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -23,6 +25,7 @@ import java.util.List;
 @RequestMapping("//region")
 public class RegionController {
 
+    @Autowired
     private IRegionService regionService;
 
 
@@ -40,9 +43,9 @@ public class RegionController {
                       @RequestParam(value = "code",required = false) String code,
                       @RequestParam(value = "pageNum",required = true) String pageNum,
                       @RequestParam(value = "pageSize",required = true) String pageSize){
-        List<Region> list = regionService.list(id,name,code,pageNum,pageSize);
-        if (StringUtils.isNotEmpty(list)){
-            return R.ok(list.size()).data(list);
+        IPage<Region> list = regionService.list(id,name,code,pageNum,pageSize);
+        if (null != list){
+            return R.ok().data(list);
         }else {
             return R.error().data("查询失败！");
         }

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

@@ -1,6 +1,7 @@
 package com.gyee.backconfig.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Windpowerstation;
@@ -8,6 +9,7 @@ import com.gyee.backconfig.service.BackConfigService;
 import com.gyee.backconfig.service.auto.IWindpowerstationService;
 import com.gyee.backconfig.vo.Windpowerstationvo;
 import com.gyee.common.model.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;
@@ -26,6 +28,8 @@ public class WindpowerstationController {
     @Resource
     private BackConfigService backConfigService;
 
+
+    @Autowired
     private IWindpowerstationService windpowerstationService;
 
     @GetMapping("/listByPage")
@@ -130,9 +134,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){
-        List<Windpowerstation> list = windpowerstationService.getList(id,name,code,companyid,pageNum,pageSize);
+        IPage<Windpowerstation> list = windpowerstationService.getList(id,name,code,companyid,pageNum,pageSize);
         if (null != list){
-            return R.ok(list.size()).data(list);
+            return R.ok().data(list);
         }else {
             return R.error().data("查询失败！");
         }

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

@@ -1,6 +1,7 @@
 package com.gyee.backconfig.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Windturbine;
 import com.gyee.backconfig.service.auto.IWindturbineService;
@@ -45,9 +46,9 @@ public class WindturbineController {
                       @RequestParam(value = "lineid", required = false) String lineid,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        List<Windturbine> list = windturbineService.list(id, code, stationid, projectid, lineid, pageNum, pageSize);
-        if (StringUtils.isNotEmpty(list)) {
-            return R.ok(list.size()).data(list);
+        IPage<Windturbine> list = windturbineService.list(id, code, stationid, projectid, lineid, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
         } else {
             return R.error().data("查询失败！");
         }

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

@@ -2,6 +2,9 @@ package com.gyee.backconfig.service.auto;
 
 import com.gyee.backconfig.model.auto.Line;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.Windpowerstation;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +15,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-09-23
  */
 public interface ILineService extends IService<Line> {
+    List<Line> getList(String id, String name, String code, String aname,String projectid,Integer ordernum,Integer capacity,String capacityunit,Integer quantity,String pageNum, String pageSize);
+
+    Line getOne(String id);
+
+    boolean addOrUpdate(Line Line);
 
+    boolean  removeByIds(String ids);
 }

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

@@ -1,5 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.Project;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -16,7 +17,7 @@ import java.util.List;
 public interface IProjectService extends IService<Project> {
 
 
-    List<Project> getList(String id, String name, String code, String stationid, String pageNum, String pageSize);
+    IPage<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/IRegionService.java

@@ -1,5 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.Companys;
 import com.gyee.backconfig.model.auto.Region;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,6 +17,6 @@ import java.util.List;
  */
 public interface IRegionService extends IService<Region> {
 
-    List<Region> list(String id, String name, String code, String pageNum, String pageSize);
+    IPage<Region> list(String id, String name, String code, String pageNum, String pageSize);
 
 }

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

@@ -1,5 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -16,7 +17,7 @@ import java.util.List;
 public interface IWindpowerstationService extends IService<Windpowerstation> {
 
 
-    List<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize);
+    IPage<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/IWindturbineService.java

@@ -1,5 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.Windturbine;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -16,7 +17,7 @@ import java.util.List;
 public interface IWindturbineService extends IService<Windturbine> {
 
 
-    List<Windturbine> list(String id, String code,String stationid, String projectid, String lineid,String pageNum, String pageSize);
+    IPage<Windturbine> list(String id, String code, String stationid, String projectid, String lineid, String pageNum, String pageSize);
 
     Windturbine getOne(String id);
 

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

@@ -1,11 +1,18 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.Line;
 import com.gyee.backconfig.mapper.auto.LineMapper;
+import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.service.auto.ILineService;
 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>
  *  服务实现类
@@ -17,4 +24,44 @@ import org.springframework.stereotype.Service;
 @Service
 public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements ILineService {
 
+    @Override
+    public List<Line> getList(String id, String name, String code, String aname, String projectid, Integer ordernum, Integer capacity, String capacityunit, Integer quantity, String pageNum, String pageSize) {
+        QueryWrapper<Line> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(id)){
+            qw.like("id",id);
+        }
+
+        if (StringUtils.isNotEmpty(code)){
+            qw.like("code",code);
+        }
+
+        if (StringUtils.isNotEmpty(name)){
+            qw.like("name",name);
+        }
+        if (StringUtils.isNotEmpty(name)){
+            qw.eq("projectid",projectid);
+        }
+        Page<Line> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<Line> companysPage = getBaseMapper().selectPage(page, qw);
+        List<Line> list = companysPage.getRecords();
+        return list;
+    }
+
+    @Override
+    public Line getOne(String id) {
+        return null;
+    }
+
+    @Override
+    public boolean addOrUpdate(Line Line) {
+        return false;
+    }
+
+    @Override
+    public boolean removeByIds(String ids) {
+        String[] strings = ids.split(",");
+        boolean b = this.removeByIds(Arrays.asList(strings));
+        return b;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.gyee.backconfig.service.auto.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.gyee.backconfig.model.auto.Project;
 import com.gyee.backconfig.mapper.auto.ProjectMapper;
@@ -24,11 +25,11 @@ import java.util.List;
 public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements IProjectService {
 
     @Override
-    public List<Project> getList(String id, String name, String code, String stationid, String pageNum, String pageSize) {
+    public IPage<Project> getList(String id, String name, String code, String stationid, String pageNum, String pageSize) {
         QueryWrapper<Project> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
-            qw.like("id",id);
+            qw.eq("id",id);
         }
 
         if (StringUtils.isNotEmpty(code)){
@@ -44,10 +45,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         }
 
         Page<Project> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        Page<Project> companysPage = getBaseMapper().selectPage(page, qw);
-        List<Project> list = companysPage.getRecords();
+        IPage<Project> companysPage = getBaseMapper().selectPage(page, qw);
+//        List<Project> list = companysPage.getRecords();
 
-        return list;
+        return companysPage;
     }
 
     @Override

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

@@ -25,11 +25,11 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
 
     @Override
-    public List<Region> list(String id, String name, String code, String pageNum, String pageSize) {
+    public IPage<Region> list(String id, String name, String code, String pageNum, String pageSize) {
         QueryWrapper<Region> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
-            qw.like("id",id);
+            qw.eq("id",id);
         }
 
         if (StringUtils.isNotEmpty(code)){
@@ -43,8 +43,8 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
         Page<Region> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         IPage<Region> pageData = baseMapper.selectPage(page, qw);
-        List<Region> list = pageData.getRecords();
-        return list;
+//        List<Region> list = pageData.getRecords();
+        return pageData;
     }
 
 }

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

@@ -1,6 +1,7 @@
 package com.gyee.backconfig.service.auto.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.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.mapper.auto.WindpowerstationMapper;
@@ -25,12 +26,12 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
 
 
     @Override
-    public List<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize) {
+    public IPage<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize) {
 
         QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
-            qw.like("id",id);
+            qw.eq("id",id);
         }
 
         if (StringUtils.isNotEmpty(code)){
@@ -46,9 +47,9 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
         }
 
         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;
+        IPage<Windpowerstation> companysPage = getBaseMapper().selectPage(page, qw);
+//        List<Windpowerstation> list = companysPage.getRecords();
+        return companysPage;
 
     }
 

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

@@ -1,6 +1,7 @@
 package com.gyee.backconfig.service.auto.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.gyee.backconfig.model.auto.Windturbine;
 import com.gyee.backconfig.mapper.auto.WindturbineMapper;
@@ -24,7 +25,7 @@ import java.util.List;
 public class WindturbineServiceImpl extends ServiceImpl<WindturbineMapper, Windturbine> implements IWindturbineService {
 
     @Override
-    public List<Windturbine> list(String id, String code, String stationid, String projectid, String lineid, String pageNum, String pageSize) {
+    public IPage<Windturbine> list(String id, String code, String stationid, String projectid, String lineid, String pageNum, String pageSize) {
         QueryWrapper<Windturbine> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)){
             qw.eq("id",id);
@@ -46,9 +47,9 @@ public class WindturbineServiceImpl extends ServiceImpl<WindturbineMapper, Windt
         }
 
         Page<Windturbine> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        Page<Windturbine> companysPage = getBaseMapper().selectPage(page, qw);
-        List<Windturbine> list = companysPage.getRecords();
-        return list;
+        IPage<Windturbine> companysPage = getBaseMapper().selectPage(page, qw);
+//        List<Windturbine> list = companysPage.getRecords();
+        return companysPage;
     }
 
     @Override