Commit 52f72b31526959ae25fc2d687eed70bac4599be9

Authored by 云中非
1 parent 1d62d56e

fix: 修改节点信息判断租户是否匹配

... ... @@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
9 9 import org.springframework.transaction.annotation.Transactional;
10 10 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
11 11 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
  12 +import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
12 13 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationDatasourceDTO;
13 14 import org.thingsboard.server.dao.yunteng.entities.ConfigurationDatasource;
14 15 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationDatasourceMapper;
... ... @@ -32,12 +33,13 @@ public class YtConfigurationDatasourceServiceImpl
32 33 @Transactional(rollbackFor = Exception.class)
33 34 public ConfigurationDatasourceDTO saveConfigurationDatasource(ConfigurationDatasourceDTO sourceDTO) {
34 35 LambdaQueryWrapper<ConfigurationDatasource> filter = new QueryWrapper<ConfigurationDatasource>().lambda()
35   - .eq(ConfigurationDatasource::getTenantId,sourceDTO.getTenantId())
36 36 .eq(ConfigurationDatasource::getNodeId, sourceDTO.getNodeId());
37 37 ConfigurationDatasource old = baseMapper.selectOne(filter);
38 38 ConfigurationDatasource newData = sourceDTO.getEntity(ConfigurationDatasource.class);
39 39 if (old == null) {
40 40 baseMapper.insert(newData);
  41 + } else if(!sourceDTO.getTenantId().equals(old.getTenantId())){
  42 + throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());
41 43 } else {
42 44 baseMapper.update(newData, filter);
43 45 }
... ...
... ... @@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
9 9 import org.springframework.transaction.annotation.Transactional;
10 10 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
11 11 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
  12 +import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
12 13 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationEventDTO;
13 14 import org.thingsboard.server.dao.yunteng.entities.ConfigurationDatasource;
14 15 import org.thingsboard.server.dao.yunteng.entities.ConfigurationEvent;
... ... @@ -41,6 +42,8 @@ public class YtConfigurationEventServiceImpl
41 42 ConfigurationEvent newData = eventDTO.getEntity(ConfigurationEvent.class);
42 43 if (old == null) {
43 44 baseMapper.insert(newData);
  45 + } else if(!eventDTO.getTenantId().equals(old.getTenantId())){
  46 + throw new YtDataValidationException(ErrorMessage.HAVE_NO_PERMISSION.getMessage());
44 47 } else {
45 48 baseMapper.update(newData, filter);
46 49 }
... ...