【ID1015664】

落地页群列表按钮名称可自定义-v0.02

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

@@ -534,106 +534,6 @@ public class PlanNewController {
     }
 
 
-    /**
-     * 修改计划
-     * @param saveRequest
-     * @return {@link Mono}<{@link RStatus}<{@link PlanNew}>>
-     */
-    @PostMapping("updatePlan1")
-    public Mono<RStatus<PlanNew>> updatePlan1(@RequestBody PlanReq saveRequest){
-        Long posterTemplateId = saveRequest.getPosterTemplateId();
-        Mono<String> stringMono1 = template
-                .select(Query.query(Criteria.where("poster_template_id").is(posterTemplateId)).sort(Sort.by(Sort.Order.asc("created_at"))), Poster.class)
-                .collectList().flatMap(f -> {
-                    Poster poster = f.get(0);
-                    String posterTemplate = poster.posterTemplate();
-                    JSONObject jsonObject = JSONUtil.parseObj(posterTemplate);
-                    GoRequest goRequest = new GoRequest();
-                    BeanUtil.copyProperties(jsonObject, goRequest);
-                    ServiceGroupSettingItemRequest serviceGroupSettingItemRequest = saveRequest.getBackgroupFxSetting().get(0);
-                    Mono<String> stringMono = goGenerateService.saveAndUpdatePlanGenerateImage0(goRequest,
-                            goGenerateService.getStringBuilderMono(goRequest), serviceGroupSettingItemRequest, saveRequest);
-                    return stringMono;
-                });
-        Mono<PlanNew> plan_new_id1 = template.selectOne(Query.query(Criteria.where("plan_new_id").is(saveRequest.getPlanNewId())), PlanNew.class);
-
-        Mono<StringBuilder> stringBuilderMono ;
-        if(saveRequest.getRedirectType()==2){
-            stringBuilderMono = Mono.just(new StringBuilder(""));//goGenerateService.byPlanNewIdGetUrl(saveRequest.getRedirectPlanId());
-        }else {
-            stringBuilderMono=Mono.just(new StringBuilder(saveRequest.getLink()));
-        }
-        Mono<PlanNew> planNewMono = Mono.zip(stringMono1, plan_new_id1, stringBuilderMono).flatMap(f -> {
-            PlanNew map = f.getT2();
-            PlanNew planNew = new PlanNew(
-                    saveRequest.getPlanNewId(),
-                    saveRequest.getName(),
-                    map.createUser(),
-                    map.createId(),
-                    map.createdAt(),
-                    ZonedDateTime.now(),
-                    map.deletedAt(),
-                    saveRequest.getType(),
-                    map.code(),
-                    saveRequest.getGroupId(),
-                    saveRequest.getPosterTemplateId(),
-                    saveRequest.getPageShow(),
-                    saveRequest.getPageLine(),
-                    saveRequest.getCount(),
-                    saveRequest.getListAudioId(),
-                    saveRequest.getRetAudioId(),
-                    f.getT3().toString(),
-                    saveRequest.getIsAddQun(),
-                    saveRequest.getBackgroundGroupId(),
-                    saveRequest.getHomePageId(),
-                    saveRequest.getTopAdvNum(),
-                    saveRequest.getBottomAdvNum(),
-                    saveRequest.getReturnLoopId(),
-                    saveRequest.getBackgroundGroupQsId(),
-                    saveRequest.getTopAdvBl(),
-                    saveRequest.getBottomAdvBl(),
-                    saveRequest.getReturnLoopBl(),
-                    saveRequest.getGroupIdQs(),
-                    saveRequest.getBaiduDot(),
-                    saveRequest.getBackgroundGroupIdNewAdd(),
-                    f.getT1(),
-                    saveRequest.getRedirectType(),
-                    saveRequest.getRedirectPlanId(),
-                    null,
-                    null,
-                    null,
-                    null,
-                    null
-            );
-            return Mono.just(planNew);
-        }).flatMap(template::update);
-        Mono<PlanNew> map = planNewMono.flatMap(f -> {
-            Query plan_new_id = Query.query(Criteria.where("plan_new_id").is(f.planNewId()));
-            Mono<Long> longMono = template.count(plan_new_id, PlanNewBackgroupPoster.class)
-                    .filter(f0 -> f0 > 0)
-                    .flatMap(f1 -> template.delete(plan_new_id, PlanNewBackgroupPoster.class))
-                    .switchIfEmpty(Mono.just(-1L));
-            List<ServiceGroupSettingItemRequest> backgroupFxSetting = saveRequest.getBackgroupFxSetting();
-            List<PlanNewBackgroupPoster> collect = backgroupFxSetting.stream()
-                    .map(fx -> fxBackgroupSettingsUpdate(fx, f.planNewId(), 1)).collect(Collectors.toList());
-            List<ServiceGroupSettingItemRequest> backgroupQsSetting = saveRequest.getBackgroupQsSetting();
-            List<PlanNewBackgroupPoster> collect1 = backgroupQsSetting
-                    .stream()
-                    .map(qs -> fxBackgroupSettingsUpdate(qs, f.planNewId(), 2))
-                    .collect(Collectors.toList());
-            collect.addAll(collect1);
-            Flux<PlanNewBackgroupPoster> planNewBackgroupPosterFlux = Flux.fromIterable(collect1);
-            Mono<List<PlanNewBackgroupPoster>> listMono = planNewBackgroupPosterFlux.flatMap(entity -> template
-                    .insert(PlanNewBackgroupPoster.class).using(entity)).collectList();
-            Mono<PlanNew> longMono1 = Mono.zip(listMono, Mono.just(f), longMono).flatMap(ff -> {
-                PlanNew t2 = ff.getT2();
-                return Mono.just(t2);
-            });
-            return longMono1;
-        });
-        return RStatus.success(map);
-
-    }
 
     @PostMapping("updatePlan")
     public Mono<RStatus<String>> updatePlan(@RequestBody PlanReq saveRequest){
@@ -919,10 +819,9 @@ public class PlanNewController {
                                         saveRequest.previewUrl(),
                                         saveRequest.redirectType(),
                                         saveRequest.redirectPlanId(),
-                                        null,
-                                        Objects.nonNull(saveRequest.importDomain()) && !"".equals(saveRequest.importDomain().trim()) ?Integer.valueOf(saveRequest.importDomain()):null,
-                                        Objects.nonNull(saveRequest.landingPageDomain()) && !"".equals(saveRequest.landingPageDomain().trim()) ?Integer.valueOf(saveRequest.landingPageDomain()):null,
-
+                                        saveRequest.listButton(),
+                                        Objects.nonNull(saveRequest.importDomain()) && !"".equals(saveRequest.importDomain().trim()) ? Integer.valueOf(saveRequest.importDomain()) : null,
+                                        Objects.nonNull(saveRequest.landingPageDomain()) && !"".equals(saveRequest.landingPageDomain().trim()) ? Integer.valueOf(saveRequest.landingPageDomain()) : null,
                                        // saveRequest.landingPageDomain(),
                                         Objects.nonNull(saveRequest.transferPageDomain()) && !"".equals(saveRequest.transferPageDomain().trim()) ?Integer.valueOf(saveRequest.transferPageDomain()):null,