品牌对标接口修改

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

@@ -143,7 +143,7 @@ public class BenchmarkingService {
         List<String> wpidsList = Arrays.asList(wpids.split(","));
 
         return CacheContext.wtls.stream()
-                .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && containsAny(wt.getPcodes(), wpidsList))
+                .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getNemName().contains("逆变器") && wt.getPcodes() != null && containsAny(wt.getPcodes(), wpidsList))
                 .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
                 .values()
                 .stream()
@@ -1222,7 +1222,6 @@ public class BenchmarkingService {
         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.ge("record_date", DateUtils.parseDate(beginDate)).le("record_date", DateUtils.parseDate(endDate));
         if (StringUtils.isNotEmpty(wpids)) {
@@ -1271,7 +1270,7 @@ public class BenchmarkingService {
             String[] splitMd = model.split(",");
             if (!model.isEmpty()) {
                 for (String s1 : splitMd) {
-                    List<String> wtls = CacheContext.wtls.stream().filter(c -> !Objects.isNull(c.getModelId()) && c.getPcodes().contains(s) &&
+                    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);
@@ -1282,7 +1281,7 @@ public class BenchmarkingService {
                     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());
+                List<String> wtls = CacheContext.wtls.stream().filter(c ->  c.getPcodes().contains(s) && c.getNemName().contains("逆变器")).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);