增加阵区列表

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/bmk/BenchmarkingController.java

@@ -550,4 +550,17 @@ public class BenchmarkingController {
         }
     }
 
+    @GetMapping(value = "/squarelist")
+    @ApiOperation(value = "阵区列表", notes = "阵区列表")
+    public R squarelist(@RequestParam(value = "wpids", required = true) String wpids)  {
+
+        List<ProBasicOrganizeEquipment> resultList = benchmarkingService.squarelist(wpids);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+
 }

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

@@ -23,8 +23,10 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 @Service
@@ -159,6 +161,18 @@ public class BenchmarkingService {
         return false;
     }
 
+    public List<ProBasicOrganizeEquipment> squarelist(String wpids) {
+        return CacheContext.organizeEquipmentList.stream()
+                .filter(oe -> wpids.contains(oe.getWindpowerstationId()) && (oe.getNemName().contains("逆变器") && oe.getSquareId()!= null || oe.getNemName().contains("风机")))
+                .filter(distinctByKey(ProBasicOrganizeEquipment::getSquareId))
+                .collect(Collectors.toList());
+    }
+
+    public static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
+        Set<Object> seen = ConcurrentHashMap.newKeySet();
+        return t -> seen.add(keyExtractor.apply(t));
+    }
+
     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<>();
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();