guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 重试不新增日志

Browse Source
feat/uodateFlow20240623
Vincent 1 year ago
parent 906fc1e65b
commit e081a21a6d
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File

7
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/PrevailCloudApi.java
Unescape View File

@ -17,13 +17,15 @@ public interface PrevailCloudApi {
/**
* 根据参数拉取，某个业务主体的任务数据
*
* @param pictureSourceParameter
* @return
*/
ApiPage<PictureSourceResult> pullPictureSource(PictureSourceParameter pictureSourceParameter) throws Exception;
ApiPage<PictureSourceResult> 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<PictureSourceResult> getAllPictureSourceResultApiPage(PictureSourceParameter pictureSourceParameter);
List<PictureSourceResult> getPictureSourceResultApiPage(PictureSourceParameter pictureSourceParameter);
List<PictureSourceResult> getPictureSourceResultApiPage(PictureSourceParameter pictureSourceParameter, boolean isRetry);
}

14
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
Unescape View File

@ -56,7 +56,7 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
private OcrPrevailCloudLogService prevailCloudLogService;
@Override
public ApiPage<PictureSourceResult> pullPictureSource(PictureSourceParameter pictureSourceParameter) throws Exception {
public ApiPage<PictureSourceResult> pullPictureSource(PictureSourceParameter pictureSourceParameter, boolean isRetry) throws Exception {
//1.检查api配置是否正常
if (!apiConfig.checkConfig()) {
return null;
@ -105,7 +105,7 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
ApiPage<String> 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<PictureSourceResult> getPictureSourceResultApiPage(PictureSourceParameter pictureSourceParameter) {
public List<PictureSourceResult> getPictureSourceResultApiPage(PictureSourceParameter pictureSourceParameter, boolean isRetry) {
ApiPage<PictureSourceResult> apiPage = null;
try {
apiPage = this.pullPictureSource(pictureSourceParameter);
apiPage = this.pullPictureSource(pictureSourceParameter, isRetry);
} catch (Exception e) {
e.printStackTrace();
}

6
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/PrevailCloudApiController.java
Unescape View File

@ -173,7 +173,7 @@ public class PrevailCloudApiController {
pictureSourceParameter.setTenantNo(tenantNo);
pictureSourceParameter.setAccountNo(accountNo);
try {
ApiPage<PictureSourceResult> apiPage = prevailCloudApi.pullPictureSource(pictureSourceParameter);
ApiPage<PictureSourceResult> apiPage = prevailCloudApi.pullPictureSource(pictureSourceParameter, false);
if (apiPage == null) {
return "获取数据为空！";
}
@ -255,7 +255,7 @@ public class PrevailCloudApiController {
pictureSourceParameter.setTenantNo(tenantNo);
pictureSourceParameter.setAccountNo(accountNo);
List<PictureSourceResult> resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter);
List<PictureSourceResult> resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter, false);
if (CollectionUtils.isEmpty(resultList)) {
continue;
}
@ -290,7 +290,7 @@ public class PrevailCloudApiController {
}
PictureSourceParameter pictureSourceParameter = RequestParameterFormat.fromString(parameterString);
List<PictureSourceResult> resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter);
List<PictureSourceResult> resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter, true);
if (CollectionUtils.isEmpty(resultList)) {
//更新日志
OcrPrevailCloudLog ocrPrevailCloudLog = OcrPrevailCloudLog.builder()

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java
Unescape View File

@ -135,7 +135,7 @@ public class PictureSourceTimerJob {
pictureSourceParameter.setTenantNo(tenantNo);
pictureSourceParameter.setAccountNo(accountNo);
List<PictureSourceResult> resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter);
List<PictureSourceResult> resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter, false);
if (CollectionUtils.isEmpty(resultList)) {
continue;
}

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java
Unescape View File

@ -97,7 +97,7 @@ public class PullPictureDataJob {
pictureSourceParameter.setTenantNo(tenantNo);
pictureSourceParameter.setAccountNo(accountNo);
List<PictureSourceResult> resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter);
List<PictureSourceResult> resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter, false);
if (CollectionUtils.isEmpty(resultList)) {
continue;
}

Write Preview
Loading…
Cancel
Save