diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java index f540032..ed990f7 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java @@ -49,6 +49,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.text.DecimalFormat; import java.time.*; @@ -406,7 +407,11 @@ public class WlRecordServiceImpl extends ServiceImpl i return commonQueryParam; }).collect(Collectors.toList()); List deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams); - deviceRtData.get(deviceRtData.size()-1).setValue(null); + //此处设空时为了有多段时将线条断开前端显示 + if(!CollectionUtils.isEmpty(deviceRtData)){ + deviceRtData.get(deviceRtData.size()-1).setValue(null); + + } List collect1 = deviceRtData.stream().map(temp -> { ThdDataVO vo = new ThdDataVO(); vo.setLineId(temp.getLineId());