增加公司字段

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

@@ -29,7 +29,7 @@ public class BackController {
     private BackConfigService backConfigService;
 
     /**
-     * 公司列表
+     * 计划电量树
      *
      * @return
      */

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

@@ -30,13 +30,13 @@ public class Companys extends Model {
 
     private String aname;
 
-    private Integer windcapacity;
+    private Double windcapacity;
 
     private String windcapacityunit;
 
     private Integer windquantity;
 
-    private Integer capacity;
+    private Double capacity;
 
     private String capacityunit;
 
@@ -50,7 +50,7 @@ public class Companys extends Model {
 
     private Integer jrwindquantity;
 
-    private Integer jrcapacity;
+    private Double jrcapacity;
 
     private String jrcapacityunit;
 
@@ -60,6 +60,13 @@ public class Companys extends Model {
 
     private Integer ordernum;
 
+    private Integer windnumber;
+
+    private Integer  number;
+
+    private Integer  jrwindnumber;
+
+    private Integer  jrnumber;
 
     @TableField(exist = false)
     private List<Windpowerstation> Children = new ArrayList<>();

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

@@ -32,7 +32,7 @@ public class Line extends Model {
 
     private Integer ordernum;
 
-    private Integer capacity;
+    private Double capacity;
 
     private String capacityunit;
 

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

@@ -32,7 +32,7 @@ public class Region extends Model {
 
     private Integer windquantity;
 
-    private Integer capacity;
+    private Double capacity;
 
     private String capacityunit;
 
@@ -56,6 +56,14 @@ public class Region extends Model {
 
     private Integer ordernum;
 
+    private Integer windnumber;
+
+    private Integer  number;
+
+    private Integer  jrwindnumber;
+
+    private Integer  jrnumber;
+
 
 
 

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

@@ -33,7 +33,7 @@ public class Windpowerstation extends Model {
 
     private String telephone;
 
-    private Integer capacity;
+    private Double capacity;
 
     private String capacityunit;
 

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

@@ -408,68 +408,8 @@ public class BackConfigService {
                 List<Project> projects = prols.stream().filter(l -> l.getWindpowerstationid().equals(wpl.getId())).collect(Collectors.toList());
                 wpl.getChildren().addAll(projects);
             });
-//        prols.forEach(wp->{
-//            wpls.stream().filter(pr ->pr.getId().equals(wp.getWindpowerstationid())).collect(Collectors.toList());
-////            Companys.get(0).getData2().add(wp);
-//        });
-//        //返回结果为期次在上面，场站在下面
-////        prols.stream().forEach(cp->{
-////            Windpowerstationvo vo = new Windpowerstationvo();
-////            vo.setId(cp.getId());
-////            vo.setCode(cp.getName());
-////
-////            List<Windpowerstation> wt = wpls.stream().filter(wt1 ->wt1.getId().equals(cp.getWindpowerstationid())).collect(Collectors.toList());
-////                vo.setData(wt);
-////                wtlist.add(vo);
-////        });
-//        //返回结果为场站在上面，期次在下面，但是公司表setdata需要为vo
-//        wpls.forEach(wp->{
-//            //Projectvo vo = new Projectvo();
-//            /*Windpowerstationvo vo = new Windpowerstationvo();
-//            vo.setId(wp.getId());
-//            List<Projectvo> Project = prols.stream().filter(wt -> wt.getWindpowerstationid().equals(wp.getId())).collect(Collectors.toList());
-//            vo.setData(Project);
-//
-//            vo.setId(wp.getId());
-//            vo.setCode(wp.getName());
-//            List<Project> Project = prols.stream().filter(wt -> wt.getWindpowerstationid().equals(wp.getId())).collect(Collectors.toList());
-//            vo.setData(Project);
-//            volist.add(vo);*/
-//            cpls.stream().filter(ct ->ct.getId().equals(wp.getCompanyid())).collect(Collectors.toList());
-//            Companysvo vo = new Companysvo();
-//            vo.setId(Companys.get(0).getId());
-//            vo.setName(Companys.get(0).getName());
-//            vo.setRid(Companys.get(0).getRid());
-//            vo.getData1().add(wp);
-//            colist.add(vo);
-//        });
-
-
-//        cpls.stream().forEach(cpl->{
-//            Projectvo vo = new Projectvo();
-//            vo.setWindpowerstationid(cpl.getId());
-//
-//         List<Projectvo> cc = volist.stream().filter((wt2 ->wt2.getWindpowerstationid().equals(cpl.getId()))).collect(Collectors.toList());
-//            vo.setData(cc);
-//            volist.add(vo);
-//        });
-//
-//        volist.stream().forEach(vol->{
-//            Companysvo vo = new Companysvo();
-//            vo.setId(vol.get());
-//            List<Companys> Companys = cpls.stream().filter(ct ->ct.getId().equals(vol.getWindpowerstationid())).collect(Collectors.toList());
-//            vo.setData(Companys);
-//            colist.add(vo);
-//        });
-//
-//        cpls.stream().forEach(wp->{
-//            Companysvo vo = new Companysvo();
-//
-////            vo.setId(wp.getCompanyid());
-//            List<Windpowerstationvo> Companys = wtlist.stream().filter(wt -> wt.getCompanyid().equals(wp.getId())).collect(Collectors.toList());
-//            vo.setData(Companys);
-//            colist.add(vo);
-//        });
+        HashMap<Integer,String> Map = new HashMap<>();
+        Map.put(1,cpls.get(0).getId());
         return cpls;
     }