Showing
1 changed file
with
8 additions
and
1 deletions
@@ -10,6 +10,8 @@ import org.thingsboard.server.dao.yunteng.mapper.TriggerMapper; | @@ -10,6 +10,8 @@ import org.thingsboard.server.dao.yunteng.mapper.TriggerMapper; | ||
10 | import org.thingsboard.server.dao.yunteng.service.AbstractBaseService; | 10 | import org.thingsboard.server.dao.yunteng.service.AbstractBaseService; |
11 | import org.thingsboard.server.dao.yunteng.service.TriggerService; | 11 | import org.thingsboard.server.dao.yunteng.service.TriggerService; |
12 | 12 | ||
13 | +import java.util.Optional; | ||
14 | + | ||
13 | /** | 15 | /** |
14 | * @Description | 16 | * @Description |
15 | * @Author cxy | 17 | * @Author cxy |
@@ -26,6 +28,11 @@ public class TriggerServiceImpl extends AbstractBaseService<TriggerMapper, Trigg | @@ -26,6 +28,11 @@ public class TriggerServiceImpl extends AbstractBaseService<TriggerMapper, Trigg | ||
26 | LambdaQueryWrapper filter = new QueryWrapper<Trigger>().lambda() | 28 | LambdaQueryWrapper filter = new QueryWrapper<Trigger>().lambda() |
27 | .eq(Trigger::getSceneLinkageId, sceneId) | 29 | .eq(Trigger::getSceneLinkageId, sceneId) |
28 | .eq(Trigger::getEntityId, deviceId); | 30 | .eq(Trigger::getEntityId, deviceId); |
29 | - return triggerMapper.selectOne(filter).getDTO(TriggerDTO.class); | 31 | + Trigger trigger = triggerMapper.selectOne(filter); |
32 | + if(trigger == null){ | ||
33 | + return null; | ||
34 | + } | ||
35 | + | ||
36 | + return trigger.getDTO(TriggerDTO.class); | ||
30 | } | 37 | } |
31 | } | 38 | } |