From 10bbfc474553a276dd3c2af75f04e29121c1a3c9 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 15 Apr 2025 18:51:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/imgTool/task/job/ProPullTask.java |  2 +-
 .../imgTool/utils/HighQualityWatermark.java     |  6 +++---
 .../mappers/backstage/SynthesisQueryMapper.xml  | 17 ++++++++---------
 .../resources/mappers/basic/ProPullMapper.xml   |  2 +-
 .../proClassifyStatisticsDetail.js              |  2 +-
 5 files changed, 14 insertions(+), 15 deletions(-)

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 8c09d39..9eb329d 100644
--- a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java
+++ b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java
@@ -63,7 +63,7 @@ public class ProPullTask {
             String localPath = SystemUtils.getUploadPath() + item.getOriginalFilePath();
             List<String> sb = new ArrayList<>();
             sb.add(item.getVioDate());
-            sb.add(item.getProName());
+            sb.add(item.getProName().replaceAll("(.{18})", "$1@@"));
             if(item.getSourceTypeName().contains("-")){
                 String[] split = item.getSourceTypeName().split("-");
                 sb.add(split[0]);
diff --git a/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java b/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java
index 3f2746a..0be5247 100644
--- a/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java
+++ b/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java
@@ -276,7 +276,7 @@ public class HighQualityWatermark {
                 if ("center".equalsIgnoreCase(position)) {
                     x = (imgWidth - lineWidth) / 2;
                 }
-
+                line = line.replaceAll("@@","");
                 g2d.drawString(line, x, currentY);
                 currentY += lineHeight;
             }
@@ -348,8 +348,8 @@ public class HighQualityWatermark {
             watermarkLines.add(proName.replaceAll("(.{18})", "$1@@"));
             watermarkLines.add("安全违章");
             watermarkLines.add("违章照片");
-            String localPath = "C:\\Users\\10488\\Desktop\\新建文件夹 (2)\\2.png";
-            String outPath = "C:\\Users\\10488\\Desktop\\output.png";
+            String localPath = "C:\\Users\\10488\\Desktop\\174470065630950048665.jpg";
+            String outPath = "C:\\Users\\10488\\Desktop\\output.jpg";
             // 添加高质量水印
             addHighQualityWatermark(localPath, outPath,
                     watermarkLines, "bottom-left",
diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
index c7982f1..8447880 100644
--- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
+++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
@@ -498,16 +498,15 @@
                A.dict_name             AS sourceTypeName,
                tcq.title,
                tcq.pro_name            AS proName
-        FROM tb_comprehensive_query tcq
-                 LEFT JOIN sys_file_resource sfr
-                           ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND sfr.is_active = '1'
-                 LEFT JOIN (SELECT sd.dict_value, sd.dict_name
-                            FROM sys_distinct sd
-                                     LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
-                            WHERE sd2.dict_code = 'file_source_type'
-                              AND sd.del_flag = 0) A ON A.dict_value = sfr.source_type
+        FROM sys_file_resource sfr
+     LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND tcq.is_active = '1'
+     LEFT JOIN (SELECT sd.dict_value, sd.dict_name
+                FROM sys_distinct sd
+                         LEFT JOIN sys_distinct sd2 ON sd.p_id = sd2.id
+                WHERE sd2.dict_code = 'file_source_type'
+                  AND sd.del_flag = 0) A ON A.dict_value = sfr.source_type
         WHERE tcq.pro_id = #{proId}
-          AND tcq.is_active = '1'
+          AND sfr.is_active = '1'
           AND sfr.watermark_file_path IS NULL
     </select>
 
diff --git a/src/main/resources/mappers/basic/ProPullMapper.xml b/src/main/resources/mappers/basic/ProPullMapper.xml
index a806380..7b4e9df 100644
--- a/src/main/resources/mappers/basic/ProPullMapper.xml
+++ b/src/main/resources/mappers/basic/ProPullMapper.xml
@@ -143,7 +143,7 @@
     <select id="getNotHaveWatermarkPhoto" resultType="com.bonus.imgTool.system.vo.dto.FileStorageDto">
 		SELECT
 			sfr.id,
-			IFNULL(tcq.vio_date,"") as vioDate,
+			DATE_FORMAT(sfr.create_time,'%Y-%m-%d') as vioDate,
 			IFNULL(tcq.pro_name,"") as proName,
 			sd.dict_name AS sourceTypeName,
 			sfr.original_file_path
diff --git a/src/main/resources/static/js/synthesisQuery/proClassifyStatisticsDetail.js b/src/main/resources/static/js/synthesisQuery/proClassifyStatisticsDetail.js
index 3899460..1c953d1 100644
--- a/src/main/resources/static/js/synthesisQuery/proClassifyStatisticsDetail.js
+++ b/src/main/resources/static/js/synthesisQuery/proClassifyStatisticsDetail.js
@@ -192,7 +192,7 @@ function initListData(list) {
         $.each(list, function (index, item) {
             let html = "<div class='list-info'>" +
                 "        <div class='info-data layout'>" +
-                "            <p>" + item.vioDate + "</p>" +
+                "            <p>" + (item.vioDate || '/') + "</p>" +
                 "            <p class='img-color" + (item.uploadType) + "'>" + item.uploadTypeName + "</p>" +
                 "        </div>" +
                 setBasicInfo(item) +