From 6cf077fef37e4a55ea13abe83fc42a730346cd27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 27 Nov 2023 18:54:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=A0=86=E6=A0=88=E4=BF=A1=E6=81=AF=E7=9A=84=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/PushInvoiceServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index e8ed93d7..5dbe59e0 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -676,6 +676,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { //多路径推送,返回数据异常后继续推送 String error=String.format("%s推送企业异常,异常信息:%s",LOGGER_MSG,e); log.error(error); + log.error("堆栈信息打印{}",e); errorMsg = e.getMessage(); r = processPushFail(fpTsMqData, pushUrl, errorMsg, shList); sendPushDelay = true; @@ -686,6 +687,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } catch (Exception e) { String error=String.format("%s推送异常，异常信息:%s",LOGGER_MSG,e); log.error(error); + log.error("堆栈信息打印{}",e); errorMsg = e.getMessage(); r = processPushFail(fpTsMqData, pushUrl, errorMsg, shList); sendPushDelay = true; From 9dec4dc354965b732318f4bb168787e69c0bc315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 27 Nov 2023 19:32:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BD=93sap=E6=8A=A5=E9=94=99=E6=97=B6?= =?UTF-8?q?=E8=BD=AC=E5=8C=96=E4=B8=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=8A=9B=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/PushInvoiceServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 5dbe59e0..8ed70820 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -549,6 +549,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { if(OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(xtly)||OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(xtly)) { PoCommonResponseParam poCommonResponseParam = JsonUtils.getInstance().parseObject(result, PoCommonResponseParam.class); EsOutput es_output = poCommonResponseParam.getES_OUTPUT(); + if (es_output == null) { + throw new InterfaceException("推送SAP返回报错","500"); + } String sapkey = es_output.getSAPKEY(); String ztype = es_output.getZTYPE(); String zmessage = es_output.getZMESSAGE(); From 7a55f0301908689cbe15e0cafe08b2a3a3821558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 28 Nov 2023 12:56:40 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=9D=9Esap=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 8ed70820..03ce40b5 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -513,6 +513,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { // if (param.length() > 500) { // param = param.substring(0, 400); // } + + if (!"SAP".equalsIgnoreCase(pushInfo.getByzd1())){ + log.debug("************非sap推送信息跳过************"); + continue; + } log.info("{}推送企业开始,推送企业url:{},用户:{},密码:{},推送参数:{}", LOGGER_MSG, pushInfo.getPushUrl(),baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword(), fptsParam); long startTime = System.currentTimeMillis(); String result = ""; @@ -617,6 +622,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { processPushSuccess(fpTsMqData, s, pushInfo.getVersionIdent()); successPush(null,JsonUtils.getInstance().toJsonString(fpTsMqData),s,pushInfo,fpTsMqData.getPushType()); + sendPushDelay = false; } else { String error=String.format("推送数据返回的状态结果为失败,信息为:%s",dxhyInterfaceResponse.getReturnMessage()); log.error(error); @@ -753,6 +759,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } catch (Exception e) { String error=String.format("影像系统推送数据异常，%s ,推送类型为%s",e.getMessage(),pushType); log.error(error); + log.error("打印堆栈信息{}",e); e.printStackTrace(); failPush(id,content,error,e.getMessage(),pushInfo1,pushType); return; From d20669bdb6c7998570b609f85544efcec2de0485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 28 Nov 2023 13:42:23 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=A0=81=E5=92=8C?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=8D=E8=BF=87=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/PushInvoiceServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 03ce40b5..ba0dc420 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -515,6 +515,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { // } if (!"SAP".equalsIgnoreCase(pushInfo.getByzd1())){ + log.debug("备用字段1{}",pushInfo.getByzd1()); log.debug("************非sap推送信息跳过************"); continue; } @@ -555,7 +556,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { PoCommonResponseParam poCommonResponseParam = JsonUtils.getInstance().parseObject(result, PoCommonResponseParam.class); EsOutput es_output = poCommonResponseParam.getES_OUTPUT(); if (es_output == null) { - throw new InterfaceException("推送SAP返回报错","500"); + throw new InterfaceException("500","推送SAP返回报错"); } String sapkey = es_output.getSAPKEY(); String ztype = es_output.getZTYPE(); From 349d393de72a923ac6f8ddd41dd1f7aee0746ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 28 Nov 2023 14:11:49 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=88=AA=E5=8F=96?= =?UTF-8?q?=E5=BD=B1=E5=83=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index ba0dc420..d84b9c5e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -739,9 +739,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { Map headerMap = Maps.newHashMap(); headerMap.put("Authorization",md5Encode); String param = JSONObject.toJSONString(outputInvoiceRequest); - if(StringUtils.isNotBlank(param) && param.length() > 400){ - param = param.substring(0,400); - } +// if(StringUtils.isNotBlank(param) && param.length() > 400){ +// param = param.substring(0,400); +// } log.info("call image check request url：{}，header：{}，parameter：{}",invoiceConfig.getSnYxUrl(),JSONObject.toJSONString(headerMap),param); String body = HttpRequest.post(invoiceConfig.getSnYxUrl()).addHeaders(headerMap).body(JSONObject.toJSONString(outputInvoiceRequest)).timeout(300000).execute().body(); log.info("call image check return parameter：{}",body); From 71a56f78695b36e08a2e16a472d05305ee3b2998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 28 Nov 2023 14:57:07 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0content-type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/PushInvoiceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index d84b9c5e..dce6d74d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -743,7 +743,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { // param = param.substring(0,400); // } log.info("call image check request url：{}，header：{}，parameter：{}",invoiceConfig.getSnYxUrl(),JSONObject.toJSONString(headerMap),param); - String body = HttpRequest.post(invoiceConfig.getSnYxUrl()).addHeaders(headerMap).body(JSONObject.toJSONString(outputInvoiceRequest)).timeout(300000).execute().body(); + String body = HttpRequest.post(invoiceConfig.getSnYxUrl()).contentType("application/json").addHeaders(headerMap).body(JSONObject.toJSONString(outputInvoiceRequest)).timeout(300000).execute().body(); log.info("call image check return parameter：{}",body); JSONObject jsonObject = JSONObject.parseObject(body); String status = jsonObject.getString("status");//200 成功、 500 失败 From afc1287d222c7e0195f05308acaffe07ff0b1305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 28 Nov 2023 15:51:16 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=BD=B1=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PushInvoiceServiceImpl.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index dce6d74d..734fde6d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -465,6 +465,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { // this.openTextUploadFile(fpTsMqData,shList); //多个地址循环推送 + boolean flag = true; for (PushInfo pushInfo : pushInfoList) { if (StringUtils.isBlank(pushInfo.getPushUrl())) { @@ -482,17 +483,21 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { failPush(null,JsonUtils.getInstance().toJsonString(fpTsMqData),error,error,pushInfo,fpTsMqData.getPushType()); break; } - try { - //推送影像系统 - sendImageSys(content,fpTsMqData.getPushType(),pushInfo, null); - } catch (Exception e) { - String error=String.format("影像推送出现异常%s,推送类型%s",e,fpTsMqData.getPushType()); - log.error(error); - PushInfo pushInfo1 = new PushInfo(); - pushInfo1.setId(pushInfo.getId()); - pushInfo1.setByzd1("YXXT"); - failPush(null,content,error,e.getMessage(),pushInfo1,fpTsMqData.getPushType()); - e.printStackTrace(); + if(flag){ + try { + //推送影像系统 + sendImageSys(content,fpTsMqData.getPushType(),pushInfo, null); + flag = false; + } catch (Exception e) { + flag = false; + String error=String.format("影像推送出现异常%s,推送类型%s",e,fpTsMqData.getPushType()); + log.error(error); + PushInfo pushInfo1 = new PushInfo(); + pushInfo1.setId(pushInfo.getId()); + pushInfo1.setByzd1("YXXT"); + failPush(null,content,error,e.getMessage(),pushInfo1,fpTsMqData.getPushType()); + e.printStackTrace(); + } } OrderProcessInfo orderProcessInfo = null; Map requestMap = commonDisposeService.getRequestParameter(pushInfo.getNsrsbh(), pushInfo.getZipCode(), pushInfo.getEncryptCode(), content, pushInfo.getPushUrl(), pushInfo.getInterfaceType(), pushInfo.getVersionIdent());