diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java index 9f776a8..139ea73 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java @@ -21,9 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.time.Instant; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** * TODO @@ -83,8 +81,15 @@ public class ApiTestController { int localCount = listResult.size(); int size = 0; for (PictureSourceResult pictureSourceResult : listResult) { + //1.如果不存在图片默认一个默认图片，方便走测试。 if(pictureSourceResult.getLivePhoto()==null){ - continue; + List> livePhoto = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("imgUrl","http://47.93.59.251/api/image/default.png"); + map.put("imgName","default.png"); + livePhoto.add(map); + pictureSourceResult.setLivePhoto(livePhoto); +// continue; } size++; //将可以处理数据放入处理队列中 diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java index 2c1af2e..bf29c0f 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java @@ -196,12 +196,19 @@ public class PictureDisposeTask implements Runnable{ } } //拜访科室 - picture.setField7(pictureSourceResult.getCompanyDepartment()); + if(StringUtils.isNotBlank(pictureSourceResult.getCompanyDepartment())){ + picture.setField7(pictureSourceResult.getCompanyDepartment()); + } //拜访小结 - picture.setField8(pictureSourceResult.getDiscoveredIssues()); + if(StringUtils.isNotBlank(pictureSourceResult.getDiscoveredIssues())){ + picture.setField8(pictureSourceResult.getDiscoveredIssues()); + } + //拜访日期 - picture.setField11(pictureSourceResult.getVisitDate()); + if(StringUtils.isNotBlank(pictureSourceResult.getVisitDate())){ + picture.setField11(pictureSourceResult.getVisitDate()); + } //提报日期时间戳 picture.setSubmitDateTimestamp(pictureSourceResult.getSubmitTime()); @@ -212,8 +219,9 @@ public class PictureDisposeTask implements Runnable{ System.out.println("SubmitDateTimestamp2=================>>>>>>>"+picture.getSubmitDateTimestamp()); //定位距离 - picture.setField12(pictureSourceResult.getDistance()); - + if(StringUtils.isNotBlank(pictureSourceResult.getDistance())){ + picture.setField12(pictureSourceResult.getDistance()); + } //设置图片信息 if(map.get("imgName")!=null){ picture.setImgname(map.get("imgName").toString()); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureImgToLocalTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureImgToLocalTask.java index e7044a7..e52532c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureImgToLocalTask.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureImgToLocalTask.java @@ -15,6 +15,7 @@ import org.apache.http.client.ClientProtocolException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; import java.io.IOException; import java.util.Map; @@ -51,15 +52,17 @@ public class PictureImgToLocalTask implements Runnable { this.pictureImgToLocal = pictureImgToLocal; } -// public static String api_test2_identify_url="http://127.0.0.1:7003/semantic"; - public static String api_test2_identify_url="http://47.93.59.251/semantic/semantic"; - @Override public void run() { OcrPictureService ocrPictureService = SpringUtils.getBean("ocrPictureService"); OcrPicture picture = ocrPictureService.getById(pictureImgToLocal.getPictureId()); //1.开始转储图片 - Boolean result = DownloadImgUtil.downloadImage(pictureImgToLocal.getImgUrl(), pictureImgToLocal.getLocalPath()); + Boolean result = true; + //检查是否已经存在本地图片，存在则不进行转储了。 + File file = new File(pictureImgToLocal.getLocalPath()); + if(!file.isFile()){ + result = DownloadImgUtil.downloadImage(pictureImgToLocal.getImgUrl(), pictureImgToLocal.getLocalPath()); + } if (Boolean.TRUE.equals(result)) { if (ObjectUtil.isNotEmpty(picture)) { picture.setLocalpictrueurl(pictureImgToLocal.getLocalPath()); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/DownloadImgUtil.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/DownloadImgUtil.java index 3c06415..1d8f3c9 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/DownloadImgUtil.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/DownloadImgUtil.java @@ -3,10 +3,7 @@ package cn.jyjz.xiaoyao.ocr.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.io.PrintWriter; -import java.io.StringWriter; +import java.io.*; import java.net.URL; /** @@ -26,6 +23,15 @@ public class DownloadImgUtil { * @param destinationFile */ public static Boolean downloadImage(String imageUrl, String destinationFile) { + //检查路径是否存在，不存在测进行新建 + if(destinationFile.lastIndexOf(File.separator)!=-1){ + String directoryUrl = destinationFile.substring(0,destinationFile.lastIndexOf(File.separator)); + File file = new File(directoryUrl); + if(!file.isDirectory()){ + file.mkdirs(); + } + } + try (InputStream in = new URL(imageUrl).openStream(); FileOutputStream out = new FileOutputStream(destinationFile)) {