代码提交

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

@@ -2,15 +2,20 @@ 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;
 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.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -26,6 +31,9 @@ public class ProjectController {
     @Resource
     private BackConfigService backConfigService;
 
+    @Autowired
+    private IProjectService projectService;
+
     @GetMapping("/listByPage")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
@@ -93,4 +101,104 @@ public class ProjectController {
         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<Project> list = projectService.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){
+
+        Project project = projectService.getOne(id);
+        if (StringUtils.isNotNull(project)){
+            return R.ok().data(project);
+        }else {
+            return R.error().data("查询失败！");
+        }
+
+    }
+
+
+    /**
+     * 插入（批量）
+     * @param project
+     * @return
+     */
+    @PostMapping(value = "/add")
+    public R addAll(@RequestBody Project project){
+
+        boolean b = projectService.addOrUpdate(project);
+        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 = projectService.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<Project> list){
+        boolean b = projectService.updateBatchById(list);
+        if (b){
+            return R.ok().data(b);
+        }else {
+            return R.error().data("更新失败！");
+        }
+    }
+
 }

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

@@ -120,6 +120,7 @@ public class RegionController {
         }else {
             return R.error().data("更新失败！");
         }
+
     }
 
 

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

@@ -215,6 +215,7 @@ public class WindpowerstationController {
         }else {
             return R.error().data("更新失败！");
         }
+
     }
 
 }

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

@@ -1,7 +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;
 
 /**
  * <p>
@@ -13,4 +15,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProjectService extends IService<Project> {
 
+
+    MyPage<Project> getList(String id, String name, String code, String stationid, String pageNum, String pageSize);
+
+    Project getOne(String id);
+
+    boolean addOrUpdate(Project project);
+
+    boolean removeByIds(String ids);
+
 }

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

@@ -18,4 +18,5 @@ 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

@@ -24,7 +24,6 @@ public interface IWindpowerstationService extends IService<Windpowerstation> {
 
     boolean addOrUpdate(Windpowerstation windpowerstation);
 
-
     boolean  removeByIds(String ids);
 
 

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

@@ -1,11 +1,17 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.config.MyPage;
 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;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +23,48 @@ import org.springframework.stereotype.Service;
 @Service
 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) {
+        QueryWrapper<Project> 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("windpowerstationid",stationid);
+        }
+        MyPage<Project> page = new MyPage<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        MyPage<Project> pageData = baseMapper.selectPage(page, qw);
+
+        return pageData;
+    }
+
+    @Override
+    public Project getOne(String id) {
+        Project project =  this.getById(id);
+
+        return project;
+    }
+
+    @Override
+    public boolean addOrUpdate(Project project) {
+        boolean b =  this.saveOrUpdate(project);
+        return b;
+    }
+
+    @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/RegionServiceImpl.java

@@ -40,6 +40,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             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();

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

@@ -72,6 +72,7 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
         String[] strings = ids.split(",");
         boolean b = this.removeByIds(Arrays.asList(strings));
         return b;
+
     }