bug修复

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/init/CacheContext.java

@@ -185,17 +185,19 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicOrganizeEquipment> organizeEquipmentList;//把树形展开的设备列表
     public static List<ProEconWtPowerCurveFitting> wtPowerCurveFittingList;
     public static List<ProEconInPowerCurveFitting> inPowerCurveFittingList;
+    public static Map<String, List<ProEconInPowerCurveFitting>> inPowerCurveFittingMap;
 
     @Override
     public void run(String... args) throws Exception {
         logger.info("缓存开始------------------------------------------------------------");
         proBasicOrganizeTrees = proBasicOrganizeTreeService.list();
-        proBasicOrganizeTrees = proBasicOrganizeTrees.stream().filter(pbot -> pbot.getIsAble() == 1).collect(Collectors.toList());
+        proBasicOrganizeTrees = proBasicOrganizeTrees.stream().filter(pbot -> pbot.getIsAble() == 1 && StringUtils.isNotEmpty(pbot.getParentCode())).collect(Collectors.toList());
         proBasicOrganizeTreesMap = proBasicOrganizeTrees.stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId, Function.identity()));
 
         organizeEquipmentList = proBasicOrganizeEquipmentService.list().stream().filter(pboe -> pboe.getIsAble() == 1).collect(Collectors.toList());
         wtPowerCurveFittingList = wtPowerCurveFittingService.list();
         inPowerCurveFittingList = inPowerCurveFittingService.list();
+        inPowerCurveFittingMap = inPowerCurveFittingList.stream().collect(Collectors.groupingBy(ProEconInPowerCurveFitting::getInverterId));
 
         //List<String> pbotids = proBasicOrganizeTrees.stream().map(pbot -> pbot.getId()).collect(Collectors.toList());
         //Map<String, Object> pbotidMap = redisService.batchGetKeys(pbotids);

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

@@ -113,7 +113,8 @@ public class BenchmarkingService {
     }
 
     public List<ProBasicOrganizeEquipment> wtByWplist(String wpids) {
-        return CacheContext.organizeEquipmentList.stream().filter(oe -> wpids.contains(oe.getWindpowerstationId())).collect(Collectors.toList());
+        return CacheContext.organizeEquipmentList.stream().filter(
+                oe -> wpids.contains(oe.getWindpowerstationId())&&(oe.getNemName().contains("逆变器") || oe.getNemName().contains("风机"))).collect(Collectors.toList());
     }
 
     public List<FjjxbVo> performance(String companyid, String getype, String sttype, String beginDate, String endDate, String wpids, String projectids, String lineids, String target, String sort) {
@@ -472,7 +473,7 @@ public class BenchmarkingService {
                 vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum().doubleValue());
             } else if (StringUtils.isNotEmpty(wpids) && StringUtils.isNotEmpty(projectids) && StringUtils.isNotEmpty(lineids)) {
                 vo.setId(i.getLineId());
-                vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getAname());
+                vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getNemName());
                 vo.setOrdernum(CacheContext.lnmap.get(i.getLineId().trim()).getOrderNum().doubleValue());
             } else {
                 vo.setId(i.getWindpowerstationId());