From 5c2e09dff916aa5957a4824bba7710c42df38123 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期五, 07 一月 2022 15:31:38 +0800
Subject: [PATCH] 路灯任务接口修改
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index 4a752bd..bc8b7a7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -40,6 +40,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -289,8 +290,9 @@
if(CollectionUtil.isEmpty(poleIdList)){
return null;
}
- return list(Wrappers.lambdaQuery(Pole.class).in(Pole::getId, poleIdList).select(Pole::getDeviceCode))
- .stream().map(Pole::getDeviceCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
+ List<Pole> list = list(Wrappers.lambdaQuery(Pole.class).in(Pole::getId, poleIdList).select(Pole::getDeviceCode));
+ return list
+ .stream().filter(Objects::nonNull).map(Pole::getDeviceCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
}
/**
--
Gitblit v1.9.3