fix: 调过不走回调修改

bpm-core/src/main/java/com/srm/bpm/logic/listener/ProcessBillListener.java

@@ -5,6 +5,8 @@ package com.srm.bpm.logic.listener;
 import com.google.common.base.MoreObjects;
 import com.google.common.primitives.Longs;
 
+import com.srm.bpm.infra.entity.ToaBillEntity;
+import com.srm.bpm.infra.service.ToaBillService;
 import com.srm.bpm.logic.service.BillLogic;
 import com.srm.config.SpringContextHolder;
 
@@ -42,9 +44,12 @@ public class ProcessBillListener implements ExecutionListener {
             // 更新审批单为结束
             if (StringUtils.isNotEmpty(businessKey)) {
                 long billId = MoreObjects.firstNonNull(Longs.tryParse(businessKey), 0L);
+                log.debug("ProcessBillListener流程结束回调:{}",billId);
                 if (billId > 0) {
                     final BillLogic billService = SpringContextHolder.getBean(BillLogic.class);
-                    billService.complete(billId, action);
+                    final ToaBillService toaBillService = SpringContextHolder.getBean(ToaBillService.class);
+                    final ToaBillEntity byId = toaBillService.getById(billId);
+                    billService.complete(byId, action);
                 }
             }
         }

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

@@ -3,6 +3,7 @@
 package com.srm.bpm.logic.service;
 
 import com.srm.bpm.infra.entity.BillTaskEntity;
+import com.srm.bpm.infra.entity.ToaBillEntity;
 import com.srm.bpm.infra.po.ProcessDetailPO;
 import com.srm.bpm.logic.context.BillDataContext;
 import com.srm.bpm.logic.dto.BillActionParamDTO;
@@ -166,7 +167,7 @@ public interface BillLogic {
      *
      * @param billId 审批单ID
      */
-    void complete(long billId,String action);
+    void complete(ToaBillEntity byId,String action);
 
     /**
      * 获取某个审批单的审批历史记录

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

@@ -894,34 +894,32 @@ public class BillLogicImpl implements BillLogic {
     /**
      * 结束并设置完成审批单
      *
-     * @param billId 审批单ID
+     * @param bill 审批单ID
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void complete(long billId, String action) {
-        ToaBillEntity bill = new ToaBillEntity();
+    //    @Transactional(rollbackFor = Exception.class)
+    public void complete(ToaBillEntity bill, String action) {
         final int dateline = DateTimeUtil.unixTime();
-        bill.setId(billId);
         bill.setCompletionTime(dateline);
         bill.setStatus(BillStatus.COMPLETE.getStatus());
         bill.setArchivedTime(dateline);
         TimerTask businessTask = new TimerTask() {
             @Override
             public void run() {
-                final ToaBillEntity byId = billService.getById(billId);
                 billService.upldate(bill);
+                log.info("查询到的审批单数据:{}", bill);
                 if (action.equals(BillAction.refuse.name())) {
-                    callBackLogic.callBack(byId.getProcessId(), billId,
+                    callBackLogic.callBack(bill.getProcessId(), bill.getId(),
                             BillTaskStatus.REFUSE.getStatus());
                 } else {
                     BillTaskEntity a = new BillTaskEntity();
-                    a.setBillId(byId.getId());
-                    a.setUserCode(byId.getSender());
+                    a.setBillId(bill.getId());
+                    a.setUserCode(bill.getSender());
                     a.setNodeStatus(BillTaskStatus.COMPLATE.getStatus());
-                    a.setNodeName(byId.getTitle());
+                    a.setNodeName(bill.getTitle());
                     a.setOpinion("通过");
                     flowMsgLogic.sendMsg(Lists.newArrayList(a));
-                    callBackLogic.callBack(byId.getProcessId(), billId,
+                    callBackLogic.callBack(bill.getProcessId(), bill.getId(),
                             BillStatus.COMPLETE.getStatus());
                 }
             }

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

@@ -1,16 +1,10 @@
 
 package com.srm.bpm.logic.service.impl;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.srm.bpm.infra.entity.BillTaskEntity;
 import com.srm.bpm.infra.entity.ProcessNodeExtendEntity;
 import com.srm.bpm.infra.entity.ToaBillEntity;
@@ -23,6 +17,14 @@ import com.srm.bpm.logic.dto.FlowMsgDTO;
 import com.srm.bpm.logic.service.FlowMsgLogic;
 import com.srm.bpm.logic.service.PushMsgLogic;
 
+import org.jetbrains.annotations.NotNull;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -43,6 +45,7 @@ public class FlowMsgLogicImpl implements FlowMsgLogic {
 	private final ProcessNodeExtendService nodeExtendService;
 
 	@Override
+	@Async
 	public void sendMsg(List<BillTaskEntity> billTaskEntities) {
 		if (CollectionUtil.isNotEmpty(billTaskEntities)) {
 			final BillTaskEntity billTaskEntity = billTaskEntities.get(0);

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

@@ -12,14 +12,6 @@
 
 package com.srm.bpm.logic.service.impl;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.srm.bpm.facde.RestTemplateUtil;
@@ -28,6 +20,13 @@ import com.srm.bpm.logic.service.PushMsgLogic;
 import com.srm.common.data.rest.R;
 import com.srm.config.BpmConfig;
 
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -44,9 +43,9 @@ public class PushMsgLogicImpl implements PushMsgLogic {
 		if(!CollectionUtils.isEmpty(allMsg)) {
 			JSONObject data = new JSONObject();
 			data.put("msg", JSON.toJSON(allMsg));
-			log.info("回调返回的数据:{}", allMsg);
+			log.info("消息推送的数据:{}", allMsg);
 			final ResponseEntity<R> post = restTemplateUtil.post(bpmConfig.getPushmsgUrl(), data, "1");
-			log.info("回调返回的数据:{}", post);
+			log.info("消息返回的数据:{}", post);
 		}
 	}
 }

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

@@ -42,7 +42,7 @@ public class CallBackLogicImpl implements CallBackLogic {
         data.put("processId", processId);
         data.put("billId", billId);
         data.put("status", status);
-        log.info("回调返回的数据:{}", data);
+        log.info("回调推送的数据:{}", data);
 
         final ResponseEntity<R> post = restTemplateUtil.post(bpmConfig.getCallbackUrl(), data, "1");
         log.info("回调返回的数据:{}", post);