树形列表排序

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

@@ -143,12 +143,15 @@ public class BenchmarkingService {
 
     public ProBasicOrganizeTree treeByWpid(String wpId, String treeType) {
         if (organizeTrees == null) {
-            List<ProBasicOrganizeTree> collect = CacheContext.proBasicOrganizeTrees.stream().filter(ot -> {
+            /*List<ProBasicOrganizeTree> collect = CacheContext.proBasicOrganizeTrees.stream().filter(ot -> {
                 if ("EQ".equals(ot.getOrgType())) {
                     if (!"IN".equals(ot.getEqType())) return false;
                 }
                 return true;
-            }).collect(Collectors.toList());
+            }).collect(Collectors.toList());*/
+            List<ProBasicOrganizeTree> collect = CacheContext.proBasicOrganizeTrees.stream()
+                    .filter(ot->!"EQ".equals(ot.getOrgType())).collect(Collectors.toList());
+            SortUtils.sort(collect, "orderNum", SortUtils.ASC);
             organizeTrees = ObjectUtil.cloneByStream(collect);
             ProBasicOrganizeTree.buildTree(organizeTrees);
         }
@@ -168,17 +171,17 @@ public class BenchmarkingService {
     }
 
     //public List<ProBasicOrganizeTree> modellist(String wpids) {
-//    if (CacheContext.wtls == null) {
-//        return new ArrayList<>();
-//    }
-//
-//    return CacheContext.wtls.stream()
-//            .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && wpids.contains(wt.getPcodes()))
-//            .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
-//            .values()
-//            .stream()
-//            .collect(Collectors.toList());
-//}
+    //    if (CacheContext.wtls == null) {
+    //        return new ArrayList<>();
+    //    }
+    //
+    //    return CacheContext.wtls.stream()
+    //            .filter(wt -> "EQ".equals(wt.getOrgType()) && wt.getPcodes() != null && wpids.contains(wt.getPcodes()))
+    //            .collect(Collectors.toMap(ProBasicOrganizeTree::getModelId, Function.identity(), (a, b) -> a))
+    //            .values()
+    //            .stream()
+    //            .collect(Collectors.toList());
+    //}
     public List<ProBasicOrganizeTree> modellist(String wpids) {
         if (CacheContext.wtls == null) {
             return new ArrayList<>();
@@ -1354,7 +1357,7 @@ public class BenchmarkingService {
                 splitMd = models.stream().distinct().collect(Collectors.toList());
             }
         }
-//        if (!model.isEmpty()) {
+        //        if (!model.isEmpty()) {
         for (String s1 : splitMd) {
 
             List<String> wtls = null;
@@ -1398,50 +1401,50 @@ public class BenchmarkingService {
 
             peeidls.add(infoDay1);
         }
-//        }
-//        else if (model.isEmpty()) {
-//            List<String> wtls = null;
-//            if (!wpids.isEmpty()) {
-//                wtls = CacheContext.organizeEquipmentList.stream().filter(
-//                        oe -> wpids.contains(oe.getWindpowerstationId())).map(ot -> ot.getWindturbineId()).collect(Collectors.toList());
-//            }else if (wpids.isEmpty() && companys.endsWith("ZGS")){
-//                wtls = CacheContext.organizeEquipmentList.stream().filter(
-//                        oe -> companys.contains(oe.getCompanyId())).map(ot -> ot.getWindturbineId()).collect(Collectors.toList());
-//            }else if (wpids.isEmpty()&&companys.endsWith("RGN")){
-//                wtls = CacheContext.organizeEquipmentList.stream().filter(
-//                        oe -> companys.contains(oe.getRegionId())).map(ot -> ot.getWindturbineId()).collect(Collectors.toList());
-//            }
-//
-//            QueryWrapper<ProEconEquipmentInfoDay1> wiqw = qw.clone().in("windturbine_id", wtls);
-//            List<ProEconEquipmentInfoDay1> listls = proEconEquipmentInfoDay1Service.list(wiqw);
-//            List<ProBasicOrganizeTree> treeList = CacheContext.wtls.stream().filter(wt -> wt.getEqType().equals("IN")).collect(Collectors.toList());
-//            Map<String, ProBasicOrganizeTree> collect = treeList.stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId, Function.identity()));
-//
-//            ProEconEquipmentInfoDay1 infoDay1 = new ProEconEquipmentInfoDay1();
-//            for (ProEconEquipmentInfoDay1 listl : listls) {
-//
-//                        infoDay1.setRfdl((infoDay1.getRfdl() != null ? infoDay1.getRfdl() : 0) + (listl.getRfdl() != null ? listl.getRfdl() : 0));
-//                        infoDay1.setRllfdl((infoDay1.getRllfdl() != null ? infoDay1.getRllfdl() : 0) + (listl.getRllfdl() != null ? listl.getRllfdl() : 0));
-//                        infoDay1.setRpjfs((infoDay1.getRpjfs() != null ? infoDay1.getRpjfs() : 0) + (listl.getRpjfs() != null ? listl.getRpjfs() : 0));
-//                        infoDay1.setRjxssdl((infoDay1.getRjxssdl() != null ? infoDay1.getRjxssdl() : 0) + (listl.getRjxssdl() != null ? listl.getRjxssdl() : 0));
-//                        infoDay1.setRcnsljxssdl((infoDay1.getRcnsljxssdl() != null ? infoDay1.getRcnsljxssdl() : 0) + (listl.getRcnsljxssdl() != null ? listl.getRcnsljxssdl() : 0));
-//                        infoDay1.setRgzssdl((infoDay1.getRgzssdl() != null ? infoDay1.getRgzssdl() : 0) + (listl.getRgzssdl() != null ? listl.getRgzssdl() : 0));
-//                        infoDay1.setRcnslgzssdl((infoDay1.getRcnslgzssdl() != null ? infoDay1.getRcnslgzssdl() : 0) + (listl.getRcnslgzssdl() != null ? listl.getRcnslgzssdl() : 0));
-//                        infoDay1.setRxdtjssdl((infoDay1.getRxdtjssdl() != null ? infoDay1.getRxdtjssdl() : 0) + (listl.getRxdtjssdl() != null ? listl.getRxdtjssdl() : 0));
-//                        infoDay1.setRxdjclssdl((infoDay1.getRxdjclssdl() != null ? infoDay1.getRxdjclssdl() : 0) + (listl.getRxdjclssdl() != null ? listl.getRxdjclssdl() : 0));
-//                        infoDay1.setRdjssdl((infoDay1.getRdjssdl() != null ? infoDay1.getRdjssdl() : 0) + (listl.getRdjssdl() != null ? listl.getRdjssdl() : 0));
-//                        infoDay1.setRqxjclssdl((infoDay1.getRqxjclssdl() != null ? infoDay1.getRqxjclssdl() : 0) + (listl.getRqxjclssdl() != null ? listl.getRqxjclssdl() : 0));
-//                        infoDay1.setRsdtjssdl((infoDay1.getRsdtjssdl() != null ? infoDay1.getRsdtjssdl() : 0) + (listl.getRsdtjssdl() != null ? listl.getRsdtjssdl() : 0));
-//                        infoDay1.setRxnssdl((infoDay1.getRxnssdl() != null ? infoDay1.getRxnssdl() : 0) + (listl.getRxnssdl() != null ? listl.getRxnssdl() : 0));
-//                        infoDay1.setRcwsldwssdl((infoDay1.getRcwsldwssdl() != null ? infoDay1.getRcwsldwssdl() : 0) + (listl.getRcwsldwssdl() != null ? listl.getRcwsldwssdl() : 0));
-//                        infoDay1.setRcwsltqssdl((infoDay1.getRcwsltqssdl() != null ? infoDay1.getRcwsltqssdl() : 0) + (listl.getRcwsltqssdl() != null ? listl.getRcwsltqssdl() : 0));
-//                        infoDay1.setWindpowerstationId(listl.getWindpowerstationId());
-//                        infoDay1.setWindturbineId(collect.get(listl.getWindturbineId()).getModelId());
-//                    //}
-//            }
-//            peeidls.add(infoDay1);
-//
-//        }
+        //        }
+        //        else if (model.isEmpty()) {
+        //            List<String> wtls = null;
+        //            if (!wpids.isEmpty()) {
+        //                wtls = CacheContext.organizeEquipmentList.stream().filter(
+        //                        oe -> wpids.contains(oe.getWindpowerstationId())).map(ot -> ot.getWindturbineId()).collect(Collectors.toList());
+        //            }else if (wpids.isEmpty() && companys.endsWith("ZGS")){
+        //                wtls = CacheContext.organizeEquipmentList.stream().filter(
+        //                        oe -> companys.contains(oe.getCompanyId())).map(ot -> ot.getWindturbineId()).collect(Collectors.toList());
+        //            }else if (wpids.isEmpty()&&companys.endsWith("RGN")){
+        //                wtls = CacheContext.organizeEquipmentList.stream().filter(
+        //                        oe -> companys.contains(oe.getRegionId())).map(ot -> ot.getWindturbineId()).collect(Collectors.toList());
+        //            }
+        //
+        //            QueryWrapper<ProEconEquipmentInfoDay1> wiqw = qw.clone().in("windturbine_id", wtls);
+        //            List<ProEconEquipmentInfoDay1> listls = proEconEquipmentInfoDay1Service.list(wiqw);
+        //            List<ProBasicOrganizeTree> treeList = CacheContext.wtls.stream().filter(wt -> wt.getEqType().equals("IN")).collect(Collectors.toList());
+        //            Map<String, ProBasicOrganizeTree> collect = treeList.stream().collect(Collectors.toMap(ProBasicOrganizeTree::getId, Function.identity()));
+        //
+        //            ProEconEquipmentInfoDay1 infoDay1 = new ProEconEquipmentInfoDay1();
+        //            for (ProEconEquipmentInfoDay1 listl : listls) {
+        //
+        //                        infoDay1.setRfdl((infoDay1.getRfdl() != null ? infoDay1.getRfdl() : 0) + (listl.getRfdl() != null ? listl.getRfdl() : 0));
+        //                        infoDay1.setRllfdl((infoDay1.getRllfdl() != null ? infoDay1.getRllfdl() : 0) + (listl.getRllfdl() != null ? listl.getRllfdl() : 0));
+        //                        infoDay1.setRpjfs((infoDay1.getRpjfs() != null ? infoDay1.getRpjfs() : 0) + (listl.getRpjfs() != null ? listl.getRpjfs() : 0));
+        //                        infoDay1.setRjxssdl((infoDay1.getRjxssdl() != null ? infoDay1.getRjxssdl() : 0) + (listl.getRjxssdl() != null ? listl.getRjxssdl() : 0));
+        //                        infoDay1.setRcnsljxssdl((infoDay1.getRcnsljxssdl() != null ? infoDay1.getRcnsljxssdl() : 0) + (listl.getRcnsljxssdl() != null ? listl.getRcnsljxssdl() : 0));
+        //                        infoDay1.setRgzssdl((infoDay1.getRgzssdl() != null ? infoDay1.getRgzssdl() : 0) + (listl.getRgzssdl() != null ? listl.getRgzssdl() : 0));
+        //                        infoDay1.setRcnslgzssdl((infoDay1.getRcnslgzssdl() != null ? infoDay1.getRcnslgzssdl() : 0) + (listl.getRcnslgzssdl() != null ? listl.getRcnslgzssdl() : 0));
+        //                        infoDay1.setRxdtjssdl((infoDay1.getRxdtjssdl() != null ? infoDay1.getRxdtjssdl() : 0) + (listl.getRxdtjssdl() != null ? listl.getRxdtjssdl() : 0));
+        //                        infoDay1.setRxdjclssdl((infoDay1.getRxdjclssdl() != null ? infoDay1.getRxdjclssdl() : 0) + (listl.getRxdjclssdl() != null ? listl.getRxdjclssdl() : 0));
+        //                        infoDay1.setRdjssdl((infoDay1.getRdjssdl() != null ? infoDay1.getRdjssdl() : 0) + (listl.getRdjssdl() != null ? listl.getRdjssdl() : 0));
+        //                        infoDay1.setRqxjclssdl((infoDay1.getRqxjclssdl() != null ? infoDay1.getRqxjclssdl() : 0) + (listl.getRqxjclssdl() != null ? listl.getRqxjclssdl() : 0));
+        //                        infoDay1.setRsdtjssdl((infoDay1.getRsdtjssdl() != null ? infoDay1.getRsdtjssdl() : 0) + (listl.getRsdtjssdl() != null ? listl.getRsdtjssdl() : 0));
+        //                        infoDay1.setRxnssdl((infoDay1.getRxnssdl() != null ? infoDay1.getRxnssdl() : 0) + (listl.getRxnssdl() != null ? listl.getRxnssdl() : 0));
+        //                        infoDay1.setRcwsldwssdl((infoDay1.getRcwsldwssdl() != null ? infoDay1.getRcwsldwssdl() : 0) + (listl.getRcwsldwssdl() != null ? listl.getRcwsldwssdl() : 0));
+        //                        infoDay1.setRcwsltqssdl((infoDay1.getRcwsltqssdl() != null ? infoDay1.getRcwsltqssdl() : 0) + (listl.getRcwsltqssdl() != null ? listl.getRcwsltqssdl() : 0));
+        //                        infoDay1.setWindpowerstationId(listl.getWindpowerstationId());
+        //                        infoDay1.setWindturbineId(collect.get(listl.getWindturbineId()).getModelId());
+        //                    //}
+        //            }
+        //            peeidls.add(infoDay1);
+        //
+        //        }
 
         if (!peeidls.isEmpty() && peeidls.size() > 0) {
             if (peeidls.get(0).getWindturbineId() != null && !peeidls.get(0).getWindturbineId().isEmpty()
@@ -1455,7 +1458,7 @@ public class BenchmarkingService {
                         WxsslVo vo = new WxsslVo();
 
                         if (type.equals(TYPE_WIND)) {
-//                        vo.setId(i.getWindpowerstationId());
+                            //                        vo.setId(i.getWindpowerstationId());
                             vo.setName(i.getWindturbineId());
                             vo.setOrdernum(station.get(i.getWindpowerstationId()).doubleValue());
                         } else if (type.equals(TYPE_PROJECT)) {