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"> - +