Commit 4fcdcbb6d96f5703b5e8a017d912fdb63f7097e3

Authored by 云中非
1 parent 39543656

fix(DEFECT-418): 删除组态记录,为同步删除节点信息。

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;
4 5 import lombok.RequiredArgsConstructor;
5 6 import lombok.extern.slf4j.Slf4j;
6 7 import org.springframework.stereotype.Service;
... ... @@ -9,8 +10,14 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
9 10 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
10 11 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
11 12 import org.thingsboard.server.common.data.yunteng.dto.*;
  13 +import org.thingsboard.server.dao.yunteng.entities.ConfigurationAct;
12 14 import org.thingsboard.server.dao.yunteng.entities.ConfigurationContent;
  15 +import org.thingsboard.server.dao.yunteng.entities.ConfigurationDatasource;
  16 +import org.thingsboard.server.dao.yunteng.entities.ConfigurationEvent;
  17 +import org.thingsboard.server.dao.yunteng.mapper.ConfigurationActMapper;
13 18 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationContentMapper;
  19 +import org.thingsboard.server.dao.yunteng.mapper.ConfigurationDatasourceMapper;
  20 +import org.thingsboard.server.dao.yunteng.mapper.ConfigurationEventMapper;
14 21 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
15 22 import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
16 23 import java.util.List;
... ... @@ -22,6 +29,9 @@ import java.util.Set;
22 29 public class YtConfigurationContentServiceImpl
23 30 extends AbstractBaseService<ConfigurationContentMapper, ConfigurationContent>
24 31 implements YtConfigurationContentService {
  32 + private final ConfigurationDatasourceMapper datasourceMapper;
  33 + private final ConfigurationEventMapper eventMapper;
  34 + private final ConfigurationActMapper actMapper;
25 35
26 36 @Override
27 37 @Transactional
... ... @@ -62,6 +72,18 @@ public class YtConfigurationContentServiceImpl
62 72 @Override
63 73 @Transactional
64 74 public boolean deleteConfigurationContentByCenterId(Set<String> configurationCenterIds) {
  75 + LambdaQueryWrapper<ConfigurationDatasource> dataFilter = new QueryWrapper<ConfigurationDatasource>().lambda()
  76 + .in(ConfigurationDatasource::getConfigurationId,configurationCenterIds);
  77 + datasourceMapper.delete(dataFilter);
  78 +
  79 + LambdaQueryWrapper<ConfigurationEvent> eventFilter = new QueryWrapper<ConfigurationEvent>().lambda()
  80 + .in(ConfigurationEvent::getConfigurationId,configurationCenterIds);
  81 + eventMapper.delete(eventFilter);
  82 +
  83 + LambdaQueryWrapper<ConfigurationAct> actFilter = new QueryWrapper<ConfigurationAct>().lambda()
  84 + .in(ConfigurationAct::getConfigurationId,configurationCenterIds);
  85 + actMapper.delete(actFilter);
  86 +
65 87 return baseMapper.delete(
66 88 new LambdaQueryWrapper<ConfigurationContent>()
67 89 .in(ConfigurationContent::getConfigurationId, configurationCenterIds))
... ...