|
@@ -67,10 +67,9 @@ public class WatermarkImgServiceImpl extends BaseServiceImpl<WatermarkImgMapper,
|
|
|
@Override
|
|
@Override
|
|
|
public VaultsResponse<List<PriceUploadDto>> printingWatermark(List<PriceUploadDto> list) {
|
|
public VaultsResponse<List<PriceUploadDto>> printingWatermark(List<PriceUploadDto> list) {
|
|
|
for (PriceUploadDto dto : list) {
|
|
for (PriceUploadDto dto : list) {
|
|
|
- if(dto.getType().contains("video")){
|
|
|
|
|
|
|
+ if(StringUtils.isBlank(dto.getDate()) || StringUtils.isBlank(dto.getUrl()) ||StringUtils.isBlank(dto.getType()) || dto.getType().contains("video")){
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
- if(StringUtils.isNotBlank(dto.getDate()) && StringUtils.isNotBlank(dto.getUrl())){
|
|
|
|
|
String uid = (dto.getUrl().split("/")[dto.getUrl().split("/").length-1]).split("\\.")[0];
|
|
String uid = (dto.getUrl().split("/")[dto.getUrl().split("/").length-1]).split("\\.")[0];
|
|
|
WatermarkImg watermarkImg = this.getEntityByBeanId("uid",uid );
|
|
WatermarkImg watermarkImg = this.getEntityByBeanId("uid",uid );
|
|
|
if(watermarkImg != null){
|
|
if(watermarkImg != null){
|
|
@@ -88,7 +87,6 @@ public class WatermarkImgServiceImpl extends BaseServiceImpl<WatermarkImgMapper,
|
|
|
this.save(newWi);
|
|
this.save(newWi);
|
|
|
dto.setUrl(newWi.getNowImg());
|
|
dto.setUrl(newWi.getNowImg());
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
return VaultsResponse.success(list);
|
|
return VaultsResponse.success(list);
|
|
|
}
|
|
}
|
|
|
|
|
|