Commit 7874850f7260dc32202e0551ed405a3f698d43fd
Committed by
xp.Huang
1 parent
50337500
fix: 场景联动命令下发兼容问题。
(cherry picked from commit 3baceeb6)
Showing
1 changed file
with
5 additions
and
6 deletions
1 | 1 | package org.thingsboard.server.dao.yunteng.impl; |
2 | 2 | |
3 | 3 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
4 | -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |
5 | 4 | import lombok.RequiredArgsConstructor; |
6 | 5 | import org.springframework.stereotype.Service; |
7 | 6 | import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO; |
8 | 7 | import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum; |
9 | 8 | import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum; |
9 | +import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity; | |
10 | 10 | import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity; |
11 | 11 | import org.thingsboard.server.dao.yunteng.entities.TkDoActionEntity; |
12 | -import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity; | |
13 | 12 | import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper; |
14 | 13 | import org.thingsboard.server.dao.yunteng.mapper.DoActionMapper; |
15 | 14 | import org.thingsboard.server.dao.yunteng.service.AbstractBaseService; |
... | ... | @@ -43,11 +42,11 @@ public class TkDoActionServiceImpl extends AbstractBaseService<DoActionMapper, T |
43 | 42 | List<TkDeviceEntity> partDevices = deviceMapper.selectList(new LambdaQueryWrapper<TkDeviceEntity>().in(TkDeviceEntity::getTbDeviceId,t.getDeviceId())); |
44 | 43 | List<String> deviceId = new ArrayList<>(); |
45 | 44 | for(TkDeviceEntity item : partDevices){ |
46 | - if(!DeviceTypeEnum.SENSOR.equals(item.getDeviceType())){ | |
47 | - //网关子设备才需要重写deviceId字段 | |
48 | - break; | |
45 | + if(DeviceTypeEnum.SENSOR.equals(item.getDeviceType())){ | |
46 | + deviceId.add(item.getGatewayId()); | |
47 | + }else{ | |
48 | + deviceId.add(item.getTbDeviceId()); | |
49 | 49 | } |
50 | - deviceId.add(item.getGatewayId()); | |
51 | 50 | } |
52 | 51 | t.setDeviceId(deviceId); |
53 | 52 | return t; | ... | ... |