diff --git a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java index 5d513f4..25d1431 100644 --- a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java +++ b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java @@ -53,22 +53,26 @@ public class ProPullTask { /** * 水印照片转换 */ -// @Scheduled(initialDelay = 6000, fixedDelay = 60000 * 30) + @Scheduled(initialDelay = 6000, fixedDelay = 60000 * 30) @Async public void getPhotoWatermarkTask() { log.info("--------水印照片生成定时器开启------"); //实名制工程 List fileList = dao.getNotHaveWatermarkPhoto(); fileList.forEach(item -> { - String localPath = SystemUtils.getUploadPath() + File.separator+ item.getOriginalFilePath(); + String localPath = SystemUtils.getUploadPath() + item.getOriginalFilePath(); List sb = new ArrayList<>(); sb.add(item.getVioDate()); sb.add(item.getProName()); String[] split = item.getSourceTypeName().split("-"); sb.add(split[0]); sb.add(split[1]); - String s = HighQualityWatermark.generateWatermark(sb, localPath); - item.setWatermarkFilePath(s); + try { + String s = HighQualityWatermark.generateWatermark(sb, localPath); + item.setWatermarkFilePath(s); + } catch (Exception e) { + log.error("水印照片转换异常:",e); + } }); dao.updateHaveWatermarkPhoto(fileList); log.info("--------水印照片生成定时器完毕------"); diff --git a/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java b/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java index 33afb39..1a6f6f2 100644 --- a/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java +++ b/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java @@ -322,6 +322,10 @@ public class HighQualityWatermark { String suffix = IDUtils.getSuffix(localPath); String path = File.separator + "sy" + File.separator + IDUtils.createID() + suffix; String outPath = SystemUtils.getUploadPath() + path; + File uploadFile = new File(outPath); + if (!uploadFile.getParentFile().exists()) { + uploadFile.getParentFile().mkdirs(); + } // 添加高质量水印 addHighQualityWatermark(localPath, outPath, watermarkLines, "bottom-left",