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