plan-java v0.63

(cherry picked from commit 222c9690bc8d16a3ba97732aaa76b615e92e81b2)

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

@@ -148,10 +148,21 @@ public class PlanNewOutController {
         Mono<PlanNew> code0 = template.selectOne(Query.query(Criteria.where("code").is(request.getCode())), PlanNew.class);
         Mono<DataLists> dataListsMono1 = code0.flatMap(planNew -> {
             Mono<PlanNew> code = Mono.just(planNew);
-            Mono<List<Domain>> domain = code.flatMap(plan -> template.select(Query.query(Criteria.where("group_type").is(1).and("deleted_at").isNull()), Domain.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"6"))).collectList());
+            Long group_type_id ; //.and("group_type_id").is(group_type_id)
+            if (Objects.isNull(request.getWx_user_id()) || "".equals(request.getWx_user_id())) {
+                group_type_id=planNew.groupId();
+            }else {
+                group_type_id=planNew.groupIdQs();
+            }
+            Mono<List<Domain>> domain = code.flatMap(plan -> template.select(Query.query(Criteria.where("group_type").is(1)
+                    .and("deleted_at").isNull()), Domain.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"6"))).collectList());
             // //类型 1素材分类2清水分类
-            Mono<List<Image>> image = template.select(Query.query(Criteria.where("type").is(1).and("deleted_at").isNull()), Image.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"7"))).collectList();
-            Mono<List<Material>> text = template.select(Query.query(Criteria.where("type").is(4).and("deleted_at").isNull()), Material.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"8"))).collectList();
+            Mono<List<Image>> image = template.select(Query.query(Criteria.where("type")
+                    .is(1).and("deleted_at").isNull().and("group_type_id").is(group_type_id)), Image.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"7")))
+                    .collectList();
+            Mono<List<Material>> text = template.select(Query.query(Criteria.where("type")
+                    .is(4).and("deleted_at").isNull().and("group_type_id").is(group_type_id)), Material.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"8")))
+                    .collectList();
 
             Mono<UserVisits> wx_user_id ;
             if (Objects.isNull(request.getWx_user_id()) || "".equals(request.getWx_user_id())) {
@@ -176,9 +187,9 @@ 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());