品牌对标接口修改

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

@@ -64,7 +64,6 @@ public class BenchmarkingService {
 
         SortUtils.sort(result, "orderNum", SortUtils.ASC);
 
-
         result.add(0,company);
         return result;
     }
@@ -117,7 +116,7 @@ public class BenchmarkingService {
 
     public List<ProBasicOrganizeEquipment> wtByWplist(String wpids) {
         return CacheContext.organizeEquipmentList.stream().filter(
-                oe -> wpids.contains(oe.getWindpowerstationId()) &&  !oe.getParentCode().endsWith("AG") && (oe.getNemName().contains("逆变器")  || oe.getNemName().contains("风机"))).collect(Collectors.toList());
+                oe -> wpids.contains(oe.getWindpowerstationId())).collect(Collectors.toList());
     }
 
     public List<ProBasicOrganizeEquipment> wtByWplistxin(String wpids) {
@@ -172,7 +171,7 @@ public class BenchmarkingService {
             for (ProBasicOrganizeTree sq : CacheContext.sqls) {
 
                 if (sqlist.getSquareId().equals(sq.getId())){
-                    sqlist.setAname(sq.getAname());
+                    sqlist.setParentCode(sq.getAname());
                 }
             }
         }
@@ -1292,107 +1291,132 @@ public class BenchmarkingService {
 
     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(",");
-            if (!model.isEmpty()) {
-                for (String s1 : splitMd) {
-                    List<String> wtls = CacheContext.wtls.stream().filter(c -> !Objects.isNull(c.getModelId()) && c.getNemName().contains("逆变器") && 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) && c.getNemName().contains("逆变器")).map(ot -> ot.getId()).collect(Collectors.toList());
+        List<ProEconEquipmentInfoDay1> peeidls = new ArrayList<>();
+        String[] splitMd = model.split(",");
+        if (!model.isEmpty()) {
+            for (String s1 : splitMd) {
+
+
+//                    List<String> wtls = CacheContext.wtls.stream().filter(c -> !Objects.isNull(c.getModelId()) && c.getNemName().contains("逆变器") &&
+//                            s1.equals(c.getModelId())).map(ot -> ot.getId()).collect(Collectors.toList());
+
+                List<String> wtls  = CacheContext.organizeEquipmentList.stream().filter(
+                        oe -> wpids.contains(oe.getWindpowerstationId())).map(ot -> ot.getWindturbineId()).collect(Collectors.toList());
+
                 if (wtls.size() == 0) continue;
                 QueryWrapper<ProEconEquipmentInfoDay1> wiqw = qw.clone().in("windturbine_id", wtls);
                 List<ProEconEquipmentInfoDay1> listls = proEconEquipmentInfoDay1Service.list(wiqw);
-                for (ProBasicOrganizeTree t1: CacheContext.wtls){
-                    for (ProEconEquipmentInfoDay1 listl : listls) {
-                        if (t1.getId().equals(wtls.get(0)))
-                            listl.setWindturbineId(t1.getModelId());
-                    }
+
+                ProEconEquipmentInfoDay1 infoDay1 = new ProEconEquipmentInfoDay1();
+
+                for (ProEconEquipmentInfoDay1 listl : listls) {
+
+                    infoDay1.setRfdl((infoDay1.getRfdl() != null ? infoDay1.getRfdl() : 0) + (listl.getRfdl() != null ? listl.getRfdl() : 0));
+                    infoDay1.setRllfdl((infoDay1.getRllfdl() != null ? infoDay1.getRllfdl() : 0) + (listl.getRllfdl() != null ? listl.getRllfdl() : 0));
+                    infoDay1.setRpjfs((infoDay1.getRpjfs() != null ? infoDay1.getRpjfs() : 0) + (listl.getRpjfs() != null ? listl.getRpjfs() : 0));
+                    infoDay1.setRjxssdl((infoDay1.getRjxssdl() != null ? infoDay1.getRjxssdl() : 0) + (listl.getRjxssdl() != null ? listl.getRjxssdl() : 0));
+                    infoDay1.setRcnsljxssdl((infoDay1.getRcnsljxssdl() != null ? infoDay1.getRcnsljxssdl() : 0) + (listl.getRcnsljxssdl() != null ? listl.getRcnsljxssdl() : 0));
+                    infoDay1.setRgzssdl((infoDay1.getRgzssdl() != null ? infoDay1.getRgzssdl() : 0) + (listl.getRgzssdl() != null ? listl.getRgzssdl() : 0));
+                    infoDay1.setRcnslgzssdl((infoDay1.getRcnslgzssdl() != null ? infoDay1.getRcnslgzssdl() : 0) + (listl.getRcnslgzssdl() != null ? listl.getRcnslgzssdl() : 0));
+                    infoDay1.setRxdtjssdl((infoDay1.getRxdtjssdl() != null ? infoDay1.getRxdtjssdl() : 0) + (listl.getRxdtjssdl() != null ? listl.getRxdtjssdl() : 0));
+                    infoDay1.setRxdjclssdl((infoDay1.getRxdjclssdl() != null ? infoDay1.getRxdjclssdl() : 0) + (listl.getRxdjclssdl() != null ? listl.getRxdjclssdl() : 0));
+                    infoDay1.setRdjssdl((infoDay1.getRdjssdl() != null ? infoDay1.getRdjssdl() : 0) + (listl.getRdjssdl() != null ? listl.getRdjssdl() : 0));
+                    infoDay1.setRqxjclssdl((infoDay1.getRqxjclssdl() != null ? infoDay1.getRqxjclssdl() : 0) + (listl.getRqxjclssdl() != null ? listl.getRqxjclssdl() : 0));
+                    infoDay1.setRsdtjssdl((infoDay1.getRsdtjssdl() != null ? infoDay1.getRsdtjssdl() : 0) + (listl.getRsdtjssdl() != null ? listl.getRsdtjssdl() : 0));
+                    infoDay1.setRxnssdl((infoDay1.getRxnssdl() != null ? infoDay1.getRxnssdl() : 0) + (listl.getRxnssdl() != null ? listl.getRxnssdl() : 0));
+                    infoDay1.setRcwsldwssdl((infoDay1.getRcwsldwssdl() != null ? infoDay1.getRcwsldwssdl() : 0) + (listl.getRcwsldwssdl() != null ? listl.getRcwsldwssdl() : 0));
+                    infoDay1.setRcwsltqssdl((infoDay1.getRcwsltqssdl() != null ? infoDay1.getRcwsltqssdl() : 0) + (listl.getRcwsltqssdl() != null ? listl.getRcwsltqssdl() : 0));
+                    infoDay1.setWindpowerstationId(listl.getWindpowerstationId());
+                    infoDay1.setWindturbineId(s1);
+                }
+
+                peeidls.add(infoDay1);
+            }
+        } else if (model.isEmpty()) {
+            List<String> wtls  = CacheContext.organizeEquipmentList.stream().filter(
+                    oe -> wpids.contains(oe.getWindpowerstationId())).map(ot -> ot.getWindturbineId()).collect(Collectors.toList());
+
+            QueryWrapper<ProEconEquipmentInfoDay1> wiqw = qw.clone().in("windturbine_id", wtls);
+            List<ProEconEquipmentInfoDay1> listls = proEconEquipmentInfoDay1Service.list(wiqw);
+
+            ProEconEquipmentInfoDay1 infoDay1 = new ProEconEquipmentInfoDay1();
+
+            for (ProBasicOrganizeTree t1: CacheContext.wtls){
+                for (ProEconEquipmentInfoDay1 listl : listls) {
+                    infoDay1.setRfdl((infoDay1.getRfdl() != null ? infoDay1.getRfdl() : 0) + (listl.getRfdl() != null ? listl.getRfdl() : 0));
+                    infoDay1.setRllfdl((infoDay1.getRllfdl() != null ? infoDay1.getRllfdl() : 0) + (listl.getRllfdl() != null ? listl.getRllfdl() : 0));
+                    infoDay1.setRpjfs((infoDay1.getRpjfs() != null ? infoDay1.getRpjfs() : 0) + (listl.getRpjfs() != null ? listl.getRpjfs() : 0));
+                    infoDay1.setRjxssdl((infoDay1.getRjxssdl() != null ? infoDay1.getRjxssdl() : 0) + (listl.getRjxssdl() != null ? listl.getRjxssdl() : 0));
+                    infoDay1.setRcnsljxssdl((infoDay1.getRcnsljxssdl() != null ? infoDay1.getRcnsljxssdl() : 0) + (listl.getRcnsljxssdl() != null ? listl.getRcnsljxssdl() : 0));
+                    infoDay1.setRgzssdl((infoDay1.getRgzssdl() != null ? infoDay1.getRgzssdl() : 0) + (listl.getRgzssdl() != null ? listl.getRgzssdl() : 0));
+                    infoDay1.setRcnslgzssdl((infoDay1.getRcnslgzssdl() != null ? infoDay1.getRcnslgzssdl() : 0) + (listl.getRcnslgzssdl() != null ? listl.getRcnslgzssdl() : 0));
+                    infoDay1.setRxdtjssdl((infoDay1.getRxdtjssdl() != null ? infoDay1.getRxdtjssdl() : 0) + (listl.getRxdtjssdl() != null ? listl.getRxdtjssdl() : 0));
+                    infoDay1.setRxdjclssdl((infoDay1.getRxdjclssdl() != null ? infoDay1.getRxdjclssdl() : 0) + (listl.getRxdjclssdl() != null ? listl.getRxdjclssdl() : 0));
+                    infoDay1.setRdjssdl((infoDay1.getRdjssdl() != null ? infoDay1.getRdjssdl() : 0) + (listl.getRdjssdl() != null ? listl.getRdjssdl() : 0));
+                    infoDay1.setRqxjclssdl((infoDay1.getRqxjclssdl() != null ? infoDay1.getRqxjclssdl() : 0) + (listl.getRqxjclssdl() != null ? listl.getRqxjclssdl() : 0));
+                    infoDay1.setRsdtjssdl((infoDay1.getRsdtjssdl() != null ? infoDay1.getRsdtjssdl() : 0) + (listl.getRsdtjssdl() != null ? listl.getRsdtjssdl() : 0));
+                    infoDay1.setRxnssdl((infoDay1.getRxnssdl() != null ? infoDay1.getRxnssdl() : 0) + (listl.getRxnssdl() != null ? listl.getRxnssdl() : 0));
+                    infoDay1.setRcwsldwssdl((infoDay1.getRcwsldwssdl() != null ? infoDay1.getRcwsldwssdl() : 0) + (listl.getRcwsldwssdl() != null ? listl.getRcwsldwssdl() : 0));
+                    infoDay1.setRcwsltqssdl((infoDay1.getRcwsltqssdl() != null ? infoDay1.getRcwsltqssdl() : 0) + (listl.getRcwsltqssdl() != null ? listl.getRcwsltqssdl() : 0));
+                    infoDay1.setWindpowerstationId(listl.getWindpowerstationId());
+                    if (t1.getId().equals(wtls.get(0)))
+                        infoDay1.setWindturbineId(t1.getModelId());
                 }
-                peeidls.add(listls);
             }
+            peeidls.add(infoDay1);
         }
         Map<String, Integer> station = CacheContext.wpls
                 .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId, ProBasicOrganizeTree::getOrderNum));
 
-//        List<String> wtls = CacheContext.wtls.stream().filter(c -> !Objects.isNull(c.getModelId()) && model.contains(c.getModelId()))
-//                .map(ot->ot.getId()).collect(Collectors.toList());
-
-
-        List<ProEconEquipmentInfoDay1> list = new ArrayList<>();
-
-//        for (ProBasicOrganizeTree wt : wtls){
-//            for (ProEconEquipmentInfoDay1 lst : listls) {
-//                if (lst.getWindturbineId().equals(wt.getId())){
-//                    list.add(lst);
-//                }
-//            }
-//        }
-
         if (!type.equals(TYPE_DATE))
-//            peeidls = peeidls.stream().filter(a -> a.getWindpowerstationId() != null || a.getProjectId() != null ||
-//                    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());
-                    }
-
-                    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);
+            for (ProEconEquipmentInfoDay1 i : peeidls) {
+                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);
             }
+
+
         SortUtils.sort(resultList, "llfdl", SortUtils.DESC);
         for (int i = 0; i < resultList.size(); i++) {
             resultList.get(i).setZhpm(i + 1);