图片名称按照计划分类随机1

(cherry picked from commit 3b7fc174a3633d7b47b367673ca1ea6d2b8609b1)

launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewOutController.java

@@ -209,14 +209,25 @@ public class PlanNewOutController {
                 //List<Domain> t2 = f.getT2();
                 List<Image> t3 = f.getT2();
                 List<Material> t4 = f.getT3();
+                if (t3.size() < integer || t4.size() < integer) {
+                    throw new BaseException("图片或文字素材小于计划设置数");
+                }
+                ArrayList<Long> listImg = new ArrayList<>();
+                ArrayList<Long> listTxt = new ArrayList<>();
                 List<H5ImageAndText> h5ImageAndTexts = new ArrayList<>();
                 IntStream.range(0, integer).forEach(i -> {
-                    Image image1 = t3.get(RandomUtil.randomInt(0, t3.size()));
-                    //  Domain domain1 = t2.get(RandomUtil.randomInt(0,t2.size()));
-                    Material material = t4.get(RandomUtil.randomInt(0, t4.size()));
+                    List<Image> collect = t3.stream().filter(fff -> !listImg.contains(fff.id())).collect(Collectors.toList());
+                    Image image1 = collect.get(RandomUtil.randomInt(0,collect.size()));
+                    listImg.add(image1.id());
+                    List<Material> collect1 = t4.stream().filter(fff -> !listTxt.contains(fff.id())).collect(Collectors.toList());
+                    Material material = collect1.get(RandomUtil.randomInt(0,collect1.size()));
+                    listTxt.add(material.id());
+                    //Image image1 = t3.get(RandomUtil.randomInt(0, t3.size()));
+                    //Domain domain1 = t2.get(RandomUtil.randomInt(0,t2.size()));
+                    //Material material = t4.get(RandomUtil.randomInt(0, t4.size()));
                     H5ImageAndText h5ImageAndText = new H5ImageAndText();
                     h5ImageAndText.setImage(image1.image());
-                    //  h5ImageAndText.setDomain(domain1.domain());
+                    //h5ImageAndText.setDomain(domain1.domain());
                     h5ImageAndText.setName(material.content());
                     h5ImageAndText.setRemark(material.remark());
                     h5ImageAndTexts.add(h5ImageAndText);