品牌对标修改

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -115,33 +115,49 @@ public class BenchmarkingService {
 
     public List<ProBasicOrganizeEquipment> wtByWplist(String wpids) {
         return CacheContext.organizeEquipmentList.stream().filter(
-                oe -> wpids.contains(oe.getWindpowerstationId())&&(oe.getNemName().contains("逆变器") || oe.getNemName().contains("风机"))).collect(Collectors.toList());
+                oe -> wpids.contains(oe.getWindpowerstationId()) && (oe.getNemName().contains("逆变器") || oe.getNemName().contains("风机"))).collect(Collectors.toList());
     }
+
     public List<ProBasicOrganizeEquipment> wtByWplistxin(String wpids) {
         return CacheContext.organizeEquipmentList.stream().filter(
-                oe -> wpids.contains(oe.getWindpowerstationId())||(oe.getNemName().contains("风机"))).collect(Collectors.toList());
+                oe -> wpids.contains(oe.getWindpowerstationId()) || (oe.getNemName().contains("风机"))).collect(Collectors.toList());
     }
 
-//    public List<ProBasicOrganizeTree> modellist(String wpids) {
-//        if (CacheContext.wtls == null) {
-//            return new ArrayList<>();
-//        }
-//        return CacheContext.wtls.stream()
-//                .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && wt.getPcodes().contains(wpids))
-//                .collect(Collectors.toList());
+    //public List<ProBasicOrganizeTree> modellist(String wpids) {
+//    if (CacheContext.wtls == null) {
+//        return new ArrayList<>();
 //    }
-public List<ProBasicOrganizeTree> modellist(String wpids) {
-    if (CacheContext.wtls == null) {
-        return new ArrayList<>();
+//
+//    return CacheContext.wtls.stream()
+//            .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && wpids.contains(wt.getPcodes()))
+//            .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
+//            .values()
+//            .stream()
+//            .collect(Collectors.toList());
+//}
+    public List<ProBasicOrganizeTree> modellist(String wpids) {
+        if (CacheContext.wtls == null) {
+            return new ArrayList<>();
+        }
+
+        List<String> wpidsList = Arrays.asList(wpids.split(","));
+
+        return CacheContext.wtls.stream()
+                .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && containsAny(wt.getPcodes(), wpidsList))
+                .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
+                .values()
+                .stream()
+                .collect(Collectors.toList());
     }
 
-    return CacheContext.wtls.stream()
-            .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && wt.getPcodes().contains(wpids))
-            .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
-            .values()
-            .stream()
-            .collect(Collectors.toList());
-}
+    private boolean containsAny(String target, List<String> values) {
+        for (String value : values) {
+            if (target.contains(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
     public List<FjjxbVo> performance(String companyid, String getype, String sttype, String beginDate, String endDate, String wpids, String projectids, String lineids, String target, String sort) {
         List<FjjxbVo> resultList = new ArrayList<>();
@@ -193,7 +209,7 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
 
         List<ProEconEquipmentInfoDay1> list = proEconEquipmentInfoDay1Service.list(qw);
         list = list.stream().filter(a -> a.getWindpowerstationId() != null || a.getProjectId() != null ||
-                a.getLineId() != null || a.getWindturbineId() != null ).collect(Collectors.toList());
+                a.getLineId() != null || a.getWindturbineId() != null).collect(Collectors.toList());
 
         AtomicReference<Double> llfdl = new AtomicReference<>((double) 0);
         AtomicReference<Double> sjfdl = new AtomicReference<>((double) 0);
@@ -323,7 +339,7 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
         }
         List<ProEconEquipmentInfoDay1> list = proEconEquipmentInfoDay1Service.list(qw);
         list = list.stream().filter(a -> a.getWindpowerstationId() != null || a.getProjectId() != null ||
-                a.getLineId() != null || a.getWindturbineId() != null ).collect(Collectors.toList());
+                a.getLineId() != null || a.getWindturbineId() != null).collect(Collectors.toList());
 
         AtomicReference<Double> llfdl = new AtomicReference<>((double) 0);
         AtomicReference<Double> sjfdl = new AtomicReference<>((double) 0);
@@ -941,11 +957,11 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
 
         List<WxsslVo> wxsslVoList;
         if (id.endsWith("ZGS")) {
-            qw.select("windpowerstation_id,"+sql);
+            qw.select("windpowerstation_id," + sql);
             qw.groupBy("windpowerstation_id");
             wxsslVoList = getWxsslSortVos(qw, resultList, TYPE_WIND);
         } else {
-            qw.select("windturbine_id,"+sql);
+            qw.select("windturbine_id," + sql);
             qw.groupBy("windturbine_id");
             wxsslVoList = getWxsslSortVos(qw, resultList, TYPE_WINDTURBINE);
         }
@@ -1202,10 +1218,11 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
     /**
      * 设备对标
      */
-    public List<WxsslVo> ppdb(String companys, String type, String wpids,String model, String beginDate, String endDate, String target, String sort) {
+    public List<WxsslVo> ppdb(String companys, String type, String wpids, String model, String beginDate, String endDate, String target, String sort) {
         List<WxsslVo> resultList = new ArrayList<>();
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();
-        qw.select("windpowerstation_id,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");;
+        qw.select("windpowerstation_id,sum(rfdl) rfdl,sum(rllfdl) rllfdl,avg(rpjfs) rpjfs,sum(rjxssdl) rjxssdl,sum(rcnsljxssdl) rcnsljxssdl,sum(rgzssdl) rgzssdl,sum(rcnslgzssdl) rcnslgzssdl,sum(rxdtjssdl) rxdtjssdl,sum(rxdjclssdl) rxdjclssdl,sum(rdjssdl) rdjssdl,sum(rqxjclssdl) rqxjclssdl,sum(rsdtjssdl) rsdtjssdl,sum(rxnssdl) rxnssdl,sum(rcwsldwssdl) rcwsldwssdl,sum(rcwsltqssdl) rcwsltqssdl");
+        ;
 
         qw.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
         if (StringUtils.isNotEmpty(wpids)) {
@@ -1232,7 +1249,7 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
             qw.like("windturbine_id", "_IN_");
         }
         qw.groupBy("windpowerstation_id");
-        List<WxsslVo> wxsslVoList = getxinWxsslSortVos(qw, resultList, TYPE_WIND,wpids,model);
+        List<WxsslVo> wxsslVoList = getxinWxsslSortVos(qw, resultList, TYPE_WIND, wpids, model);
         if (StringUtils.isNotEmpty(target) && StringUtils.isNotEmpty(sort)) {
             if (sort.equals("1")) {
                 SortUtils.sort(resultList, target, SortUtils.ASC);
@@ -1246,20 +1263,31 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
     }
 
 
-    private List<WxsslVo> getxinWxsslSortVos(QueryWrapper<ProEconEquipmentInfoDay1> qw, List<WxsslVo> resultList, String type,String wpids,String model) {
+    private List<WxsslVo> getxinWxsslSortVos(QueryWrapper<ProEconEquipmentInfoDay1> qw, List<WxsslVo> resultList, String type, String wpids, String model) {
 
         List<List<ProEconEquipmentInfoDay1>> peeidls = new ArrayList<>();
         String[] splitWp = wpids.split(",");
         for (String s : splitWp) {
             String[] splitMd = model.split(",");
-            for (String s1 : splitMd) {
-                List<String> wtls = CacheContext.wtls.stream().filter(c -> !Objects.isNull(c.getModelId()) &&c.getPcodes().contains(s) &&
-                        s1.equals(c.getModelId())).map(ot->ot.getId()).collect(Collectors.toList());
-                if(wtls.size()==0) continue;
+            if (!model.isEmpty()) {
+                for (String s1 : splitMd) {
+                    List<String> wtls = CacheContext.wtls.stream().filter(c -> !Objects.isNull(c.getModelId()) && c.getPcodes().contains(s) &&
+                            s1.equals(c.getModelId())).map(ot -> ot.getId()).collect(Collectors.toList());
+                    if (wtls.size() == 0) continue;
+                    QueryWrapper<ProEconEquipmentInfoDay1> wiqw = qw.clone().in("windturbine_id", wtls);
+                    List<ProEconEquipmentInfoDay1> listls = proEconEquipmentInfoDay1Service.list(wiqw);
+                    for (ProEconEquipmentInfoDay1 listl : listls) {
+                        listl.setWindturbineId(s1);
+                    }
+                    peeidls.add(listls);
+                }
+            } else if (model.isEmpty()) {
+                List<String> wtls = CacheContext.wtls.stream().filter(c ->  c.getPcodes().contains(s)).map(ot -> ot.getId()).collect(Collectors.toList());
+                if (wtls.size() == 0) continue;
                 QueryWrapper<ProEconEquipmentInfoDay1> wiqw = qw.clone().in("windturbine_id", wtls);
-                List<ProEconEquipmentInfoDay1> listls =proEconEquipmentInfoDay1Service.list(wiqw);
+                List<ProEconEquipmentInfoDay1> listls = proEconEquipmentInfoDay1Service.list(wiqw);
                 for (ProEconEquipmentInfoDay1 listl : listls) {
-                    listl.setWindturbineId(s1);
+                    listl.setWindturbineId("HFYG_SG500KTL");
                 }
                 peeidls.add(listls);
             }
@@ -1286,55 +1314,55 @@ public List<ProBasicOrganizeTree> modellist(String wpids) {
 //                    a.getLineId() != null || a.getWindturbineId() != null || a.getSquareId() != null ||
 //                    a.getId() != null).collect(Collectors.toList());
 
-        for (List<ProEconEquipmentInfoDay1> peeidl : peeidls) {
-            for (ProEconEquipmentInfoDay1 i : peeidl) {
-                WxsslVo vo = new WxsslVo();
-
-                if (type.equals(TYPE_WIND)) {
-                    vo.setId(i.getWindpowerstationId());
-                    vo.setName(i.getWindturbineId());
-                    vo.setOrdernum(station.get(i.getWindpowerstationId()).doubleValue());
-                } else if (type.equals(TYPE_PROJECT)) {
-                    vo.setId(i.getProjectId());
-                    vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getModelId());
-                    vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum().doubleValue());
-                } else if (type.equals(TYPE_LINE)) {
-                    vo.setId(i.getLineId());
-                    vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getModelId());
-                    vo.setOrdernum(CacheContext.lnmap.get(i.getLineId().trim()).getOrderNum().doubleValue());
-                } else if (type.equals(TYPE_WINDTURBINE)) {
-                    vo.setId(i.getWindturbineId());
-                    vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getModelId());
-                    vo.setOrdernum(CacheContext.wtmap.get(i.getWindturbineId().trim()).getOrderNum().doubleValue());
-                } else if (type.equals(TYPE_SQUARE)) {
-                    vo.setId(i.getSquareId());
-                    vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getModelId());
-                    vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getOrderNum().doubleValue());
-                } else if (type.equals(TYPE_COMPANY)) {
-                    vo.setId(i.getId());
-                    vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getAname());
-                    vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getOrderNum().doubleValue());
+            for (List<ProEconEquipmentInfoDay1> peeidl : peeidls) {
+                for (ProEconEquipmentInfoDay1 i : peeidl) {
+                    WxsslVo vo = new WxsslVo();
+
+                    if (type.equals(TYPE_WIND)) {
+                        vo.setId(i.getWindpowerstationId());
+                        vo.setName(i.getWindturbineId());
+                        vo.setOrdernum(station.get(i.getWindpowerstationId()).doubleValue());
+                    } else if (type.equals(TYPE_PROJECT)) {
+                        vo.setId(i.getProjectId());
+                        vo.setName(CacheContext.pjmap.get(i.getProjectId().trim()).getModelId());
+                        vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum().doubleValue());
+                    } else if (type.equals(TYPE_LINE)) {
+                        vo.setId(i.getLineId());
+                        vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getModelId());
+                        vo.setOrdernum(CacheContext.lnmap.get(i.getLineId().trim()).getOrderNum().doubleValue());
+                    } else if (type.equals(TYPE_WINDTURBINE)) {
+                        vo.setId(i.getWindturbineId());
+                        vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getModelId());
+                        vo.setOrdernum(CacheContext.wtmap.get(i.getWindturbineId().trim()).getOrderNum().doubleValue());
+                    } else if (type.equals(TYPE_SQUARE)) {
+                        vo.setId(i.getSquareId());
+                        vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getModelId());
+                        vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getSquareId()).getOrderNum().doubleValue());
+                    } else if (type.equals(TYPE_COMPANY)) {
+                        vo.setId(i.getId());
+                        vo.setName(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getAname());
+                        vo.setOrdernum(CacheContext.proBasicOrganizeTreesMap.get(i.getId()).getOrderNum().doubleValue());
+                    }
+
+                    vo.setDate(i.getRecordDate());
+                    vo.setFdl(DoubleUtils.keepPrecision(i.getRfdl() / 10000, 2));
+                    vo.setLlfdl(DoubleUtils.keepPrecision(i.getRllfdl() / 10000, 2));
+                    vo.setJxssdl(DoubleUtils.keepPrecision((i.getRjxssdl() + i.getRcnsljxssdl()) / 10000, 2));
+                    vo.setGzssdl(DoubleUtils.keepPrecision((i.getRgzssdl() + i.getRcnslgzssdl()) / 10000, 2));
+                    vo.setXdssdl(DoubleUtils.keepPrecision((i.getRxdtjssdl() + i.getRxdjclssdl()) / 10000, 2));
+                    vo.setSlssdl(DoubleUtils.keepPrecision((i.getRcwsltqssdl() + i.getRcwsldwssdl()) / 10000, 2));
+                    vo.setXnssdl(DoubleUtils.keepPrecision((i.getRdjssdl() + i.getRsdtjssdl() + i.getRqxjclssdl() + i.getRxnssdl()) / 10000, 2));
+                    vo.setZssdl(DoubleUtils.keepPrecision(vo.getGzssdl() + vo.getJxssdl() + vo.getXdssdl() + vo.getXnssdl() + vo.getSlssdl(), 2));
+                    vo.setFnlyl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getFdl() / vo.getLlfdl() * 100, 2) : 0);
+                    vo.setGzssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getGzssdl() / vo.getLlfdl() * 100, 2) : 0);
+                    vo.setJxssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getJxssdl() / vo.getLlfdl() * 100, 2) : 0);
+                    vo.setQfl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getXdssdl() / vo.getLlfdl() * 100, 2) : 0);
+                    vo.setXnssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getXnssdl() / vo.getLlfdl() * 100, 2) : 0);
+                    vo.setSlssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getSlssdl() / vo.getLlfdl() * 100, 2) : 0);
+                    resultList.add(vo);
                 }
 
-                vo.setDate(i.getRecordDate());
-                vo.setFdl(DoubleUtils.keepPrecision(i.getRfdl() / 10000, 2));
-                vo.setLlfdl(DoubleUtils.keepPrecision(i.getRllfdl() / 10000, 2));
-                vo.setJxssdl(DoubleUtils.keepPrecision((i.getRjxssdl() + i.getRcnsljxssdl()) / 10000, 2));
-                vo.setGzssdl(DoubleUtils.keepPrecision((i.getRgzssdl() + i.getRcnslgzssdl()) / 10000, 2));
-                vo.setXdssdl(DoubleUtils.keepPrecision((i.getRxdtjssdl() + i.getRxdjclssdl()) / 10000, 2));
-                vo.setSlssdl(DoubleUtils.keepPrecision((i.getRcwsltqssdl() + i.getRcwsldwssdl()) / 10000, 2));
-                vo.setXnssdl(DoubleUtils.keepPrecision((i.getRdjssdl() + i.getRsdtjssdl() + i.getRqxjclssdl() + i.getRxnssdl()) / 10000, 2));
-                vo.setZssdl(DoubleUtils.keepPrecision(vo.getGzssdl() + vo.getJxssdl() + vo.getXdssdl() + vo.getXnssdl() + vo.getSlssdl(), 2));
-                vo.setFnlyl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getFdl() / vo.getLlfdl() * 100, 2) : 0);
-                vo.setGzssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getGzssdl() / vo.getLlfdl() * 100, 2) : 0);
-                vo.setJxssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getJxssdl() / vo.getLlfdl() * 100, 2) : 0);
-                vo.setQfl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getXdssdl() / vo.getLlfdl() * 100, 2) : 0);
-                vo.setXnssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getXnssdl() / vo.getLlfdl() * 100, 2) : 0);
-                vo.setSlssl(vo.getLlfdl() != 0 ? DoubleUtils.keepPrecision(vo.getSlssdl() / vo.getLlfdl() * 100, 2) : 0);
-                resultList.add(vo);
             }
-
-        }
         SortUtils.sort(resultList, "llfdl", SortUtils.DESC);
         for (int i = 0; i < resultList.size(); i++) {
             resultList.get(i).setZhpm(i + 1);