diff --git a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java index 1a7ffdc32..87c98465f 100644 --- a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java +++ b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java @@ -9,6 +9,7 @@ import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.collect.IoCollectOrderService; import com.glxp.api.util.IntUtil; +import org.jfree.util.Log; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -25,39 +26,48 @@ public class YPCF002Download implements IDownload { @Override public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { - int page = 1; - int limit = 100; - GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest(); - getSickPrescribeRequest.setLimit(limit); - getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo()); - getSickPrescribeRequest.setThirdSys("thirdId"); - getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); - getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType()); - getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime()); - getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()); - getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords()); - getSickPrescribeRequest.setBusType(collectOrderRequest.getBusType()); - while (true) { - getSickPrescribeRequest.setPage(page); - BaseResponse> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest); - - // TODO: 2024/9/11 添加一张中间表(io_collect_order_origin)原始表做为转换 - - if (baseResponse.getCode() == 20000) { - List list = baseResponse.getData().getList(); - if (list == null) { - return ResultVOUtils.error(500, "未查到此业务单据"); - } - thrOrderDownload.importThrOrder(list, collectOrderRequest); - if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) { - page++; + + int page = 1; + int limit = 100; + GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest(); + getSickPrescribeRequest.setLimit(limit); + getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo()); + getSickPrescribeRequest.setThirdSys("thirdId"); + getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); + getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType()); + getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime()); + getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()); + getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords()); + getSickPrescribeRequest.setBusType(collectOrderRequest.getBusType()); + while (true) { + List list; + try { + getSickPrescribeRequest.setPage(page); + BaseResponse> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest); + + // TODO: 2024/9/11 添加一张中间表(io_collect_order_origin)原始表做为转换 + + if (baseResponse.getCode() == 20000) { + list = baseResponse.getData().getList(); + if (list == null) { + return ResultVOUtils.error(500, "未查到此业务单据"); + } + thrOrderDownload.importThrOrder(list, collectOrderRequest); + if ((list.size() >= limit && !baseResponse.getData().getTotal().equals(-666)) || IntUtil.value(baseResponse.getData().getTotal()) == -555) { + page++; + } else { + break; + } } else { - break; + return ResultVOUtils.error(500, "下载第三方系统产品信息异常"); + } + }catch (Exception e){ + System.out.println("下载三方错误==="+e.getMessage()+"==="+collectOrderRequest); + e.printStackTrace(); } - } else { - return ResultVOUtils.error(500, "下载第三方系统产品信息异常"); } - } + + return ResultVOUtils.success("下载成功"); } }