From f733a8b6b5777f77c7d166be9315cc3d5c97d7a1 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Mon, 14 Apr 2025 13:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/imgTool/system/vo/dto/FileStorageDto.java   |  2 ++
 .../java/com/bonus/imgTool/task/job/ProPullTask.java  | 11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

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<String> 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);