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