From 83ec8021e8d6fed6b4e6f1a5076406120ab173fd Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 31 Jul 2024 10:40:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BasicdataStoreContactServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java index 473975570..4e1ac1db6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java @@ -34,6 +34,7 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -111,7 +112,7 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl Date: Wed, 31 Jul 2024 14:13:39 +0800 Subject: [PATCH 2/2] =?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 --- .../mengtian/mq/NodeDataPushListener.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 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 a88e53094..5f8f14ff8 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 @@ -312,22 +312,29 @@ public class NodeDataPushListener { } private void sendFactory(String body, String operationCode, String url, FactoryNodePushEntity entity) { + log.info("推送工厂：{}", body); HttpRequest post = HttpUtil.createPost(mengTianProperties.getHost() + url); post.header("ClientId", "mt.ht"); post.header("OperationCode", operationCode); + post.timeout(5000); post.body(body); - HttpResponse execute = post.execute(); - String resBody = execute.body(); - log.info("推送工厂结果：{}", resBody); - JSONObject entries = JSONUtil.parseObj(resBody); - String resultCode = entries.getStr("Result"); // 存入日志表 entity.setContent(body); entity.setOperationCode(operationCode); entity.setSendUrl(mengTianProperties.getHost() + url); - entity.setResultContent(resBody); - entity.setSendStatus(StrUtil.isEmpty(resultCode) ? "0" : resultCode); + try { + HttpResponse execute = post.execute(); + String resBody = execute.body(); + log.info("推送工厂结果：{}", resBody); + JSONObject entries = JSONUtil.parseObj(resBody); + String resultCode = entries.getStr("Result"); + entity.setResultContent(resBody); + entity.setSendStatus(StrUtil.isEmpty(resultCode) ? "0" : resultCode); + } catch (Exception e) { + entity.setResultContent(e.getMessage()); + entity.setSendStatus("0"); + } factoryNodePushService.save(entity); }