diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java index dd278b4..a1079c2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.OcrConstant; @@ -39,6 +40,7 @@ import java.util.stream.Collectors; */ @Service @EnableAsync +@Slf4j public class OcrIdentifyServiceImpl extends ServiceImpl implements IOcrIdentifyService { @Resource IOcrRuleCheckService ocrRuleCheckService; @@ -233,9 +235,13 @@ public class OcrIdentifyServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OcrIdentifyDetail::getIdentifyId,id); @@ -275,10 +281,16 @@ public class OcrIdentifyServiceImpl extends ServiceImpl !t.equals(task_id)).collect(Collectors.joining(",")); if (StringUtils.isBlank(collect)) { //如果主任务下的子任务已清空,删除key - redisUtil.del(masterTaskId); + redisUtil.del("identify_"+masterTaskId); //刷新Ocr识别任务状态 updateOcrIdentifyStatus(masterTaskId,"1"); log.error("更新任务状态,id:"+masterTaskId); }else{ //主任务还存在,刷新主任务明细 - redisUtil.set(masterTaskId,collect); + redisUtil.set("identify_"+masterTaskId,collect); } } } else { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/FileOUtils.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/FileOUtils.java index c579aa2..b3a566a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/FileOUtils.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/FileOUtils.java @@ -29,13 +29,16 @@ public class FileOUtils { if (sourceImages.indexOf("http://")!=-1||sourceImages.indexOf("https://")!=-1) { //网络目录 try { - URL url = new URL(sourceImages); - // 返回一个 URLConnection 对象,它表示到 URL 所引用的远程对象的连接。 - URLConnection uc = url.openConnection(); - // 打开的连接读取的输入流。 - InputStream in = uc.getInputStream(); - //附件存在 - files.add(sourceImages); + String[] split = sourceImages.split(","); + for (String s : split) { + URL url = new URL(s); + // 返回一个 URLConnection 对象,它表示到 URL 所引用的远程对象的连接。 + URLConnection uc = url.openConnection(); + // 打开的连接读取的输入流。 + InputStream in = uc.getInputStream(); + //附件存在 + files.add(s); + } } catch (Exception e) { //附件不存在 return null;