Merge branch 'feature-tds-v1.0.0' into 'develop'
可信空间连接器入住接口 See merge request !16
Showing
1 changed file
with
5 additions
and
4 deletions
| ... | @@ -26,6 +26,7 @@ import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity; | ... | @@ -26,6 +26,7 @@ import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity; |
| 26 | import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorIdentityService; | 26 | import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorIdentityService; |
| 27 | import com.csbr.qingcloud.portal.service.TdsConnectorIdentityService; | 27 | import com.csbr.qingcloud.portal.service.TdsConnectorIdentityService; |
| 28 | import csbr.cloud.entity.enums.ApprovalStateEnum; | 28 | import csbr.cloud.entity.enums.ApprovalStateEnum; |
| 29 | import io.seata.spring.annotation.GlobalTransactional; | ||
| 29 | import jakarta.annotation.Resource; | 30 | import jakarta.annotation.Resource; |
| 30 | import lombok.extern.slf4j.Slf4j; | 31 | import lombok.extern.slf4j.Slf4j; |
| 31 | import org.apache.commons.collections.CollectionUtils; | 32 | import org.apache.commons.collections.CollectionUtils; |
| ... | @@ -144,8 +145,8 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements | ... | @@ -144,8 +145,8 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements |
| 144 | * @param flowBaseVO | 145 | * @param flowBaseVO |
| 145 | * @return boolean | 146 | * @return boolean |
| 146 | */ | 147 | */ |
| 147 | // @GlobalTransactional(rollbackFor = Exception.class) | 148 | @GlobalTransactional(rollbackFor = Exception.class) |
| 148 | @Transactional(rollbackFor = Exception.class) | 149 | // @Transactional(rollbackFor = Exception.class) |
| 149 | @Override | 150 | @Override |
| 150 | public void saveTdsConnectorIdentity(FlowRQBaseVO flowBaseVO) { | 151 | public void saveTdsConnectorIdentity(FlowRQBaseVO flowBaseVO) { |
| 151 | TdsConnectorIdentityRQVO rqVO = (TdsConnectorIdentityRQVO) flowBaseVO; | 152 | TdsConnectorIdentityRQVO rqVO = (TdsConnectorIdentityRQVO) flowBaseVO; |
| ... | @@ -199,7 +200,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements | ... | @@ -199,7 +200,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements |
| 199 | * @param flowBaseVO | 200 | * @param flowBaseVO |
| 200 | * @return boolean | 201 | * @return boolean |
| 201 | */ | 202 | */ |
| 202 | @Transactional(rollbackFor = Exception.class) | 203 | @GlobalTransactional(rollbackFor = Exception.class) |
| 203 | @Override | 204 | @Override |
| 204 | public void updateTdsConnectorIdentity(FlowRQBaseVO flowBaseVO) { | 205 | public void updateTdsConnectorIdentity(FlowRQBaseVO flowBaseVO) { |
| 205 | // 将修改前数据查出来缓存下来,传入到修改后方法中,用于一些特殊逻辑处理,如某个值变化才进行 | 206 | // 将修改前数据查出来缓存下来,传入到修改后方法中,用于一些特殊逻辑处理,如某个值变化才进行 |
| ... | @@ -435,7 +436,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements | ... | @@ -435,7 +436,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements |
| 435 | } | 436 | } |
| 436 | 437 | ||
| 437 | @Override | 438 | @Override |
| 438 | @Transactional | 439 | @GlobalTransactional |
| 439 | public void changeSaveTdsConnectorIdentity(FlowRQBaseVO flowBaseVO) { | 440 | public void changeSaveTdsConnectorIdentity(FlowRQBaseVO flowBaseVO) { |
| 440 | TdsConnectorIdentityRQVO rqVO = (TdsConnectorIdentityRQVO) flowBaseVO; | 441 | TdsConnectorIdentityRQVO rqVO = (TdsConnectorIdentityRQVO) flowBaseVO; |
| 441 | MfTdsConnectorIdentity oldTdsConnectorIdentity = beforeChangeSaveTdsConnectorIdentity(rqVO); | 442 | MfTdsConnectorIdentity oldTdsConnectorIdentity = beforeChangeSaveTdsConnectorIdentity(rqVO); | ... | ... |
-
Please register or sign in to post a comment