plan-java v0.27

(cherry picked from commit 86c834b2df1d07637339954c6d6d50a625cb6c58)

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

@@ -239,7 +239,7 @@ public class PlanNewOutController {
             }
             Map<Integer, List<PlanNewBackgroupPoster>> collect = f.getT4().stream().collect(Collectors.groupingBy(PlanNewBackgroupPoster::qsOrFx));
             List<PlanNewBackgroupPoster> fx = collect.get(1);
-            if (fx.size() != 0) {
+            if (Objects.nonNull(fx) &&fx.size() != 0) {
                 if (fx.size() <= request.getUserVisits()) {
                     dataLists0.setFxSetting(fx.getLast());
                     dataLists0.setLink(dataLists0.getPlanNew().link());
@@ -249,7 +249,7 @@ public class PlanNewOutController {
                 }
             }
             List<PlanNewBackgroupPoster> qs = collect.get(2);
-            if(!qs.isEmpty()){
+            if(Objects.nonNull(qs) && !qs.isEmpty()){
                 if (qs.size() <= request.getUserVisits()) {
                     dataLists0.setQsSetting(qs.getLast());
                 }else {
@@ -274,12 +274,12 @@ public class PlanNewOutController {
         Mono<Audio> audioMono = dataLists0Mono.flatMap(f -> {
             if (Objects.nonNull(request.getWx_user_id()) && !"".equals(request.getWx_user_id())) {
                 PlanNewBackgroupPoster qsSetting = f.getQsSetting();
-                if (Objects.nonNull(qsSetting.audioId()) && 0 != qsSetting.audioId()) {
+                if (Objects.nonNull(qsSetting) && Objects.nonNull(qsSetting.audioId()) && 0 != qsSetting.audioId()) {
                     return template.selectOne(Query.query(Criteria.where("id").is(qsSetting.audioId())), Audio.class);
                 }
             } else {
                 PlanNewBackgroupPoster fxSetting = f.getFxSetting();
-                if (Objects.nonNull(fxSetting.audioId()) && 0 != fxSetting.audioId()) {
+                if (Objects.nonNull(fxSetting) && Objects.nonNull(fxSetting.audioId()) && 0 != fxSetting.audioId()) {
                     return template.selectOne(Query.query(Criteria.where("id").is(fxSetting.audioId())), Audio.class);
                 }
             }
@@ -362,104 +362,104 @@ public class PlanNewOutController {
      * @param request
      * @return {@link Mono}<{@link RStatus}<{@link DataLists}>>
      */
-    @PostMapping("hfoInfo1")
-    public Mono<RStatus<DataLists>> hfoInfo1(@RequestBody HfoRequest request){
-        Mono<DataLists> map = Mono.just(new DataLists()).map(dataLists -> {
-            template.selectOne(Query.query(Criteria.where("code").is(request.getCode())), PlanNew.class)
-                    .subscribe(dataLists::setPlanNew);
-            return dataLists;
-        }).map(dataLists -> {
-            template.selectOne(Query.query(Criteria.where("id").is(dataLists.getPlanNew().listAudioId())), Audio.class)
-                    .subscribe(dataLists::setListAudio);
-            return dataLists;
-        }).map(dataLists -> {
-            template.selectOne(Query.query(Criteria.where("id").is(dataLists.getPlanNew().retAudioId())), Audio.class)
-                    .subscribe(dataLists::setRetAudio);
-            return dataLists;
-        }).map(dataLists -> {
-            Integer integer = dataLists.getPlanNew().pageShow();//群数量
-          //  Integer integer1 = dataLists.getPlanNew().pageLine();//单行数量
-            template.select(Query.query(Criteria.where("type").is(1)), Image.class).limitRate(integer).collectList()
-                    .subscribe(images -> {
-                        template.select(Query.query(Criteria.where("type").is(4)),Material.class).limitRate(integer).collectList().subscribe(text->{
-                            ArrayList<H5ImageAndText> h5ImageAndTexts = new ArrayList<>();
-                            AtomicInteger adder = new AtomicInteger(0);
-                            images.forEach(f1->{
-                                H5ImageAndText h5ImageAndText = new H5ImageAndText();
-                                h5ImageAndText.setImage(f1.image());
-                                if(adder.get()>=text.size()){
-                                    Material material = text.get(text.size() - 1);
-                                    h5ImageAndText.setName(material.content());
-                                }else {
-                                    Material material = text.get(adder.get());
-                                    h5ImageAndText.setName(material.content());
-                                }
-                                h5ImageAndTexts.add(h5ImageAndText);
-                                adder.incrementAndGet();
-                            });
-                            dataLists.setImages(h5ImageAndTexts);
-                        });
-                    });
-            return dataLists;
-        }).map(dataLists -> {
-            Integer top = dataLists.getPlanNew().topAdvBl();
-            if (1 == top) {//广告类型1顶部2底部3返回4安卓，ios的返回
-                Integer integer = dataLists.getPlanNew().topAdvNum();
-                template.select(Query.query(Criteria.where("type").is(1)), Ad.class).limitRate(integer).collectList()
-                        .subscribe(dataLists::setTopAd);
-            }
-            Integer bottom = dataLists.getPlanNew().bottomAdvBl();
-            if (1 == bottom) {//广告类型1顶部2底部3返回4安卓，ios的返回
-                Integer integer = dataLists.getPlanNew().topAdvNum();
-                template.select(Query.query(Criteria.where("type").is(2)), Ad.class).limitRate(integer).collectList()
-                        .subscribe(dataLists::setBottomAd);
-            }
-            return dataLists;
-        }).map(dataLists -> {
-            Integer integer = dataLists.getPlanNew().returnLoopBl();
-            if (integer == 1) {
-                template.selectOne(Query.query(Criteria.where("id").is(dataLists.getPlanNew().returnLoopId())), ReturnLoop.class)
-                        .subscribe(dataLists::setReturnLoop);
-            }
-            return dataLists;
-        });
-        return RStatus.successList(map);
-    }
+//    @PostMapping("hfoInfo1")
+//    public Mono<RStatus<DataLists>> hfoInfo1(@RequestBody HfoRequest request){
+//        Mono<DataLists> map = Mono.just(new DataLists()).map(dataLists -> {
+//            template.selectOne(Query.query(Criteria.where("code").is(request.getCode())), PlanNew.class)
+//                    .subscribe(dataLists::setPlanNew);
+//            return dataLists;
+//        }).map(dataLists -> {
+//            template.selectOne(Query.query(Criteria.where("id").is(dataLists.getPlanNew().listAudioId())), Audio.class)
+//                    .subscribe(dataLists::setListAudio);
+//            return dataLists;
+//        }).map(dataLists -> {
+//            template.selectOne(Query.query(Criteria.where("id").is(dataLists.getPlanNew().retAudioId())), Audio.class)
+//                    .subscribe(dataLists::setRetAudio);
+//            return dataLists;
+//        }).map(dataLists -> {
+//            Integer integer = dataLists.getPlanNew().pageShow();//群数量
+//          //  Integer integer1 = dataLists.getPlanNew().pageLine();//单行数量
+//            template.select(Query.query(Criteria.where("type").is(1)), Image.class).limitRate(integer).collectList()
+//                    .subscribe(images -> {
+//                        template.select(Query.query(Criteria.where("type").is(4)),Material.class).limitRate(integer).collectList().subscribe(text->{
+//                            ArrayList<H5ImageAndText> h5ImageAndTexts = new ArrayList<>();
+//                            AtomicInteger adder = new AtomicInteger(0);
+//                            images.forEach(f1->{
+//                                H5ImageAndText h5ImageAndText = new H5ImageAndText();
+//                                h5ImageAndText.setImage(f1.image());
+//                                if(adder.get()>=text.size()){
+//                                    Material material = text.get(text.size() - 1);
+//                                    h5ImageAndText.setName(material.content());
+//                                }else {
+//                                    Material material = text.get(adder.get());
+//                                    h5ImageAndText.setName(material.content());
+//                                }
+//                                h5ImageAndTexts.add(h5ImageAndText);
+//                                adder.incrementAndGet();
+//                            });
+//                            dataLists.setImages(h5ImageAndTexts);
+//                        });
+//                    });
+//            return dataLists;
+//        }).map(dataLists -> {
+//            Integer top = dataLists.getPlanNew().topAdvBl();
+//            if (1 == top) {//广告类型1顶部2底部3返回4安卓，ios的返回
+//                Integer integer = dataLists.getPlanNew().topAdvNum();
+//                template.select(Query.query(Criteria.where("type").is(1)), Ad.class).limitRate(integer).collectList()
+//                        .subscribe(dataLists::setTopAd);
+//            }
+//            Integer bottom = dataLists.getPlanNew().bottomAdvBl();
+//            if (1 == bottom) {//广告类型1顶部2底部3返回4安卓，ios的返回
+//                Integer integer = dataLists.getPlanNew().topAdvNum();
+//                template.select(Query.query(Criteria.where("type").is(2)), Ad.class).limitRate(integer).collectList()
+//                        .subscribe(dataLists::setBottomAd);
+//            }
+//            return dataLists;
+//        }).map(dataLists -> {
+//            Integer integer = dataLists.getPlanNew().returnLoopBl();
+//            if (integer == 1) {
+//                template.selectOne(Query.query(Criteria.where("id").is(dataLists.getPlanNew().returnLoopId())), ReturnLoop.class)
+//                        .subscribe(dataLists::setReturnLoop);
+//            }
+//            return dataLists;
+//        });
+//        return RStatus.successList(map);
+//    }
     /**
      *废弃/废弃/废弃/废弃/废弃/废弃/  h5-通过code （第二个接口）
      * @param request
      * @return {@link Mono}<{@link RStatus}<{@link DataLists}>>
      */
-    @PostMapping("hftInfo1")
-    public Mono<RStatus<DataLists0>> hftInfo1(@RequestBody HftRequest request){
-        Mono<DataLists0> map = Mono.just(new DataLists0()).map(dataLists -> {
-            template.selectOne(Query.query(Criteria.where("code").is(request.getCode())), PlanNew.class)
-                    .subscribe(dataLists::setPlanNew);
-            return dataLists;
-        }).map(dataLists -> {
-            template.selectOne(Query.query(Criteria.where("poster_template_id").is(dataLists.getPlanNew().posterTemplateId())), PosterTemplate.class)
-                    .subscribe(dataLists::setPosterTemplate);
-            return dataLists;
-        }).map(dataLists -> {
-//            template.select(Query.query(Criteria.where("poster_template_id").is(dataLists.getPlanNew().posterTemplateId())), Poster.class).collectList()
-//                    .subscribe(dataLists::setPoster);
-            return dataLists;
-        }).map(dataLists -> {
-            Long planNewId = dataLists.getPlanNew().planNewId();
-            template.select(Query.query(Criteria.where("plan_new_id")
-                    .is(planNewId)),PlanNewBackgroupPoster.class)
-                    .collectList().subscribe(lt->{//qsOrFx,//1：分享背景组 2：清水背景组
-                Map<Integer, List<PlanNewBackgroupPoster>> collect = lt.stream().collect(Collectors.groupingBy(PlanNewBackgroupPoster::qsOrFx));
-                List<PlanNewBackgroupPoster> planNewBackgroupPosters = collect.get(1);
-              //  dataLists.setFxSetting(planNewBackgroupPosters);
-                List<PlanNewBackgroupPoster> planNewBackgroupPosters1 = collect.get(2);
-               // dataLists.setQsSetting(planNewBackgroupPosters1);
-            });
-            return dataLists;
-        });
-        return RStatus.successList(map);
-    }
-
+//    @PostMapping("hftInfo1")
+//    public Mono<RStatus<DataLists0>> hftInfo1(@RequestBody HftRequest request){
+//        Mono<DataLists0> map = Mono.just(new DataLists0()).map(dataLists -> {
+//            template.selectOne(Query.query(Criteria.where("code").is(request.getCode())), PlanNew.class)
+//                    .subscribe(dataLists::setPlanNew);
+//            return dataLists;
+//        }).map(dataLists -> {
+//            template.selectOne(Query.query(Criteria.where("poster_template_id").is(dataLists.getPlanNew().posterTemplateId())), PosterTemplate.class)
+//                    .subscribe(dataLists::setPosterTemplate);
+//            return dataLists;
+//        }).map(dataLists -> {
+////            template.select(Query.query(Criteria.where("poster_template_id").is(dataLists.getPlanNew().posterTemplateId())), Poster.class).collectList()
+////                    .subscribe(dataLists::setPoster);
+//            return dataLists;
+//        }).map(dataLists -> {
+//            Long planNewId = dataLists.getPlanNew().planNewId();
+//            template.select(Query.query(Criteria.where("plan_new_id")
+//                    .is(planNewId)),PlanNewBackgroupPoster.class)
+//                    .collectList().subscribe(lt->{//qsOrFx,//1：分享背景组 2：清水背景组
+//                Map<Integer, List<PlanNewBackgroupPoster>> collect = lt.stream().collect(Collectors.groupingBy(PlanNewBackgroupPoster::qsOrFx));
+//                List<PlanNewBackgroupPoster> planNewBackgroupPosters = collect.get(1);
+//              //  dataLists.setFxSetting(planNewBackgroupPosters);
+//                List<PlanNewBackgroupPoster> planNewBackgroupPosters1 = collect.get(2);
+//               // dataLists.setQsSetting(planNewBackgroupPosters1);
+//            });
+//            return dataLists;
+//        });
+//        return RStatus.successList(map);
+//    }
+//
 
     /**
      * 废弃/废弃/废弃/废弃/废弃/废弃/ H5 接口（第一版废弃）