feat: 水印支持页边距控制

This commit is contained in:
2024-01-11 15:46:25 +08:00
parent ba53565a0e
commit 7366808e9d
7 changed files with 25 additions and 171 deletions
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.MinioUtil;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService;
import com.jero.modules.laws.enterprise.util.WaterMarkUtil;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.util.SysWaterMarkUtil;
import com.jero.modules.system.util.UserUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.io.ClassPathResource;
@@ -36,7 +36,7 @@ import java.nio.charset.StandardCharsets;
public class SysCommonController {
@Resource
private WaterMarkUtil waterMarkUtil;
private SysWaterMarkUtil sysWaterMarkUtil;
@Resource
private IOSSFileService ossFileService;
@@ -120,7 +120,7 @@ public class SysCommonController {
// 然后在您的controller方法中:
if ("pdf".equalsIgnoreCase(FileUtil.extName(fileName))) {
try (InputStream originalInputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), url);
InputStream watermarkedInputStream = waterMarkUtil.addWatermarkToPdf(originalInputStream);
InputStream watermarkedInputStream = sysWaterMarkUtil.addWatermarkToPdf(originalInputStream);
OutputStream outputStream = response.getOutputStream()) {
if (originalInputStream == null) {