From 06a90b26909c880e1074a12ba6a493ccdfd816ea Mon Sep 17 00:00:00 2001 From: xuliangwei Date: Tue, 18 Jul 2023 13:57:38 +0800 Subject: [PATCH] =?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