6张照片处理

src/main/java/com/poteviohealth/cgp/statistics/service/impl/WatermarkImgServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -51,6 +52,28 @@ public class WatermarkImgServiceImpl extends BaseServiceImpl<WatermarkImgMapper,
                 }
             }
         }
+
+        OrderImageDTO dto = baseMapper.getOrderUrl(TokenContext.cureOperatorId(),dbName, orderId);
+        String orgVal = "";
+        if(StringUtils.isNotEmpty(dto.getStartUrl())){
+            orgVal = dto.getStartUrl()+",";
+           List<String> urlList = Arrays.asList(dto.getStartUrl().split(","));
+           if(urlList.size()>3){
+               for (int i = 3; i < urlList.size(); i++) {
+                   startUrl.add(urlList.get(i));
+               }
+           }
+        }
+        if(StringUtils.isNotEmpty(dto.getEndUrl())){
+            orgVal += dto.getEndUrl();
+            List<String> urlList = Arrays.asList(dto.getEndUrl().split(","));
+            if(urlList.size()>3){
+                for (int i = 3; i < urlList.size(); i++) {
+                    endUrl.add(urlList.get(i));
+                }
+            }
+        }
+
         String nowVal = "";
         String start = "";
         if(!startUrl.isEmpty()){
@@ -63,15 +86,6 @@ public class WatermarkImgServiceImpl extends BaseServiceImpl<WatermarkImgMapper,
             end = endUrl.stream().map(String::valueOf).collect(Collectors.joining(","));
             nowVal +=end;
         }
-
-        OrderImageDTO dto = baseMapper.getOrderUrl(TokenContext.cureOperatorId(),dbName, orderId);
-        String orgVal = "";
-        if(StringUtils.isNotEmpty(dto.getStartUrl())){
-            orgVal = dto.getStartUrl()+",";
-        }
-        if(StringUtils.isNotEmpty(dto.getEndUrl())){
-            orgVal += dto.getEndUrl();
-        }
         WatermarkImg wi = new WatermarkImg();
         wi.setUid(orderId.toString());
         wi.setOriginalImg(orgVal);