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; }