From d1f043fad74a4f9e17f655c8b43e96f67460b811 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Fri, 14 Jul 2023 15:15:40 +0800 Subject: [PATCH 01/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E9=87=8D=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/InterfaceController.java | 32 +++- .../controller/SDNYMainProcessController.java | 74 +++++--- .../com/dxhy/erp/entity/RequestRecord.java | 22 ++- .../com/dxhy/erp/enums/RequestRecordEnum.java | 58 +++--- .../erp/service/RequestRecordService.java | 12 +- .../impl/RequestRecordServiceImpl.java | 175 +++++++++++++----- 6 files changed, 265 insertions(+), 108 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index e4ca2456..ca805249 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1222,9 +1222,10 @@ public class InterfaceController extends AbstractController { try { if (esOutPutResp.getZMESSAGE().contains("不存在")) { - requestRecordService.saveRecord(receiveErpInvoiceMessageRecord, 1,1, JsonUtils.getInstance().toJsonString(outPut),0); + requestRecordService.saveFailedRequestRecord(receiveErpInvoiceMessageRecord, 0, JsonUtils.getInstance().toJsonString(outPut), + esOutPutResp.getZMESSAGE()); } else { - requestRecordService.saveRecord(receiveErpInvoiceMessageRecord, 0,0, JsonUtils.getInstance().toJsonString(outPut)); + requestRecordService.saveSuccessfulRequestRecord(receiveErpInvoiceMessageRecord, JsonUtils.getInstance().toJsonString(outPut)); } } catch (Exception e) { log.error("FI847接口记录保存失败，errormsg:{}",e.getMessage()); @@ -1242,7 +1243,13 @@ public class InterfaceController extends AbstractController { esOutPutResp.setZMESSAGE("程序内部错误"); outPut.setES_OUTPUT(esOutPutResp); - requestRecordService.saveRecord(receiveErpInvoiceMessageRecord, 1,1, JsonUtils.getInstance().toJsonString(outPut), 1); + try { + requestRecordService.saveFailedRequestRecord(receiveErpInvoiceMessageRecord, 1, JsonUtils.getInstance().toJsonString(outPut), + "FI847接口接收erp发票数据出错,异常信息："+"{"+JSONObject.toJSONString(e)+"}"); + } catch (Exception exception) { + log.error("FI847接口记录保存失败，errormsg:{}",e.getMessage()); + exception.printStackTrace(); + } return JsonUtils.getInstance().toJsonString(outPut); } @@ -1255,12 +1262,17 @@ public class InterfaceController extends AbstractController { List fpdms = new ArrayList<>(); List fphms = new ArrayList<>(); + List bzdhs = new ArrayList<>(); for (Map map:list) { String invoiceCode =(String) map.get("ZFPDM"); String invoiceNo = (String)map.get("ZFPHM"); + String bzdh = (String)map.get("ZBZDH"); fpdms.add(invoiceCode); fphms.add(invoiceNo); + bzdhs.add(bzdh); } + log.info("进项税转出（FI849）接收到的发票号码为:{}\n进项税转出（FI849）接收到的发票代码为:{}\n进项税转出（FI849）接收到的报账单号为:{}\n", + JSONObject.toJSONString(fphms),JSONObject.toJSONString(fpdms),JSONObject.toJSONString(bzdhs)); RequestRecord transferOutRecord =requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(erpInvoiceData), "/po", JSONObject.toJSONString(fpdms),JSONObject.toJSONString(fphms), "transferOut"); @@ -1283,7 +1295,8 @@ public class InterfaceController extends AbstractController { outPut.setES_OUTPUT(es); try { - requestRecordService.saveRecord(transferOutRecord, 1, 1, JsonUtils.getInstance().toJsonString(outPut), 0); + requestRecordService.saveFailedRequestRecord(transferOutRecord, 0, JsonUtils.getInstance().toJsonString(outPut), + es.getZMESSAGE()); } catch (Exception e) { log.error("FI849接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -1335,7 +1348,7 @@ public class InterfaceController extends AbstractController { } try { - requestRecordService.saveRecord(transferOutRecord,0, 0, transfer); + requestRecordService.saveSuccessfulRequestRecord(transferOutRecord, transfer); } catch (Exception e) { log.error("FI849接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -1352,7 +1365,14 @@ public class InterfaceController extends AbstractController { es.setZMESSAGE("系统内部错误"); outPut.setES_OUTPUT(es); - requestRecordService.saveRecord(transferOutRecord,1, 1, JsonUtils.getInstance().toJsonString(outPut), 1); + try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); + requestRecordService.saveFailedRequestRecord(transferOutRecord,1, JsonUtils.getInstance().toJsonString(outPut), + "进项税转出（FI849）处理出现异常，异常信息："+"{"+JSONObject.toJSONString(e)+"}"); + } catch (Exception exception) { + log.error("FI849接口记录保存失败，errormsg:{}",e.getMessage()); + exception.printStackTrace(); + } return JsonUtils.getInstance().toJsonString(outPut); } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index bcb1c740..b0cc2838 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -11,6 +11,7 @@ import com.dxhy.common.constant.DbConstant; import com.dxhy.common.controller.AbstractController; import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.enums.SNFplxEnum; +import com.dxhy.common.exception.BaseException; import com.dxhy.common.util.InvoiceUtil; import com.dxhy.common.utils.Base64Encoding; import com.dxhy.common.utils.R; @@ -135,7 +136,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", checkInvoiceResult); try { - requestRecordService.saveRecord(singleInvoiceCheckRecord, 0,0, JSONObject.toJSONString(data)); + requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord, JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -154,7 +155,7 @@ public class SDNYMainProcessController extends AbstractController { if (StringUtils.isBlank(pramsMap.get("invoiceNumber"))) { try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(R.error("发票号码不能为空！")),0); + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0,JSONObject.toJSONString(R.error("发票号码不能为空！")), "发票号码不能为空！"); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -173,7 +174,8 @@ public class SDNYMainProcessController extends AbstractController { } else { try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(R.error("开票日期不能为空！")), 0); + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, + JSONObject.toJSONString(R.error("开票日期不能为空！")), "开票日期不能为空！"); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -185,8 +187,9 @@ public class SDNYMainProcessController extends AbstractController { if (StringUtils.isBlank(pramsMap.get("invoiceType"))) { try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(R.error("发票类型不能为空！")), 0); - } catch (Exception e) { + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, + JSONObject.toJSONString(R.error("发票类型不能为空！")), "发票类型不能为空！"); + } catch (BaseException e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); } @@ -203,7 +206,8 @@ public class SDNYMainProcessController extends AbstractController { if (StringUtils.isBlank(pramsMap.get("totalAmount"))) { try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(R.error("金额不能为空！")), 0); + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, + JSONObject.toJSONString(R.error("金额不能为空！")), "金额不能为空！"); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -215,7 +219,8 @@ public class SDNYMainProcessController extends AbstractController { if (StringUtils.isBlank(pramsMap.get("checkCode"))) { try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(R.error("校验码不能为空！")), 0); + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, + JSONObject.toJSONString(R.error("校验码不能为空！")), "校验码不能为空！"); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -237,7 +242,8 @@ public class SDNYMainProcessController extends AbstractController { if (notes != null) { try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(R.error(notes)), 0); + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, + JSONObject.toJSONString(R.error(notes)), notes); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -293,14 +299,18 @@ public class SDNYMainProcessController extends AbstractController { // saveCheckLog(pramsMap, checkInvoice); try { - if (checkInvoiceResult!=null && checkInvoiceResult.containsKey("code")) { - if (checkInvoiceResult.containsKey("cyjg")) { - requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(data), 0); + if (checkInvoiceResult.containsKey("code")) { + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), + (String) checkInvoiceResult.get("message")); - } } else { - requestRecordService.saveRecord(singleInvoiceCheckRecord,0,0,JSONObject.toJSONString(data)); - + if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { + log.info("进项票池已存在发票,查验结果:{}",JSONObject.toJSON(checkInvoiceResult)); + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), + (String) checkInvoiceResult.get("cyjgxx")); + } else { + requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); + } } } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); @@ -332,7 +342,7 @@ public class SDNYMainProcessController extends AbstractController { // saveCheckLog(pramsMap,checkInvoice); try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,0,0,JSONObject.toJSONString(data)); + requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord, JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -354,7 +364,8 @@ public class SDNYMainProcessController extends AbstractController { log.error("查验失败，errormsg:{}",e.getMessage()); try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(R.error("查验失败，"+e.getMessage())), 1); + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,1,JSONObject.toJSONString(R.error("查验失败，"+e.getMessage())), + "查验失败,异常信息:{}"+JSONObject.toJSONString(e.getMessage())); } catch (Exception exception) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); exception.printStackTrace(); @@ -370,7 +381,8 @@ public class SDNYMainProcessController extends AbstractController { data = errorInfo(checkInvoiceResult, data); try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(data), 0); + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), + (String) checkInvoiceResult.get("cyjgxx")); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -390,7 +402,7 @@ public class SDNYMainProcessController extends AbstractController { signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, userid, "1", dbName); try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,0,0,JSONObject.toJSONString(data)); + requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -428,7 +440,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", checkInvoiceResult); try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,0,0,JSONObject.toJSONString(data)); + requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -439,7 +451,8 @@ public class SDNYMainProcessController extends AbstractController { } try { - requestRecordService.saveRecord(singleInvoiceCheckRecord,1,1,JSONObject.toJSONString(R.error().put("data", checkInvoiceResult)),0); + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0,JSONObject.toJSONString(R.error().put("data", checkInvoiceResult)), + "未知异常，请联系管理员"); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -777,7 +790,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", result); try { - requestRecordService.saveRecord(record,0, 0, JSONObject.toJSONString(R.error(result))); + requestRecordService.saveFailedRequestRecord(record,0, JSONObject.toJSONString(R.error(result)), result); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -801,6 +814,7 @@ public class SDNYMainProcessController extends AbstractController { // JSONObject.toJSONString(invoiceNos), // "pushCheckResultToSAP", 1); try { + record.setActiveCallRequestDetail(request.toJSONString()); record.setActiveCall("pushCheckResultToSAP"); //将信息推送到影像系统 result = snPushCheckRecordService.pushCheckResultToSAP(request.toJSONString()); @@ -811,7 +825,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", result); try { - requestRecordService.saveRecord(record,0, 0, JSONObject.toJSONString(data)); + requestRecordService.saveSuccessfulRequestRecord(record, JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -824,7 +838,8 @@ public class SDNYMainProcessController extends AbstractController { // requestRecordService.saveRecord(pushCheckResultToSAPRecord,1, 1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)), 1); try { - requestRecordService.saveRecord(record,1, 1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)), 1); + requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)), + "推送sap失败，失败原因："+"{"+JSONObject.toJSONString(e)+"}"); } catch (Exception exception) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); exception.printStackTrace(); @@ -851,7 +866,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", ""); try { - requestRecordService.saveRecord(record,0, 0, JSONObject.toJSONString(data)); + requestRecordService.saveSuccessfulRequestRecord(record, JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -876,7 +891,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", ""); try { - requestRecordService.saveRecord(record,0, 0, JSONObject.toJSONString(data)); + requestRecordService.saveSuccessfulRequestRecord(record, JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -891,7 +906,8 @@ public class SDNYMainProcessController extends AbstractController { exception.printStackTrace(); try { - requestRecordService.saveRecord(record,1, 1, JSONObject.toJSONString(R.error(CommonConstants.CONNECT_TIMEOUT)),1); + requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.CONNECT_TIMEOUT)), + "同步SAP失败,报错信息为:"+"{"+JSONObject.toJSONString(exception)+"}"); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -903,7 +919,8 @@ public class SDNYMainProcessController extends AbstractController { exception.printStackTrace(); try { - requestRecordService.saveRecord(record,1, 1, JSONObject.toJSONString(R.error(CommonConstants.NULL_POINTER_TIMEOUT)), 1); + requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.NULL_POINTER_TIMEOUT)), + "同步SAP失败,报错信息为:"+"{"+JSONObject.toJSONString(exception)+"}"); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); @@ -915,7 +932,8 @@ public class SDNYMainProcessController extends AbstractController { exception.printStackTrace(); try { - requestRecordService.saveRecord(record,1, 1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT)),1); + requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT)), + "同步SAP失败,报错信息为:"+"{"+JSONObject.toJSONString(exception)+"}"); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); e.printStackTrace(); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/RequestRecord.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/RequestRecord.java index 0399a12f..c1c6d720 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/RequestRecord.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/RequestRecord.java @@ -105,10 +105,22 @@ public class RequestRecord { private String activeCall; /** - * 失败原因（0参数校验未通过，1其他原因） + * 主动调用其它系统的接口参数 + */ + @TableField("active_call_request_detail") + private String activeCallRequestDetail; + + /** + * 失败原因 */ @TableField("failed_reason") - private Integer failedReason; + private String failedReason; + + /** + * 是否可重调（0不可重调，1可重调） + */ + @TableField("is_recall") + private Integer isRecall; /** * 重调用后的返回参数 @@ -122,4 +134,10 @@ public class RequestRecord { @TableField("active_call_response") private String activeCallResponse; + /** + * 主动调用其它系统的返回参数（重调用） + */ + @TableField("active_call_recall_response") + private String activeCallRecallResponse; + } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java b/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java index 4745d048..e25f1be6 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java @@ -1,44 +1,50 @@ package com.dxhy.erp.enums; -import com.dxhy.erp.controller.InterfaceController; -import com.dxhy.erp.controller.SDNYMainProcessController; -import com.dxhy.erp.service.SNPushCheckRecordService; +import com.alibaba.fastjson.JSONObject; +import com.dxhy.erp.entity.sdny.SNRequestObject; +import org.springframework.http.ResponseEntity; import java.util.Map; public enum RequestRecordEnum { - SYNC_INVOICE_INFO("/syncInvoiceInfo", "syncInvoiceInfo", SDNYMainProcessController.class), + SYNC_INVOICE_INFO("/sn/syncInvoiceInfo", "syncInvoiceInfo", Map.class, ResponseEntity.class,"SDNYMainProcessController"), - SINGLE_INVOICE_CHECK("/singleInvoiceCheck", "singleInvoiceCheck", SDNYMainProcessController.class), + SINGLE_INVOICE_CHECK("/sn/singleInvoiceCheck", "singleInvoiceCheck", SNRequestObject.class, ResponseEntity.class, "SDNYMainProcessController"), - RECEIVE_ERP_INVOICE_MESSAGE("/po", "receiveErpInvoiceMessage", InterfaceController.class), + SINGLE_CHECK_INVOICE("singleCheckInvoice", Map.class, JSONObject.class, "SNPushCheckRecordService"), - TRANSFER_OUT("/po", "transferOut", InterfaceController.class), - - INSERT_VOUNCHER_RECORD("/po", "insertVouncherRecord", InterfaceController.class), - - PUSH_CHECK_RESULT_TO_SAP("pushCheckResultToSAP", SNPushCheckRecordService.class, String.class), - - SING_CHECK_INVOICE("singleCheckInvoice",SNPushCheckRecordService.class, Map.class); + PUSH_CHECK_RESULT_TO_SAP("pushCheckResultToSAP", String.class, String.class, "SNPushCheckRecordService"); + private String className; private String portName; private String methodName; private Class argClass; - private Class controllerName; + private Class responseEntityClass; - RequestRecordEnum(String portName, String methodName, Class controllerClass) { + RequestRecordEnum(String portName, String methodName, Class argClass, Class responseEntityClass, String className) { + this.className = className; this.portName = portName; this.methodName = methodName; - this.controllerName = controllerClass; + this.argClass = argClass; + this.responseEntityClass = responseEntityClass; } - RequestRecordEnum(String methodName, Class controllerClass, Class argClass) { + RequestRecordEnum(String methodName, Class argClass, Class responseEntityClass, String className) { + this.className = className; this.methodName = methodName; - this.controllerName = controllerClass; this.argClass = argClass; + this.responseEntityClass = responseEntityClass; + } + + public void setResponseEntityClass(Class responseEntityClass) { + this.responseEntityClass = responseEntityClass; + } + + public Class getResponseEntityClass() { + return responseEntityClass; } public void setPortName(String portName) { @@ -49,10 +55,6 @@ public enum RequestRecordEnum { this.methodName = methodName; } - public void setControllerName(Class controllerName) { - this.controllerName = controllerName; - } - public String getPortName() { return portName; } @@ -61,10 +63,6 @@ public enum RequestRecordEnum { return methodName; } - public Class getControllerName() { - return controllerName; - } - public Class getArgClass() { return argClass; } @@ -72,4 +70,12 @@ public enum RequestRecordEnum { public void setArgClass(Class argClass) { this.argClass = argClass; } + + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java index b657ea42..2fb6fef1 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java @@ -9,7 +9,11 @@ import java.util.List; public interface RequestRecordService extends MpBaseService { - int saveRecord(RequestRecord requestRecord,Integer failedTimes, Integer status, String responseDetail,Integer... failedReason); + int saveSuccessfulRequestRecord(RequestRecord record, String responseDetail); + +// int saveRecord(RequestRecord requestRecord,Integer failedTimes, Integer status, String responseDetail,Integer... failedReason); + + int saveFailedRequestRecord(RequestRecord record, Integer isRecall, String responseDetail, String failedReason); List getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer PageSize); @@ -19,5 +23,11 @@ public interface RequestRecordService extends MpBaseService { RequestRecord getBaseRequestRecord(String requestDetail, String portName, String invoiceNo, String methodName); +// int updateSuccessfulRecallRecord(RequestRecord record, Integer status, String activeCallRequestDetail, String recallResponseDetail); +// +// int updateFailedRecallRecord(RequestRecord record, Integer status, String activeCallResponse, String recallResponseDetail, String failedReason, Integer isRecall); + ResponseEntity reCall(RequestRecord requestRecord); + + // int saveTestRequestRecord(RequestRecord record, Integer isRecall, String responseDetail, String failedReason); } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 086e7bba..622689a4 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -2,8 +2,11 @@ package com.dxhy.erp.service.impl; import cn.hutool.core.util.ReflectUtil; import com.alibaba.fastjson.JSONObject; +import com.dxhy.common.constant.CommonConstants; import com.dxhy.common.constant.DbConstant; +import com.dxhy.common.datasource.annotation.DataSource; import com.dxhy.common.datasource.config.DynamicContextHolder; +import com.dxhy.common.exception.BaseException; import com.dxhy.common.service.impl.MpBaseServiceImpl; import com.dxhy.common.utils.R; import com.dxhy.erp.dao.RequestRecordDao; @@ -13,46 +16,65 @@ import com.dxhy.erp.service.RequestRecordService; import com.dxhy.erp.service.SNPushCheckRecordService; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.http.HttpEntity; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.client.RestTemplate; +import org.springframework.http.HttpHeaders; import javax.annotation.Resource; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.Date; -import java.util.List; +import java.util.*; @Slf4j @Service public class RequestRecordServiceImpl extends MpBaseServiceImpl implements RequestRecordService { - private final Integer MAX_TIMES = 10; + private SNPushCheckRecordService snPushCheckRecordService; + private final String dbname = "business"; @Resource RequestRecordDao requestRecordDao; - @Resource - private SNPushCheckRecordService snPushCheckRecordService; + @Autowired + private ApplicationContext applicationContext; + - @Transactional(propagation = Propagation.REQUIRES_NEW) @Override - public int saveRecord(RequestRecord record, Integer failedTimes, Integer status, String responseDetail, Integer... failedReason) { - DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); - record.setFailedTimes(failedTimes); - record.setStatus(status); + @DataSource(name = "business_business_write") + @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) + public int saveSuccessfulRequestRecord(RequestRecord record, String responseDetail) { + record.setFailedTimes(0); + record.setStatus(0); record.setResponseDetail(responseDetail); - if (failedReason.length > 0) { - record.setFailedReason(failedReason[0]); - } log.info("接口调用记录正在保存，调用记录详情:{}",JSONObject.toJSONString(record)); - int insert = super.getBaseMapper().insert(record); + int insert = requestRecordDao.insert(record); + return insert; + } + + @Override + @DataSource(name = "business_business_write") + @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) + public int saveFailedRequestRecord(RequestRecord record, Integer isRecall, String responseDetail, String failedReason) { + record.setFailedTimes(1); + record.setStatus(1); + record.setResponseDetail(responseDetail); + record.setFailedReason(failedReason); + record.setIsRecall(isRecall); + log.info("接口调用记录正在保存，调用记录详情:{}",JSONObject.toJSONString(record)); + int insert = requestRecordDao.insert(record); return insert; } @Override + @DataSource(name = "business_business_read") public List getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer PageSize) { - DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); PageHelper.startPage(pageNumber, PageSize); List recordList = requestRecordDao.selectRecordList(portName, startTime, endTime, status, methodName); return recordList; @@ -91,59 +113,122 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl reCall(RequestRecord requestRecord) { - DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); + DynamicContextHolder.push(dbname+DbConstant.BUSINESS_READ); RequestRecord dbRecord = requestRecordDao.selectById(requestRecord.getId()); - if (!dbRecord.getRequestDetail().equals(requestRecord.getRequestDetail()) - || !dbRecord.getResponseDetail().equals(requestRecord.getResponseDetail()) - || !dbRecord.getMethodName().equals(dbRecord.getMethodName())) { + if (dbRecord != null && !dbRecord.getRequestDetail().equals(requestRecord.getRequestDetail()) + && !dbRecord.getResponseDetail().equals(requestRecord.getResponseDetail()) + && !dbRecord.getMethodName().equals(dbRecord.getMethodName())) { return ResponseEntity.ok(JSONObject.toJSONString(R.error("请求信息错误，请确认后再发送！"))); } - if (dbRecord.getFailedReason() == 0) { + if (dbRecord.getIsRecall() == 0) { return ResponseEntity.ok(JSONObject.toJSONString(R.error("该请求参数不符合标准，无法进行重调，请校验参数后再申请！"))); } - if (dbRecord.getFailedTimes() > MAX_TIMES) { - return ResponseEntity.ok(JSONObject.toJSONString(R.error("该请求已达到最大重调用次数，无法再重新请求!"))); - } + RequestRecordEnum[] RequestRecordEnums = RequestRecordEnum.values(); for (RequestRecordEnum recordenum : RequestRecordEnums) { - if (recordenum.getMethodName().equals(dbRecord.getMethodName())) { - if (recordenum.getPortName() == null) { - Method method = ReflectUtil.getMethod(recordenum.getControllerName(), recordenum.getMethodName()); - Object invokeResponse; - try { - invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(dbRecord.getRequestDetail(), recordenum.getArgClass())); - updateRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse)); - - R data = new R(1000, "default success"); - data.put("data", invokeResponse); + if (recordenum.getMethodName().equals(dbRecord.getActiveCall())) { + snPushCheckRecordService = (SNPushCheckRecordService)applicationContext.getBean(recordenum.getClassName()); + Method method = ReflectUtil.getMethod(recordenum.getClass(), recordenum.getMethodName(), recordenum.getArgClass()); + + Object invokeResponse = null; + R data = new R(1000, "default success"); + try { + DynamicContextHolder.push(dbname+DbConstant.BUSINESS_WRITE); + invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(), recordenum.getArgClass())); + Map map = JSONObject.parseObject(JSONObject.toJSONString(invokeResponse), Map.class); + + data.put("data", invokeResponse); + + if (map.containsKey("SAPKEY")) { + if (!map.containsValue("处理成功")) { + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("ZMESSAGE"), 0); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + } + } + if (map.containsKey("code")) { + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("message"), 0); return ResponseEntity.ok(JSONObject.toJSONString(data)); - } catch (Exception e) { - log.error("重调用失败，错误信息：{}", e); - updateRecord(dbRecord, 1); - e.printStackTrace(); - if (recordenum.getMethodName().equals("singleCheckInvoice")) { - return ResponseEntity.ok(JSONObject.toJSONString(R.error("查验失败，错误信息：" + e.getMessage()))); + } else { + if (map.containsKey("cyjg")) { + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("cyjgxx"), 0); + return ResponseEntity.ok(JSONObject.toJSONString(data)); } - return ResponseEntity.ok(JSONObject.toJSONString(R.error("推送失败，错误信息：" + e.getMessage()))); } + + updateSuccessfulRecallRecord(dbRecord, 0, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data)); + return ResponseEntity.ok(JSONObject.toJSONString(data)); } + catch (IllegalAccessException e) { + log.info("重调用出现异常，异常信息:{}",e); + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), JSONObject.toJSONString(e), 1); + e.printStackTrace(); + return ResponseEntity.ok(JSONObject.toJSONString(R.error("重调用出现异常，请稍后重试"))); + } catch (InvocationTargetException e) { + log.info("重调用出现异常，异常信息:{}",e); + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), JSONObject.toJSONString(e), 1); + e.printStackTrace(); + return ResponseEntity.ok(JSONObject.toJSONString(R.error("重调用出现异常，请稍后重试"))); + } + } } - return ResponseEntity.ok(JSONObject.toJSONString(R.error("未找到相应信息！"))); + return ResponseEntity.ok(JSONObject.toJSONString(R.error("未找到相应信息！"))); } - private int updateRecord(RequestRecord record, Integer status, String... responseDetail) { - DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); + private int updateSuccessfulRecallRecord(RequestRecord record, Integer status, String activeCallRecallResponse, String recallResponseDetail) { + setResponse(record, activeCallRecallResponse, recallResponseDetail); record.setLastRetryTime(new Date()); record.setRetryTimes(record.getRetryTimes() + 1); record.setStatus(status); - record.setRecallResponseDetail(responseDetail[0]); - requestRecordDao.updateById(record); + record.setIsRecall(null); + return requestRecordDao.updateById(record); } + private int updateFailedRecallRecord(RequestRecord record, Integer status, String activeCallResponse, String recallResponseDetail, String failedReason, Integer isRecall) { + setResponse(record, activeCallResponse, recallResponseDetail); + record.setLastRetryTime(new Date()); + record.setRetryTimes(record.getRetryTimes() + 1); + record.setStatus(status); + record.setFailedReason(failedReason); + record.setIsRecall(isRecall); + + return requestRecordDao.updateById(record); + } + + private void setResponse(RequestRecord record, String activeCallRecallResponse, String recallResponseDetail) { + if (record.getRetryTimes() == 0) { + HashMap recallMap = new LinkedHashMap<>(); + HashMap activeCallrecallMap = new LinkedHashMap<>(); + recallMap.put("第1次重调结果", recallResponseDetail); + activeCallrecallMap.put("第1次主动调用重调返回结果", activeCallRecallResponse); + record.setRecallResponseDetail(JSONObject.toJSONString(recallMap)); + } else { + JSONObject.parseObject(record.getRecallResponseDetail(),LinkedHashMap.class).put("第"+ record.getRetryTimes() + 1+"次重调结果", recallResponseDetail); + JSONObject.parseObject(record.getActiveCallRecallResponse(),LinkedHashMap.class).put("第"+ record.getRetryTimes() + 1+"次主动调用重调返回结果", activeCallRecallResponse); + } + } + + + // @Override +// @DataSource(name = "business_business_write") +// @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = BaseException.class) +// public int saveTestRequestRecord(RequestRecord record, Integer isRecall, String responseDetail, String failedReason) throws BaseException{ +// record.setFailedTimes(1); +// record.setStatus(1); +// record.setResponseDetail(responseDetail); +// record.setFailedReason(failedReason); +// record.setIsRecall(isRecall); +// log.info("接口调用记录正在保存，调用记录详情:{}",JSONObject.toJSONString(record)); +// +// int insert = super.getBaseMapper().insert(record); +// throw new BaseException("测试用"); + +// } + } From d329bc7239934c6491e334c6b1d73c705a7af2df Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Fri, 14 Jul 2023 15:27:23 +0800 Subject: [PATCH 02/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AF=B7=E6=B1=82=E9=87=8D=E8=B0=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RequestRecallController.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index 3567e79c..b439c86d 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -1,13 +1,32 @@ package com.dxhy.erp.controller; +import com.dxhy.common.controller.AbstractController; +import com.dxhy.erp.entity.RequestRecord; +import com.dxhy.erp.service.RequestRecordService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +@SuppressWarnings("AlibabaMethodTooLong") @RequestMapping("/recall") @RestController -public class RequestRecallController { +@Slf4j +public class RequestRecallController extends AbstractController { + + @Resource + RequestRecordService requestRecordService; + + + @ApiOperation(value = "重调接口入口", notes = "重调接口入口") + @RequestMapping(path = "/requestRecordRecall", method = {RequestMethod.POST}) + public ResponseEntity recall(RequestRecord requestRecord) { + return requestRecordService.reCall(requestRecord); + } } From 37d0fca87b03becdb7f0446053e671bb97728019 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 17 Jul 2023 09:35:49 +0800 Subject: [PATCH 03/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/RequestRecallController.java | 7 ++++++- .../dxhy/erp/service/impl/RequestRecordServiceImpl.java | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index b439c86d..e3f1ebe7 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -1,5 +1,6 @@ package com.dxhy.erp.controller; +import com.alibaba.fastjson.JSONObject; import com.dxhy.common.controller.AbstractController; import com.dxhy.erp.entity.RequestRecord; import com.dxhy.erp.service.RequestRecordService; @@ -25,7 +26,11 @@ public class RequestRecallController extends AbstractController { @ApiOperation(value = "重调接口入口", notes = "重调接口入口") @RequestMapping(path = "/requestRecordRecall", method = {RequestMethod.POST}) public ResponseEntity recall(RequestRecord requestRecord) { - return requestRecordService.reCall(requestRecord); + log.info("重调用接口调用开始"); + log.info("重调用接口入参:{}", JSONObject.toJSONString(requestRecord)); + ResponseEntity responseEntity = requestRecordService.reCall(requestRecord); + log.info("重调用接口调用结束，返回参数:{}", JSONObject.toJSONString(responseEntity)); + return responseEntity; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 622689a4..c35626ea 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -118,6 +118,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl reCall(RequestRecord requestRecord) { DynamicContextHolder.push(dbname+DbConstant.BUSINESS_READ); RequestRecord dbRecord = requestRecordDao.selectById(requestRecord.getId()); + log.info("数据库匹配信息:{}", JSONObject.toJSONString(dbRecord)); if (dbRecord != null && !dbRecord.getRequestDetail().equals(requestRecord.getRequestDetail()) && !dbRecord.getResponseDetail().equals(requestRecord.getResponseDetail()) && !dbRecord.getMethodName().equals(dbRecord.getMethodName())) { @@ -128,6 +129,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Mon, 17 Jul 2023 09:42:42 +0800 Subject: [PATCH 04/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index c35626ea..57e62a04 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -133,6 +133,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Mon, 17 Jul 2023 09:55:37 +0800 Subject: [PATCH 05/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/SDNYMainProcessController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index b0cc2838..9fe6f2c5 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -707,7 +707,7 @@ public class SDNYMainProcessController extends AbstractController { invoiceCodes.add(invoiceInfo.getInvoiceCode()); invoiceNos.add(invoiceInfo.getInvoiceNumber()); }); - if (invoiceCodes.get(0)!=null) { + if (invoiceCodes.size()>0) { record = requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(snRequestObject), "/syncInvoiceInfo", JSONObject.toJSONString(invoiceCodes), From ab6c7800a6bc53cb46b45e8dca7fc5a06b3ad957 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 17 Jul 2023 10:43:10 +0800 Subject: [PATCH 06/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RequestRecallController.java | 26 ++++++++++++++++++- .../controller/SDNYMainProcessController.java | 9 ++----- .../impl/RequestRecordServiceImpl.java | 2 ++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index e3f1ebe7..c8b00069 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -2,16 +2,21 @@ package com.dxhy.erp.controller; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.controller.AbstractController; +import com.dxhy.common.utils.R; import com.dxhy.erp.entity.RequestRecord; import com.dxhy.erp.service.RequestRecordService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; @SuppressWarnings("AlibabaMethodTooLong") @RequestMapping("/recall") @@ -25,7 +30,7 @@ public class RequestRecallController extends AbstractController { @ApiOperation(value = "重调接口入口", notes = "重调接口入口") @RequestMapping(path = "/requestRecordRecall", method = {RequestMethod.POST}) - public ResponseEntity recall(RequestRecord requestRecord) { + public ResponseEntity recall(@RequestBody RequestRecord requestRecord) { log.info("重调用接口调用开始"); log.info("重调用接口入参:{}", JSONObject.toJSONString(requestRecord)); ResponseEntity responseEntity = requestRecordService.reCall(requestRecord); @@ -33,5 +38,24 @@ public class RequestRecallController extends AbstractController { return responseEntity; } + @ApiOperation(value = "接口记录查询", notes = "接口记录查询") + @RequestMapping(path = "/requestRecordBatch", method = {RequestMethod.POST}) + public ResponseEntity batchRequestRecord(@RequestBody Map params) { + String portName = (String) params.get("portName"); + Date startTime = (Date) params.get("startTime"); + Date endTime = (Date) params.get("endTime"); + Integer status = (Integer) params.get("status"); + String methodName = (String) params.get("startTime"); + Integer pageNumber = (Integer) params.get("pageNumber"); + Integer pageSize = (Integer) params.get("pageSize"); + List recordList = requestRecordService.getRecordList(portName, startTime, endTime, status, methodName, pageNumber, pageSize); + R data = new R(1000, "default success"); + if (recordList != null &&recordList.size()>0) { + data.put("查询成功",recordList); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + } + data.put("查询结果为空",""); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + } } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 9fe6f2c5..2be715e7 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -701,12 +701,12 @@ public class SDNYMainProcessController extends AbstractController { List invoiceNos = new ArrayList<>(); RequestRecord record=null; if (snRequestObject.getInvoiceInfoList()!=null && snRequestObject.getInvoiceInfoList().size()>0) { - log.info("影像系统同步数据的发票号码为:{}", JSONObject.toJSONString(invoiceNos)); - log.info("影像系统同步数据的发票代码为:{}", JSONObject.toJSONString(invoiceCodes)); snRequestObject.getInvoiceInfoList().stream().forEach(invoiceInfo->{ invoiceCodes.add(invoiceInfo.getInvoiceCode()); invoiceNos.add(invoiceInfo.getInvoiceNumber()); }); + log.info("影像系统同步数据的发票号码为:{}", JSONObject.toJSONString(invoiceNos)); + log.info("影像系统同步数据的发票代码为:{}", JSONObject.toJSONString(invoiceCodes)); if (invoiceCodes.size()>0) { record = requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(snRequestObject), "/syncInvoiceInfo", @@ -808,11 +808,6 @@ public class SDNYMainProcessController extends AbstractController { JSONObject request = new JSONObject(); request.put("IS_INPUT", object); -// RequestRecord pushCheckResultToSAPRecord =requestRecordService.getBaseRequestRecord(request.toJSONString(), -// "/syncInvoiceInfo", -// JSONObject.toJSONString(invoiceCodes), -// JSONObject.toJSONString(invoiceNos), -// "pushCheckResultToSAP", 1); try { record.setActiveCallRequestDetail(request.toJSONString()); record.setActiveCall("pushCheckResultToSAP"); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 57e62a04..f1aa8924 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -2,6 +2,7 @@ package com.dxhy.erp.service.impl; import cn.hutool.core.util.ReflectUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dxhy.common.constant.CommonConstants; import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.annotation.DataSource; @@ -77,6 +78,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer PageSize) { PageHelper.startPage(pageNumber, PageSize); List recordList = requestRecordDao.selectRecordList(portName, startTime, endTime, status, methodName); + log.info("查询结果:{}",JSONObject.toJSONString(recordList)); return recordList; } From 14155af019c2f0b6d3a1365d13e12c652806815f Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 17 Jul 2023 10:52:36 +0800 Subject: [PATCH 07/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/impl/RequestRecordServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index f1aa8924..9344d8f3 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -123,7 +123,9 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Mon, 17 Jul 2023 15:17:49 +0800 Subject: [PATCH 08/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 9 +++++++ .../com/dxhy/erp/enums/RequestRecordEnum.java | 14 +++++----- .../impl/RequestRecordServiceImpl.java | 27 +++++++++++-------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 2be715e7..fbf2a1ea 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -274,6 +274,10 @@ public class SDNYMainProcessController extends AbstractController { if(delete > 0) { checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap,null); + List activeCallRequest = new ArrayList<>(); + activeCallRequest.add(JSONObject.toJSONString(pramsMap)); + activeCallRequest.add(JSONObject.toJSONString(null)); + singleInvoiceCheckRecord.setActiveCallRequestDetail(JSONObject.toJSONString(activeCallRequest)); singleInvoiceCheckRecord.setActiveCall("singleCheckInvoice"); singleInvoiceCheckRecord.setActiveCallResponse(JSONObject.toJSONString(checkInvoiceResult)); @@ -355,6 +359,11 @@ public class SDNYMainProcessController extends AbstractController { try { checkInvoiceResult = snPushCheckRecordService.singleCheckInvoice(pramsMap,"1"); + + List activeCallRequest = new ArrayList<>(); + activeCallRequest.add(JSONObject.toJSONString(pramsMap)); + activeCallRequest.add(JSONObject.toJSONString("1")); + singleInvoiceCheckRecord.setActiveCallRequestDetail(JSONObject.toJSONString(activeCallRequest)); singleInvoiceCheckRecord.setActiveCall("singleCheckInvoice"); singleInvoiceCheckRecord.setActiveCallResponse(JSONObject.toJSONString(checkInvoiceResult)); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java b/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java index e25f1be6..1a4e4eaf 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java @@ -12,15 +12,15 @@ public enum RequestRecordEnum { SINGLE_INVOICE_CHECK("/sn/singleInvoiceCheck", "singleInvoiceCheck", SNRequestObject.class, ResponseEntity.class, "SDNYMainProcessController"), - SINGLE_CHECK_INVOICE("singleCheckInvoice", Map.class, JSONObject.class, "SNPushCheckRecordService"), + SINGLE_CHECK_INVOICE("singleCheckInvoice", JSONObject.class, "SNPushCheckRecordService", Map.class, String.class), - PUSH_CHECK_RESULT_TO_SAP("pushCheckResultToSAP", String.class, String.class, "SNPushCheckRecordService"); + PUSH_CHECK_RESULT_TO_SAP("pushCheckResultToSAP", String.class, "SNPushCheckRecordService", String.class); private String className; private String portName; private String methodName; - private Class argClass; + private Class[] argClass; private Class responseEntityClass; @@ -28,11 +28,11 @@ public enum RequestRecordEnum { this.className = className; this.portName = portName; this.methodName = methodName; - this.argClass = argClass; + this.argClass[0] = argClass; this.responseEntityClass = responseEntityClass; } - RequestRecordEnum(String methodName, Class argClass, Class responseEntityClass, String className) { + RequestRecordEnum(String methodName, Class responseEntityClass, String className, Class... argClass) { this.className = className; this.methodName = methodName; this.argClass = argClass; @@ -63,11 +63,11 @@ public enum RequestRecordEnum { return methodName; } - public Class getArgClass() { + public Class[] getArgClass() { return argClass; } - public void setArgClass(Class argClass) { + public void setArgClass(Class[] argClass) { this.argClass = argClass; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 9344d8f3..bf339130 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -138,13 +138,24 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl list = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(),List.class); + if (recordenum.getArgClass().length>1) { + invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(list.get(0), recordenum.getArgClass()[0]),JSONObject.parseObject(list.get(1), recordenum.getArgClass()[1])); + }else { + invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(list.get(0), recordenum.getArgClass()[0])); + } + log.info("重调后得到的结果:{}",JSONObject.toJSONString(invokeResponse)); + Map map = JSONObject.parseObject(JSONObject.toJSONString(invokeResponse), Map.class); data.put("data", invokeResponse); @@ -168,16 +179,10 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Mon, 17 Jul 2023 15:23:26 +0800 Subject: [PATCH 09/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/impl/RequestRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index bf339130..e783ea3c 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -148,11 +148,11 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl list = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(),List.class); if (recordenum.getArgClass().length>1) { + List list = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(),List.class); invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(list.get(0), recordenum.getArgClass()[0]),JSONObject.parseObject(list.get(1), recordenum.getArgClass()[1])); }else { - invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(list.get(0), recordenum.getArgClass()[0])); + invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(), recordenum.getArgClass()[0])); } log.info("重调后得到的结果:{}",JSONObject.toJSONString(invokeResponse)); From 6a791ac32753f05d41ff05525b89c42688fb1507 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Tue, 18 Jul 2023 09:24:11 +0800 Subject: [PATCH 10/42] =?UTF-8?q?=E9=87=8D=E8=B0=83=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/erp/enums/RequestRecordEnum.java | 8 ++++---- .../dxhy/erp/service/impl/RequestRecordServiceImpl.java | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java b/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java index 1a4e4eaf..522a147d 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java @@ -8,9 +8,9 @@ import java.util.Map; public enum RequestRecordEnum { - SYNC_INVOICE_INFO("/sn/syncInvoiceInfo", "syncInvoiceInfo", Map.class, ResponseEntity.class,"SDNYMainProcessController"), + SYNC_INVOICE_INFO("/sn/syncInvoiceInfo", "syncInvoiceInfo", ResponseEntity.class,"SDNYMainProcessController", Map.class), - SINGLE_INVOICE_CHECK("/sn/singleInvoiceCheck", "singleInvoiceCheck", SNRequestObject.class, ResponseEntity.class, "SDNYMainProcessController"), + SINGLE_INVOICE_CHECK("/sn/singleInvoiceCheck", "singleInvoiceCheck", ResponseEntity.class, "SDNYMainProcessController", SNRequestObject.class), SINGLE_CHECK_INVOICE("singleCheckInvoice", JSONObject.class, "SNPushCheckRecordService", Map.class, String.class), @@ -24,11 +24,11 @@ public enum RequestRecordEnum { private Class responseEntityClass; - RequestRecordEnum(String portName, String methodName, Class argClass, Class responseEntityClass, String className) { + RequestRecordEnum(String portName, String methodName, Class responseEntityClass, String className, Class... argClass) { this.className = className; this.portName = portName; this.methodName = methodName; - this.argClass[0] = argClass; + this.argClass = argClass; this.responseEntityClass = responseEntityClass; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index e783ea3c..5330ea3a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -121,11 +121,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Tue, 18 Jul 2023 10:14:36 +0800 Subject: [PATCH 11/42] =?UTF-8?q?=E9=87=8D=E8=B0=83=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RequestRecordServiceImpl.java | 114 ++++++++++-------- 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 5330ea3a..2f013308 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -17,6 +17,7 @@ import com.dxhy.erp.service.RequestRecordService; import com.dxhy.erp.service.SNPushCheckRecordService; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; @@ -118,70 +119,79 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl reCall(RequestRecord requestRecord) { - DynamicContextHolder.push(dbname+DbConstant.BUSINESS_READ); - RequestRecord dbRecord = requestRecordDao.selectById(requestRecord.getId()); - log.info("数据库匹配信息:{}", JSONObject.toJSONString(dbRecord)); - if (dbRecord == null || dbRecord.getStatus() != 0) { - return ResponseEntity.ok(JSONObject.toJSONString(R.error("请求信息错误，请确认后再发送！"))); - } - if (dbRecord.getIsRecall() == 0) { - return ResponseEntity.ok(JSONObject.toJSONString(R.error("该请求参数不符合标准，无法进行重调，请校验参数后再申请！"))); - } - - RequestRecordEnum[] RequestRecordEnums = RequestRecordEnum.values(); - log.info("获取到的枚举类型:{}",JSONObject.toJSONString(RequestRecordEnums)); - for (RequestRecordEnum recordenum : RequestRecordEnums) { - if (recordenum.getMethodName().equals(dbRecord.getActiveCall())) { - snPushCheckRecordService = JSONObject.parseObject(JSONObject.toJSONString(applicationContext.getBean(recordenum.getClassName())),SNPushCheckRecordService.class); - log.info("通过反射获取到的snPushCheckRecordService是否为空:{}",JSONObject.toJSONString(snPushCheckRecordService == null)); - Method method = ReflectUtil.getMethodByName(snPushCheckRecordService.getClass(),recordenum.getMethodName()); - log.info("通过反射获取到的方法是否为空：{}",JSONObject.toJSONString(method == null)); - if (method != null) { - log.info("通过反射获取到的方法名：{}",JSONObject.toJSONString(method.getName())); - } + try { + DynamicContextHolder.push(dbname+DbConstant.BUSINESS_READ); + RequestRecord dbRecord = requestRecordDao.selectById(requestRecord.getId()); + log.info("数据库匹配信息:{}", JSONObject.toJSONString(dbRecord)); + if (dbRecord == null) { + return ResponseEntity.ok(JSONObject.toJSONString(R.error("请求信息错误，请确认后再发送！"))); + } + if (dbRecord.getStatus() == 0) { + return ResponseEntity.ok(JSONObject.toJSONString(R.error("该请求已成功，无法继续重调！"))); + } + if (dbRecord.getIsRecall() == 0) { + return ResponseEntity.ok(JSONObject.toJSONString(R.error("该请求参数不符合标准，无法进行重调！"))); + } - Object invokeResponse = null; - R data = new R(1000, "default success"); - try { - DynamicContextHolder.push(dbname+DbConstant.BUSINESS_WRITE); - if (recordenum.getArgClass().length>1) { - List list = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(),List.class); - invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(list.get(0), recordenum.getArgClass()[0]),JSONObject.parseObject(list.get(1), recordenum.getArgClass()[1])); - }else { - invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(), recordenum.getArgClass()[0])); + RequestRecordEnum[] RequestRecordEnums = RequestRecordEnum.values(); + log.info("获取到的枚举类型:{}",JSONObject.toJSONString(RequestRecordEnums)); + for (RequestRecordEnum recordenum : RequestRecordEnums) { + if (recordenum.getMethodName().equals(dbRecord.getActiveCall())) { + snPushCheckRecordService = JSONObject.parseObject(JSONObject.toJSONString(applicationContext.getBean(recordenum.getClassName())),SNPushCheckRecordService.class); + log.info("通过反射获取到的snPushCheckRecordService是否为空:{}",JSONObject.toJSONString(snPushCheckRecordService == null)); + Method method = ReflectUtil.getMethodByName(snPushCheckRecordService.getClass(),recordenum.getMethodName()); + log.info("通过反射获取到的方法是否为空：{}",JSONObject.toJSONString(method == null)); + if (method != null) { + log.info("通过反射获取到的方法名：{}",JSONObject.toJSONString(method.getName())); } - log.info("重调后得到的结果:{}",JSONObject.toJSONString(invokeResponse)); - Map map = JSONObject.parseObject(JSONObject.toJSONString(invokeResponse), Map.class); + Object invokeResponse = null; + R data = new R(1000, "default success"); + try { + DynamicContextHolder.push(dbname+DbConstant.BUSINESS_WRITE); + if (recordenum.getArgClass().length>1) { + List list = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(),List.class); + invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(list.get(0), recordenum.getArgClass()[0]),JSONObject.parseObject(list.get(1), recordenum.getArgClass()[1])); + }else { + invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(), recordenum.getArgClass()[0])); + } + log.info("重调后得到的结果:{}",JSONObject.toJSONString(invokeResponse)); - data.put("data", invokeResponse); + Map map = JSONObject.parseObject(JSONObject.toJSONString(invokeResponse), Map.class); - if (map.containsKey("SAPKEY")) { - if (!map.containsValue("处理成功")) { - updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("ZMESSAGE"), 0); - return ResponseEntity.ok(JSONObject.toJSONString(data)); + data.put("data", invokeResponse); + + if (map.containsKey("SAPKEY")) { + if (!map.containsValue("处理成功")) { + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("ZMESSAGE"), 0); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + } } - } - if (map.containsKey("code")) { - updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("message"), 0); - return ResponseEntity.ok(JSONObject.toJSONString(data)); - } else { - if (map.containsKey("cyjg")) { - updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("cyjgxx"), 0); + if (map.containsKey("code")) { + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("message"), 0); return ResponseEntity.ok(JSONObject.toJSONString(data)); + } else { + if (map.containsKey("cyjg")) { + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("cyjgxx"), 0); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + } } + + updateSuccessfulRecallRecord(dbRecord, 0, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data)); + return ResponseEntity.ok(JSONObject.toJSONString(data)); + } + catch (Exception e) { + log.info("重调出现异常，异常信息:{}",e); + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), + JSONObject.toJSONString(data), "重调用失败,异常信息:{}"+JSONObject.toJSONString(e.getMessage()), 0); + return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT))); } - updateSuccessfulRecallRecord(dbRecord, 0, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data)); - return ResponseEntity.ok(JSONObject.toJSONString(data)); } - catch (Exception e) { - log.info("重调出现异常，异常信息:{}",e); - e.printStackTrace(); - return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT))); - } - } + } catch (Exception e) { + log.info("请求处理异常，异常信息:{}", JSONObject.toJSONString(e)); + return ResponseEntity.ok(JSONObject.toJSONString(R.error("请求处理异常，请校正参数！"))); } return ResponseEntity.ok(JSONObject.toJSONString(R.error("未找到相应信息！"))); From 06a90b26909c880e1074a12ba6a493ccdfd816ea Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Tue, 18 Jul 2023 13:57:38 +0800 Subject: [PATCH 12/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/InterfaceController.java | 4 ++++ .../controller/SDNYMainProcessController.java | 22 +++++++++++++++++++ .../impl/RequestRecordServiceImpl.java | 19 ++++------------ 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index ca805249..9949cde4 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1221,6 +1221,7 @@ public class InterfaceController extends AbstractController { outPut.setES_OUTPUT(esOutPutResp); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); if (esOutPutResp.getZMESSAGE().contains("不存在")) { requestRecordService.saveFailedRequestRecord(receiveErpInvoiceMessageRecord, 0, JsonUtils.getInstance().toJsonString(outPut), esOutPutResp.getZMESSAGE()); @@ -1244,6 +1245,7 @@ public class InterfaceController extends AbstractController { outPut.setES_OUTPUT(esOutPutResp); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(receiveErpInvoiceMessageRecord, 1, JsonUtils.getInstance().toJsonString(outPut), "FI847接口接收erp发票数据出错,异常信息："+"{"+JSONObject.toJSONString(e)+"}"); } catch (Exception exception) { @@ -1295,6 +1297,7 @@ public class InterfaceController extends AbstractController { outPut.setES_OUTPUT(es); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(transferOutRecord, 0, JsonUtils.getInstance().toJsonString(outPut), es.getZMESSAGE()); } catch (Exception e) { @@ -1348,6 +1351,7 @@ public class InterfaceController extends AbstractController { } try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(transferOutRecord, transfer); } catch (Exception e) { log.error("FI849接口记录保存失败，errormsg:{}",e.getMessage()); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index fbf2a1ea..e680a7b6 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -136,6 +136,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", checkInvoiceResult); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord, JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); @@ -155,6 +156,7 @@ public class SDNYMainProcessController extends AbstractController { if (StringUtils.isBlank(pramsMap.get("invoiceNumber"))) { try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0,JSONObject.toJSONString(R.error("发票号码不能为空！")), "发票号码不能为空！"); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); @@ -174,6 +176,7 @@ public class SDNYMainProcessController extends AbstractController { } else { try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, JSONObject.toJSONString(R.error("开票日期不能为空！")), "开票日期不能为空！"); } catch (Exception e) { @@ -187,6 +190,7 @@ public class SDNYMainProcessController extends AbstractController { if (StringUtils.isBlank(pramsMap.get("invoiceType"))) { try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, JSONObject.toJSONString(R.error("发票类型不能为空！")), "发票类型不能为空！"); } catch (BaseException e) { @@ -206,6 +210,7 @@ public class SDNYMainProcessController extends AbstractController { if (StringUtils.isBlank(pramsMap.get("totalAmount"))) { try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, JSONObject.toJSONString(R.error("金额不能为空！")), "金额不能为空！"); } catch (Exception e) { @@ -219,6 +224,7 @@ public class SDNYMainProcessController extends AbstractController { if (StringUtils.isBlank(pramsMap.get("checkCode"))) { try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, JSONObject.toJSONString(R.error("校验码不能为空！")), "校验码不能为空！"); } catch (Exception e) { @@ -242,6 +248,7 @@ public class SDNYMainProcessController extends AbstractController { if (notes != null) { try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, JSONObject.toJSONString(R.error(notes)), notes); } catch (Exception e) { @@ -303,6 +310,7 @@ public class SDNYMainProcessController extends AbstractController { // saveCheckLog(pramsMap, checkInvoice); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); if (checkInvoiceResult.containsKey("code")) { requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), (String) checkInvoiceResult.get("message")); @@ -346,6 +354,7 @@ public class SDNYMainProcessController extends AbstractController { // saveCheckLog(pramsMap,checkInvoice); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord, JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); @@ -373,6 +382,7 @@ public class SDNYMainProcessController extends AbstractController { log.error("查验失败，errormsg:{}",e.getMessage()); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,1,JSONObject.toJSONString(R.error("查验失败，"+e.getMessage())), "查验失败,异常信息:{}"+JSONObject.toJSONString(e.getMessage())); } catch (Exception exception) { @@ -390,6 +400,7 @@ public class SDNYMainProcessController extends AbstractController { data = errorInfo(checkInvoiceResult, data); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), (String) checkInvoiceResult.get("cyjgxx")); } catch (Exception e) { @@ -411,6 +422,7 @@ public class SDNYMainProcessController extends AbstractController { signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, userid, "1", dbName); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); @@ -449,6 +461,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", checkInvoiceResult); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); @@ -460,6 +473,7 @@ public class SDNYMainProcessController extends AbstractController { } try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0,JSONObject.toJSONString(R.error().put("data", checkInvoiceResult)), "未知异常，请联系管理员"); } catch (Exception e) { @@ -799,6 +813,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", result); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(record,0, JSONObject.toJSONString(R.error(result)), result); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); @@ -829,6 +844,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", result); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(record, JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); @@ -842,6 +858,7 @@ public class SDNYMainProcessController extends AbstractController { // requestRecordService.saveRecord(pushCheckResultToSAPRecord,1, 1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)), 1); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)), "推送sap失败，失败原因："+"{"+JSONObject.toJSONString(e)+"}"); } catch (Exception exception) { @@ -870,6 +887,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", ""); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(record, JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); @@ -895,6 +913,7 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", ""); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(record, JSONObject.toJSONString(data)); } catch (Exception e) { log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); @@ -910,6 +929,7 @@ public class SDNYMainProcessController extends AbstractController { exception.printStackTrace(); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.CONNECT_TIMEOUT)), "同步SAP失败,报错信息为:"+"{"+JSONObject.toJSONString(exception)+"}"); } catch (Exception e) { @@ -923,6 +943,7 @@ public class SDNYMainProcessController extends AbstractController { exception.printStackTrace(); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.NULL_POINTER_TIMEOUT)), "同步SAP失败,报错信息为:"+"{"+JSONObject.toJSONString(exception)+"}"); } catch (Exception e) { @@ -936,6 +957,7 @@ public class SDNYMainProcessController extends AbstractController { exception.printStackTrace(); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT)), "同步SAP失败,报错信息为:"+"{"+JSONObject.toJSONString(exception)+"}"); } catch (Exception e) { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 2f013308..9ae4d72c 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -2,12 +2,10 @@ package com.dxhy.erp.service.impl; import cn.hutool.core.util.ReflectUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dxhy.common.constant.CommonConstants; import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.annotation.DataSource; import com.dxhy.common.datasource.config.DynamicContextHolder; -import com.dxhy.common.exception.BaseException; import com.dxhy.common.service.impl.MpBaseServiceImpl; import com.dxhy.common.utils.R; import com.dxhy.erp.dao.RequestRecordDao; @@ -17,20 +15,14 @@ import com.dxhy.erp.service.RequestRecordService; import com.dxhy.erp.service.SNPushCheckRecordService; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.http.HttpEntity; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; -import org.springframework.http.HttpHeaders; import javax.annotation.Resource; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.*; @@ -38,18 +30,17 @@ import java.util.*; @Service public class RequestRecordServiceImpl extends MpBaseServiceImpl implements RequestRecordService { - private SNPushCheckRecordService snPushCheckRecordService; + private final String dbname = "business"; @Resource - RequestRecordDao requestRecordDao; + private RequestRecordDao requestRecordDao; - @Autowired - private ApplicationContext applicationContext; + @Resource + private SNPushCheckRecordService snPushCheckRecordService; @Override - @DataSource(name = "business_business_write") @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) public int saveSuccessfulRequestRecord(RequestRecord record, String responseDetail) { record.setFailedTimes(0); @@ -61,7 +52,6 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Tue, 18 Jul 2023 14:39:49 +0800 Subject: [PATCH 13/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index e680a7b6..2a93d54e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -276,6 +276,7 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); if(baseTDxRecordInvoiceDetail != null && baseTDxRecordInvoiceDetail.size() != 0){ + log.info("发票明细不为空，明细:{}",JSONObject.toJSONString(baseTDxRecordInvoiceDetail)); //先删除原有主数据,再查验更新主数据和明细数据 int delete = baseTDxRecordInvoiceDao.delete(recordWrapper); if(delete > 0) { @@ -310,17 +311,21 @@ public class SDNYMainProcessController extends AbstractController { // saveCheckLog(pramsMap, checkInvoice); try { - DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); + if (checkInvoiceResult.containsKey("code")) { + log.info("发票详细:{}",JSONObject.toJSONString(baseTDxRecordInvoiceDetail)); + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), (String) checkInvoiceResult.get("message")); } else { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { log.info("进项票池已存在发票,查验结果:{}",JSONObject.toJSON(checkInvoiceResult)); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), (String) checkInvoiceResult.get("cyjgxx")); } else { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); } } From a4459a669253329eb0a54e97a29e234fd5bcdca8 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Tue, 18 Jul 2023 15:32:04 +0800 Subject: [PATCH 14/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 2a93d54e..3860361e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -311,23 +311,20 @@ public class SDNYMainProcessController extends AbstractController { // saveCheckLog(pramsMap, checkInvoice); try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); + if (checkInvoiceResult != null) { + if (checkInvoiceResult.containsKey("code")) { + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), + (String) checkInvoiceResult.get("message")); - if (checkInvoiceResult.containsKey("code")) { - log.info("发票详细:{}",JSONObject.toJSONString(baseTDxRecordInvoiceDetail)); - DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); - requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), - (String) checkInvoiceResult.get("message")); - - } else { - DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); + } if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { log.info("进项票池已存在发票,查验结果:{}",JSONObject.toJSON(checkInvoiceResult)); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), (String) checkInvoiceResult.get("cyjgxx")); - } else { - DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); - requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); } + } else { + requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); } } catch (Exception e) { log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); From 58315ba7ae5be034873ae53850f6ab27ad6ade84 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Wed, 19 Jul 2023 13:46:42 +0800 Subject: [PATCH 15/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/service/impl/RequestRecordServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 9ae4d72c..2f238dfd 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -138,12 +138,12 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl1) { - List list = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(),List.class); - invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(list.get(0), recordenum.getArgClass()[0]),JSONObject.parseObject(list.get(1), recordenum.getArgClass()[1])); - }else { - invokeResponse = method.invoke(snPushCheckRecordService, JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(), recordenum.getArgClass()[0])); - } + List arglist = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(),List.class); + List args = new ArrayList<>(); + arglist.forEach(strArg-> args.add(JSONObject.parseObject(strArg, recordenum.getArgClass()[arglist.indexOf(strArg)]))); + + invokeResponse = method.invoke(snPushCheckRecordService, args.toArray()); + log.info("重调后得到的结果:{}",JSONObject.toJSONString(invokeResponse)); Map map = JSONObject.parseObject(JSONObject.toJSONString(invokeResponse), Map.class); From e7842d69ae1cf2c03e65083cf5fc55250594ee2d Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Wed, 19 Jul 2023 14:22:19 +0800 Subject: [PATCH 16/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RequestRecordServiceImpl.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 2f238dfd..f9be9d4e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -146,33 +146,32 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl map = JSONObject.parseObject(JSONObject.toJSONString(invokeResponse), Map.class); + JSONObject rspJson = JSONObject.parseObject(JSONObject.toJSONString(invokeResponse), JSONObject.class); data.put("data", invokeResponse); - if (map.containsKey("SAPKEY")) { - if (!map.containsValue("处理成功")) { - updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("ZMESSAGE"), 0); + if (rspJson.containsKey("SAPKEY")) { + if (!rspJson.containsKey("处理成功")) { + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), rspJson.getString("ZMESSAGE"), 0); return ResponseEntity.ok(JSONObject.toJSONString(data)); } } - if (map.containsKey("code")) { - updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("message"), 0); + if (rspJson.containsKey("code")) { + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), rspJson.getString("message"), 0); return ResponseEntity.ok(JSONObject.toJSONString(data)); } else { - if (map.containsKey("cyjg")) { - updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), map.get("cyjgxx"), 0); + if (rspJson.containsKey("cyjg")) { + updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data), rspJson.getString("cyjgxx"), 0); return ResponseEntity.ok(JSONObject.toJSONString(data)); } } updateSuccessfulRecallRecord(dbRecord, 0, JSONObject.toJSONString(invokeResponse), JSONObject.toJSONString(data)); return ResponseEntity.ok(JSONObject.toJSONString(data)); - } - catch (Exception e) { + }catch (Exception e) { log.info("重调出现异常，异常信息:{}",e); updateFailedRecallRecord(dbRecord, 1, JSONObject.toJSONString(invokeResponse), - JSONObject.toJSONString(data), "重调用失败,异常信息:{}"+JSONObject.toJSONString(e.getMessage()), 0); + JSONObject.toJSONString(data), "重调用出现异常:"+JSONObject.toJSONString(e.getMessage()), 0); return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT))); } @@ -217,7 +216,6 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Wed, 19 Jul 2023 14:34:28 +0800 Subject: [PATCH 17/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/impl/RequestRecordServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index f9be9d4e..6d9df3c4 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -209,11 +209,9 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl recallMap = new LinkedHashMap<>(); HashMap activeCallrecallMap = new LinkedHashMap<>(); - recallMap.put("第1次重调结果", recallResponseDetail); activeCallrecallMap.put("第1次主动调用重调返回结果", activeCallRecallResponse); - record.setRecallResponseDetail(JSONObject.toJSONString(recallMap)); + record.setActiveCallRecallResponse(JSONObject.toJSONString(activeCallrecallMap)); } else { JSONObject.parseObject(record.getRecallResponseDetail(),LinkedHashMap.class).put("第"+ record.getRetryTimes() + 1+"次重调结果", recallResponseDetail); } From ac0b615c9aa60dc6a111de297313bb5a4f1d4f1a Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Wed, 19 Jul 2023 15:09:16 +0800 Subject: [PATCH 18/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 3860361e..ee692476 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -835,7 +835,9 @@ public class SDNYMainProcessController extends AbstractController { request.put("IS_INPUT", object); try { - record.setActiveCallRequestDetail(request.toJSONString()); + List requestList = new ArrayList<>(); + requestList.add(request.toJSONString()); + record.setActiveCallRequestDetail(JSONObject.toJSONString(requestList)); record.setActiveCall("pushCheckResultToSAP"); //将信息推送到影像系统 result = snPushCheckRecordService.pushCheckResultToSAP(request.toJSONString()); From 883931566dbc3f5d57bb5c733444de3da4a1dd6f Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Wed, 19 Jul 2023 16:48:37 +0800 Subject: [PATCH 19/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RequestRecordServiceImpl.java | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 6d9df3c4..c76acbf1 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -146,32 +146,37 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl activeCallrecallMap = JSONObject.parseObject(record.getRecallResponseDetail(),HashMap.class); + HashMap reCallMap = JSONObject.parseObject(record.getRecallResponseDetail(),HashMap.class); if (record.getRetryTimes() == 0) { - HashMap activeCallrecallMap = new LinkedHashMap<>(); + activeCallrecallMap = new HashMap<>(); + reCallMap = new HashMap<>(); activeCallrecallMap.put("第1次主动调用重调返回结果", activeCallRecallResponse); - record.setActiveCallRecallResponse(JSONObject.toJSONString(activeCallrecallMap)); + activeCallrecallMap.put("第1次重调返回结果", recallResponseDetail); } else { - JSONObject.parseObject(record.getRecallResponseDetail(),LinkedHashMap.class).put("第"+ record.getRetryTimes() + 1+"次重调结果", recallResponseDetail); + reCallMap.put("第"+ record.getRetryTimes() + 1+"次重调结果", recallResponseDetail); + activeCallrecallMap.put("第"+ record.getRetryTimes() + 1+"次主动调用重调结果", activeCallRecallResponse); } + record.setActiveCallRecallResponse(JSONObject.toJSONString(activeCallrecallMap)); + record.setRecallResponseDetail(JSONObject.toJSONString(reCallMap)); } From bd39d859e4aaa739958f3731be6663eaa0f46c63 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Thu, 20 Jul 2023 08:35:48 +0800 Subject: [PATCH 20/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RequestRecordServiceImpl.java | 72 ++++++++----------- 1 file changed, 28 insertions(+), 44 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index c76acbf1..602450f6 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -15,8 +15,6 @@ import com.dxhy.erp.service.RequestRecordService; import com.dxhy.erp.service.SNPushCheckRecordService; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -24,7 +22,10 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; @Slf4j @Service @@ -46,7 +47,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer PageSize) { PageHelper.startPage(pageNumber, PageSize); List recordList = requestRecordDao.selectRecordList(portName, startTime, endTime, status, methodName); - log.info("查询结果:{}",JSONObject.toJSONString(recordList)); + log.info("查询结果:{}", JSONObject.toJSONString(recordList)); return recordList; } @@ -110,7 +111,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl reCall(RequestRecord requestRecord) { try { - DynamicContextHolder.push(dbname+DbConstant.BUSINESS_READ); + DynamicContextHolder.push(dbname + DbConstant.BUSINESS_READ); RequestRecord dbRecord = requestRecordDao.selectById(requestRecord.getId()); log.info("数据库匹配信息:{}", JSONObject.toJSONString(dbRecord)); if (dbRecord == null) { @@ -124,30 +125,30 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl arglist = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(),List.class); + DynamicContextHolder.push(dbname + DbConstant.BUSINESS_WRITE); + List arglist = JSONObject.parseObject(dbRecord.getActiveCallRequestDetail(), List.class); List args = new ArrayList<>(); - arglist.forEach(strArg-> args.add(JSONObject.parseObject(strArg, recordenum.getArgClass()[arglist.indexOf(strArg)]))); + arglist.forEach(strArg -> args.add(JSONObject.parseObject(strArg, recordenum.getArgClass()[arglist.indexOf(strArg)]))); invokeResponse = method.invoke(snPushCheckRecordService, args.toArray()); - log.info("重调后得到的结果:{}",JSONObject.toJSONString(invokeResponse)); + log.info("重调后得到的结果:{}", JSONObject.toJSONString(invokeResponse)); JSONObject rspJson = JSONObject.parseObject(invokeResponse.toString(), JSONObject.class); - log.info("重调后返回信息:{}",rspJson); + log.info("重调后返回信息:{}", rspJson); data.put("data", invokeResponse); @@ -169,13 +170,13 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl activeCallrecallMap = JSONObject.parseObject(record.getRecallResponseDetail(),HashMap.class); - HashMap reCallMap = JSONObject.parseObject(record.getRecallResponseDetail(),HashMap.class); + LinkedHashMap activeCallrecallMap = JSONObject.parseObject(record.getRecallResponseDetail(), LinkedHashMap.class); + LinkedHashMap reCallMap = JSONObject.parseObject(record.getRecallResponseDetail(), LinkedHashMap.class); if (record.getRetryTimes() == 0) { - activeCallrecallMap = new HashMap<>(); - reCallMap = new HashMap<>(); + activeCallrecallMap = new LinkedHashMap<>(); + reCallMap = new LinkedHashMap<>(); activeCallrecallMap.put("第1次主动调用重调返回结果", activeCallRecallResponse); activeCallrecallMap.put("第1次重调返回结果", recallResponseDetail); } else { - reCallMap.put("第"+ record.getRetryTimes() + 1+"次重调结果", recallResponseDetail); - activeCallrecallMap.put("第"+ record.getRetryTimes() + 1+"次主动调用重调结果", activeCallRecallResponse); + reCallMap.put("第" + (record.getRetryTimes() + 1) + "次重调结果", recallResponseDetail); + activeCallrecallMap.put("第" + (record.getRetryTimes() + 1) + "次主动调用重调结果", activeCallRecallResponse); } record.setActiveCallRecallResponse(JSONObject.toJSONString(activeCallrecallMap)); record.setRecallResponseDetail(JSONObject.toJSONString(reCallMap)); } - - // @Override -// @DataSource(name = "business_business_write") -// @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = BaseException.class) -// public int saveTestRequestRecord(RequestRecord record, Integer isRecall, String responseDetail, String failedReason) throws BaseException{ -// record.setFailedTimes(1); -// record.setStatus(1); -// record.setResponseDetail(responseDetail); -// record.setFailedReason(failedReason); -// record.setIsRecall(isRecall); -// log.info("接口调用记录正在保存，调用记录详情:{}",JSONObject.toJSONString(record)); -// -// int insert = super.getBaseMapper().insert(record); -// throw new BaseException("测试用"); - -// } - } From c52760bb3880db01790f202d0f357fde61e89eec Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Thu, 20 Jul 2023 08:58:01 +0800 Subject: [PATCH 21/42] =?UTF-8?q?=E9=87=8D=E8=B0=83=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A2=9D=E5=A4=96=E7=9A=84=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/service/impl/RequestRecordServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 602450f6..2c7bb0ea 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -128,12 +128,8 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Thu, 20 Jul 2023 10:46:47 +0800 Subject: [PATCH 22/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/erp/controller/InterfaceController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index 9949cde4..3bba2ddf 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1277,6 +1277,7 @@ public class InterfaceController extends AbstractController { JSONObject.toJSONString(fphms),JSONObject.toJSONString(fpdms),JSONObject.toJSONString(bzdhs)); RequestRecord transferOutRecord =requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(erpInvoiceData), "/po", JSONObject.toJSONString(fpdms),JSONObject.toJSONString(fphms), "transferOut"); + transferOutRecord.setBzdh(JSONObject.toJSONString(bzdhs)); for(Map map:list){ String invoiceCode =(String) map.get("ZFPDM"); From 93d2df137c29633c270f8fd80b8cf49b9c014f62 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Thu, 20 Jul 2023 11:12:20 +0800 Subject: [PATCH 23/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/impl/RequestRecordServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 2c7bb0ea..e9e2bdb3 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -167,10 +167,12 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Thu, 20 Jul 2023 13:51:22 +0800 Subject: [PATCH 24/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/service/impl/RequestRecordServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index e9e2bdb3..6d12dc1a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -166,14 +166,14 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Thu, 20 Jul 2023 15:15:23 +0800 Subject: [PATCH 25/42] =?UTF-8?q?=E8=A1=A5=E5=81=BF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml b/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml index 487a433d..525543b2 100644 --- a/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml +++ b/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml @@ -48,7 +48,7 @@ From 3da6d630c99a2ad8416dc3d23e4f1464dec41e54 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Thu, 20 Jul 2023 15:21:27 +0800 Subject: [PATCH 26/42] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 6d12dc1a..9bea083b 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -212,6 +212,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl activeCallrecallMap = JSONObject.parseObject(record.getRecallResponseDetail(), LinkedHashMap.class); LinkedHashMap reCallMap = JSONObject.parseObject(record.getRecallResponseDetail(), LinkedHashMap.class); if (record.getRetryTimes() == 0) { From 1135a2b6b4f9296ac18cea7ad2ad0a55c8346cd7 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Thu, 20 Jul 2023 16:58:43 +0800 Subject: [PATCH 27/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RequestRecallController.java | 12 ++++------ .../erp/service/RequestRecordService.java | 11 ++------- .../impl/RequestRecordServiceImpl.java | 24 ++++++++++++++----- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index c8b00069..1e57adf8 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Date; -import java.util.List; import java.util.Map; @SuppressWarnings("AlibabaMethodTooLong") @@ -48,14 +47,11 @@ public class RequestRecallController extends AbstractController { String methodName = (String) params.get("startTime"); Integer pageNumber = (Integer) params.get("pageNumber"); Integer pageSize = (Integer) params.get("pageSize"); - List recordList = requestRecordService.getRecordList(portName, startTime, endTime, status, methodName, pageNumber, pageSize); - R data = new R(1000, "default success"); - if (recordList != null &&recordList.size()>0) { - data.put("查询成功",recordList); - return ResponseEntity.ok(JSONObject.toJSONString(data)); + if (pageNumber == null || pageSize== null) { + return ResponseEntity.ok(R.error("分页参数")); } - data.put("查询结果为空",""); - return ResponseEntity.ok(JSONObject.toJSONString(data)); + JSONObject resultJson = requestRecordService.getRecordList(portName, startTime, endTime, status, methodName, pageNumber, pageSize); + return ResponseEntity.ok(R.ok().put("data",resultJson)); } } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java index 2fb6fef1..b9df76a1 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java @@ -1,21 +1,19 @@ package com.dxhy.erp.service; +import com.alibaba.fastjson.JSONObject; import com.dxhy.common.service.MpBaseService; import com.dxhy.erp.entity.RequestRecord; import org.springframework.http.ResponseEntity; import java.util.Date; -import java.util.List; public interface RequestRecordService extends MpBaseService { int saveSuccessfulRequestRecord(RequestRecord record, String responseDetail); -// int saveRecord(RequestRecord requestRecord,Integer failedTimes, Integer status, String responseDetail,Integer... failedReason); - int saveFailedRequestRecord(RequestRecord record, Integer isRecall, String responseDetail, String failedReason); - List getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer PageSize); + JSONObject getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer PageSize); RequestRecord getBaseRequestRecord(String requestDetail, String portName, String invoiceCode, String invoiceNo, String methodName); @@ -23,11 +21,6 @@ public interface RequestRecordService extends MpBaseService { RequestRecord getBaseRequestRecord(String requestDetail, String portName, String invoiceNo, String methodName); -// int updateSuccessfulRecallRecord(RequestRecord record, Integer status, String activeCallRequestDetail, String recallResponseDetail); -// -// int updateFailedRecallRecord(RequestRecord record, Integer status, String activeCallResponse, String recallResponseDetail, String failedReason, Integer isRecall); - ResponseEntity reCall(RequestRecord requestRecord); - // int saveTestRequestRecord(RequestRecord record, Integer isRecall, String responseDetail, String failedReason); } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 9bea083b..7d91d4c0 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -14,6 +14,7 @@ import com.dxhy.erp.enums.RequestRecordEnum; import com.dxhy.erp.service.RequestRecordService; import com.dxhy.erp.service.SNPushCheckRecordService; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -67,11 +68,23 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer PageSize) { - PageHelper.startPage(pageNumber, PageSize); - List recordList = requestRecordDao.selectRecordList(portName, startTime, endTime, status, methodName); - log.info("查询结果:{}", JSONObject.toJSONString(recordList)); - return recordList; + public JSONObject getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer pageSize) { + JSONObject json = new JSONObject(); + try { + PageHelper.startPage(pageNumber, pageSize); + List recordList = requestRecordDao.selectRecordList(portName, startTime, endTime, status, methodName); + + PageInfo pageInfo = new PageInfo<>(recordList); + json.put("datalist",recordList); + json.put("total",pageInfo.getTotal()); + + log.info("查询结果:{}", JSONObject.toJSONString(recordList)); + return json; + } catch (Exception e) { + log.error("请求出现异常,异常信息:{}",e); + json.put("datalist",null); + return json; + } } @Override @@ -189,7 +202,6 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Thu, 20 Jul 2023 16:59:25 +0800 Subject: [PATCH 28/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/RequestRecallController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index 1e57adf8..1ffa437e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -47,9 +47,7 @@ public class RequestRecallController extends AbstractController { String methodName = (String) params.get("startTime"); Integer pageNumber = (Integer) params.get("pageNumber"); Integer pageSize = (Integer) params.get("pageSize"); - if (pageNumber == null || pageSize== null) { - return ResponseEntity.ok(R.error("分页参数")); - } + JSONObject resultJson = requestRecordService.getRecordList(portName, startTime, endTime, status, methodName, pageNumber, pageSize); return ResponseEntity.ok(R.ok().put("data",resultJson)); } From 9a902b1d2a662697b84809cd5efafec11c3e889f Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 24 Jul 2023 11:22:03 +0800 Subject: [PATCH 29/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=EF=BC=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0fi848=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=AE=B0=E5=BD=95=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/InterfaceController.java | 44 ++++++++++--- .../controller/RequestRecallController.java | 10 ++- .../controller/SDNYMainProcessController.java | 63 +++++++------------ .../com/dxhy/erp/dao/RequestRecordDao.java | 10 ++- .../erp/service/RequestRecordService.java | 4 +- .../impl/RequestRecordServiceImpl.java | 23 ++++++- .../resources/mapper/RequestRecordMapper.xml | 62 +++++++++++++++--- 7 files changed, 150 insertions(+), 66 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index 3bba2ddf..ad462672 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1170,6 +1170,14 @@ public class InterfaceController extends AbstractController { OutPut outPut = new OutPut(); String zdata = requestParam.getIS_INPUT().getZDATA(); List voucherRecords = JSON.parseArray(zdata, VoucherRecord.class); + + RequestRecord insertVouncherRecordRequestRecord = requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(requestParam), "/po", "insertVouncherRecord"); + List bzdhs = new ArrayList<>(); + if (!CollectionUtils.isEmpty(voucherRecords)) { + voucherRecords.forEach(voucherRecord -> bzdhs.add(voucherRecord.getZbzdh())); + insertVouncherRecordRequestRecord.setBzdh(JSONObject.toJSONString(bzdhs)); + } + DynamicContextHolder.push("business"+ DbConstant.BUSINESS_READ); try{ boolean b = voucherRecordService.addVoucherRecords(voucherRecords); @@ -1184,6 +1192,19 @@ public class InterfaceController extends AbstractController { esOutPutResp.setZMESSAGE("处理失败"); } outPut.setES_OUTPUT(esOutPutResp); + + try { + DynamicContextHolder.push("business"+ DbConstant.BUSINESS_WRITE); + if (b) { + requestRecordService.saveSuccessfulRequestRecord(insertVouncherRecordRequestRecord, JSONObject.toJSONString(outPut)); + } else { + requestRecordService.saveFailedRequestRecord(insertVouncherRecordRequestRecord, 0, JSONObject.toJSONString(outPut), "处理失败"); + } + + } catch (Exception e) { + log.error("fi848接口请求记录保存失败，错误信息:{}",e); + } + return JsonUtils.getInstance().toJsonString(outPut); }catch (Exception e){ e.printStackTrace(); @@ -1193,6 +1214,14 @@ public class InterfaceController extends AbstractController { esOutPutResp.setZTYPE("E"); esOutPutResp.setZMESSAGE("程序内部错误"); outPut.setES_OUTPUT(esOutPutResp); + + try { + DynamicContextHolder.push("business"+ DbConstant.BUSINESS_WRITE); + requestRecordService.saveFailedRequestRecord(insertVouncherRecordRequestRecord, 1, JSONObject.toJSONString(outPut), JSONObject.toJSONString(e)); + } catch (Exception exception) { + log.error("fi848接口请求记录保存失败，错误信息:{}",e); + } + return JsonUtils.getInstance().toJsonString(outPut); } @@ -1229,8 +1258,7 @@ public class InterfaceController extends AbstractController { requestRecordService.saveSuccessfulRequestRecord(receiveErpInvoiceMessageRecord, JsonUtils.getInstance().toJsonString(outPut)); } } catch (Exception e) { - log.error("FI847接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("FI847接口记录保存失败，errormsg:{}",e); } return JsonUtils.getInstance().toJsonString(outPut); @@ -1249,8 +1277,7 @@ public class InterfaceController extends AbstractController { requestRecordService.saveFailedRequestRecord(receiveErpInvoiceMessageRecord, 1, JsonUtils.getInstance().toJsonString(outPut), "FI847接口接收erp发票数据出错,异常信息："+"{"+JSONObject.toJSONString(e)+"}"); } catch (Exception exception) { - log.error("FI847接口记录保存失败，errormsg:{}",e.getMessage()); - exception.printStackTrace(); + log.error("FI847接口记录保存失败，errormsg:{}",e); } return JsonUtils.getInstance().toJsonString(outPut); @@ -1302,8 +1329,7 @@ public class InterfaceController extends AbstractController { requestRecordService.saveFailedRequestRecord(transferOutRecord, 0, JsonUtils.getInstance().toJsonString(outPut), es.getZMESSAGE()); } catch (Exception e) { - log.error("FI849接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("FI849接口记录保存失败，errormsg:{}",e); } return JsonUtils.getInstance().toJsonString(outPut); @@ -1355,8 +1381,7 @@ public class InterfaceController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(transferOutRecord, transfer); } catch (Exception e) { - log.error("FI849接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("FI849接口记录保存失败，errormsg:{}",e); } return transfer; @@ -1375,8 +1400,7 @@ public class InterfaceController extends AbstractController { requestRecordService.saveFailedRequestRecord(transferOutRecord,1, JsonUtils.getInstance().toJsonString(outPut), "进项税转出（FI849）处理出现异常，异常信息："+"{"+JSONObject.toJSONString(e)+"}"); } catch (Exception exception) { - log.error("FI849接口记录保存失败，errormsg:{}",e.getMessage()); - exception.printStackTrace(); + log.error("FI849接口记录保存失败，errormsg:{}",e); } return JsonUtils.getInstance().toJsonString(outPut); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index 1ffa437e..46a1360e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -47,8 +47,16 @@ public class RequestRecallController extends AbstractController { String methodName = (String) params.get("startTime"); Integer pageNumber = (Integer) params.get("pageNumber"); Integer pageSize = (Integer) params.get("pageSize"); + Integer orderBy = (Integer) params.get("orderBy"); - JSONObject resultJson = requestRecordService.getRecordList(portName, startTime, endTime, status, methodName, pageNumber, pageSize); + JSONObject resultJson = requestRecordService.getRecordList(portName, startTime, endTime, status, methodName, pageNumber, pageSize, orderBy); + return ResponseEntity.ok(R.ok().put("data",resultJson)); + } + + @ApiOperation(value = "接口记录详细查询", notes = "接口记录详细查询") + @RequestMapping(path = "/requestDetailRecordBatch", method = {RequestMethod.POST, RequestMethod.GET}) + public ResponseEntity batchRequestDetailRecord(Integer id) { + JSONObject resultJson = requestRecordService.getDetailRecord(id); return ResponseEntity.ok(R.ok().put("data",resultJson)); } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index ee692476..60fabeb4 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -139,8 +139,7 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord, JSONObject.toJSONString(data)); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } @@ -159,8 +158,7 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0,JSONObject.toJSONString(R.error("发票号码不能为空！")), "发票号码不能为空！"); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error("发票号码不能为空！"))); @@ -180,8 +178,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, JSONObject.toJSONString(R.error("开票日期不能为空！")), "开票日期不能为空！"); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error("开票日期不能为空！"))); @@ -194,8 +191,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, JSONObject.toJSONString(R.error("发票类型不能为空！")), "发票类型不能为空！"); } catch (BaseException e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error("发票类型不能为空！"))); @@ -228,8 +224,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, JSONObject.toJSONString(R.error("校验码不能为空！")), "校验码不能为空！"); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error("校验码不能为空！"))); @@ -252,8 +247,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, JSONObject.toJSONString(R.error(notes)), notes); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error(notes))); @@ -327,8 +321,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); } } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(data)); @@ -359,8 +352,7 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord, JSONObject.toJSONString(data)); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(data)); @@ -388,8 +380,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,1,JSONObject.toJSONString(R.error("查验失败，"+e.getMessage())), "查验失败,异常信息:{}"+JSONObject.toJSONString(e.getMessage())); } catch (Exception exception) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - exception.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error("查验失败，"+e.getMessage()))); @@ -406,8 +397,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0,JSONObject.toJSONString(data), (String) checkInvoiceResult.get("cyjgxx")); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(data)); @@ -427,8 +417,7 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } } @@ -466,8 +455,7 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(singleInvoiceCheckRecord,JSONObject.toJSONString(data)); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(data)); @@ -479,8 +467,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0,JSONObject.toJSONString(R.error().put("data", checkInvoiceResult)), "未知异常，请联系管理员"); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error().put("data", checkInvoiceResult))); @@ -818,8 +805,7 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveFailedRequestRecord(record,0, JSONObject.toJSONString(R.error(result)), result); } catch (Exception e) { - log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票同步接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error(result))); @@ -851,8 +837,7 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(record, JSONObject.toJSONString(data)); } catch (Exception e) { - log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票同步接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(data)); @@ -866,8 +851,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)), "推送sap失败，失败原因："+"{"+JSONObject.toJSONString(e)+"}"); } catch (Exception exception) { - log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); - exception.printStackTrace(); + log.error("发票同步接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY))); @@ -894,8 +878,7 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(record, JSONObject.toJSONString(data)); } catch (Exception e) { - log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票同步接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(data)); @@ -920,8 +903,7 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); requestRecordService.saveSuccessfulRequestRecord(record, JSONObject.toJSONString(data)); } catch (Exception e) { - log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票同步接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(data)); @@ -937,8 +919,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.CONNECT_TIMEOUT)), "同步SAP失败,报错信息为:"+"{"+JSONObject.toJSONString(exception)+"}"); } catch (Exception e) { - log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票同步接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.CONNECT_TIMEOUT))); @@ -951,8 +932,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.NULL_POINTER_TIMEOUT)), "同步SAP失败,报错信息为:"+"{"+JSONObject.toJSONString(exception)+"}"); } catch (Exception e) { - log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票同步接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.NULL_POINTER_TIMEOUT))); @@ -965,8 +945,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(record,1, JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT)), "同步SAP失败,报错信息为:"+"{"+JSONObject.toJSONString(exception)+"}"); } catch (Exception e) { - log.error("发票同步接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票同步接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_DEFAULT))); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java index f43a9e6a..5e34bc8d 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java @@ -25,5 +25,13 @@ public interface RequestRecordDao extends BaseMapper { @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("status") Integer status, - @Param("methodName") String methodName); + @Param("methodName") String methodName, + @Param("orderBy") Integer orderBy); + + /** + * 查询记录详情 + * @param id + * @return + */ + RequestRecord selectDetailRecord(Integer id); } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java index b9df76a1..3206ead0 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java @@ -13,7 +13,9 @@ public interface RequestRecordService extends MpBaseService { int saveFailedRequestRecord(RequestRecord record, Integer isRecall, String responseDetail, String failedReason); - JSONObject getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer PageSize); + JSONObject getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer PageSize, Integer orderBy); + + JSONObject getDetailRecord(Integer id); RequestRecord getBaseRequestRecord(String requestDetail, String portName, String invoiceCode, String invoiceNo, String methodName); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 7d91d4c0..72d22ae8 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -68,11 +68,12 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl recordList = requestRecordDao.selectRecordList(portName, startTime, endTime, status, methodName); + List recordList = requestRecordDao.selectRecordList(portName, startTime, endTime, status, methodName, orderBy); PageInfo pageInfo = new PageInfo<>(recordList); json.put("datalist",recordList); @@ -87,6 +88,21 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl + + + + + + + + + + + + @@ -19,26 +31,26 @@ - + + + + + + + + + \ No newline at end of file From b12a805f6b4ccd0e6dc30bfea65dbf3c0b38a375 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 24 Jul 2023 13:39:11 +0800 Subject: [PATCH 30/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 60fabeb4..e5ae50ad 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -210,8 +210,7 @@ public class SDNYMainProcessController extends AbstractController { requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord,0, JSONObject.toJSONString(R.error("金额不能为空！")), "金额不能为空！"); } catch (Exception e) { - log.error("发票查验接口记录保存失败，errormsg:{}",e.getMessage()); - e.printStackTrace(); + log.error("发票查验接口记录保存失败，errormsg:{}",e); } return ResponseEntity.ok(JSONObject.toJSONString(R.error("金额不能为空！"))); From 6b6fbdb92a3a37b85658d004b9c35782e87ca82f Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 24 Jul 2023 13:41:23 +0800 Subject: [PATCH 31/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/InterfaceController.java | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index ad462672..998b62a9 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1170,14 +1170,6 @@ public class InterfaceController extends AbstractController { OutPut outPut = new OutPut(); String zdata = requestParam.getIS_INPUT().getZDATA(); List voucherRecords = JSON.parseArray(zdata, VoucherRecord.class); - - RequestRecord insertVouncherRecordRequestRecord = requestRecordService.getBaseRequestRecord(JSONObject.toJSONString(requestParam), "/po", "insertVouncherRecord"); - List bzdhs = new ArrayList<>(); - if (!CollectionUtils.isEmpty(voucherRecords)) { - voucherRecords.forEach(voucherRecord -> bzdhs.add(voucherRecord.getZbzdh())); - insertVouncherRecordRequestRecord.setBzdh(JSONObject.toJSONString(bzdhs)); - } - DynamicContextHolder.push("business"+ DbConstant.BUSINESS_READ); try{ boolean b = voucherRecordService.addVoucherRecords(voucherRecords); @@ -1192,19 +1184,6 @@ public class InterfaceController extends AbstractController { esOutPutResp.setZMESSAGE("处理失败"); } outPut.setES_OUTPUT(esOutPutResp); - - try { - DynamicContextHolder.push("business"+ DbConstant.BUSINESS_WRITE); - if (b) { - requestRecordService.saveSuccessfulRequestRecord(insertVouncherRecordRequestRecord, JSONObject.toJSONString(outPut)); - } else { - requestRecordService.saveFailedRequestRecord(insertVouncherRecordRequestRecord, 0, JSONObject.toJSONString(outPut), "处理失败"); - } - - } catch (Exception e) { - log.error("fi848接口请求记录保存失败，错误信息:{}",e); - } - return JsonUtils.getInstance().toJsonString(outPut); }catch (Exception e){ e.printStackTrace(); @@ -1214,14 +1193,6 @@ public class InterfaceController extends AbstractController { esOutPutResp.setZTYPE("E"); esOutPutResp.setZMESSAGE("程序内部错误"); outPut.setES_OUTPUT(esOutPutResp); - - try { - DynamicContextHolder.push("business"+ DbConstant.BUSINESS_WRITE); - requestRecordService.saveFailedRequestRecord(insertVouncherRecordRequestRecord, 1, JSONObject.toJSONString(outPut), JSONObject.toJSONString(e)); - } catch (Exception exception) { - log.error("fi848接口请求记录保存失败，错误信息:{}",e); - } - return JsonUtils.getInstance().toJsonString(outPut); } From 3434b8a8a8547d76b7c20fb475f9ba45be03016d Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 24 Jul 2023 14:07:09 +0800 Subject: [PATCH 32/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E8=B0=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E6=97=A5=E6=9C=9F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/RequestRecallController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index 46a1360e..45d71be0 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -2,6 +2,7 @@ package com.dxhy.erp.controller; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.controller.AbstractController; +import com.dxhy.common.util.DateTimeHelper; import com.dxhy.common.utils.R; import com.dxhy.erp.entity.RequestRecord; import com.dxhy.erp.service.RequestRecordService; @@ -41,15 +42,16 @@ public class RequestRecallController extends AbstractController { @RequestMapping(path = "/requestRecordBatch", method = {RequestMethod.POST}) public ResponseEntity batchRequestRecord(@RequestBody Map params) { String portName = (String) params.get("portName"); - Date startTime = (Date) params.get("startTime"); - Date endTime = (Date) params.get("endTime"); + String startTime = (String) params.get("startTime"); + String endTime = (String) params.get("endTime"); Integer status = (Integer) params.get("status"); String methodName = (String) params.get("startTime"); Integer pageNumber = (Integer) params.get("pageNumber"); Integer pageSize = (Integer) params.get("pageSize"); Integer orderBy = (Integer) params.get("orderBy"); - JSONObject resultJson = requestRecordService.getRecordList(portName, startTime, endTime, status, methodName, pageNumber, pageSize, orderBy); + JSONObject resultJson = requestRecordService.getRecordList(portName, DateTimeHelper.parseDateTime(startTime), + DateTimeHelper.parseDateTime(endTime), status, methodName, pageNumber, pageSize, orderBy); return ResponseEntity.ok(R.ok().put("data",resultJson)); } From 5a445bf26f18fcf62316bfbff3b4c4b63ab6a19d Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 24 Jul 2023 14:38:37 +0800 Subject: [PATCH 33/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 72d22ae8..f0f4c986 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -251,6 +251,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl(); activeCallrecallMap.put("第1次主动调用重调返回结果", activeCallRecallResponse); activeCallrecallMap.put("第1次重调返回结果", recallResponseDetail); + log.info("第1次重调返回结果:{}",JSONObject.toJSONString(reCallMap)); } else { reCallMap.put("第" + (record.getRetryTimes() + 1) + "次重调结果", recallResponseDetail); activeCallrecallMap.put("第" + (record.getRetryTimes() + 1) + "次主动调用重调结果", activeCallRecallResponse); From 9d66dd9c3e9a2a61a34af70fd815417806a4af27 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 24 Jul 2023 14:53:01 +0800 Subject: [PATCH 34/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml b/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml index cca0137a..65fc7ee4 100644 --- a/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml +++ b/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml @@ -79,7 +79,7 @@ - select id, bzdh, From 1fda0f1e15d807bdae905126fc891016792cdd4f Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 24 Jul 2023 16:10:26 +0800 Subject: [PATCH 35/42] =?UTF-8?q?=E6=96=B0=E5=A2=9EBaseRequestRecordVO?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/dao/RequestRecordDao.java | 13 ++++++----- .../dxhy/erp/entity/BaseRequestRecordVO.java | 23 +++++++++++++++++++ .../impl/RequestRecordServiceImpl.java | 5 ++-- .../resources/mapper/RequestRecordMapper.xml | 2 +- 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseRequestRecordVO.java diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java index 5e34bc8d..13c515ed 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java @@ -1,6 +1,7 @@ package com.dxhy.erp.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dxhy.erp.entity.BaseRequestRecordVO; import com.dxhy.erp.entity.RequestRecord; import com.dxhy.erp.entity.TdxRecordInvoiceStatistics; import org.apache.ibatis.annotations.Mapper; @@ -21,12 +22,12 @@ public interface RequestRecordDao extends BaseMapper { * @param methodName 方法名 * @return */ - List selectRecordList(@Param("portName") String portName, - @Param("startTime") Date startTime, - @Param("endTime") Date endTime, - @Param("status") Integer status, - @Param("methodName") String methodName, - @Param("orderBy") Integer orderBy); + List selectRecordList(@Param("portName") String portName, + @Param("startTime") Date startTime, + @Param("endTime") Date endTime, + @Param("status") Integer status, + @Param("methodName") String methodName, + @Param("orderBy") Integer orderBy); /** * 查询记录详情 diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseRequestRecordVO.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseRequestRecordVO.java new file mode 100644 index 00000000..af5fe1b5 --- /dev/null +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/BaseRequestRecordVO.java @@ -0,0 +1,23 @@ +package com.dxhy.erp.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class BaseRequestRecordVO { + + private Long id; + private String requestDetail; + private String responseDetail; + private String portName; + private Integer retryTimes; + private Integer failedTimes; + private Date createTime; + private Integer status; + private String methodName; +} diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index f0f4c986..ec21f609 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -9,6 +9,7 @@ import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.service.impl.MpBaseServiceImpl; import com.dxhy.common.utils.R; import com.dxhy.erp.dao.RequestRecordDao; +import com.dxhy.erp.entity.BaseRequestRecordVO; import com.dxhy.erp.entity.RequestRecord; import com.dxhy.erp.enums.RequestRecordEnum; import com.dxhy.erp.service.RequestRecordService; @@ -73,9 +74,9 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl recordList = requestRecordDao.selectRecordList(portName, startTime, endTime, status, methodName, orderBy); + List recordList = requestRecordDao.selectRecordList(portName, startTime, endTime, status, methodName, orderBy); - PageInfo pageInfo = new PageInfo<>(recordList); + PageInfo pageInfo = new PageInfo<>(recordList); json.put("datalist",recordList); json.put("total",pageInfo.getTotal()); diff --git a/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml b/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml index 65fc7ee4..5162b7c0 100644 --- a/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml +++ b/dxhy-erp/src/main/resources/mapper/RequestRecordMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + From 94aeead6709aa5726290ac14789ca627a15fc23c Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Mon, 24 Jul 2023 16:17:43 +0800 Subject: [PATCH 36/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84id=E5=85=A5=E5=8F=82=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/RequestRecallController.java | 2 +- dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java | 2 +- .../main/java/com/dxhy/erp/service/RequestRecordService.java | 2 +- .../com/dxhy/erp/service/impl/RequestRecordServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index 45d71be0..7140471d 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -57,7 +57,7 @@ public class RequestRecallController extends AbstractController { @ApiOperation(value = "接口记录详细查询", notes = "接口记录详细查询") @RequestMapping(path = "/requestDetailRecordBatch", method = {RequestMethod.POST, RequestMethod.GET}) - public ResponseEntity batchRequestDetailRecord(Integer id) { + public ResponseEntity batchRequestDetailRecord(Long id) { JSONObject resultJson = requestRecordService.getDetailRecord(id); return ResponseEntity.ok(R.ok().put("data",resultJson)); } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java index 13c515ed..e671925a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/RequestRecordDao.java @@ -34,5 +34,5 @@ public interface RequestRecordDao extends BaseMapper { * @param id * @return */ - RequestRecord selectDetailRecord(Integer id); + RequestRecord selectDetailRecord(Long id); } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java index 3206ead0..2990c26c 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/RequestRecordService.java @@ -15,7 +15,7 @@ public interface RequestRecordService extends MpBaseService { JSONObject getRecordList(String portName, Date startTime, Date endTime, Integer status, String methodName, Integer pageNumber, Integer PageSize, Integer orderBy); - JSONObject getDetailRecord(Integer id); + JSONObject getDetailRecord(Long id); RequestRecord getBaseRequestRecord(String requestDetail, String portName, String invoiceCode, String invoiceNo, String methodName); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index ec21f609..31d4f517 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -91,7 +91,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Mon, 24 Jul 2023 16:31:46 +0800 Subject: [PATCH 37/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/impl/RequestRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 31d4f517..929041c9 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -92,9 +92,10 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl Date: Tue, 25 Jul 2023 09:31:34 +0800 Subject: [PATCH 38/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/impl/RequestRecordServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java index 929041c9..f011c102 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java @@ -245,14 +245,13 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl activeCallrecallMap = JSONObject.parseObject(record.getRecallResponseDetail(), LinkedHashMap.class); LinkedHashMap reCallMap = JSONObject.parseObject(record.getRecallResponseDetail(), LinkedHashMap.class); if (record.getRetryTimes() == 0) { activeCallrecallMap = new LinkedHashMap<>(); reCallMap = new LinkedHashMap<>(); activeCallrecallMap.put("第1次主动调用重调返回结果", activeCallRecallResponse); - activeCallrecallMap.put("第1次重调返回结果", recallResponseDetail); + reCallMap.put("第1次重调返回结果", recallResponseDetail); log.info("第1次重调返回结果:{}",JSONObject.toJSONString(reCallMap)); } else { reCallMap.put("第" + (record.getRetryTimes() + 1) + "次重调结果", recallResponseDetail); From a6cb7acc620b60d13c03ef6735ad2bb8eefd1b1c Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Tue, 25 Jul 2023 10:38:02 +0800 Subject: [PATCH 39/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/RequestRecallController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index 7140471d..48230b40 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -57,7 +57,7 @@ public class RequestRecallController extends AbstractController { @ApiOperation(value = "接口记录详细查询", notes = "接口记录详细查询") @RequestMapping(path = "/requestDetailRecordBatch", method = {RequestMethod.POST, RequestMethod.GET}) - public ResponseEntity batchRequestDetailRecord(Long id) { + public ResponseEntity batchRequestDetailRecord(@RequestBody Long id) { JSONObject resultJson = requestRecordService.getDetailRecord(id); return ResponseEntity.ok(R.ok().put("data",resultJson)); } From 43cc6a39527799cf42ea54626c345f4b67f541fa Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Tue, 25 Jul 2023 10:45:58 +0800 Subject: [PATCH 40/42] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/RequestRecallController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index 48230b40..3b974077 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -45,7 +45,7 @@ public class RequestRecallController extends AbstractController { String startTime = (String) params.get("startTime"); String endTime = (String) params.get("endTime"); Integer status = (Integer) params.get("status"); - String methodName = (String) params.get("startTime"); + String methodName = (String) params.get("methodName"); Integer pageNumber = (Integer) params.get("pageNumber"); Integer pageSize = (Integer) params.get("pageSize"); Integer orderBy = (Integer) params.get("orderBy"); From 00423e63e41c83e9ca6ca3046bdb8c86955d6963 Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Tue, 25 Jul 2023 11:08:03 +0800 Subject: [PATCH 41/42] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4=E8=BD=AC=E6=8D=A2=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/RequestRecallController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java index 3b974077..fe6d6bd8 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/RequestRecallController.java @@ -6,6 +6,7 @@ import com.dxhy.common.util.DateTimeHelper; import com.dxhy.common.utils.R; import com.dxhy.erp.entity.RequestRecord; import com.dxhy.erp.service.RequestRecordService; +import com.dxhy.erp.utils.DateUtil; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -50,8 +51,8 @@ public class RequestRecallController extends AbstractController { Integer pageSize = (Integer) params.get("pageSize"); Integer orderBy = (Integer) params.get("orderBy"); - JSONObject resultJson = requestRecordService.getRecordList(portName, DateTimeHelper.parseDateTime(startTime), - DateTimeHelper.parseDateTime(endTime), status, methodName, pageNumber, pageSize, orderBy); + JSONObject resultJson = requestRecordService.getRecordList(portName, DateUtil.strToDate(startTime), + DateUtil.strToDate(endTime), status, methodName, pageNumber, pageSize, orderBy); return ResponseEntity.ok(R.ok().put("data",resultJson)); } From 5d9cc784d04c45320e40996fa9dd19926e3906f5 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Tue, 25 Jul 2023 13:45:04 +0800 Subject: [PATCH 42/42] . --- .../java/com/dxhy/erp/controller/InterfaceController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java index 998b62a9..a578f25a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java @@ -1266,7 +1266,7 @@ public class InterfaceController extends AbstractController { for (Map map:list) { String invoiceCode =(String) map.get("ZFPDM"); String invoiceNo = (String)map.get("ZFPHM"); - String bzdh = (String)map.get("ZBZDH"); + String bzdh = map.get("ZBZDH")==null?"":map.get("ZBZDH").toString(); fpdms.add(invoiceCode); fphms.add(invoiceNo); bzdhs.add(bzdh); @@ -1357,7 +1357,7 @@ public class InterfaceController extends AbstractController { return transfer; }catch (Exception e){ - e.printStackTrace(); + log.error("error", e); OutPut outPut = new OutPut(); EsOutPutResp es = new EsOutPutResp(); es.setSAPKEY(erpInvoiceData.getIS_INPUT().getSAPKEY());