|
@@ -119,6 +119,27 @@ public class BenchmarkingService {
|
|
|
oe -> wpids.contains(oe.getWindpowerstationId())).collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
+ public ProBasicOrganizeTree treeByWpid(String wpId, String treeType) {
|
|
|
+
|
|
|
+ ProBasicOrganizeTree root = null;
|
|
|
+ List<ProBasicOrganizeTree> collect = CacheContext.proBasicOrganizeTrees.stream().filter(pbot -> {
|
|
|
+ if(wpId.equals(pbot.getParentCode()) || wpId.equals(pbot.getId())){
|
|
|
+ if("AG".equals(treeType)){
|
|
|
+ if("EQ".equals(pbot.getOrgType())) return false;
|
|
|
+ }else if ("LN".equals(treeType)){
|
|
|
+ if("EQ".equals(pbot.getOrgType()) || "AG".equals(pbot.getOrgType())) return false;
|
|
|
+ } else if ("EG".equals(treeType)) {
|
|
|
+ if("EQ".equals(pbot.getOrgType()) || "AG".equals(pbot.getOrgType()) || "LN".equals(pbot.getOrgType())) return false;
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+
|
|
|
+ return ProBasicOrganizeTree.buildTree(collect);
|
|
|
+ }
|
|
|
+
|
|
|
public List<ProBasicOrganizeEquipment> wtByWplistxin(String wpids) {
|
|
|
return CacheContext.organizeEquipmentList.stream().filter(
|
|
|
oe -> wpids.contains(oe.getWindpowerstationId()) || (oe.getNemName().contains("风机"))).collect(Collectors.toList());
|
|
@@ -1479,5 +1500,4 @@ public class BenchmarkingService {
|
|
|
// SortUtils.sort(resultList,"ordernum",SortUtils.ASC);
|
|
|
return resultList;
|
|
|
}
|
|
|
-
|
|
|
}
|