From 5242e99df0f7f7f9bf962c75986d56b92911c914 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 14 Aug 2024 16:27:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E6=8E=A8=E9=80=81=E8=AF=B7=E6=B1=82=E7=9A=84=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factorydata/mengtian/mq/NodeDataPushListener.java | 11 ++++++----- 1 file changed, 6 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 de950d14f..485ba3af9 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 @@ -328,23 +328,24 @@ public class NodeDataPushListener { HttpRequest post = HttpUtil.createPost(mengTianProperties.getHost() + url); post.header("ClientId", "mt.ht"); post.header("OperationCode", operationCode); - post.timeout(5000); + post.timeout(30000); post.body(body); // 存入日志表 entity.setContent(body); entity.setOperationCode(operationCode); entity.setSendUrl(mengTianProperties.getHost() + url); + String resBody = ""; try { HttpResponse execute = post.execute(); - String resBody = execute.body(); + 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); + entity.setSendStatus(StrUtil.isEmpty(resultCode) ? "-1" : resultCode); } catch (Exception e) { - entity.setResultContent(e.getMessage()); - entity.setSendStatus("0"); + entity.setResultContent(resBody); + entity.setSendStatus("-1"); } factoryNodePushService.save(entity); }