水池液位趋势修改

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

@@ -1004,7 +1004,7 @@ public class TopographyController extends AbstractBaseController {
             }
         });
         List<Date> collect = containsWaterDates.stream().distinct().sorted(Comparator.comparing(t -> t)).collect(Collectors.toList());
-        IotIndexResVo iotIndexRes = new IotIndexResVo();
+        IotIndexResVo iotIndexRes = null;
         Map<String, List<IotDataVO>> map = new HashMap<>();
         for (IotIndexResVo indexResVo : finalResContainsWaterLevel) {
             iotIndexRes.setName(indexResVo.getName());
@@ -1073,8 +1073,12 @@ public class TopographyController extends AbstractBaseController {
             }
             j++;
         }
-        iotIndexRes.setIotData(list);
-        resultResContainsWater.add(iotIndexRes);
+        if (!CollectionUtils.isEmpty(list)) {
+            iotIndexRes.setIotData(list);
+        }
+        if (!ObjectUtils.isEmpty(iotIndexRes)) {
+            resultResContainsWater.add(iotIndexRes);
+        }
         resultMap.put("noMergeList", finalRes);
         resultMap.put("mergeList", resultResContainsWater);
         return CommonResponseUtil.success(resultMap);