From f68ddf01de3bfa3836b8a0abcf5183be3febee54 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 17 Jan 2025 21:53:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=87=91=E7=89=8C=E5=B7=A5?= =?UTF-8?q?=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 优化金牌回传失败问题 --- .../java/com/logpm/factorydata/jinpai/job/AuthPushJob.java | 1 + .../logpm/factorydata/jinpai/mq/NodeDataPushListener.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/job/AuthPushJob.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/job/AuthPushJob.java index 5ff1d208d..2b090a948 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/job/AuthPushJob.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/job/AuthPushJob.java @@ -84,6 +84,7 @@ public class AuthPushJob { String content = factoryNodePushEntity.getContent(); JSONObject entries = JSONUtil.parseObj(content); entries.set("passSite", entries.getStr("endSite")); + entries.set("sendSite", entries.getStr("endSite")); String url = jinPaiProperties.getOldSystemHost() + jinPaiProperties.getOldSystemArrivedUrl(); log.info("字段缺失重新推送：{}", JSONUtil.toJsonStr(entries)); String result = HttpUtil.post(url, JSONUtil.toJsonStr(entries)); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java index bf8a46510..443ff971e 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/mq/NodeDataPushListener.java @@ -250,7 +250,11 @@ public class NodeDataPushListener { js.set("doType", 32); js.set("doLocation", ""); js.set("doTime", entries.getStr("operatorTime")); - js.set("sendSite", filterDatum.getWaybillStartWarehouse()); + if (StrUtil.isNotEmpty(filterDatum.getWaybillStartWarehouse())) { + js.set("sendSite", filterDatum.getWaybillStartWarehouse()); + } else { + js.set("sendSite", filterDatum.getWarehouseName()); + } js.set("endSite", filterDatum.getWarehouseName()); if (StrUtil.isNotEmpty(filterDatum.getDestinationWarehouse())) { js.set("passSite", filterDatum.getDestinationWarehouse());