From da6e56af8be75176f902053383b06d03c5d50791 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Wed, 26 Jun 2024 11:46:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=BF=97?=
 =?UTF-8?q?=E9=82=A6=E8=8A=82=E7=82=B9=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zbom/mq/ZbomNodeDataPushListener.java     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java
index b01aa148f..ad1680c2b 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/mq/ZbomNodeDataPushListener.java
@@ -131,7 +131,7 @@ public class ZbomNodeDataPushListener {
 							.eq(ZbFactoryNodePushEntity::getDepartCode, value.getDepartCode())
 						);
 						// 已经推送过了就不再推了
-						if(CollUtil.isNotEmpty(list)){
+						if (CollUtil.isNotEmpty(list)) {
 							return;
 						}
 					}
@@ -156,10 +156,11 @@ public class ZbomNodeDataPushListener {
 			Map<String, SendMsg> sendMsgMap = new HashMap<>();
 			// 构建提交参数
 			buildParam(entries, node, workNodeEnums, orders, noSignNumberMap, nodeOrderMap, nodeConfirmLsit, sendMsgMap);
-			try {
-				// 推送给志邦
-				if (CollUtil.isNotEmpty(nodeConfirmLsit)) {
-					for (NodeConfirmParamDTO nodeConfirmParam : nodeConfirmLsit) {
+			if (CollUtil.isNotEmpty(nodeConfirmLsit)) {
+				for (NodeConfirmParamDTO nodeConfirmParam : nodeConfirmLsit) {
+					log.info("zb节点数据推送NodeConfirmParamDTO：{}", JSONUtil.toJsonStr(nodeConfirmParam));
+					try {
+						// 推送给志邦
 						String key = nodeConfirmParam.getDepartCode() + nodeConfirmParam.getPlatformOrderCode();
 						String body = JSONUtil.toJsonStr(nodeConfirmParam);
 						String result = null;
@@ -224,14 +225,14 @@ public class ZbomNodeDataPushListener {
 								}
 							}
 						}
+					} catch (Exception e) {
+						// 处理推送不成功的异常情况
+						log.error("zb节点推送数据异常：{}", e);
+						// 保存日志
+
+						e.printStackTrace();
 					}
 				}
-			} catch (Exception e) {
-				// 处理推送不成功的异常情况
-				log.error("zb节点推送数据异常：{}", e);
-				// 保存日志
-
-				e.printStackTrace();
 			}
 		}
 	}