Parcourir la source

适配器bug,后续修复

xieshengjie il y a 2 ans
Parent
commit
988dfabca2

+ 19 - 20
web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/MatrixPushByWpService.java

@@ -151,42 +151,41 @@ public class MatrixPushByWpService {
 
                 }
 //                List<PointData> ptlist = realApiUtil.getRealData(pointcodes);
-//                List<PointData> ptlist = new ArrayList<>();
-//                List<List<String>> list = splitList(pointcodes, 500);
-//                list.stream().forEach(i->{
-//                    try {
-//                        ptlist.addAll(realApiUtil.getRealData(i));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                });
                 List<PointData> ptlist = new ArrayList<>();
-//
-                pointcodes.stream().forEach(point->{
+                List<List<String>> list = splitList(pointcodes, 150);
+                list.stream().forEach(i->{
                     try {
-                        ptlist.add(realApiUtil.getRealData(point));
+                        ptlist.addAll(realApiUtil.getRealData(i));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                 });
-
-//                List<PointData> zlptlist = realApiUtil.getRealData(zlpointcodes);
-                List<PointData> zlptlist = new ArrayList<>();
-//                List<List<String>> list1 = splitList(zlpointcodes, 500);
-//                list1.stream().forEach(i->{
+//
+//                pointcodes.stream().forEach(point->{
 //                    try {
-//                        zlptlist.addAll(realApiUtil.getRealData(i));
+//                        ptlist.add(realApiUtil.getRealData(point));
 //                    } catch (Exception e) {
 //                        e.printStackTrace();
 //                    }
 //                });
-                zlpointcodes.stream().forEach(point->{
+
+//                List<PointData> zlptlist = realApiUtil.getRealData(zlpointcodes);
+                List<PointData> zlptlist = new ArrayList<>();
+                List<List<String>> list1 = splitList(zlpointcodes, 150);
+                list1.stream().forEach(i->{
                     try {
-                        zlptlist.add(realApiUtil.getRealData(point));
+                        zlptlist.addAll(realApiUtil.getRealData(i));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                 });
+//                zlpointcodes.stream().forEach(point->{
+//                    try {
+//                        zlptlist.add(realApiUtil.getRealData(point));
+//                    } catch (Exception e) {
+//                        e.printStackTrace();
+//                    }
+//                });
 
                 int zlnumber=0;
                 if (!ptlist.isEmpty() && ptlist.size() == pointcodes.size()) {