From 6388a84432dad9479953182cd0359e1388f04216 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Mon, 7 Apr 2025 20:00:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E7=85=A7=E7=89=87=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SafetyViolationServiceImpl.java | 11 ++++++- .../imgTool/system/vo/dto/FileStorageDto.java | 4 +++ .../bonus/imgTool/task/dao/ProPullDao.java | 5 ++++ .../bonus/imgTool/task/job/ProPullTask.java | 28 +++++++++++++++++ .../resources/mappers/basic/ProPullMapper.xml | 30 +++++++++++++++++++ 5 files changed, 77 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java index 1a3f7c0..1c20979 100644 --- a/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imgUpload/service/impl/SafetyViolationServiceImpl.java @@ -53,10 +53,19 @@ public class SafetyViolationServiceImpl implements SafetyViolationService { LoginUser loginUser = UserUtil.getLoginUser(); bean.setCreateUserId(loginUser.getId()); bean.setCreateUserName(loginUser.getUsername()); + List fileList = bean.getFileList(); +// //判断是否有整改照片，有则为已整改 +// if (fileList != null && !fileList.isEmpty()) { +// fileList.forEach(item -> { +// if("2".equals(item.getSourceType()){ +// bean.setRectStatus("1"); +// } +// }); +// } //基础数据存入库 int i = dao.insertSafetyViolation(bean); if (i > 0) { - List fileList = bean.getFileList(); + //照片入库 if (fileList != null && !fileList.isEmpty()) { fileList.forEach(item -> { 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 2a05451..8b1c320 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 @@ -91,4 +91,8 @@ public class FileStorageDto { */ private Integer isActive; + private String vioDate; + + private String proName; + } diff --git a/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java b/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java index 1e4864b..4efe913 100644 --- a/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java +++ b/src/main/java/com/bonus/imgTool/task/dao/ProPullDao.java @@ -1,6 +1,7 @@ package com.bonus.imgTool.task.dao; import com.bonus.imgTool.basic.vo.dto.ProDto; +import com.bonus.imgTool.system.vo.dto.FileStorageDto; import org.springframework.stereotype.Repository; import java.util.List; @@ -15,4 +16,8 @@ public interface ProPullDao { void addProject(List list); void updateProject(ProDto imgProject); + + List getNotHaveWatermarkPhoto(); + + void updateHaveWatermarkPhoto(List fileList); } 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 fcffd50..5d513f4 100644 --- a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java +++ b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java @@ -2,7 +2,10 @@ package com.bonus.imgTool.task.job; import cn.hutool.core.date.DateUtil; import com.bonus.imgTool.basic.vo.dto.ProDto; +import com.bonus.imgTool.system.vo.dto.FileStorageDto; import com.bonus.imgTool.task.dao.ProPullDao; +import com.bonus.imgTool.utils.HighQualityWatermark; +import com.bonus.imgTool.utils.SystemUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.Async; @@ -11,6 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import javax.annotation.Resource; +import java.io.File; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -46,6 +50,30 @@ public class ProPullTask { log.info("--------实名制工程数据拉取定时器完毕------"); } + /** + * 水印照片转换 + */ +// @Scheduled(initialDelay = 6000, fixedDelay = 60000 * 30) + @Async + public void getPhotoWatermarkTask() { + log.info("--------水印照片生成定时器开启------"); + //实名制工程 + List fileList = dao.getNotHaveWatermarkPhoto(); + fileList.forEach(item -> { + String localPath = SystemUtils.getUploadPath() + File.separator+ item.getOriginalFilePath(); + 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]); + String s = HighQualityWatermark.generateWatermark(sb, localPath); + item.setWatermarkFilePath(s); + }); + dao.updateHaveWatermarkPhoto(fileList); + log.info("--------水印照片生成定时器完毕------"); + } + /** * 同步工程数据 * @param proList diff --git a/src/main/resources/mappers/basic/ProPullMapper.xml b/src/main/resources/mappers/basic/ProPullMapper.xml index 04759f1..cf7248c 100644 --- a/src/main/resources/mappers/basic/ProPullMapper.xml +++ b/src/main/resources/mappers/basic/ProPullMapper.xml @@ -77,6 +77,18 @@ WHERE id = #{proId} + + + + UPDATE + sys_file_resource + SET + watermark_file_path = #{item.watermarkFilePath} + WHERE + id = #{item.id} + + + +