转办

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/BillLogicImpl.java

@@ -114,6 +114,8 @@ import org.apache.commons.codec.binary.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -134,15 +136,11 @@ import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.support.TransactionSynchronizationAdapter;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.transaction.support.TransactionTemplate;
 
-import static com.srm.bpm.logic.error.BillCode.APPROVAL_STATUS_ERROR;
-import static com.srm.bpm.logic.error.BillCode.BILL_CANCEL_ONAGREE;
-import static com.srm.bpm.logic.error.BillCode.BILL_HAS_COMPLETE;
-import static com.srm.bpm.logic.error.BillCode.BILL_NOT_IN_DRAFTS;
-import static com.srm.bpm.logic.error.BillCode.Bill_APPROVAL_IN;
-import static com.srm.bpm.logic.error.BillCode.ENDORSE_CANNOT_IN_NODE;
-import static com.srm.bpm.logic.error.BillCode.TARGET_TASK_NULL;
-import static com.srm.bpm.logic.error.BillCode.TURN_CANNOT_IN_NODE;
+import static com.srm.bpm.logic.error.BillCode.*;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 
 /**
@@ -185,6 +183,7 @@ public class BillLogicImpl implements BillLogic {
     private final BillBasicConvert billBasicConvert;
     private final ProcessTypeService processTypeService;
     private final ProcessBasicConvert processBasicConvert;
+    private PlatformTransactionManager transactionManager;
 
     /**
      * 创建审批单
@@ -898,13 +897,15 @@ public class BillLogicImpl implements BillLogic {
      *
      * @param bill 审批单ID
      */
-    @Override
-    //    @Transactional(rollbackFor = Exception.class)
+    /*@Override
+    @Transactional(rollbackFor = Exception.class)
     public void complete(ToaBillEntity bill, String action) {
         final int dateline = DateTimeUtil.unixTime();
         bill.setCompletionTime(dateline);
         bill.setStatus(BillStatus.COMPLETE.getStatus());
         bill.setArchivedTime(dateline);
+
+
         TimerTask businessTask = new TimerTask() {
             @Override
             public void run() {
@@ -926,7 +927,113 @@ public class BillLogicImpl implements BillLogic {
                 }
             }
         };
+
         CallBackThreadPoolManager.me().executeLog(businessTask);
+
+
+        *//*try {
+            log.info("查询到的审批单数据:{}", bill);
+            billService.upldate(bill);
+            
+            if (action.equals(BillAction.refuse.name())) {
+                callBackLogic.callBack(bill.getProcessId(), bill.getId(), BillTaskStatus.REFUSE.getStatus());
+            } else {
+                BillTaskEntity a = new BillTaskEntity();
+                a.setBillId(bill.getId());
+                a.setUserCode(bill.getSender());
+                a.setNodeStatus(BillTaskStatus.COMPLATE.getStatus());
+                a.setNodeName(bill.getTitle());
+                a.setOpinion("通过");
+                flowMsgLogic.sendMsg(Lists.newArrayList(a));
+                callBackLogic.callBack(bill.getProcessId(), bill.getId(), BillTaskStatus.COMPLATE.getStatus());
+            }
+        } catch (Exception e) {
+            log.error("流程完成失败: billId={}, action={}, error={}", 
+                      bill.getId(), action, e.getMessage(), e);
+            throw new RbException("流程完成失败：" + e.getMessage());
+        }*//*
+
+    }*/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void complete(ToaBillEntity bill, String action) {
+        final int dateline = DateTimeUtil.unixTime();
+        bill.setCompletionTime(dateline);
+        bill.setStatus(BillStatus.COMPLETE.getStatus());
+        bill.setArchivedTime(dateline);
+
+        // 准备数据（避免闭包问题）
+        final Long processId = bill.getProcessId();
+        final Long billId = bill.getId();
+        final String sender = bill.getSender();
+        final String title = bill.getTitle();
+
+        // 使用事务同步器：在事务提交后执行异步任务
+        TransactionSynchronizationManager.registerSynchronization(
+                new TransactionSynchronizationAdapter() {
+                    @Override
+                    public void afterCommit() {
+                        // 事务提交成功后，在异步线程中开启新事务
+                        TimerTask businessTask = new TimerTask() {
+                            @Override
+                            public void run() {
+                                // 在异步线程中使用编程式事务
+                                TransactionTemplate transactionTemplate =
+                                        new TransactionTemplate(transactionManager);
+                                transactionTemplate.setPropagationBehavior(
+                                        TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+                                transactionTemplate.setIsolationLevel(
+                                        TransactionDefinition.ISOLATION_READ_COMMITTED);
+                                transactionTemplate.setTimeout(30); // 30秒超时
+
+                                transactionTemplate.execute(status -> {
+                                    try {
+                                        // 重新查询最新的bill数据（避免脏数据）
+                                        ToaBillEntity latestBill = billService.getById(billId);
+                                        if (latestBill == null) {
+                                            log.error("审批单不存在: billId={}", billId);
+                                            return null;
+                                        }
+
+                                        // 在事务中更新数据库
+                                        latestBill.setCompletionTime(dateline);
+                                        latestBill.setStatus(BillStatus.COMPLETE.getStatus());
+                                        latestBill.setArchivedTime(dateline);
+                                        billService.upldate(latestBill);
+
+                                        log.info("查询到的审批单数据:{}", latestBill);
+
+                                        // 在事务中执行回调
+                                        if (action.equals(BillAction.refuse.name())) {
+                                            callBackLogic.callBack(processId, billId,
+                                                    BillTaskStatus.REFUSE.getStatus());
+                                        } else {
+                                            BillTaskEntity a = new BillTaskEntity();
+                                            a.setBillId(billId);
+                                            a.setUserCode(sender);
+                                            a.setNodeStatus(BillTaskStatus.COMPLATE.getStatus());
+                                            a.setNodeName(title);
+                                            a.setOpinion("通过");
+                                            flowMsgLogic.sendMsg(Lists.newArrayList(a));
+                                            callBackLogic.callBack(processId, billId,
+                                                    BillStatus.COMPLETE.getStatus());
+                                        }
+
+                                        return null;
+                                    } catch (Exception e) {
+                                        log.error("异步任务执行失败: billId={}, error={}",
+                                                billId, e.getMessage(), e);
+                                        // 抛出异常触发事务回滚
+                                        throw new RuntimeException("异步任务执行失败", e);
+                                    }
+                                });
+                            }
+                        };
+
+                        CallBackThreadPoolManager.me().executeLog(businessTask);
+                    }
+                }
+        );
     }
 
     /**

bpm-server/src/main/java/com/srm/bpmserver/logic/impl/CallBackLogicImpl.java

@@ -8,6 +8,7 @@ import com.srm.bpm.logic.service.CallBackLogic;
 import com.srm.config.BpmConfig;
 import com.srm.common.data.rest.R;
 
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
@@ -46,5 +47,12 @@ public class CallBackLogicImpl implements CallBackLogic {
 
         final ResponseEntity<R> post = restTemplateUtil.post(bpmConfig.getCallbackUrl(), data, "1");
         log.info("回调返回的数据:{}", post);
+
+        HttpStatus statusCode = post.getStatusCode();
+        //如果是500报错
+        if(statusCode !=null && statusCode.compareTo(HttpStatus.INTERNAL_SERVER_ERROR)==0){
+            throw new RuntimeException("回调返回数据异常");
+        }
+
     }
 }