紧急bug空指针问题

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -29,6 +29,7 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -1011,19 +1012,17 @@ public class TopographyController extends AbstractBaseController {
 
         Map<String, Map<Date, IotDataVO>> iotDataAndDateMap= new HashMap<>();
         finalResContainsWaterLevel.stream().forEach(item -> {
+            if (!CollectionUtils.isEmpty(item.getTimes())) {
                 containsWaterDates.addAll(item.getTimes());
                 Map<Date, IotDataVO> dateDataMap = new HashMap<>();
                 for (int i = 0; i < item.getTimes().size(); i++) {
                     dateDataMap.put(item.getTimes().get(i), item.getIotData().get(i));
                 }
                 iotDataAndDateMap.put(item.getId() + item.getEquipId(), dateDataMap);
+            }
         });
-
-
         List<Date> collect = containsWaterDates.stream().distinct().sorted(Comparator.comparing(t -> t)).collect(Collectors.toList());
 
-
-
         for (IotIndexResVo indexResVo : finalResContainsWaterLevel) {
             IotIndexResVo iotIndexRes = new IotIndexResVo();
             iotIndexRes.setName(indexResVo.getName());
@@ -1115,14 +1114,18 @@ public class TopographyController extends AbstractBaseController {
                 }
             });
 
-
+            if (!CollectionUtils.isEmpty(equipmentSpecifics.stream().filter(equipmentIndex -> !equipmentIndex.getIsTrend()).map(EquipmentIndex::getTypeCode).distinct().collect(Collectors.toList()))) {
                 typeCodeList.addAll(equipmentSpecifics.stream().filter(equipmentIndex -> !equipmentIndex.getIsTrend()).map(EquipmentIndex::getTypeCode).distinct().collect(Collectors.toList()));
+            }
+            if (!CollectionUtils.isEmpty(equipmentSpecifics.stream().filter(equipmentIndex -> !equipmentIndex.getIsTrend()).map(EquipmentIndex::getTypeName).distinct().collect(Collectors.toList()))) {
                 typeNameList.addAll(equipmentSpecifics.stream().filter(equipmentIndex -> !equipmentIndex.getIsTrend()).map(EquipmentIndex::getTypeName).distinct().collect(Collectors.toList()));
-
+            }
+            if (!CollectionUtils.isEmpty(equipmentSpecifics.stream().filter(equipmentIndex -> !equipmentIndex.getIsTrend()).map(t -> {
+                return t.getPerfQuotaDefinitionId() + iotCode;
+            }).distinct().collect(Collectors.toList()))) {
                 indexKeyList.addAll(equipmentSpecifics.stream().filter(equipmentIndex -> !equipmentIndex.getIsTrend()).map(t -> {
                     return t.getPerfQuotaDefinitionId() + iotCode;
-            }).distinct().collect(Collectors.toList()));
-
+                }).distinct().collect(Collectors.toList()));            }
         }
         allKeys = typeCodeList.stream().distinct().collect(Collectors.joining(","));
         names = typeNameList.stream().distinct().collect(Collectors.joining(","));