bonus
/
yn_img_tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题修改

This commit is contained in:
cwchen 2025-04-15 18:51:43 +08:00
parent ed4bf502ff
commit 10bbfc4745
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/imgTool/task/job/ProPullTask.java
View File

@ -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]);

6
src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java
View File

@ -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",

17
src/main/resources/mappers/backstage/SynthesisQueryMapper.xml
View File

@ -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>

2
src/main/resources/mappers/basic/ProPullMapper.xml
View File

@ -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

2
src/main/resources/static/js/synthesisQuery/proClassifyStatisticsDetail.js
View File

@ -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) +