|
@@ -7,6 +7,7 @@ import com.poteviohealth.cgp.common.service.impl.BaseServiceImpl;
|
|
|
import com.poteviohealth.cgp.statistics.mapper.WatermarkImgMapper;
|
|
import com.poteviohealth.cgp.statistics.mapper.WatermarkImgMapper;
|
|
|
import com.poteviohealth.cgp.statistics.model.WatermarkImg;
|
|
import com.poteviohealth.cgp.statistics.model.WatermarkImg;
|
|
|
import com.poteviohealth.cgp.statistics.model.indto.PriceUploadDto;
|
|
import com.poteviohealth.cgp.statistics.model.indto.PriceUploadDto;
|
|
|
|
|
+import com.poteviohealth.cgp.statistics.model.outdto.OrderImageDTO;
|
|
|
import com.poteviohealth.cgp.statistics.service.IWatermarkImgService;
|
|
import com.poteviohealth.cgp.statistics.service.IWatermarkImgService;
|
|
|
import com.poteviohealth.cgp.statistics.utils.OssUtils;
|
|
import com.poteviohealth.cgp.statistics.utils.OssUtils;
|
|
|
import com.poteviohealth.cgp.statistics.utils.Watermark;
|
|
import com.poteviohealth.cgp.statistics.utils.Watermark;
|
|
@@ -48,16 +49,32 @@ public class WatermarkImgServiceImpl extends BaseServiceImpl<WatermarkImgMapper,
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ String nowVal = "";
|
|
|
String start = "";
|
|
String start = "";
|
|
|
if(!startUrl.isEmpty()){
|
|
if(!startUrl.isEmpty()){
|
|
|
start = startUrl.stream().map(String::valueOf).collect(Collectors.joining(","));
|
|
start = startUrl.stream().map(String::valueOf).collect(Collectors.joining(","));
|
|
|
|
|
+ nowVal = start+",";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
String end = "";
|
|
String end = "";
|
|
|
if(!endUrl.isEmpty()){
|
|
if(!endUrl.isEmpty()){
|
|
|
end = endUrl.stream().map(String::valueOf).collect(Collectors.joining(","));
|
|
end = endUrl.stream().map(String::valueOf).collect(Collectors.joining(","));
|
|
|
|
|
+ nowVal +=end;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ OrderImageDTO dto = baseMapper.getOrderUrl(TokenContext.cureOperatorId(),dbName, orderId);
|
|
|
|
|
+ String orgVal = "";
|
|
|
|
|
+ if(StringUtils.isNotBlank(dto.getStartUrl())){
|
|
|
|
|
+ orgVal = dto.getStartUrl()+",";
|
|
|
|
|
+ }
|
|
|
|
|
+ if(StringUtils.isNotBlank(dto.getEndUrl())){
|
|
|
|
|
+ orgVal += dto.getEndUrl();
|
|
|
|
|
+ }
|
|
|
|
|
+ WatermarkImg wi = new WatermarkImg();
|
|
|
|
|
+ wi.setUid(orderId.toString());
|
|
|
|
|
+ wi.setOriginalImg(orgVal);
|
|
|
|
|
+ wi.setNowImg(nowVal);
|
|
|
|
|
+ this.save(wi);
|
|
|
if(orderId != null){
|
|
if(orderId != null){
|
|
|
baseMapper.updateOrderUrl(TokenContext.cureOperatorId(),start ,end , dbName, orderId);
|
|
baseMapper.updateOrderUrl(TokenContext.cureOperatorId(),start ,end , dbName, orderId);
|
|
|
}
|
|
}
|