diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java index 8eee2943..c9d27339 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataObjectServiceImpl.java @@ -43,6 +43,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; import javax.annotation.Resource; @@ -69,6 +70,7 @@ public class DataObjectServiceImpl implements DataObjectService { private TransactionTemplate transactionTemplate; @Override + @Transactional(rollbackFor = Exception.class) public Long createDataObject(CreateDataObjectReq req) { // 校验 // objectName、objectCode不能重复 @@ -173,6 +175,7 @@ public class DataObjectServiceImpl implements DataObjectService { } @Override + @Transactional(rollbackFor = Exception.class) public void editDataObject(EditDataObjectReq req) { // 对象属性名和code不能重复 checkObjectAttrNameOrCodeUnique(req.getAttrs()); @@ -242,6 +245,7 @@ public class DataObjectServiceImpl implements DataObjectService { } @Override + @Transactional(rollbackFor = Exception.class) public void deleteDataObject(Long dataObjectId, Long updateBy) { List idList = Collections.singletonList(dataObjectId); transactionTemplate.executeWithoutResult(status -> { diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataResourceServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataResourceServiceImpl.java index 0273bd77..e7ceeb53 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataResourceServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/DataResourceServiceImpl.java @@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Objects; @@ -48,6 +49,7 @@ public class DataResourceServiceImpl implements DataResourceService { private final SaasFeatureDao saasFeatureDao; private final SaasFeatureDataResourceDao saasFeatureDataResourceDao; @Override + @Transactional(rollbackFor = Exception.class) public void create(CreateDataResourceParam param) { DataResource existDataResource = dataResourceDao.lambdaQuery() .eq(DataResource::getResourceCode, param.getResourceCode()) @@ -72,6 +74,7 @@ public class DataResourceServiceImpl implements DataResourceService { } @Override + @Transactional(rollbackFor = Exception.class) public boolean delete(DeleteDataResourceParam param) { DataResource dataResource = dataResourceDao.getById(param.getId()); if (Objects.nonNull(dataResource)) { @@ -109,6 +112,7 @@ public class DataResourceServiceImpl implements DataResourceService { } @Override + @Transactional(rollbackFor = Exception.class) public boolean update(UpdateDataResourceParam param) { DataResource dataResource = new DataResource(); BeanUtils.copyProperties(param, dataResource); @@ -116,6 +120,7 @@ public class DataResourceServiceImpl implements DataResourceService { } @Override + @Transactional(rollbackFor = Exception.class) public void createDataResourceSaasFeature(DataResourceSaasFeatureParam param) { DataResource existDataResource = dataResourceDao.lambdaQuery() .eq(DataResource::getResourceCode, param.getResourceCode()) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/FeatureResourceSyncServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/FeatureResourceSyncServiceImpl.java index 41a24b09..a6da2b19 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/FeatureResourceSyncServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/FeatureResourceSyncServiceImpl.java @@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Collections; import java.util.List; @@ -75,6 +76,7 @@ public class FeatureResourceSyncServiceImpl implements FeatureResourceSyncServic } @Override + @Transactional(rollbackFor = Exception.class) public void syncFromBase(ResourceSyncReq req) { if (req.getIds().size() > 1) { //超过一个异步处理 diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java index 51feb1b6..f51c9716 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java @@ -314,6 +314,7 @@ public class PermissionPointServiceImpl implements PermissionPointService { } @Override + @Transactional(rollbackFor = Exception.class) public PermissionPointDTO save(PermissionPointDTO dto) { if (dto.getId() == null) { return doInsert(dto); @@ -431,6 +432,7 @@ public class PermissionPointServiceImpl implements PermissionPointService { @Override + @Transactional(rollbackFor = Exception.class) public void move(PermissionPointMoveRequest request) { SaasFeature feature = getAndCheck(request.getPermissionId()); changeParent(feature, request); diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java index 5fb9196a..003d502c 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java @@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.bouncycastle.util.Integers; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -92,6 +93,7 @@ public class ProductServiceImpl implements ProductService { } @Override + @Transactional(rollbackFor = Exception.class) public ApiResult add(ProductAddReq req) { Optional optProduct = productModuleDao.lambdaQuery() .eq(ProductModule::getProductName, req.getProductName()) @@ -108,6 +110,7 @@ public class ProductServiceImpl implements ProductService { } @Override + @Transactional(rollbackFor = Exception.class) public ApiResult update(ProductUpdateReq req) { Optional optProduct = productModuleDao.lambdaQuery() .eq(ProductModule::getProductName, req.getProductName()) @@ -125,6 +128,7 @@ public class ProductServiceImpl implements ProductService { } @Override + @Transactional(rollbackFor = Exception.class) public ApiResult delete(Long id) { ProductModule productModule = productModuleDao.getById(id); AssertUtil.isTrue(Objects.nonNull(productModule), "产品不存在"); diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java index 3853fb91..4d2bec03 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java @@ -351,12 +351,14 @@ public class RoleUserService implements SaasRoleUserService { } @Override + @Transactional(rollbackFor = Exception.class) public void removeWorkspaceOuAllUserRole(Long workspaceId, Long ouId) { saasRoleDao.removeWorkspaceOuAllRole(workspaceId, ouId); roleUserRelationDao.removeWorkspaceOuAllUserRole(workspaceId, ouId); } @Override + @Transactional(rollbackFor = Exception.class) public void grantOrUngrantWorkerLeader(GantOrUnGantaWorkerLeaderRoleReq req) { Boolean grant = req.getGrant(); // 授权 diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java index d99c244b..192e223f 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasBasicDictServiceImpl.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; @@ -103,6 +104,7 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService { * @return */ @Override + @Transactional(rollbackFor = Exception.class) public Long create(BasicDictCreateReq req) { SaasBasicDict parent = saasBasicDictDao.getById(req.getParentId()); if (Objects.isNull(parent)) { @@ -145,6 +147,7 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService { } @Override + @Transactional(rollbackFor = Exception.class) public Boolean update(BasicDictUpdateReq req) { BasicDictNodeResp currentNode = getById(req.getId()); if (Objects.isNull(currentNode)) { @@ -166,6 +169,7 @@ public class SaasBasicDictServiceImpl implements SaasBasicDictService { } @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateStauts(BasicDictUpdateStatusReq req) { return saasBasicDictDao.updateStatus(req); } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java index 0e0e7fb9..a52f3449 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java @@ -220,6 +220,7 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic } @Override + @Transactional(rollbackFor = Exception.class) @CacheEvict(value = SaasFeatureResourceCacheService.CACHE_FEATURE_RESOURCE_TREE,allEntries = true) public void updateFeatureAuthType(Long featureId, Integer authType) { if (featureId != null && authType != null) { diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java index 921b37f2..cffa57b4 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java @@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Arrays; @@ -104,6 +105,7 @@ public class SaasRoleGroupServiceImpl extends ServiceImpl ids) { if (CollectionUtils.isEmpty(ids)) { return;