提交

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

@@ -1,72 +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/RegionController.java

@@ -1,16 +1,9 @@
 package com.gyee.backconfig.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.Companys;
-import com.gyee.backconfig.model.auto.Region;
-import com.gyee.backconfig.service.auto.IRegionService;
-import com.gyee.common.model.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
 
-import java.util.Arrays;
-import java.util.List;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -24,103 +17,4 @@ import java.util.List;
 @RequestMapping("//region")
 public class RegionController {
 
-    private IRegionService regionService;
-
-
-    /**
-     * 查询
-     * @param id
-     * @param name
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @GetMapping(value = "/List")
-    public R findList(@RequestParam(value = "id",required = false) String id,
-                      @RequestParam(value = "name",required = false) String name,
-                      @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);
-        }else {
-            return R.error().data("查询失败！");
-        }
-    }
-
-
-
-    /**
-     * 根据id查询
-     * @param id
-     * @return
-     */
-    @GetMapping(value = "/{id}")
-    public R findOne(@PathVariable("id") String id){
-        QueryWrapper<Region> qw = new QueryWrapper<>();
-        qw.eq("id",id);
-        Region region = regionService.getOne(qw);
-        if (StringUtils.isNotNull(region)){
-            return R.ok().data(region);
-        }else {
-            return R.error().data("查询失败！");
-        }
-
-    }
-
-
-    /**
-     * 插入（批量）
-     * @param region
-     * @return
-     */
-    @PostMapping(value = "/region")
-    public R addAll(@RequestBody Region region){
-
-        boolean b = regionService.saveOrUpdate(region);
-        if (b){
-            return R.ok().data(b);
-        }else {
-            return R.error().data("保存失败！");
-        }
-
-    }
-
-
-
-    /**
-     * 批量删除
-     * @param ids
-     * @return
-     */
-    @DeleteMapping(value = "/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids){
-        String[] strings = ids.split(",");
-        boolean b = regionService.removeByIds(Arrays.asList(strings));
-        if (b){
-            return R.ok().data(b);
-        }else {
-            return R.error().data("删除失败！");
-        }
-    }
-
-
-
-    /**
-     * 批量修改
-     * @param list
-     * @return
-     */
-    @PutMapping(value = "/editRegions")
-    public R update(@RequestBody List<Region> list){
-        boolean b = regionService.updateBatchById(list);
-        if (b){
-            return R.ok().data(b);
-        }else {
-            return R.error().data("更新失败！");
-        }
-    }
-
-
 }

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

@@ -1,22 +1,18 @@
 package com.gyee.backconfig.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.backconfig.config.MyPage;
+import com.gyee.backconfig.common.requst.vo.ProjectPlanQueryVo;
 import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.model.auto.Windpowerstation;
+import com.gyee.backconfig.model.auto.XrpProjectplan;
 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.Arrays;
-import java.util.List;
+import java.util.Currency;
 
 /**
  * <p>
@@ -32,10 +28,6 @@ public class WindpowerstationController {
     @Resource
     private BackConfigService backConfigService;
 
-
-    @Autowired
-    private IWindpowerstationService windpowerstationService;
-
     @GetMapping("/listByPage")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
@@ -121,100 +113,4 @@ public class WindpowerstationController {
         vo.setVersion(version);
     }
 
-
-
-
-
-    /**
-     * 查询
-     * @param id
-     * @param name
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @GetMapping(value = "/List")
-    public R findList(@RequestParam(value = "id",required = false) String id,
-                      @RequestParam(value = "name",required = false) String name,
-                      @RequestParam(value = "code",required = false) String code,
-                      @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);
-        if (null != list){
-            return R.ok().data(list);
-        }else {
-            return R.error().data("查询失败！");
-        }
-    }
-
-
-
-    /**
-     * 根据id查询
-     * @param id
-     * @return
-     */
-    @GetMapping(value = "/{id}")
-    public R findOne(@PathVariable("id") String id){
-
-        Windpowerstation windpowerstation = windpowerstationService.getOne(id);
-        if (StringUtils.isNotNull(windpowerstation)){
-            return R.ok().data(windpowerstation);
-        }else {
-            return R.error().data("查询失败！");
-        }
-
-    }
-
-
-    /**
-     * 插入（批量）
-     * @param windpowerstation
-     * @return
-     */
-    @PostMapping(value = "/add")
-    public R addAll(@RequestBody Windpowerstation windpowerstation){
-
-        boolean b = windpowerstationService.addOrUpdate(windpowerstation);
-        if (b){
-            return R.ok().data(b);
-        }else {
-            return R.error().data("保存失败！");
-        }
-
-    }
-
-
-
-    /**
-     * 批量删除
-     * @param ids
-     * @return
-     */
-    @DeleteMapping(value = "/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids){
-        boolean b = windpowerstationService.removeByIds(ids);
-        if (b){
-            return R.ok().data(b);
-        }else {
-            return R.error().data("删除失败！");
-        }
-    }
-
-    /**
-     * 批量修改
-     * @param list
-     * @return
-     */
-    @PutMapping(value = "/editRegions")
-    public R update(@RequestBody List<Windpowerstation> list){
-        boolean b = windpowerstationService.updateBatchById(list);
-        if (b){
-            return R.ok().data(b);
-        }else {
-            return R.error().data("更新失败！");
-        }
-    }
-
 }

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

@@ -1,11 +1,8 @@
 package com.gyee.backconfig.service.auto;
 
-import com.gyee.backconfig.model.auto.Companys;
 import com.gyee.backconfig.model.auto.Region;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
  *  服务类
@@ -16,6 +13,4 @@ import java.util.List;
  */
 public interface IRegionService extends IService<Region> {
 
-    List<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,12 +1,8 @@
 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;
 
-import java.util.List;
-
 /**
  * <p>
  *  服务类
@@ -17,15 +13,4 @@ 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);
-
-    Windpowerstation getOne(String id);
-
-    boolean addOrUpdate(Windpowerstation windpowerstation);
-
-
-    boolean  removeByIds(String ids);
-
-
 }

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

@@ -1,18 +1,11 @@
 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.Companys;
 import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.mapper.auto.RegionMapper;
 import com.gyee.backconfig.service.auto.IRegionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  *  服务实现类
@@ -24,25 +17,4 @@ import java.util.List;
 @Service
 public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements IRegionService {
 
-    @Override
-    public List<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);
-        }
-
-        if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
-        }
-
-        if (StringUtils.isNotEmpty(name)){
-            qw.like("name",name);
-        }
-
-        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;
-    }
 }

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

@@ -1,20 +1,11 @@
 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.config.MyPage;
-import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.mapper.auto.WindpowerstationMapper;
 import com.gyee.backconfig.service.auto.IWindpowerstationService;
 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>
  *  服务实现类
@@ -26,53 +17,4 @@ import java.util.List;
 @Service
 public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMapper, Windpowerstation> implements IWindpowerstationService {
 
-    @Override
-    public MyPage<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);
-        }
-
-        if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
-        }
-
-        if (StringUtils.isNotEmpty(name)){
-            qw.like("name",name);
-        }
-
-        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;
-    }
-
-    @Override
-    public Windpowerstation getOne(String id) {
-
-        Windpowerstation windpowerstation =  this.getById(id);
-
-        return windpowerstation;
-    }
-
-    @Override
-    public boolean addOrUpdate(Windpowerstation windpowerstation) {
-       boolean b =  this.saveOrUpdate(windpowerstation);
-        return b;
-    }
-
-    @Override
-    public boolean removeByIds(String ids) {
-
-        String[] strings = ids.split(",");
-        boolean b = this.removeByIds(Arrays.asList(strings));
-        return b;
-    }
-
-
 }