From c92d10627e9be9627a9f92be5c442fecda25d56d Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 29 Aug 2024 18:02:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E6=8E=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java index 084ab93f4..d0dc26255 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java @@ -351,7 +351,7 @@ public class NodeDataPushListener { entity.setResultContent(resBody); entity.setSendStatus(StrUtil.isEmpty(resultCode) ? "-1" : resultCode); } catch (Exception e) { - entity.setResultContent(resBody); + entity.setResultContent(e.getMessage()); entity.setSendStatus("-1"); } factoryNodePushService.save(entity); From fb3e8ab21732e62d5f54d202b0fbb17616b0b269 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 29 Aug 2024 18:04:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(all):=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/factory/mt/controller/MtFactoryDataController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java index 8adbaa3f2..2c032bbf0 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java @@ -22,7 +22,6 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.google.gson.Gson; import com.logpm.factory.comfac.service.IAsyncDataService; import com.logpm.factory.comfac.service.IOrderStatusLogService; import com.logpm.factory.mt.dto.MtFactoryDataDTO; From 3dfe6a482e3390009279064e8e4b2b2b0e5cc248 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 29 Aug 2024 18:07:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(all):=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/factory/mt/controller/MtFactoryDataController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java index 2c032bbf0..24a94bda1 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java @@ -41,7 +41,6 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -56,8 +55,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import static com.alibaba.druid.util.FnvHash.Constants.GSON; - /** * 梦天数据 控制器 * From 934680421a34ea9e00b8deca49db6bbeab1ba729 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 29 Aug 2024 18:28:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E6=8E=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factorydata/mengtian/mq/NodeDataPushListener.java | 10 +++++----- .../factorydata/mengtian/pros/MengTianProperties.java | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java index d0dc26255..036b4d83e 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java @@ -141,7 +141,7 @@ public class NodeDataPushListener { .packageCode(centralStkInVO.getPackageCode()) .type("收货") .build(); - sendFactory(s, "mt.poc.ht_yc_noms.CentralStkIn", mengTianProperties.getCentralStkInUrl(), entity); + sendFactory(s, mengTianProperties.getCentralStkInCode(), mengTianProperties.getCentralStkInUrl(), entity); } } } @@ -207,7 +207,7 @@ public class NodeDataPushListener { .packageCode(packageCodes) .type("确认收货") .build(); - sendFactory(s, "mt.poc.ht_yc_noms.CentralStkInConfirm", mengTianProperties.getCentralStkInConfirmUrl(), entity); + sendFactory(s, mengTianProperties.getCentralStkInConfirmCode(), mengTianProperties.getCentralStkInConfirmUrl(), entity); } } } @@ -260,7 +260,7 @@ public class NodeDataPushListener { .type("签收") .sendTaskId(signForVO.getSendTaskId()) .build(); - sendFactory(s, "mt.poc.ht_yc_noms.SignFor", mengTianProperties.getSignForUrl(), entity); + sendFactory(s, mengTianProperties.getSignForCode(), mengTianProperties.getSignForUrl(), entity); } } } @@ -320,7 +320,7 @@ public class NodeDataPushListener { .type("确认签收") .sendTaskId(confirmVO.getSendTaskId()) .build(); - sendFactory(s, "mt.poc.ht_yc_noms.SignForConfirm", mengTianProperties.getSignForConfirmUrl(), entity); + sendFactory(s, mengTianProperties.getSignForConfirmCode(), mengTianProperties.getSignForConfirmUrl(), entity); } } @@ -339,7 +339,7 @@ public class NodeDataPushListener { String resBody = ""; String resultCode = ""; try { - if(mengTianProperties.getEnable()){ + if (mengTianProperties.getEnable()) { HttpResponse execute = post.execute(); resBody = execute.body(); JSONObject entries = JSONUtil.parseObj(resBody); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/pros/MengTianProperties.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/pros/MengTianProperties.java index 6a43b9aa4..3222ddbd2 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/pros/MengTianProperties.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/pros/MengTianProperties.java @@ -18,12 +18,16 @@ public class MengTianProperties { * 收货 url */ private String centralStkInUrl; + private String centralStkInCode; /** 确认收货 url */ private String centralStkInConfirmUrl; + private String centralStkInConfirmCode; /** 签收扫描 url */ private String signForUrl; + private String signForCode; /** 确认签收 url */ private String signForConfirmUrl; + private String signForConfirmCode; /** * 是否推送工厂 */