增加调用接口查询

src/main/java/com/hr/controller/IpInterfaceCallbackController.java

@@ -3,6 +3,7 @@ package com.hr.controller;
 import com.hr.param.InterfaceCalledQueryParam;
 import com.hr.param.IpInterfaceParam;
 import com.hr.repository.service.IpOrderService;
+import com.hr.vo.IpInterfaceCallVO;
 import com.hr.vo.IpInterfaceVO;
 import com.yy.basedevelop.common.data.BasePageResult;
 import io.swagger.v3.oas.annotations.Operation;
@@ -31,8 +32,7 @@ public class IpInterfaceCallbackController {
      */
     @Operation(summary = "分页查询接口调用记录")
     @GetMapping
-    public BasePageResult<IpInterfaceVO> pageQuery(@RequestBody InterfaceCalledQueryParam ipInterfaceCalledQueryParam){
-        Page<IpInterfaceVO> ipAccountPOS = ipOrderService.pageQuery(ipInterfaceCalledQueryParam, ipInterfaceCalledQueryParam.getPageNum(), ipInterfaceCalledQueryParam.getPageSize());
-        return BasePageResult.success(ipAccountPOS.getContent(), ipAccountPOS.getTotalElements(), ipInterfaceCalledQueryParam.getPageNum(), ipInterfaceCalledQueryParam.getPageSize());
+    public BasePageResult<IpInterfaceCallVO> pageQuery(@RequestBody InterfaceCalledQueryParam ipInterfaceCalledQueryParam){
+        return ipOrderService.pageQuery(ipInterfaceCalledQueryParam);
     }
 }

src/main/java/com/hr/externelSystem/BizHandlerFactory.java

@@ -101,6 +101,7 @@ public class BizHandlerFactory {
         ipOrderPO.setCallbackUrl(ipTokenInterfacePO.getCallbackUrl());
         ipOrderPO.setCallbackNum(ipTokenInterfacePO.getCallbackNum());
         ipOrderPO.setAddTime(LocalDateTime.now());
+        ipOrderPO.setManufacturer(ipInterfacePO.getManufacturer());
 
 
         ipLogPO.setId(SnowflakeIdWorker.nextId());

src/main/java/com/hr/repository/domain/IpOrderPO.java

@@ -33,6 +33,12 @@ public class IpOrderPO implements Serializable, Cloneable {
      */
     @Column(name = "interface_name")
     private String interfaceName;
+
+    /**
+     * 厂商,;
+     */
+    @Column(name = "manufacturer")
+    private String manufacturer;
     /**
      * 账户编号,;
      */

src/main/java/com/hr/repository/jpa/IpLogRepository.java

@@ -1,6 +1,10 @@
 package com.hr.repository.jpa;
 
+import com.hr.param.InterfaceCalledQueryParam;
 import com.hr.repository.domain.IpLogPO;
+import com.hr.vo.IpInterfaceCallVO;
+import com.hr.vo.IpInterfaceVO;
+import com.yy.basedevelop.common.data.BasePageResult;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.repository.JpaRepository;
 
@@ -15,4 +19,5 @@ public interface IpLogRepository extends JpaRepository<IpLogPO,Long> {
 
  IpLogPO queryById(Long lid);
 
+ BasePageResult<IpInterfaceCallVO> queryInterfaceCallHistory(InterfaceCalledQueryParam param);
 }

src/main/java/com/hr/repository/jpa/IpOrderRepository.java

@@ -1,6 +1,8 @@
 package com.hr.repository.jpa;
 
+import com.hr.param.InterfaceCalledQueryParam;
 import com.hr.repository.domain.IpOrderPO;
+import com.hr.vo.IpInterfaceVO;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
@@ -13,5 +15,4 @@ import java.util.List;
 public interface IpOrderRepository extends JpaRepository<IpOrderPO,Long> {
 
     IpOrderPO queryById(Long oid);
-
 }

src/main/java/com/hr/repository/service/IpOrderService.java

@@ -2,8 +2,10 @@ package com.hr.repository.service;
 
 import com.hr.param.InterfaceCalledQueryParam;
 import com.hr.repository.domain.IpOrderPO;
+import com.hr.vo.IpInterfaceCallVO;
 import com.hr.vo.IpInterfaceVO;
 import com.hr.vo.IpOrderVO;
+import com.yy.basedevelop.common.data.BasePageResult;
 import org.springframework.data.domain.Page;
 
 /**
@@ -52,5 +54,5 @@ public interface IpOrderService{
      */
     boolean deleteById(Long oid);
 
-    Page<IpInterfaceVO> pageQuery(InterfaceCalledQueryParam ipInterfaceCalledQueryParam, Integer pageNum, Integer pageSize);
+    BasePageResult<IpInterfaceCallVO> pageQuery(InterfaceCalledQueryParam ipInterfaceCalledQueryParam);
 }

src/main/java/com/hr/repository/service/impl/IpOrderServiceImpl.java

@@ -1,16 +1,22 @@
 package com.hr.repository.service.impl;
 
+import com.github.pagehelper.PageHelper;
 import com.hr.param.InterfaceCalledQueryParam;
 import com.hr.repository.domain.IpOrderPO;
+import com.hr.repository.jpa.IpLogRepository;
 import com.hr.repository.jpa.IpOrderRepository;
 import com.hr.repository.service.IpOrderService;
+import com.hr.vo.IpInterfaceCallVO;
 import com.hr.vo.IpInterfaceVO;
 import com.hr.vo.IpOrderVO;
+import com.yy.basedevelop.common.data.BasePageResult;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 调用记录表;(ip_order)表服务接口实现类
  * @author : http://www.yonsum.com
@@ -20,6 +26,8 @@ import org.springframework.stereotype.Service;
 public class IpOrderServiceImpl implements IpOrderService {
     @Autowired
     private IpOrderRepository ipOrderRepository;
+    @Autowired
+    private IpLogRepository ipLogRepository;
     
     /** 
      * 通过ID查询单条数据 
@@ -70,9 +78,10 @@ public class IpOrderServiceImpl implements IpOrderService {
     }
 
     @Override
-    public Page<IpInterfaceVO> pageQuery(InterfaceCalledQueryParam ipInterfaceCalledQueryParam, Integer pageNum, Integer pageSize) {
-        
-        return null;
+    public BasePageResult<IpInterfaceCallVO> pageQuery(InterfaceCalledQueryParam ipInterfaceCalledQueryParam) {
+        PageHelper.startPage(ipInterfaceCalledQueryParam.getPageNum(), ipInterfaceCalledQueryParam.getPageSize());
+        BasePageResult<IpInterfaceCallVO> result = ipLogRepository.queryInterfaceCallHistory(ipInterfaceCalledQueryParam);
+        return result;
     }
 
     /**

src/main/java/com/hr/vo/IpInterfaceCallVO.java

@@ -0,0 +1,31 @@
+package com.hr.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class IpInterfaceCallVO {
+
+    @Schema(description = "主键")
+    private String id;
+
+    @Schema(description = "账户编号")
+    private String accountNo;
+
+    @Schema(description = "接口名称")
+    private String interfaceName;
+
+    @Schema(description = "厂商")
+    private String manufacturer;
+
+    @Schema(description = "接口状态")
+    private String status;
+
+    @Schema(description = "回调状态")
+    private String callbackStatus;
+
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String addTime;
+}

src/main/resources/mapper/IpLogMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hr.repository.jpa.IpLogRepository">
+
+
+    <select id="queryInterfaceCallHistory" >
+        select
+            log.id,
+            ord.acc_no,
+            ord.interface_name,
+            ord.manufacturer,
+            ord.`status`,
+            ord.callback_status,
+            log.add_time
+        from ip_log log
+        left join ip_order ord on ord.id = log.oid
+        where log.id =:id and ord.acc_no = :accountNo and  ord.interface_name like '%'||:interfaceName||'%'
+    </select>
+</mapper>