品牌对标接口bug修改

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

@@ -1365,55 +1365,62 @@ public class BenchmarkingService {
             }
             peeidls.add(infoDay1);
         }
-        Map<String, Integer> station = CacheContext.wpls
-                .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId, ProBasicOrganizeTree::getOrderNum));
 
-        if (!type.equals(TYPE_DATE))
-            for (ProEconEquipmentInfoDay1 i : peeidls) {
-                WxsslVo vo = new WxsslVo();
+            if (!peeidls.isEmpty() && peeidls.size() > 0) {
+                if (peeidls.get(0).getWindturbineId() != null && !peeidls.get(0).getWindturbineId().isEmpty()
+                        && peeidls.get(0).getWindpowerstationId() != null && !peeidls.get(0).getWindpowerstationId().isEmpty()) {
 
-                if (type.equals(TYPE_WIND)) {
+                    Map<String, Integer> station = CacheContext.wpls
+                            .stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId, ProBasicOrganizeTree::getOrderNum));
+
+                    if (!type.equals(TYPE_DATE))
+                        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.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);
             }