Merge branch 'master' of http://code.jing-tong.com:3000/jie.zhang/srm-bpm-service

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

@@ -0,0 +1,24 @@
+
+package com.srm.bpm.logic.service;
+
+import java.util.List;
+
+import com.srm.bpm.logic.dto.FlowMsgDTO;
+
+/**
+ * <p>
+ * </p>
+ *
+ * @author BOGON
+ * @version 1.0
+ * @since JDK 1.8
+ */
+public interface PushMsgLogic {
+	/**
+	 * 推送消息
+	 * 
+	 * @param allMsg
+	 */
+
+	void push(List<FlowMsgDTO> allMsg);
+}

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

@@ -677,6 +677,7 @@ public class BillLogicImpl implements BillLogic {
                 taskOpt = billBpmnLogic.findTaskBybillAndEmployeeAndTaskId(billId, taskId, userCode);
                 if (taskOpt.isPresent()) {
                     BillTaskEntity billTask = taskOpt.get();
+                    billTask.setOpinion(opinion);
                     final int nodeStatus = billTask.getNodeStatus();
                     BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
                     final Integer taskType = billTask.getTaskType();

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

@@ -13,6 +13,7 @@ import com.srm.bpm.logic.constant.BillTaskType;
 import com.srm.bpm.logic.constant.StringPool;
 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.stereotype.Service;
@@ -37,6 +38,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class FlowMsgLogicImpl implements FlowMsgLogic {
     private final ToaBillService billService;
+    private final PushMsgLogic pushMsgLogic;
 
     @Override
     public void sendMsg(List<BillTaskEntity> billTaskEntities) {
@@ -73,6 +75,8 @@ public class FlowMsgLogicImpl implements FlowMsgLogic {
                     allMsg.addAll(flowMsgDTOS);
                 }
                 log.debug("推送的消息是:{}", allMsg);
+//                TODO 注释消息
+//                pushMsgLogic.push(allMsg);
             }
         }
     }

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

@@ -0,0 +1,47 @@
+/*
+ * The Hefei JingTong RDC(Research and Development Centre) Group.
+ * __________________
+ *
+ *    Copyright 2015-2021
+ *    All Rights Reserved.
+ *
+ *    NOTICE:  All information contained herein is, and remains
+ *    the property of JingTong Company and its suppliers,
+ *    if any.
+ */
+
+package com.srm.bpm.logic.service.impl;
+
+import java.util.List;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.srm.bpm.facde.RestTemplateUtil;
+import com.srm.bpm.logic.dto.FlowMsgDTO;
+import com.srm.bpm.logic.service.PushMsgLogic;
+import com.srm.common.data.rest.R;
+import com.srm.config.BpmConfig;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class PushMsgLogicImpl implements PushMsgLogic {
+    private final RestTemplateUtil restTemplateUtil;
+    private final BpmConfig bpmConfig;
+
+	@Override
+	public void push(List<FlowMsgDTO> allMsg) {
+		JSONObject data = new JSONObject();
+		data.put("msg", JSON.toJSON(allMsg));
+		log.info("回调返回的数据:{}", allMsg);
+		final ResponseEntity<R> post = restTemplateUtil.post(bpmConfig.getPushmsgUrl(), data, "1");
+		log.info("回调返回的数据:{}", post);
+	}
+}
+

bpm-core/src/main/java/com/srm/config/BpmConfig.java

@@ -29,4 +29,6 @@ public class BpmConfig {
     private Integer type;
 
     private String callbackUrl;
+    
+    private String pushmsgUrl;
 }

bpm-server/src/main/resources/application-dev.yml

@@ -4,6 +4,7 @@ bpm:
   target-url: http://127.0.0.1:8778
   type: 1
   callback-url: http://127.0.0.1:8778/bill/rest/callback
+  pushmsg-url: http://127.0.0.1:8778/bill/rest/pushmsg
 spring:
   jackson:
     time-zone: GMT+8

bpm-server/src/main/resources/application-prod.yml

@@ -4,6 +4,7 @@ bpm:
   target-url: http://127.0.0.1:9888
   type: 1
   callback-url: http://127.0.0.1:9888/bill/rest/callback
+  pushmsg-url: http://127.0.0.1:9888/bill/rest/pushmsg
 spring:
   jackson:
     time-zone: GMT+8

bpm-server/src/main/resources/application-test.yml

@@ -4,6 +4,7 @@ bpm:
   target-url: http://218.92.35.106:9888
   type: 1
   callback-url: http://192.168.23.165:9888/bill/rest/callback
+  pushmsg-url: http://192.168.23.165:9888/bill/rest/pushmsg
 spring:
   jackson:
     time-zone: GMT+8