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