From 3df24db5f05b1d4a9f17c15481144d180d717e1a Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 14 Jun 2023 11:48:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=AF=B7=E6=B1=82=E7=9A=AE=E9=98=BF=E8=AF=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PanFactoryDataServiceImpl.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java index 68a61c545..cc6104554 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/PanFactoryDataServiceImpl.java @@ -2,13 +2,17 @@ package com.logpm.factory.snm.service.impl; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSONObject; +import com.alibaba.nacos.shaded.com.google.gson.Gson; +import com.alibaba.nacos.shaded.com.google.gson.GsonBuilder; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.factory.props.PanFactoryProperties; import com.logpm.factory.snm.dto.OrderInfoDTO; import com.logpm.factory.snm.dto.OrderStatusDTO; import com.logpm.factory.snm.entity.PanFactoryOrder; import com.logpm.factory.snm.entity.PanOrderStatusLog; -import com.logpm.factory.snm.service.*; +import com.logpm.factory.snm.service.IPanFactoryDataService; +import com.logpm.factory.snm.service.IPanFactoryOrderService; +import com.logpm.factory.snm.service.IPanOrderStatusLogService; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -105,20 +109,24 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { //拼接参数 Map map = new HashMap<>(); - map.put("payload",JSONObject.toJSONString(orderStatusDTO)); +// map.put("payload",JSONObject.toJSONString(orderStatusDTO)); +// map.put("payload", CommonUtil.formatJson(orderStatusDTO)); + map.put("payload", JSONObject.toJSONString(orderStatusDTO)); + + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + String s = gson.toJson(map); //先获取token String panToken = getPanToken(); //请求参数 - logger.info("##############handleStatusData: 推送包件状态请求参数 {}",map); + logger.info("##############handleStatusData: 推送包件状态请求参数 {}",s); //处理逻辑 String result = HttpRequest.post(panFactoryProperties.getUrl()+"/hitf/v1/rest/invoke?namespace=HZERO&serverCode=OPEN&interfaceCode=HUITONG_RECEIVE") .header("Authorization","Bearer "+panToken) -// .header("Content-Type","application/json") - .form(map).timeout(5 * 1000) - .execute() - .body(); + .header("Content-Type","application/json") + .body(s).timeout(5 * 1000) + .execute().body(); logger.info("##############handleStatusData: 推送包件状态返回参数 {}",result);