添加公司级地貌图场站、项目、风机接口

web/monitor-web-sxjn/src/main/java/com/gyee/frame/controller/powercompare/PowerCompareController.java

@@ -8,6 +8,7 @@ import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.MatrixVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.model.custom.StopTypeTreeVo;
+import com.gyee.frame.model.custom.WindpowerstationVo;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.Windpowerinfoday3Service;
 import com.gyee.frame.service.Windturbineinfoday3Service;
@@ -110,16 +111,40 @@ public class PowerCompareController {
     public AjaxResult windfarmByCmAjax(String cmId) {
 
 
-        List<Windpowerstation> vos=new ArrayList<>();
+        List<WindpowerstationVo> vos=new ArrayList<>();
         if(StringUtils.notEmp(cmId))
         {
 
             Map<String, List<Windpowerstation>> map = InitialRunner.cm_wpmap;
+
+
             if(null!=map && !map.isEmpty())
             {
                 if(map.containsKey(cmId))
                 {
-                    vos=map.get(cmId);
+                    List<Windpowerstation> ls=map.get(cmId);
+                    if(!ls.isEmpty())
+                    {
+                        for(Windpowerstation wp:ls)
+                        {
+                            WindpowerstationVo vo=new WindpowerstationVo();
+                            vo.setCapacity(wp.getCapacity());
+                            vo.setCode(wp.getCode());
+                            vo.setCompanyid(wp.getCompanyid());
+                            vo.setId(wp.getId());
+                            vo.setLatitude(wp.getLatitude());
+                            vo.setLongitude(wp.getLongitude());
+                            vo.setName(wp.getName());
+                            vo.setQuantity(wp.getQuantity());
+
+                            if(InitialRunner.pjsmap.containsKey(wp.getId()))
+                            {
+                                vo.setPjls(InitialRunner.pjsmap.get(wp.getId()));
+                            }
+                            vos.add(vo);
+                        }
+                    }
+
                 }
             }
         }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/custom/WindpowerstationVo.java

@@ -0,0 +1,98 @@
+package com.gyee.frame.model.custom;
+
+import com.gyee.frame.model.auto.Project;
+
+import java.util.List;
+
+public class WindpowerstationVo {
+
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private Double capacity;
+
+    private Integer quantity;
+
+    private Double longitude;
+
+    private Double latitude;
+
+    private String companyid;
+
+    private List<Project> pjls;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Double getCapacity() {
+        return capacity;
+    }
+
+    public void setCapacity(Double capacity) {
+        this.capacity = capacity;
+    }
+
+    public Integer getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(Integer quantity) {
+        this.quantity = quantity;
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getCompanyid() {
+        return companyid;
+    }
+
+    public void setCompanyid(String companyid) {
+        this.companyid = companyid;
+    }
+
+    public List<Project> getPjls() {
+        return pjls;
+    }
+
+    public void setPjls(List<Project> pjls) {
+        this.pjls = pjls;
+    }
+}