diff --git a/src/main/java/com/bonus/imgTool/system/vo/dto/FileStorageDto.java b/src/main/java/com/bonus/imgTool/system/vo/dto/FileStorageDto.java index 8b1c320..c0cedc4 100644 --- a/src/main/java/com/bonus/imgTool/system/vo/dto/FileStorageDto.java +++ b/src/main/java/com/bonus/imgTool/system/vo/dto/FileStorageDto.java @@ -95,4 +95,6 @@ public class FileStorageDto { private String proName; + private String title; + } 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 25d1431..8c09d39 100644 --- a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java +++ b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java @@ -64,9 +64,14 @@ public class ProPullTask { 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]); + if(item.getSourceTypeName().contains("-")){ + String[] split = item.getSourceTypeName().split("-"); + sb.add(split[0]); + sb.add(split[1]); + }else{ + sb.add(item.getSourceTypeName()); + sb.add(item.getTitle()); + } try { String s = HighQualityWatermark.generateWatermark(sb, localPath); item.setWatermarkFilePath(s);