1
|
1
|
package org.thingsboard.server.dao.yunteng.impl;
|
|
2
|
+
|
2
|
3
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
3
|
4
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
4
|
5
|
import lombok.RequiredArgsConstructor;
|
5
|
6
|
import lombok.extern.slf4j.Slf4j;
|
6
|
7
|
import org.springframework.stereotype.Service;
|
7
|
8
|
import org.springframework.transaction.annotation.Transactional;
|
|
9
|
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
|
8
|
10
|
import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
|
9
|
11
|
import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
|
10
|
12
|
import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
|
...
|
...
|
@@ -48,7 +50,7 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi |
48
|
50
|
|
49
|
51
|
@Override
|
50
|
52
|
@Transactional
|
51
|
|
- public SysDictDTO saveSysDict(SysDictDTO sysDictDTO,String tenantId) {
|
|
53
|
+ public SysDictDTO saveSysDict(SysDictDTO sysDictDTO, String tenantId) {
|
52
|
54
|
// 新增之前先判断该租户是否已添加
|
53
|
55
|
SysDictDTO querySysDict = baseMapper.getDictInfoByCode(tenantId, sysDictDTO.getDictCode());
|
54
|
56
|
if (querySysDict != null) {
|
...
|
...
|
@@ -66,11 +68,9 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi |
66
|
68
|
@Transactional
|
67
|
69
|
public boolean deleteSysDict(Set<String> sysDictIds) {
|
68
|
70
|
for (String id : sysDictIds) {
|
69
|
|
- List<SysDictItemDTO> sysDictItemDTO =
|
70
|
|
- sysDictItemMapper.getDictItemInfo(id,null);
|
71
|
|
- if (sysDictItemDTO != null) {
|
72
|
|
- throw new YtDataValidationException(
|
73
|
|
- "There is a relationship between superiors and subordinates");
|
|
71
|
+ List<SysDictItemDTO> sysDictItemDTO = sysDictItemMapper.getDictItemInfo(id, null);
|
|
72
|
+ if (sysDictItemDTO != null && sysDictItemDTO.size() > FastIotConstants.MagicNumber.ZERO) {
|
|
73
|
+ throw new YtDataValidationException(ErrorMessage.EXIST_LEADER_MEMBER_RELATION.getMessage());
|
74
|
74
|
}
|
75
|
75
|
}
|
76
|
76
|
return baseMapper.deleteBatchIds(sysDictIds) > 0;
|
...
|
...
|
@@ -78,7 +78,7 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi |
78
|
78
|
|
79
|
79
|
@Override
|
80
|
80
|
@Transactional
|
81
|
|
- public SysDictDTO updateSysDict(SysDictDTO sysDictDTO,String tenantId) {
|
|
81
|
+ public SysDictDTO updateSysDict(SysDictDTO sysDictDTO, String tenantId) {
|
82
|
82
|
SysDict sysDict = baseMapper.selectById(sysDictDTO.getId());
|
83
|
83
|
sysDictDTO.copyToEntity(sysDict);
|
84
|
84
|
sysDict.setTenantId(tenantId);
|
...
|
...
|
|