公司、区域表字段修改

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

@@ -4,6 +4,7 @@ package com.gyee.backconfig.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 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.R;
 import com.gyee.backconfig.model.auto.Companys;
@@ -38,38 +39,58 @@ public class CompanysController {
 
     /**
      * 查询
+     *
      * @param id
      * @param name
+     * @param aname
+     * @param capacity
      * @param pageNum
      * @param pageSize
      * @return
      */
-//    @GetMapping(value = "/companys")
-//    public R findList(@RequestParam(value = "id",required = true) String id,
-//                      @RequestParam(value = "name",required = true) String name,
-//                      @RequestParam(value = "pageNum",required = true) String pageNum,
-//                      @RequestParam(value = "pageSize",required = true) String pageSize){
-//        List<Companys> list = companysService.list(id,name,pageNum,pageSize);
-//        if (StringUtils.isNotEmpty(list)){
-//            return R.ok(list.size()).data(list);
-//        }else {
-//            return R.error().data("查询失败！");
-//        }
-//    }
+    @GetMapping(value = "/listByPage")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "aname", required = false) String aname,
+                      @RequestParam(value = "windcapacity", required = false) Integer windcapacity,
+                      @RequestParam(value = "windcapacityunit", required = false) String windcapacityunit,
+                      @RequestParam(value = "windquantity", required = false) Integer windquantity,
+                      @RequestParam(value = "capacity", required = false) Integer capacity,
+                      @RequestParam(value = "capacityunit", required = false) String capacityunit,
+                      @RequestParam(value = "quantityjz", required = false) Integer quantityjz,
+                      @RequestParam(value = "quantityzc", required = false) Integer quantityzc,
+                      @RequestParam(value = "jrwindcapacity", required = false) Integer jrwindcapacity,
+                      @RequestParam(value = "jrwindcapacityunit", required = false) String jrwindcapacityunit,
+                      @RequestParam(value = "jrwindquantity", required = false) Integer jrwindquantity,
+                      @RequestParam(value = "jrcapacity", required = false) Integer jrcapacity,
+                      @RequestParam(value = "jrcapacityunit", required = false) String jrcapacityunit,
+                      @RequestParam(value = "jrquantityjz", required = false) Integer jrquantityjz,
+                      @RequestParam(value = "jrquantityzc", required = false) Integer jrquantityzc,
+                      @RequestParam(value = "ordernum", required = false) Integer ordernum,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Companys> list = companysService.list(id, name, aname,windcapacity, windcapacityunit, windquantity, capacity, capacityunit, quantityjz, quantityzc, jrwindcapacity, jrwindcapacityunit, jrwindquantity, jrcapacity, jrcapacityunit, jrquantityjz, jrquantityzc, ordernum, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
 
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */
     @GetMapping(value = "/companys/{id}")
-    public R findOne(@PathVariable("id") String id){
+    public R findOne(@PathVariable("id") String id) {
         QueryWrapper<Companys> qw = new QueryWrapper<>();
-        qw.eq("id",id);
+        qw.eq("id", id);
         Companys companys = companysService.getOne(qw);
-        if (StringUtils.isNotNull(companys)){
+        if (StringUtils.isNotNull(companys)) {
             return R.ok().data(companys);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
 
@@ -77,16 +98,17 @@ public class CompanysController {
 
     /**
      * 插入（批量）
+     *
      * @param company
      * @return
      */
     @PostMapping(value = "/companys")
-    public R addAll(@RequestBody Companys company){
+    public R addAll(@RequestBody Companys company) {
 
         boolean b = companysService.saveOrUpdate(company);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("保存失败！");
         }
 
@@ -94,14 +116,15 @@ public class CompanysController {
 
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
     @DeleteMapping(value = "/remove-companys/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids) {
+    public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
 
-        boolean  b = companysService.removeByIds(Arrays.asList(strings));
+        boolean b = companysService.removeByIds(Arrays.asList(strings));
 
 
         if (b) {
@@ -113,52 +136,53 @@ public class CompanysController {
 
     /**
      * 批量修改
+     *
      * @param list
      * @return
      */
     @PutMapping(value = "/companys")
-    public R update(@RequestBody List<Companys> list){
+    public R update(@RequestBody List<Companys> list) {
         boolean b = companysService.updateBatchById(list);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("更新失败！");
         }
     }
 
     //分页查询
-    @GetMapping("/listByPage")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
-    public R ListByPage(
-            @RequestParam(value = "pagenum",required = true) Integer pageNum,
-            @RequestParam(value = "pagesize",required = true) Integer pageSize,
-            @RequestParam(value = "id", required = false) String id,
-            @RequestParam(value = "rid", required = false) String rid,
-            @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "version", required = false) Integer version){
-        Companysvo vo=new Companysvo();
-        setVOTemplate(pageNum, pageSize, id, rid, name,version, vo);
-
-        Page<Companys> CompanysPage = backConfigService.CompanysBypage(vo);
-        if (StringUtils.isNotNull(CompanysPage)) {
-            return R.ok().data(CompanysPage);
-        }else{
-            return R.error().message("访问失败");
-        }
-    }
-    private void setVOTemplate(@RequestParam(value = "pagenum", required = true) Integer pageNum,
-                               @RequestParam(value = "pagesize", required = true) Integer pageSize,
-                               @RequestParam(value = "id", required = false) String id,
-                               @RequestParam(value = "rid", required = false) String rid,
-                               @RequestParam(value = "name", required = false) String name,
-                               @RequestParam(value = "version", required = false) Integer version, Companysvo vo) {
-        vo.setId(id);
-        vo.setRid(rid);
-        vo.setName(name);
-        vo.setVersion(version);
-        vo.setCurrent(pageNum);
-        vo.setPageSize(pageSize);
-    }
+//    @GetMapping("/listByPage")
+//    @ResponseBody
+//    @CrossOrigin(origins = "*", maxAge = 3600)
+//    public R ListByPage(
+//            @RequestParam(value = "pagenum", required = true) Integer pageNum,
+//            @RequestParam(value = "pagesize", required = true) Integer pageSize,
+//            @RequestParam(value = "id", required = false) String id,
+//            @RequestParam(value = "rid", required = false) String rid,
+//            @RequestParam(value = "name", required = false) String name,
+//            @RequestParam(value = "version", required = false) Integer version) {
+//        Companysvo vo = new Companysvo();
+//        setVOTemplate(pageNum, pageSize, id, rid, name, version, vo);
+//
+//        Page<Companys> CompanysPage = backConfigService.CompanysBypage(vo);
+//        if (StringUtils.isNotNull(CompanysPage)) {
+//            return R.ok().data(CompanysPage);
+//        } else {
+//            return R.error().message("访问失败");
+//        }
+//    }
+//
+//    private void setVOTemplate(@RequestParam(value = "pagenum", required = true) Integer pageNum,
+//                               @RequestParam(value = "pagesize", required = true) Integer pageSize,
+//                               @RequestParam(value = "id", required = false) String id,
+//                               @RequestParam(value = "rid", required = false) String rid,
+//                               @RequestParam(value = "name", required = false) String name,
+//                               @RequestParam(value = "version", required = false) Integer version, Companysvo vo) {
+//        vo.setId(id);
+//        vo.setName(name);
+//        vo.setVersion(version);
+//        vo.setCurrent(pageNum);
+//        vo.setPageSize(pageSize);
+//    }
 
 }

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

@@ -40,11 +40,27 @@ public class RegionController {
      */
     @GetMapping(value = "/List")
     public R findList(@RequestParam(value = "id",required = false) String id,
+                      @RequestParam(value = "companyid",required = false) String companyid,
                       @RequestParam(value = "name",required = false) String name,
-                      @RequestParam(value = "code",required = false) String code,
+                      @RequestParam(value = "aname", required = false) String aname,
+                      @RequestParam(value = "windcapacity", required = false) Integer windcapacity,
+                      @RequestParam(value = "windcapacityunit", required = false) String windcapacityunit,
+                      @RequestParam(value = "windquantity", required = false) Integer windquantity,
+                      @RequestParam(value = "capacity", required = false) Integer capacity,
+                      @RequestParam(value = "capacityunit", required = false) String capacityunit,
+                      @RequestParam(value = "quantityjz", required = false) Integer quantityjz,
+                      @RequestParam(value = "quantityzc", required = false) Integer quantityzc,
+                      @RequestParam(value = "jrwindcapacity", required = false) Integer jrwindcapacity,
+                      @RequestParam(value = "jrwindcapacityunit", required = false) String jrwindcapacityunit,
+                      @RequestParam(value = "jrwindquantity", required = false) Integer jrwindquantity,
+                      @RequestParam(value = "jrcapacity", required = false) Integer jrcapacity,
+                      @RequestParam(value = "jrcapacityunit", required = false) String jrcapacityunit,
+                      @RequestParam(value = "jrquantityjz", required = false) Integer jrquantityjz,
+                      @RequestParam(value = "jrquantityzc", required = false) Integer jrquantityzc,
+                      @RequestParam(value = "ordernum", required = false) Integer ordernum,
                       @RequestParam(value = "pageNum",required = true) String pageNum,
                       @RequestParam(value = "pageSize",required = true) String pageSize){
-        IPage<Region> list = regionService.list(id,name,code,pageNum,pageSize);
+        IPage<Region> list = regionService.list(id,name,companyid,aname,windcapacity, windcapacityunit, windquantity, capacity, capacityunit, quantityjz, quantityzc, jrwindcapacity, jrwindcapacityunit, jrwindquantity, jrcapacity, jrcapacityunit, jrquantityjz, jrquantityzc, ordernum, pageNum, pageSize);
         if (null != list){
             return R.ok().data(list);
         }else {

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Companys.java

@@ -28,7 +28,39 @@ public class Companys extends Model {
 
     private String name;
 
-    private String rid;
+    private String aname;
+
+    private Integer windcapacity;
+
+    private String windcapacityunit;
+
+    private Integer windquantity;
+
+    private Integer capacity;
+
+    private String capacityunit;
+
+    private Integer quantityjz;
+
+    private Integer quantityzc;
+
+    private Integer jrwindcapacity;
+
+    private String jrwindcapacityunit;
+
+    private Integer jrwindquantity;
+
+    private Integer jrcapacity;
+
+    private String jrcapacityunit;
+
+    private Integer jrquantityjz;
+
+    private Integer jrquantityzc;
+
+    private Integer ordernum;
+
+
     @TableField(exist = false)
     private List<Windpowerstation> Children = new ArrayList<>();
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Region.java

@@ -20,9 +20,43 @@ public class Region extends Model {
 
     private String id;
 
+    private String companyid;
+
     private String name;
 
-    private String code;
+    private String aname;
+
+    private Integer windcapacity;
+
+    private String windcapacityunit;
+
+    private Integer windquantity;
+
+    private Integer capacity;
+
+    private String capacityunit;
+
+    private Integer quantityjz;
+
+    private Integer quantityzc;
+
+    private Integer jrwindcapacity;
+
+    private String jrwindcapacityunit;
+
+    private Integer jrwindquantity;
+
+    private Integer jrcapacity;
+
+    private String jrcapacityunit;
+
+    private Integer jrquantityjz;
+
+    private Integer jrquantityzc;
+
+    private Integer ordernum;
+
+
 
 
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/BackConfigService.java

@@ -372,15 +372,15 @@ public class BackConfigService {
 
         QueryWrapper<Companys> queryWrapper = new QueryWrapper<>();
         String id = vo.getId();
-        String rid = vo.getRid();
+//        String rid = vo.getRid();
         String name = vo.getName();
 
         if (StringUtils.isNotNull(id) && !id.equals("")) {
             queryWrapper.like("id", id);
         }
-        if (StringUtils.isNotNull(rid) && !rid.equals("")) {
-            queryWrapper.like("code", rid);
-        }
+//        if (StringUtils.isNotNull(rid) && !rid.equals("")) {
+//            queryWrapper.like("code", rid);
+//        }
         if (StringUtils.isNotNull(name) && !name.equals("")) {
             queryWrapper.like("name", name);
         }

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

@@ -1,5 +1,7 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.Companys;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -7,7 +9,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author wang
@@ -15,5 +17,5 @@ import java.util.List;
  */
 public interface ICompanysService extends IService<Companys> {
 
- List<Companys> list(String id, String name, String pageNum, String pageSize);
+    IPage<Companys> list(String id, String name, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize);
 }

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

@@ -17,6 +17,5 @@ import java.util.List;
  */
 public interface IRegionService extends IService<Region> {
 
-    IPage<Region> list(String id, String name, String code, String pageNum, String pageSize);
-
+    IPage<Region> list(String id, String name, String companyid, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize);
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/CompanysServiceImpl.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.Companys;
 import com.gyee.backconfig.mapper.auto.CompanysMapper;
@@ -13,7 +14,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author wang
@@ -23,17 +24,20 @@ import java.util.List;
 public class CompanysServiceImpl extends ServiceImpl<CompanysMapper, Companys> implements ICompanysService {
 
     @Override
-    public List<Companys> list(String id, String name, String pageNum, String pageSize) {
+    public IPage<Companys> list(String id, String name, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize) {
         QueryWrapper<Companys> qw = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(id)){
-            qw.like("id",id);
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
         }
-        if (StringUtils.isNotEmpty(name)){
-            qw.like("name",name);
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
         }
-        Page<Companys> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        Page<Companys> companysPage = getBaseMapper().selectPage(page, qw);
+        if (StringUtils.isNotEmpty(aname)) {
+            qw.like("aname", aname);
+        }
+        Page<Companys> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<Companys> companysPage = getBaseMapper().selectPage(page, qw);
         List<Companys> list = companysPage.getRecords();
-        return list;
+        return companysPage;
     }
 }

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

@@ -25,19 +25,22 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
 
     @Override
-    public IPage<Region> list(String id, String name, String code, String pageNum, String pageSize) {
+    public IPage<Region> list(String id, String name, String companyid, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize) {
         QueryWrapper<Region> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
             qw.eq("id",id);
         }
 
-        if (StringUtils.isNotEmpty(code)){
-            qw.eq("code",code);
+        if (StringUtils.isNotEmpty(name)){
+            qw.eq("name",name);
         }
 
-        if (StringUtils.isNotEmpty(name)){
-            qw.like("name",name);
+        if (StringUtils.isNotEmpty(companyid)){
+            qw.like("companyid",companyid);
+        }
+        if (StringUtils.isNotEmpty(aname)){
+            qw.like("aname",aname);
         }
 
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/vo/Companysvo.java

@@ -1,4 +1,5 @@
 package com.gyee.backconfig.vo;
+
 import lombok.Data;
 
 /**
@@ -14,9 +15,40 @@ public class Companysvo {
 
     private String id;
 
-    private String rid;
-
     private String name;
+
+    private String aname;
+
+    private Integer windcapacity;
+
+    private String windcapacityunit;
+
+    private Integer windquantity;
+
+    private Integer capacity;
+
+    private String capacityunit;
+
+    private Integer quantityjz;
+
+    private Integer quantityzc;
+
+    private Integer jrwindcapacity;
+
+    private String jrwindcapacityunit;
+
+    private Integer jrwindquantity;
+
+    private Integer jrcapacity;
+
+    private String jrcapacityunit;
+
+    private Integer jrquantityjz;
+
+    private Integer jrquantityzc;
+
+    private Integer ordernum;
+
     private Integer version;
     //分页
     private Integer current;