q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

水印，使用设备名称

Browse Source
This commit is contained in:
Jerry Yan
2025-05-21 16:47:25 +08:00
parent aaddbab2ab
commit c01ff160c3
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
View File

@ -19,10 +19,12 @@ import com.ycwl.basic.mapper.*;
import com.ycwl.basic.model.mobile.goods.*;
import com.ycwl.basic.model.mobile.order.IsBuyRespVO;
import com.ycwl.basic.model.mobile.order.PriceObj;
import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
import com.ycwl.basic.model.pc.face.entity.FaceEntity;
import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.model.pc.mp.MpConfigEntity;
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
import com.ycwl.basic.model.pc.source.entity.SourceEntity;
import com.ycwl.basic.model.pc.source.entity.SourceWatermarkEntity;
import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
@ -31,6 +33,7 @@ import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity;
import com.ycwl.basic.model.pc.video.req.VideoReqQuery;
import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
import com.ycwl.basic.repository.DeviceRepository;
import com.ycwl.basic.repository.FaceRepository;
import com.ycwl.basic.repository.OrderRepository;
import com.ycwl.basic.repository.ScenicRepository;
@ -90,6 +93,8 @@ public class GoodsServiceImpl implements GoodsService {
private FaceRepository faceRepository;
@Autowired
private TaskStatusBiz taskStatusBiz;
@Autowired
private DeviceRepository deviceRepository;
public ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query) {
//查询原素材
@ -662,6 +667,16 @@ public class GoodsServiceImpl implements GoodsService {
item.setUrl(any.get().getWatermarkUrl());
} else {
// 生成
String text = scenicConfig.getWatermarkScenicText();
if (StringUtils.isBlank(text)) {
SourceEntity entity = sourceMapper.getEntity(item.getGoodsId());
if (entity != null) {
DeviceEntity device = deviceRepository.getDevice(entity.getDeviceId());
if (device != null) {
text = device.getName();
}
}
}
File dstFile = new File(item.getGoodsId() + ".jpg");
File watermarkedFile = new File(item.getGoodsId() + "_" + type.getType() + "." + type.getPreferFileType());
try {
@ -674,7 +689,7 @@ public class GoodsServiceImpl implements GoodsService {
WatermarkInfo info = new WatermarkInfo();
info.setOriginalFile(dstFile);
info.setQrcodeFile(qrcode);
info.setScenicLine(scenicConfig.getWatermarkScenicText());
info.setScenicLine(text);
info.setDatetime(item.getCreateTime());
info.setDtFormat(scenicConfig.getWatermarkDtFormat());
info.setWatermarkedFile(watermarkedFile);