diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java b/openhis-server/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java index a3b17784..f2756927 100644 --- a/openhis-server/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java +++ b/openhis-server/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java @@ -1,54 +1,54 @@ -package com.core.framework.aspectj; - -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.AfterThrowing; -import org.springframework.stereotype.Component; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.TransactionStatus; -import org.springframework.transaction.support.DefaultTransactionDefinition; - -/** - * 事务处理 - */ -@Aspect -@Component -public class TransactionAspect { - - private final PlatformTransactionManager transactionManager; - private TransactionStatus transactionStatus; - - public TransactionAspect(PlatformTransactionManager transactionManager) { - this.transactionManager = transactionManager; - } - - @Before("@annotation(org.springframework.web.bind.annotation.PostMapping) || " + - "@annotation(org.springframework.web.bind.annotation.GetMapping) || " + - "@annotation(org.springframework.web.bind.annotation.PutMapping) || " + - "@annotation(org.springframework.web.bind.annotation.DeleteMapping)") - public void beginTransaction() { - transactionStatus = transactionManager.getTransaction(new DefaultTransactionDefinition()); - } - - @AfterReturning("@annotation(org.springframework.web.bind.annotation.PostMapping) || " + - "@annotation(org.springframework.web.bind.annotation.GetMapping) || " + - "@annotation(org.springframework.web.bind.annotation.PutMapping) || " + - "@annotation(org.springframework.web.bind.annotation.DeleteMapping)") - public void commitTransaction() { - if (transactionStatus != null && !transactionStatus.isCompleted()) { - transactionManager.commit(transactionStatus); - } - } - - @AfterThrowing(pointcut = "@annotation(org.springframework.web.bind.annotation.PostMapping) || " + - "@annotation(org.springframework.web.bind.annotation.GetMapping) || " + - "@annotation(org.springframework.web.bind.annotation.PutMapping) || " + - "@annotation(org.springframework.web.bind.annotation.DeleteMapping)", - throwing = "ex") - public void rollbackTransaction(Exception ex) { - if (transactionStatus != null && !transactionStatus.isCompleted()) { - transactionManager.rollback(transactionStatus); - } - } -} +// package com.core.framework.aspectj; +// +// import org.aspectj.lang.annotation.Aspect; +// import org.aspectj.lang.annotation.Before; +// import org.aspectj.lang.annotation.AfterReturning; +// import org.aspectj.lang.annotation.AfterThrowing; +// import org.springframework.stereotype.Component; +// import org.springframework.transaction.PlatformTransactionManager; +// import org.springframework.transaction.TransactionStatus; +// import org.springframework.transaction.support.DefaultTransactionDefinition; +// +/// ** +// * 事务处理 +// */ +// @Aspect +// @Component +// public class TransactionAspect { +// +// private final PlatformTransactionManager transactionManager; +// private TransactionStatus transactionStatus; +// +// public TransactionAspect(PlatformTransactionManager transactionManager) { +// this.transactionManager = transactionManager; +// } +// +// @Before("@annotation(org.springframework.web.bind.annotation.PostMapping) || " + +// "@annotation(org.springframework.web.bind.annotation.GetMapping) || " + +// "@annotation(org.springframework.web.bind.annotation.PutMapping) || " + +// "@annotation(org.springframework.web.bind.annotation.DeleteMapping)") +// public void beginTransaction() { +// transactionStatus = transactionManager.getTransaction(new DefaultTransactionDefinition()); +// } +// +// @AfterReturning("@annotation(org.springframework.web.bind.annotation.PostMapping) || " + +// "@annotation(org.springframework.web.bind.annotation.GetMapping) || " + +// "@annotation(org.springframework.web.bind.annotation.PutMapping) || " + +// "@annotation(org.springframework.web.bind.annotation.DeleteMapping)") +// public void commitTransaction() { +// if (transactionStatus != null && !transactionStatus.isCompleted()) { +// transactionManager.commit(transactionStatus); +// } +// } +// +// @AfterThrowing(pointcut = "@annotation(org.springframework.web.bind.annotation.PostMapping) || " + +// "@annotation(org.springframework.web.bind.annotation.GetMapping) || " + +// "@annotation(org.springframework.web.bind.annotation.PutMapping) || " + +// "@annotation(org.springframework.web.bind.annotation.DeleteMapping)", +// throwing = "ex") +// public void rollbackTransaction(Exception ex) { +// if (transactionStatus != null && !transactionStatus.isCompleted()) { +// transactionManager.rollback(transactionStatus); +// } +// } +// }