plan-java v0.67

(cherry picked from commit 160a9b87efaa5896d48deaf7cf768a37809e739b)

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

@@ -94,8 +94,8 @@ public class PlanNewOutController {
         Mono<PlanNew> code = template.selectOne(Query.query(Criteria.where("code").is(request.getCode())), PlanNew.class);
         // //类型 1素材分类2清水分类
         Mono<List<Domain>> domain = code.flatMap(plan -> template.select(Query.query(Criteria.where("group_type").is(1).and("deleted_at").isNull()), Domain.class).collectList());
-        Mono<List<Image>> image = template.select(Query.query(Criteria.where("type").is(1).and("deleted_at").isNull()), Image.class).collectList();
-        Mono<List<Material>> text = template.select(Query.query(Criteria.where("type").is(4).and("deleted_at").isNull()), Material.class).collectList();
+        Mono<List<Image>> image = template.select(Query.query(Criteria.where("type").is(5).and("deleted_at").isNull()), Image.class).collectList();
+        Mono<List<Material>> text = template.select(Query.query(Criteria.where("type").is(11).and("deleted_at").isNull()), Material.class).collectList();
         Mono<List<H5ImageAndText>> arrayListMono = Mono.zip(code, domain, image, text).flatMap(f -> {
             //H5ImageAndText
             Integer integer = f.getT1().pageShow();//群数量
@@ -104,13 +104,14 @@ public class PlanNewOutController {
             List<Material> t4 = f.getT4();
             List<H5ImageAndText> h5ImageAndTexts = new ArrayList<>();
             IntStream.range(0, integer).forEach(i -> {
-                Image image1 = t3.get(Math.min(i, t3.size()));
-                Domain domain1 = t2.get(Math.min(i, t2.size()));
-                Material material = t4.get(Math.min(i, t4.size()));
+                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.setName(material.content());
+                h5ImageAndText.setRemark(material.remark());
                 h5ImageAndTexts.add(h5ImageAndText);
             });
             return Mono.just(h5ImageAndTexts);