diff --git a/src/main/java/com/yuyou/openapi/openapi/api/ABClient.java b/src/main/java/com/yuyou/openapi/openapi/api/ABClient.java index d7a95dd..f8a66ac 100644 --- a/src/main/java/com/yuyou/openapi/openapi/api/ABClient.java +++ b/src/main/java/com/yuyou/openapi/openapi/api/ABClient.java @@ -50,10 +50,9 @@ public class ABClient { log.info("====== [ one request comming,request content is {} ] ======", vo.toString()); // 转换实体类映射 List dtos = ABMessageConverter.convertABMessageDTOFromVO(vo); - // 调用业务处理接口 - abClientService.recordAndSendABClientMsg(dtos); - // 返回校验成功的结果 - return CommonResponse.createBySuccess(); + // 调用业务处理接口 返回校验成功的结果 + return abClientService.recordAndSendABClientMsg(dtos) ? + CommonResponse.createBySuccess() : CommonResponse.createByErrorMessage("调用失败请重试"); } /** diff --git a/src/main/java/com/yuyou/openapi/openapi/service/ABClientService.java b/src/main/java/com/yuyou/openapi/openapi/service/ABClientService.java index 86480dc..381dd9e 100644 --- a/src/main/java/com/yuyou/openapi/openapi/service/ABClientService.java +++ b/src/main/java/com/yuyou/openapi/openapi/service/ABClientService.java @@ -21,7 +21,7 @@ public interface ABClientService { /** * 记录接口推送信息对数据进行入库,并异步进行发送给下游 */ - void recordAndSendABClientMsg(List dto); + boolean recordAndSendABClientMsg(List dto); /** * 记录推送掌门的数据,并存储入库 diff --git a/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java b/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java index 52c250f..85e59d0 100644 --- a/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java +++ b/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java @@ -6,8 +6,10 @@ import com.yuyou.openapi.openapi.model.dto.ABMessageDTO; import com.yuyou.openapi.openapi.model.dto.ABZMMessageDTO; import com.yuyou.openapi.openapi.service.ABClientService; import com.yuyou.openapi.openapi.task.ABDownTask; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; @@ -23,6 +25,7 @@ import java.util.List; * x 2020/8/4 v1.0 创建此文件 */ @Service +@Slf4j public class ABClientServiceImpl implements ABClientService { @@ -33,15 +36,20 @@ public class ABClientServiceImpl implements ABClientService { private ABMessageRepository abMessageRepository; @Override - public void recordAndSendABClientMsg(List dtos) { + public boolean recordAndSendABClientMsg(List dtos) { // 调用接口进行入库 ArrayList abMessageDOS = new ArrayList<>(); + // TODO: 2020/8/10 0010 加密存储 List dos = abMessageRepository.saveAll(abMessageDOS); - // TODO: 2020/8/10 0010 需要规划返回值类型 + if (CollectionUtils.isEmpty(dos)){ + log.error("========== [insert data error , please check .] =========="); + return Boolean.FALSE; + } + // TODO: 2020/8/10 0010 解密 发送 // 调用异步任务进行转发AB单 - 这里是这有一条数据 - // TODO: 2020/8/10 0010 经过加密类进行处理 dtos - boolean handleResult = abDownTask.doRunTask(dtos); // 返回处理结果 + abDownTask.doRunTask(dtos); + return Boolean.TRUE; } /** diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 78b8df7..ee9e57b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -22,7 +22,7 @@ spring: ab: customer: url: https://sandbox.openapi.ppke.com.cn/ - app_id: app_id + app_id: YY9X8XCZ thread_pool: corePoolSize: 8 maxPoolSize: 8