|
|
@@ -260,9 +260,9 @@ public class ChangeOrderLogic {
|
|
|
String fileName = path + "/tmp/report";
|
|
|
// 生成的文件的存放路径
|
|
|
File mkdir = FileUtil.mkdir(path + "/tmp/report" );
|
|
|
-
|
|
|
+ log.info("打水印获取OSS图片开始 {}", DateUtil.formatDateTime(DateUtil.date()));
|
|
|
File file= CommonUtils.getFileByHttpURL(patch, mkdir.getPath(), OSS_WW, sysUrl + contextPath);
|
|
|
-
|
|
|
+ log.info("打水印获取OSS图片结束 {}", DateUtil.formatDateTime(DateUtil.date()));
|
|
|
|
|
|
String contentType = FileNameUtil.getSuffix(patch);
|
|
|
if (StringUtils.isBlank(contentType)) {
|
|
|
@@ -313,21 +313,27 @@ public class ChangeOrderLogic {
|
|
|
|
|
|
// 上传原图阿里云
|
|
|
String ossOrgObjectKey = ossUtil.getFilePath()+"/gather/org/" + fileOrgName;
|
|
|
+ log.info("打水印上传原图阿里云开始 {}", DateUtil.formatDateTime(DateUtil.date()));
|
|
|
ossUtil.uploadFile(ossOrgObjectKey, file);
|
|
|
+ log.info("打水印上传原图阿里云结束 {}", DateUtil.formatDateTime(DateUtil.date()));
|
|
|
|
|
|
String style = "image/auto-orient,1/resize,m_lfit,w_720/quality,q_100";
|
|
|
|
|
|
+ log.info("打水印开始 {}", DateUtil.formatDateTime(DateUtil.date()));
|
|
|
ossUtil.imageHandle(ossOrgObjectKey, style, path + "/tmp/image/compress/" + fileOrgName);
|
|
|
|
|
|
// 图片水印
|
|
|
ImageHandlerUtils.waterPress(path + "/tmp/image/compress/" + fileOrgName,
|
|
|
path + "/tmp/image/watermark/" + fileOrgName, Color.RED, 24, positionName, fileSuffix.replace(".",""));
|
|
|
+ log.info("打水印结束 {}", DateUtil.formatDateTime(DateUtil.date()));
|
|
|
|
|
|
File ossFile = FileUtil.file(path + "/tmp/image/watermark/" + fileOrgName);
|
|
|
|
|
|
// 上传oss
|
|
|
String ossObjectKey = ossUtil.getFilePath()+"/watermark/" + fileOrgName;
|
|
|
+ log.info("打水印上传水印图片开始 {}", DateUtil.formatDateTime(DateUtil.date()));
|
|
|
ossUtil.uploadFile(ossObjectKey, ossFile);
|
|
|
+ log.info("打水印上传水印图片结束 {}", DateUtil.formatDateTime(DateUtil.date()));
|
|
|
|
|
|
// 删除本地文件
|
|
|
if (FileUtil.exist(path + "/tmp/image/compress/" + fileOrgName)) {
|
