From e081a21a6db844876ab99fbd6416b90ec411a94d Mon Sep 17 00:00:00 2001 From: Vincent <19330835921@163.com> Date: Tue, 4 Jun 2024 23:38:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E8=AF=95=E4=B8=8D=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java | 7 +++++-- .../xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java | 14 +++++++++----- .../ocr/controller/PrevailCloudApiController.java | 6 +++--- .../ocr/timerJob/PictureSourceTimerJob.java | 2 +- .../xiaoyao/ocr/timerJob/PullPictureDataJob.java | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java index 52816585..b018fe54 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java @@ -17,13 +17,15 @@ public interface PrevailCloudApi { /** * 根据参数拉取，某个业务主体的任务数据 + * * @param pictureSourceParameter * @return */ - ApiPage pullPictureSource(PictureSourceParameter pictureSourceParameter) throws Exception; + ApiPage pullPictureSource(PictureSourceParameter pictureSourceParameter, boolean isRetry) throws Exception; /** * 根据参数，拉取某个业务主体，全量业务数据 + * * @param pictureSourceParameter * @return */ @@ -33,6 +35,7 @@ public interface PrevailCloudApi { /** * 根据租户id 拉取对应业务主体信息 + * * @param tenantNo */ void pullAccountInfo(long tenantNo) throws Exception; @@ -44,7 +47,7 @@ public interface PrevailCloudApi { List getAllPictureSourceResultApiPage(PictureSourceParameter pictureSourceParameter); - List getPictureSourceResultApiPage(PictureSourceParameter pictureSourceParameter); + List getPictureSourceResultApiPage(PictureSourceParameter pictureSourceParameter, boolean isRetry); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java index 0034a3ee..fbe848ba 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java @@ -56,7 +56,7 @@ public class PrevailCloudApiImpl implements PrevailCloudApi { private OcrPrevailCloudLogService prevailCloudLogService; @Override - public ApiPage pullPictureSource(PictureSourceParameter pictureSourceParameter) throws Exception { + public ApiPage pullPictureSource(PictureSourceParameter pictureSourceParameter, boolean isRetry) throws Exception { //1.检查api配置是否正常 if (!apiConfig.checkConfig()) { return null; @@ -105,7 +105,7 @@ public class PrevailCloudApiImpl implements PrevailCloudApi { ApiPage apiPage = JSONUtil.toBean(data, ApiPage.class); //日志增加拉取数量 prevailCloudLog.setResponseParam(prevailCloudLog.getResponseParam()+",拉取数量:"+apiPage.getTotal()); - if(apiPage.getTotal()==0){ + if(!isRetry && apiPage.getTotal()==0){ prevailCloudLogService.save(prevailCloudLog); return null; } @@ -116,7 +116,11 @@ public class PrevailCloudApiImpl implements PrevailCloudApi { resultApiPage.setPageSize(apiPage.getPageSize()); resultApiPage.setTotal(apiPage.getTotal()); resultApiPage.setRecords(listResult); - prevailCloudLogService.save(prevailCloudLog); + + if (!isRetry) { + prevailCloudLogService.save(prevailCloudLog); + } + return resultApiPage; } else { logger.debug("请求图片接口数据失败,参数:{},返回值:{}", json, responseJsonStr); @@ -330,10 +334,10 @@ public class PrevailCloudApiImpl implements PrevailCloudApi { } @Override - public List getPictureSourceResultApiPage(PictureSourceParameter pictureSourceParameter) { + public List getPictureSourceResultApiPage(PictureSourceParameter pictureSourceParameter, boolean isRetry) { ApiPage apiPage = null; try { - apiPage = this.pullPictureSource(pictureSourceParameter); + apiPage = this.pullPictureSource(pictureSourceParameter, isRetry); } catch (Exception e) { e.printStackTrace(); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/PrevailCloudApiController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/PrevailCloudApiController.java index a30ba542..7aa54a8e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/PrevailCloudApiController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/PrevailCloudApiController.java @@ -173,7 +173,7 @@ public class PrevailCloudApiController { pictureSourceParameter.setTenantNo(tenantNo); pictureSourceParameter.setAccountNo(accountNo); try { - ApiPage apiPage = prevailCloudApi.pullPictureSource(pictureSourceParameter); + ApiPage apiPage = prevailCloudApi.pullPictureSource(pictureSourceParameter, false); if (apiPage == null) { return "获取数据为空！"; } @@ -255,7 +255,7 @@ public class PrevailCloudApiController { pictureSourceParameter.setTenantNo(tenantNo); pictureSourceParameter.setAccountNo(accountNo); - List resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter); + List resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter, false); if (CollectionUtils.isEmpty(resultList)) { continue; } @@ -290,7 +290,7 @@ public class PrevailCloudApiController { } PictureSourceParameter pictureSourceParameter = RequestParameterFormat.fromString(parameterString); - List resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter); + List resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter, true); if (CollectionUtils.isEmpty(resultList)) { //更新日志 OcrPrevailCloudLog ocrPrevailCloudLog = OcrPrevailCloudLog.builder() diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java index f99ea541..b1a94bc4 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java @@ -135,7 +135,7 @@ public class PictureSourceTimerJob { pictureSourceParameter.setTenantNo(tenantNo); pictureSourceParameter.setAccountNo(accountNo); - List resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter); + List resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter, false); if (CollectionUtils.isEmpty(resultList)) { continue; } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java index 8e3648ff..a23060fd 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java @@ -97,7 +97,7 @@ public class PullPictureDataJob { pictureSourceParameter.setTenantNo(tenantNo); pictureSourceParameter.setAccountNo(accountNo); - List resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter); + List resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter, false); if (CollectionUtils.isEmpty(resultList)) { continue; }