光资源分析提交

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/Economic/EconomicService.java

@@ -349,6 +349,10 @@ public class EconomicService {
 
         List<ProBasicOrganizeEquipment> wtls = CacheContext.organizeEquipmentList.stream().filter(
                 oe -> (oe.getNemName().contains("逆变器") || oe.getNemName().contains("风机"))).collect(Collectors.toList());
+
+        List<ProBasicOrganizeEquipment> cpls = CacheContext.organizeEquipmentList.stream().filter(
+                oe -> (oe.getCompanyId().contains(companys) && oe.getNemName().contains("逆变器") || oe.getNemName().contains("风机"))).collect(Collectors.toList());
+
         List<EconomicVo> wt = new ArrayList<>();
         List<Glqx> vo = new ArrayList<Glqx>();
 
@@ -375,6 +379,14 @@ public class EconomicService {
                 wt.add(vo1);
             }
         }
+//        for (ProBasicOrganizeEquipment wt1 : cpls){
+//            if (wpids.isEmpty() && companys.contains(wt1.getCompanyId())){
+//                EconomicVo vo1 = new EconomicVo();
+//                vo1.setId(wt1.getWindturbineId());
+//                vo1.setName(wt1.getNemName());
+//                wt.add(vo1);
+//            }
+//        }
 
 
         for (EconomicVo wt2 : wt) {
@@ -438,13 +450,18 @@ public class EconomicService {
     public Map<String, Object>irradiance(String companys,String wpids, String type, String starttime, String endtime, String dateType, String windturbineids) throws Exception {
 
 //        List<ProBasicOrganizeEquipment> wtls = CacheContext.organizeEquipmentList;
-
+        String[] split = wpids.split(",");
         List<ProBasicOrganizeTree> eqs = CacheContext.proBasicOrganizeTrees;
-        List<ProBasicOrganizeTree> wtls = eqs.stream()
-                .filter(v -> "EMI".equals(v.getEqType()) && v.getParentCode().equals(wpids))
-                .collect(Collectors.toList());
+
+        List<ProBasicOrganizeTree> wtls =null;
+
+            wtls = eqs.stream()
+                    .filter(v -> "EMI".equals(v.getEqType()) && wpids.contains(v.getParentCode()))
+                    .collect(Collectors.toList());
+
         List<EconomicVo> wt = new ArrayList<>();
         List<Glqx> vo = new ArrayList<>();
+
         Date beginDate = DateUtils.parseDate1(starttime);
         Date endDate = DateUtils.parseDate1(endtime);
         Date current = com.gyee.common.util.DateUtils.getCurrentDate();