设置主图，处理重复图片

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ItemServiceImpl.java

@@ -9,6 +9,7 @@ import com.wwdz.ch.core.consts.CommonEnum;
 import com.wwdz.ch.core.consts.ItemStateEnum;
 import com.wwdz.ch.core.storage.QiniuStorage;
 import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.core.util.StringUtil;
 import com.wwdz.ch.db.dao.CroppingRecordDao;
 import com.wwdz.ch.db.dao.ItemDao;
 import com.wwdz.ch.db.domain.Category;
@@ -227,6 +228,7 @@ public class ItemServiceImpl implements ItemService {
         try {
             CoinVo coinVo = new CoinVo();
             EntityMapper.copyAttribute(item, coinVo);
+            item.setImages(StringUtil.merge(item.getImages(), item.getTopImage()));
             String extra = item.getExtra();
             if (StringUtils.hasLength(extra)) {
                 Map<String, Object> map = JsonUtils.toMap(extra);

ch-core/src/main/java/com/wwdz/ch/core/util/StringUtil.java

+package com.wwdz.ch.core.util;
+
+
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.IntStream;
+
+public class StringUtil {
+
+    private final static String REGEXSPLIT = ";";
+
+
+    public static String merge(String images, String topImage) {
+        if (StringUtils.isEmpty(topImage)) {
+            return images;
+        }
+        if (StringUtils.isEmpty(images)) {
+            return null;
+        }
+        List<String> imageList = new ArrayList<>(Arrays.asList(images.split(REGEXSPLIT)));
+        if (imageList.contains(topImage)) {
+            IntStream.range(0, imageList.size()).filter(i->
+                            imageList.get(i).equals(topImage)).
+                    boxed().findFirst().map(i -> imageList.remove((int)i));
+            return String.join(REGEXSPLIT, imageList);
+        }
+        return topImage + REGEXSPLIT + images;
+    }
+
+}