diff --git a/src/main/java/com/bonus/imgTool/backstage/entity/ProClassifyStatisticsVo.java b/src/main/java/com/bonus/imgTool/backstage/entity/ProClassifyStatisticsVo.java index 2e685a8..8fa3ab0 100644 --- a/src/main/java/com/bonus/imgTool/backstage/entity/ProClassifyStatisticsVo.java +++ b/src/main/java/com/bonus/imgTool/backstage/entity/ProClassifyStatisticsVo.java @@ -25,7 +25,7 @@ public class ProClassifyStatisticsVo extends SynthesisNumVo{ @Excel(name = "工程名称", width = 30.0, orderNum = "1") private String proName; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") @Excel(name = "最后更新时间", width = 20.0, orderNum = "8",format = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date lastUpdateTime; diff --git a/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java b/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java index 505c618..7c7e1b7 100644 --- a/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java +++ b/src/main/java/com/bonus/imgTool/backstage/service/DownloadService.java @@ -171,6 +171,7 @@ public class DownloadService { try { // 查询图片未生成水印照片的数据 List list = Optional.ofNullable(synthesisQueryDao.generateWatermark(proId)).orElseGet(ArrayList::new); + System.err.println("查询图片未生成水印照片的数据:" + list.size()); List futureList = new ArrayList<>(); List newList = new ArrayList<>(); for (SynthesisQueryVo vo : list) { diff --git a/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java b/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java index 1a6f6f2..3f2746a 100644 --- a/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java +++ b/src/main/java/com/bonus/imgTool/utils/HighQualityWatermark.java @@ -49,9 +49,10 @@ public class HighQualityWatermark { opacity = Math.max(MIN_OPACITY, Math.min(opacity, MAX_OPACITY)); // 读取原始图片并获取其类型 BufferedImage originalImage = ImageIO.read(new File(sourceImagePath)); - int imageType = originalImage.getTransparency() == Transparency.OPAQUE + /*int imageType = originalImage.getTransparency() == Transparency.OPAQUE ? BufferedImage.TYPE_INT_RGB - : BufferedImage.TYPE_INT_ARGB; + : BufferedImage.TYPE_INT_ARGB;*/ + int imageType = BufferedImage.TYPE_INT_RGB; // 创建与原始图片相同大小的新图像 BufferedImage sourceImage = new BufferedImage( originalImage.getWidth(), @@ -347,8 +348,8 @@ public class HighQualityWatermark { watermarkLines.add(proName.replaceAll("(.{18})", "$1@@")); watermarkLines.add("安全违章"); watermarkLines.add("违章照片"); - String localPath = "C:\\Users\\10488\\Desktop\\3.jpg"; - String outPath = "C:\\Users\\10488\\Desktop\\output.jpg"; + String localPath = "C:\\Users\\10488\\Desktop\\新建文件夹 (2)\\2.png"; + String outPath = "C:\\Users\\10488\\Desktop\\output.png"; // 添加高质量水印 addHighQualityWatermark(localPath, outPath, watermarkLines, "bottom-left", diff --git a/src/main/resources/static/js/synthesisQuery/fileDownload.js b/src/main/resources/static/js/synthesisQuery/fileDownload.js index 220540f..3789404 100644 --- a/src/main/resources/static/js/synthesisQuery/fileDownload.js +++ b/src/main/resources/static/js/synthesisQuery/fileDownload.js @@ -21,7 +21,7 @@ document.addEventListener('DOMContentLoaded', function() { try { // 1. 生成唯一任务ID - currentTaskId = 'task_' + Date.now(); + currentTaskId = Date.now(); // 2. 显示等待提示 const swalInstance = Swal.fire({ title: '正在生成压缩包', diff --git a/src/main/resources/static/js/synthesisQuery/highSearchForm.js b/src/main/resources/static/js/synthesisQuery/highSearchForm.js index 458abd5..e9cda53 100644 --- a/src/main/resources/static/js/synthesisQuery/highSearchForm.js +++ b/src/main/resources/static/js/synthesisQuery/highSearchForm.js @@ -24,6 +24,9 @@ function setParams(obj) { setSelectValueName(majors,'majorId','请选择专业'); setSelectValueName(gxs,'gxId','请选择工序'); form.val('formInfo', highSearchData); + $('input[name="photoType"]').each(function(){ + $(this).prop('checked', false); + }) $.each(highSearchData.photoType,function(index,item){ $('input[name="photoType"][value='+item+']').prop('checked', true); })