2 커밋 108b96157b ... a1fdfabd9e

작성자 SHA1 메시지 날짜
  zhangqin a1fdfabd9e Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores 4 일 전
  zhangqin 9e405e4a7c coding:添加水印日志 4 일 전

+ 3 - 0
fs-service/src/main/java/com/fs/hospital580/util/ThumbnailatorWatermark.java

@@ -8,6 +8,7 @@ import com.fs.common.utils.AbsolutePosition;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
 import com.fs.system.service.ISysConfigService;
+import lombok.extern.slf4j.Slf4j;
 import net.coobird.thumbnailator.Thumbnails;
 import net.coobird.thumbnailator.geometry.Positions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,7 @@ import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
 @Component
+@Slf4j
 public class ThumbnailatorWatermark {
 
     @Autowired
@@ -32,6 +34,7 @@ public class ThumbnailatorWatermark {
 
     public String addWatermarkToNetworkImage(Long preId, Integer orderStatus, String signUrl) {
         try {
+            log.error("添加水印处方水印:{} {} {}0", preId, orderStatus, signUrl);
             // 处方原图
             String imageUrl = redisCache.getCacheObject("prescription:dstFilePath:" + preId);
             if (ObjectUtil.isEmpty(imageUrl)) {

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/facade/impl/Hospital580FacadeServiceImpl.java

@@ -167,7 +167,7 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
         // 处方图片
         redisCache.setCacheObject("prescription:dstFilePath:" + prescription.getPreId(), vo.getDstFilePath(), 2, TimeUnit.DAYS);
         // 处方添加待生效水印
-        prescription.setDstFilePath(thumbnailatorWatermark.addWatermarkToNetworkImage(prescription.getPreId(), fsStoreOrderScrm.getStatus(), null));
+        prescription.setDstFilePath(thumbnailatorWatermark.addWatermarkToNetworkImage(prescription.getPreId(), 0, null));
 
         // 更新处方记录
         prescription.updateById();