Showing
1 changed file
with
4 additions
and
10 deletions
| @@ -20,10 +20,7 @@ import org.thingsboard.server.dao.yunteng.mapper.TkDeviceCagegoryMapper; | @@ -20,10 +20,7 @@ import org.thingsboard.server.dao.yunteng.mapper.TkDeviceCagegoryMapper; | ||
| 20 | import org.thingsboard.server.dao.yunteng.service.AbstractBaseService; | 20 | import org.thingsboard.server.dao.yunteng.service.AbstractBaseService; |
| 21 | import org.thingsboard.server.dao.yunteng.service.TkDeviceCagegoryService; | 21 | import org.thingsboard.server.dao.yunteng.service.TkDeviceCagegoryService; |
| 22 | 22 | ||
| 23 | -import java.util.ArrayList; | ||
| 24 | -import java.util.List; | ||
| 25 | -import java.util.Map; | ||
| 26 | -import java.util.Optional; | 23 | +import java.util.*; |
| 27 | import java.util.stream.Collectors; | 24 | import java.util.stream.Collectors; |
| 28 | 25 | ||
| 29 | @Service | 26 | @Service |
| @@ -46,13 +43,10 @@ public class TkDeviceCagegoryServiceImpl extends AbstractBaseService<TkDeviceCag | @@ -46,13 +43,10 @@ public class TkDeviceCagegoryServiceImpl extends AbstractBaseService<TkDeviceCag | ||
| 46 | TkDeviceCagegoryEntity entity = new TkDeviceCagegoryEntity(); | 43 | TkDeviceCagegoryEntity entity = new TkDeviceCagegoryEntity(); |
| 47 | if (StringUtils.isBlank(tkDeviceCagegoryDTO.getId())) { | 44 | if (StringUtils.isBlank(tkDeviceCagegoryDTO.getId())) { |
| 48 | tkDeviceCagegoryDTO.copyToEntity(entity); | 45 | tkDeviceCagegoryDTO.copyToEntity(entity); |
| 46 | + String id = UUID.randomUUID().toString(); | ||
| 47 | + entity.setId(id); | ||
| 48 | + entity.setPathId(parentDto.getPathId() + "_" + id); | ||
| 49 | baseMapper.insert(entity); | 49 | baseMapper.insert(entity); |
| 50 | - String id = entity.getId(); | ||
| 51 | - tkDeviceCagegoryDTO.setPathId(parentDto.getPathId() + "_" + tkDeviceCagegoryDTO.getId()); | ||
| 52 | - LambdaQueryWrapper<TkDeviceCagegoryEntity> filter = new QueryWrapper<TkDeviceCagegoryEntity>().lambda() | ||
| 53 | - .eq(TkDeviceCagegoryEntity::getId, tkDeviceCagegoryDTO.getId()); | ||
| 54 | - entity = tkDeviceCagegoryDTO.getEntity(TkDeviceCagegoryEntity.class); | ||
| 55 | - baseMapper.update(entity, filter); | ||
| 56 | 50 | ||
| 57 | } else { | 51 | } else { |
| 58 | tkDeviceCagegoryDTO.setPathId(parentDto.getPathId() + "_" + tkDeviceCagegoryDTO.getId()); | 52 | tkDeviceCagegoryDTO.setPathId(parentDto.getPathId() + "_" + tkDeviceCagegoryDTO.getId()); |