Browse Source

火灾单位筛选出不为空的数据再调用高德api

yq 3 years ago
parent
commit
1ee0c2be1a

+ 4 - 1
mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireStatisticsServiceImpl.java

@@ -79,7 +79,10 @@ public class FireStatisticsServiceImpl implements FireStatisticsService {
                 .stream()
                 .map(this::enhanceFireStatisticsPo).collect(Collectors.toList());
         //筛选出精度和维度是空的数据
-        List<FireStatisticsPO> isNullData = list.stream().filter(fireStatisticsPo -> 0.00 == fireStatisticsPo.getLatitude()).collect(Collectors.toList());
+        List<FireStatisticsPO> isNullData = list.stream()
+                .filter(fireStatisticsPo -> 0.00 == fireStatisticsPo.getLatitude())
+                .filter(fireStatisticsPo -> StringUtils.isNotBlank(fireStatisticsPo.getAddress()))
+                .collect(Collectors.toList());
         List<List<FireStatisticsPO>> subSets = Lists.partition(isNullData, 10);
         for (List<FireStatisticsPO> listLimit:subSets) {
             String addressList = listLimit.stream().map(FireStatisticsPO::getAddress).collect(Collectors.joining("|"));

+ 4 - 1
mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/UnitServiceImpl.java

@@ -56,7 +56,10 @@ public class UnitServiceImpl implements UnitService {
         page = unitMapper.page(page);
         List<UnitPO> list = page.getRecords().stream().map(this::enhanceUnitPo).collect(Collectors.toList());
         //筛选出精度和维度是空的数据
-        List<UnitPO> isNullData = list.stream().filter(unitPo -> 0.00 == unitPo.getLatitude()).collect(Collectors.toList());
+        List<UnitPO> isNullData = list.stream()
+                .filter(unitPo -> 0.00 == unitPo.getLatitude())
+                .filter(unitPo -> StringUtils.isNotBlank(unitPo.getAddress()))
+                .collect(Collectors.toList());
         List<List<UnitPO>> subSets = Lists.partition(isNullData, 10);
         for (List<UnitPO> listLimit:subSets) {
             String addressList = listLimit.stream().map(UnitPO::getAddress).collect(Collectors.joining("|"));