Browse Source

排序优化

yq 2 years ago
parent
commit
7f5d78201a

+ 3 - 2
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDataOverviewServiceImpl.java

@@ -61,7 +61,7 @@ public class DmpDataOverviewServiceImpl extends AbstractCrudService<DmpDataOverv
         do {
             String dates = DateUtils.format(startTime, format);
             Date finalStartTime = startTime;
-            list.add(list.stream().filter(dv -> DateUtils.format(dv.getCreatedTime(), format).equals(dates))
+            list.stream().filter(dv -> DateUtils.format(dv.getCreatedTime(), format).equals(dates))
                     .findAny()
                     .orElseGet(() -> {
                         DmpDataOverview dmpDataOverview = new DmpDataOverview();
@@ -76,8 +76,9 @@ public class DmpDataOverviewServiceImpl extends AbstractCrudService<DmpDataOverv
                         dmpDataOverviewVO.setJhRadioCount(0.0D);
                         dmpDataOverviewVO.setHyRadioCount(0.0D);
                         dmpDataOverview.setDeviceNumber(JSON.toJSONString(dmpDataOverviewVO));
+                        list.add(dmpDataOverview);
                         return dmpDataOverview;
-                    }));
+                    });
             startTime = function.apply(startTime);
         } while ((startTime.getTime() - endTime.getTime()) <= 0);
     }