longhu 4 周之前
父节点
当前提交
137873c75b
共有 25 个文件被更改,包括 192 次插入39 次删除
  1. 1 1
      src/main/java/com/hr/InterfacePlatformApplication.java
  2. 33 1
      src/main/java/com/hr/controller/IpInterfaceCallbackController.java
  3. 1 0
      src/main/java/com/hr/controller/TestCallBackController.java
  4. 6 2
      src/main/java/com/hr/externelSystem/AiwenIpService.java
  5. 2 1
      src/main/java/com/hr/externelSystem/BizHandler.java
  6. 18 13
      src/main/java/com/hr/externelSystem/BizHandlerFactory.java
  7. 2 1
      src/main/java/com/hr/externelSystem/GeestService.java
  8. 2 1
      src/main/java/com/hr/externelSystem/ShujubaoMobileNameService.java
  9. 2 1
      src/main/java/com/hr/externelSystem/ShujubaoMobileOwnerService.java
  10. 2 1
      src/main/java/com/hr/externelSystem/ShujubaoMobileStateService.java
  11. 2 1
      src/main/java/com/hr/externelSystem/ShujubaoThreeElementVerificationService.java
  12. 2 1
      src/main/java/com/hr/externelSystem/TencentFaceService.java
  13. 2 1
      src/main/java/com/hr/externelSystem/TencentOrcSignService.java
  14. 0 3
      src/main/java/com/hr/param/PageParam.java
  15. 3 0
      src/main/java/com/hr/repository/domain/IpOrderPO.java
  16. 2 0
      src/main/java/com/hr/repository/jpa/IpLogRepository.java
  17. 4 0
      src/main/java/com/hr/repository/jpa/IpOrderRepository.java
  18. 7 3
      src/main/java/com/hr/repository/service/IpOrderService.java
  19. 22 4
      src/main/java/com/hr/repository/service/impl/IpOrderServiceImpl.java
  20. 31 0
      src/main/java/com/hr/vo/CallbackHistoryVO.java
  21. 13 0
      src/main/java/com/hr/vo/CallbackResponseVO.java
  22. 19 0
      src/main/java/com/hr/vo/InterfaceCalledDetail.java
  23. 1 1
      src/main/java/com/hr/vo/IpInterfaceCallVO.java
  24. 3 3
      src/main/resources/mapper/IpLogMapper.xml
  25. 12 0
      src/main/resources/mapper/IpOrderMapper.xml

+ 1 - 1
src/main/java/com/hr/InterfacePlatformApplication.java

@@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 @EnableFeignClients
 @EnableDiscoveryClient
-@MapperScan({"com.hr.repository"})
+@MapperScan({"com.hr.repository.jpa"})
 @SpringBootApplication
 @Slf4j
 public class InterfacePlatformApplication

+ 33 - 1
src/main/java/com/hr/controller/IpInterfaceCallbackController.java

@@ -2,18 +2,24 @@ package com.hr.controller;
 
 import com.hr.param.InterfaceCalledQueryParam;
 import com.hr.param.IpInterfaceParam;
+import com.hr.repository.domain.IpInterfacePO;
 import com.hr.repository.service.IpOrderService;
+import com.hr.vo.CallbackHistoryVO;
+import com.hr.vo.InterfaceCalledDetail;
 import com.hr.vo.IpInterfaceCallVO;
 import com.hr.vo.IpInterfaceVO;
 import com.yy.basedevelop.common.data.BasePageResult;
+import com.yy.basedevelop.common.data.BaseReturnDto;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
-@RequestMapping("/ipInterfaceCallback")
+@RequestMapping("/ipInterface/call")
 @Tag(name = "接口调用管理")
 public class IpInterfaceCallbackController {
 
@@ -33,4 +39,30 @@ public class IpInterfaceCallbackController {
         System.out.println();
         return ipOrderService.queryList(ipInterfaceCalledQueryParam);
     }
+
+    /**
+     * 查询接口的调用详情
+     *
+     * @param ipInterfaceCalledQueryParam 筛选条件
+     * @return 查询结果
+     */
+    @Operation(summary = "查询接口调用详情")
+    @GetMapping("/detail/{id}")
+    public BaseReturnDto<IpInterfaceCallVO> interfaceDetail(@PathVariable Long id){
+        InterfaceCalledDetail vo = ipOrderService.interfaceDetail(id);
+        return BaseReturnDto.success(vo);
+    }
+
+
+    /**
+     * 接口调用参数明细
+     *
+     * @return 查询结果
+     */
+    @Operation(summary = "查询接口回调记录")
+    @PostMapping("/callback/history/{id}")
+    public BaseReturnDto<CallbackHistoryVO> queryList(@PathVariable long id){
+        List<CallbackHistoryVO> list = ipOrderService.callbackHistory(id);
+        return BaseReturnDto.success(list);
+    }
 }

+ 1 - 0
src/main/java/com/hr/controller/TestCallBackController.java

@@ -23,4 +23,5 @@ public class TestCallBackController {
         return result;
 
     }
+
 }

+ 6 - 2
src/main/java/com/hr/externelSystem/AiwenIpService.java

@@ -12,6 +12,7 @@ import com.hr.repository.domain.IpTokenInterfacePO;
 import com.hr.service.FeishuMsgSendService;
 import com.hr.util.HttpUtils;
 import com.hr.vo.AiwenParseIpInfoVO;
+import com.hr.vo.CallbackResponseVO;
 import com.hr.vo.ServiceTypeVO;
 import com.yy.basedevelop.common.http.config.RedisService;
 import com.yy.basedevelop.common.util.HttpClientUtils;
@@ -229,13 +230,16 @@ public class AiwenIpService implements BizHandler<AiwenParam,AiwenParseIpInfoVO>
     }
 
     @Override
-    public Boolean doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam) {
+    public CallbackResponseVO doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam) {
         log.info("开始处理回调");
+        CallbackResponseVO vo = new CallbackResponseVO();
         String callbackUrl = ipOrderPO.getCallbackUrl();
         Map<String,String> javaObject = JSONObject.toJavaObject(callbackParam, Map.class);
         String post = HttpClientUtils.post(callbackUrl, javaObject);
+        vo.setStatus(true);
+        vo.setResponseParam(post);
         System.out.println(post);
-        return true;
+        return vo;
     }
 
 

+ 2 - 1
src/main/java/com/hr/externelSystem/BizHandler.java

@@ -6,6 +6,7 @@ import com.hr.dto.ApiLogDto;
 import com.hr.repository.domain.IpInterfacePO;
 import com.hr.repository.domain.IpOrderPO;
 import com.hr.repository.domain.IpTokenInterfacePO;
+import com.hr.vo.CallbackResponseVO;
 import com.hr.vo.ServiceTypeVO;
 
 public interface BizHandler<T,R> {
@@ -14,5 +15,5 @@ public interface BizHandler<T,R> {
     R handle(T t, IpInterfacePO ipInterfacePO,ApiLogDto logDto);
     Class<T> getRequestClass();
 
-    Boolean doCallBack( IpOrderPO ipOrderPO, JSONObject callbackParam);
+    CallbackResponseVO doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam);
 }

+ 18 - 13
src/main/java/com/hr/externelSystem/BizHandlerFactory.java

@@ -9,6 +9,7 @@ import com.hr.repository.domain.*;
 import com.hr.repository.jpa.IpLogRepository;
 import com.hr.repository.jpa.IpOrderRepository;
 import com.hr.util.SnowflakeIdWorker;
+import com.hr.vo.CallbackResponseVO;
 import com.timevale.esign.paas.tech.util.AesUtil;
 import com.yy.basedevelop.common.data.BaseReturnDto;
 import com.yy.basedevelop.common.util.ruoyi.exception.ServiceException;
@@ -16,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.apache.poi.ss.formula.functions.T;
-import org.checkerframework.checker.units.qual.K;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -100,9 +100,10 @@ public class BizHandlerFactory {
         ipOrderPO.setInterfaceName(ipInterfacePO.getInterfaceName());
         ipOrderPO.setAccNo(req.getAccountNo());
         ipOrderPO.setToken(req.getToken());
+        ipOrderPO.setRefId(0L);
+        ipOrderPO.setIsCallback(ipTokenInterfacePO.getIsCallback());
         ipOrderPO.setCallbackNum(ipTokenInterfacePO.getCallbackNum());
         ipOrderPO.setCallbackUrl(ipTokenInterfacePO.getCallbackUrl());
-        ipOrderPO.setCallbackNum(ipTokenInterfacePO.getCallbackNum());
         ipOrderPO.setAddTime(LocalDateTime.now());
         ipOrderPO.setManufacturer(ipInterfacePO.getManufacturer());
 
@@ -114,28 +115,29 @@ public class BizHandlerFactory {
         ipLogPO.setStatus("handle");
     }
 
-    private void wrapCallBackOrder(IpOrderPO ipOrder, Boolean callbackStatus) {
+    private void wrapCallBackOrder(IpOrderPO ipOrder, CallbackResponseVO callback, LocalDateTime callDateTime, JSONObject json) {
         IpLogPO ipLog = new IpLogPO();
         IpOrderPO ipOrderPO = new IpOrderPO();
 
         ipOrderPO.setId(SnowflakeIdWorker.nextId());
         ipOrderPO.setInterfaceName(ipOrder.getInterfaceName());
         ipOrderPO.setAccNo(ipOrder.getAccNo());
-
+        ipOrderPO.setRefId(ipOrder.getId());
         ipOrderPO.setCallbackUrl(ipOrder.getCallbackUrl());
-        ipOrderPO.setAddTime(LocalDateTime.now());
+        ipOrderPO.setAddTime(callDateTime);
         ipOrderPO.setUpdateTime(LocalDateTime.now());
         ipOrderPO.setManufacturer(ipOrder.getManufacturer());
-        ipOrderPO.setStatus(callbackStatus ? "success" : "fail");
-        ipOrderPO.setCallbackStatus(callbackStatus ? "success" : "fail");
+        ipOrderPO.setStatus(callback.getStatus() ? "success" : "fail");
+        ipOrderPO.setCallbackStatus(callback.getStatus() ? "success" : "fail");
 
         ipLog.setId(SnowflakeIdWorker.nextId());
         ipLog.setOid(ipOrderPO.getId());
-        ipLog.setAddTime(LocalDateTime.now());
+        ipLog.setAddTime(callDateTime);
+        ipLog.setRequestParam(json.toJSONString());
         ipLog.setExecuteType("callback");
-        ipLog.setStatus(callbackStatus ? "success" : "fail");
-        ipLog.setAddTime(LocalDateTime.now());
+        ipLog.setStatus(callback.getStatus() ? "success" : "fail");
         ipLog.setUpdateTime(LocalDateTime.now());
+        ipLog.setResponseResult(callback.getResponseParam());
         ipOrderRepository.save(ipOrderPO);
         ipLogRepository.save(ipLog);
     }
@@ -161,14 +163,17 @@ public class BizHandlerFactory {
         Boolean callbackResult = false;
         ipOrderPO.setCallbackStatus("handle");
         for (int i = 0; i < ipOrderPO.getCallbackNum(); i++) {
-            Boolean result = handler.doCallBack(ipOrderPO, json);
+            LocalDateTime callDateTime = LocalDateTime.now();
+            CallbackResponseVO result = handler.doCallBack(ipOrderPO, json);
             // 记录调用记录
-            wrapCallBackOrder(ipOrderPO,result);
-            if(result){
+            wrapCallBackOrder(ipOrderPO,result,callDateTime,json);
+            if(result.getStatus()){
                 callbackResult = true;
                 break;
             }
+
         }
+        ipOrderPO.setCallbackStatus(callbackResult ? "success" : "fail");
         return callbackResult;
     }
 }

+ 2 - 1
src/main/java/com/hr/externelSystem/GeestService.java

@@ -11,6 +11,7 @@ import com.hr.repository.domain.IpOrderPO;
 import com.hr.repository.domain.IpTokenInterfacePO;
 import com.hr.util.HmacSHA256;
 import com.hr.util.HttpUtils;
+import com.hr.vo.CallbackResponseVO;
 import com.hr.vo.GeestVO;
 import com.hr.vo.ServiceTypeVO;
 import lombok.extern.slf4j.Slf4j;
@@ -89,7 +90,7 @@ public class GeestService implements BizHandler<GeestParam, GeestVO> {
     }
 
     @Override
-    public Boolean doCallBack( IpOrderPO ipOrderPO, JSONObject callbackParam) {
+    public CallbackResponseVO doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam) {
         return null;
     }
 }

+ 2 - 1
src/main/java/com/hr/externelSystem/ShujubaoMobileNameService.java

@@ -8,6 +8,7 @@ import com.hr.param.ShujubaoMobileNameParam;
 import com.hr.repository.domain.IpInterfacePO;
 import com.hr.repository.domain.IpOrderPO;
 import com.hr.repository.domain.IpTokenInterfacePO;
+import com.hr.vo.CallbackResponseVO;
 import com.hr.vo.ServiceTypeVO;
 import com.yy.basedevelop.common.util.HttpClientUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -58,7 +59,7 @@ public class ShujubaoMobileNameService implements BizHandler<ShujubaoMobileNameP
     }
 
     @Override
-    public Boolean doCallBack( IpOrderPO ipOrderPO, JSONObject callbackParam) {
+    public CallbackResponseVO doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam) {
         return null;
     }
 }

+ 2 - 1
src/main/java/com/hr/externelSystem/ShujubaoMobileOwnerService.java

@@ -9,6 +9,7 @@ import com.hr.param.ShujubaoMobileOwnerParam;
 import com.hr.repository.domain.IpInterfacePO;
 import com.hr.repository.domain.IpOrderPO;
 import com.hr.repository.domain.IpTokenInterfacePO;
+import com.hr.vo.CallbackResponseVO;
 import com.hr.vo.ServiceTypeVO;
 import com.hr.vo.ShujubaoMobileOwnerVO;
 import com.yy.basedevelop.common.util.HttpClientUtils;
@@ -82,7 +83,7 @@ public class ShujubaoMobileOwnerService implements BizHandler<ShujubaoMobileOwne
     }
 
     @Override
-    public Boolean doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam) {
+    public CallbackResponseVO doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam) {
         return null;
     }
 

+ 2 - 1
src/main/java/com/hr/externelSystem/ShujubaoMobileStateService.java

@@ -10,6 +10,7 @@ import com.hr.param.ShujubaoMobileOwnerParam;
 import com.hr.repository.domain.IpInterfacePO;
 import com.hr.repository.domain.IpOrderPO;
 import com.hr.repository.domain.IpTokenInterfacePO;
+import com.hr.vo.CallbackResponseVO;
 import com.hr.vo.ServiceTypeVO;
 import com.yy.basedevelop.common.util.HttpClientUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -63,7 +64,7 @@ public class ShujubaoMobileStateService implements BizHandler<ShujubaoMobileOwne
     }
 
     @Override
-    public Boolean doCallBack( IpOrderPO ipOrderPO, JSONObject callbackParam) {
+    public CallbackResponseVO doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam) {
         return null;
     }
 }

+ 2 - 1
src/main/java/com/hr/externelSystem/ShujubaoThreeElementVerificationService.java

@@ -9,6 +9,7 @@ import com.hr.param.ShujubaoTEVParam;
 import com.hr.repository.domain.IpInterfacePO;
 import com.hr.repository.domain.IpOrderPO;
 import com.hr.repository.domain.IpTokenInterfacePO;
+import com.hr.vo.CallbackResponseVO;
 import com.hr.vo.ServiceTypeVO;
 import com.hr.vo.ShujubaoMobileOwnerVO;
 import com.yy.basedevelop.common.util.HttpClientUtils;
@@ -78,7 +79,7 @@ public class ShujubaoThreeElementVerificationService implements BizHandler<Shuju
     }
 
     @Override
-    public Boolean doCallBack( IpOrderPO ipOrderPO, JSONObject callbackParam) {
+    public CallbackResponseVO doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam) {
         return null;
     }
 }

+ 2 - 1
src/main/java/com/hr/externelSystem/TencentFaceService.java

@@ -12,6 +12,7 @@ import com.hr.repository.domain.IpOrderPO;
 import com.hr.repository.domain.IpTokenInterfacePO;
 import com.hr.util.ImageUtils;
 import com.hr.util.SignatureUtil;
+import com.hr.vo.CallbackResponseVO;
 import com.hr.vo.OcrParamVO;
 import com.hr.vo.ServiceTypeVO;
 import com.hr.vo.TencentAuthVO;
@@ -197,7 +198,7 @@ public class TencentFaceService implements BizHandler<TencentFaceParam, OcrParam
     }
 
     @Override
-    public Boolean doCallBack( IpOrderPO ipOrderPO, JSONObject callbackParam) {
+    public CallbackResponseVO doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam) {
         return null;
     }
 

+ 2 - 1
src/main/java/com/hr/externelSystem/TencentOrcSignService.java

@@ -13,6 +13,7 @@ import com.hr.repository.domain.IpOrderPO;
 import com.hr.repository.domain.IpTokenInterfacePO;
 import com.hr.util.ImageUtils;
 import com.hr.util.SignatureUtil;
+import com.hr.vo.CallbackResponseVO;
 import com.hr.vo.OcrParamVO;
 import com.hr.vo.ServiceTypeVO;
 import com.hr.vo.TencentAuthVO;
@@ -159,7 +160,7 @@ public class TencentOrcSignService implements BizHandler<TencentOcrSignParam, Oc
     }
 
     @Override
-    public Boolean doCallBack( IpOrderPO ipOrderPO, JSONObject callbackParam) {
+    public CallbackResponseVO doCallBack(IpOrderPO ipOrderPO, JSONObject callbackParam) {
         return null;
     }
 

+ 0 - 3
src/main/java/com/hr/param/PageParam.java

@@ -11,7 +11,4 @@ public class PageParam {
     @Schema(description = "每页展示条数")
     private Integer pageSize;
 
-    public Integer getPageNum(){
-        return pageNum == null ? 0 : pageNum - 1;
-    }
 }

+ 3 - 0
src/main/java/com/hr/repository/domain/IpOrderPO.java

@@ -106,4 +106,7 @@ public class IpOrderPO implements Serializable, Cloneable {
      */
     @Column(name = "update_user_name")
     private String updateUserName;
+
+    @Column(name = "ref_id")
+    private Long refId;
 }

+ 2 - 0
src/main/java/com/hr/repository/jpa/IpLogRepository.java

@@ -20,4 +20,6 @@ public interface IpLogRepository extends JpaRepository<IpLogPO,Long> {
  IpLogPO queryById(Long lid);
 
  BasePageResult<IpInterfaceCallVO> queryInterfaceCallHistory(InterfaceCalledQueryParam param);
+
+    IpLogPO findByOid(Long id);
 }

+ 4 - 0
src/main/java/com/hr/repository/jpa/IpOrderRepository.java

@@ -2,6 +2,8 @@ package com.hr.repository.jpa;
 
 import com.hr.param.InterfaceCalledQueryParam;
 import com.hr.repository.domain.IpOrderPO;
+import com.hr.vo.CallbackHistoryVO;
+import com.hr.vo.IpInterfaceCallVO;
 import com.hr.vo.IpInterfaceVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -19,4 +21,6 @@ public interface IpOrderRepository extends JpaRepository<IpOrderPO,Long> {
 
 
     IpOrderPO findByBusinessNo(@Param("businessNo") String businessNo);
+
+    List<CallbackHistoryVO> queryCallbackHistory(@Param("id") long id);
 }

+ 7 - 3
src/main/java/com/hr/repository/service/IpOrderService.java

@@ -2,12 +2,12 @@ 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.hr.vo.*;
 import com.yy.basedevelop.common.data.BasePageResult;
 import org.springframework.data.domain.Page;
 
+import java.util.List;
+
 /**
  * 调用记录表;(ip_order)表服务接口
  * @author : http://www.yonsum.com
@@ -55,4 +55,8 @@ public interface IpOrderService{
     boolean deleteById(Long oid);
 
     BasePageResult<IpInterfaceCallVO> queryList(InterfaceCalledQueryParam ipInterfaceCalledQueryParam);
+
+    InterfaceCalledDetail interfaceDetail(Long id);
+
+    List<CallbackHistoryVO> callbackHistory(long id);
 }

+ 22 - 4
src/main/java/com/hr/repository/service/impl/IpOrderServiceImpl.java

@@ -2,19 +2,19 @@ package com.hr.repository.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.hr.param.InterfaceCalledQueryParam;
+import com.hr.repository.domain.IpLogPO;
 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.hr.vo.*;
 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.ArrayList;
 import java.util.List;
 
 /**
@@ -28,7 +28,7 @@ public class IpOrderServiceImpl implements IpOrderService {
     private IpOrderRepository ipOrderRepository;
     @Autowired
     private IpLogRepository ipLogRepository;
-    
+
     /** 
      * 通过ID查询单条数据 
      *
@@ -77,6 +77,24 @@ public class IpOrderServiceImpl implements IpOrderService {
         ipOrderRepository.save(IpOrderPO);
     }
 
+    @Override
+    public List<CallbackHistoryVO> callbackHistory(long id) {
+        return ipOrderRepository.queryCallbackHistory(id);
+    }
+
+    @Override
+    public InterfaceCalledDetail interfaceDetail(Long id) {
+        IpOrderPO ipOrderPO = ipOrderRepository.findById(id).get();
+        IpLogPO ipLog = ipLogRepository.findByOid(ipOrderPO.getId());
+        InterfaceCalledDetail vo = new InterfaceCalledDetail();
+        vo.setId(ipOrderPO.getId());
+        vo.setAccountNo(ipOrderPO.getAccNo());
+        vo.setInterfaceName(ipOrderPO.getInterfaceName());
+        vo.setRequestParam(ipLog.getRequestParam());
+        vo.setResponseParam(ipLog.getResponseResult());
+        return vo;
+    }
+
     @Override
     public BasePageResult<IpInterfaceCallVO> queryList(InterfaceCalledQueryParam ipInterfaceCalledQueryParam) {
         PageHelper.startPage(ipInterfaceCalledQueryParam.getPageNum(), ipInterfaceCalledQueryParam.getPageSize());

+ 31 - 0
src/main/java/com/hr/vo/CallbackHistoryVO.java

@@ -0,0 +1,31 @@
+package com.hr.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CallbackHistoryVO implements Serializable {
+
+    @Schema(description = "主键")
+    private Long id;
+
+    @Schema(description = "回调地址")
+    private String callbackUrl;
+
+    @Schema(description = "请求参数")
+    private String requestParam;
+
+    @Schema(description = "响应参数")
+    private String responseParam;
+
+    @Schema(description = "创建时间")
+    private String addTime;
+
+    @Schema(description = "状态")
+    private String status;
+
+    @Schema(description = "更新时间")
+    private String updateTime;
+}

+ 13 - 0
src/main/java/com/hr/vo/CallbackResponseVO.java

@@ -0,0 +1,13 @@
+package com.hr.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CallbackResponseVO implements Serializable {
+
+    private Boolean status;
+
+    private String responseParam;
+}

+ 19 - 0
src/main/java/com/hr/vo/InterfaceCalledDetail.java

@@ -0,0 +1,19 @@
+package com.hr.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class InterfaceCalledDetail implements Serializable {
+
+    private Long id;
+
+    private String accountNo;
+
+    private String interfaceName;
+
+    private String requestParam;
+
+    private String responseParam;
+}

+ 1 - 1
src/main/java/com/hr/vo/IpInterfaceCallVO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 public class IpInterfaceCallVO {
 
     @Schema(description = "主键")
-    private String id;
+    private Long id;
 
     @Schema(description = "账户编号")
     private String accountNo;

+ 3 - 3
src/main/resources/mapper/IpLogMapper.xml

@@ -7,8 +7,8 @@
 
     <select id="queryInterfaceCallHistory" >
         select
-            log.id,
-            ord.acc_no,
+            ord.id,
+            ord.acc_no accountNo,
             ord.interface_name,
             ord.manufacturer,
             ord.`status`,
@@ -16,6 +16,6 @@
             log.add_time
         from ip_log log
         left join ip_order ord on ord.id = log.oid
-        where 1 =1 and  log.id =:id and ord.acc_no = :accountNo and  ord.interface_name like '%'||:interfaceName||'%'
+        where 1 =1 and ref_id = 0 and  log.id =:id and ord.acc_no = :accountNo and  ord.interface_name like '%'||:interfaceName||'%'
     </select>
 </mapper>

+ 12 - 0
src/main/resources/mapper/IpOrderMapper.xml

@@ -8,4 +8,16 @@
 <!--    <select id="queryByBusinessNo" resultType="com.hr.repository.domain.IpOrderPO">-->
 <!--        select * from ip_order where 1=1 and  business_no = :businessNo-->
 <!--    </select>-->
+    <select id="queryCallbackHistory" resultType="com.hr.vo.CallbackHistoryVO">
+        select ord.id,
+               ord.callback_url callbackUrl,
+               log.request_param requsetParam,
+               log.response_result responseParam,
+               ord.status callbackStatus,
+               ord.add_time addTime,
+               ord.update_time updateTime
+        from ip_order ord
+        left join ip_log log on ord.id = log.oid
+        where 1 = 1 and ord.ref_id = :id
+    </select>
 </mapper>