data-v0.01

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

@@ -11,6 +11,7 @@ import com.webflux.launchadmin.global.BaseException;
 import com.webflux.launchadmin.mysql.controller.planNew.req.PlanReq;
 import com.webflux.launchadmin.mysql.controller.planNew.req.ServiceGroupSettingItemRequest;
 import com.webflux.launchadmin.mysql.controller.planNew.res.PlanNewAllRs;
+import com.webflux.launchadmin.mysql.entity.listening.ListeningPlanNew;
 import com.webflux.launchadmin.mysql.entity.planNew.PlanNew;
 import com.webflux.launchadmin.mysql.entity.planNew.PlanNewBackgroupPoster;
 import com.webflux.launchadmin.mysql.entity.planNew.PlanNewCommon;
@@ -26,6 +27,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
 import org.springframework.data.relational.core.query.Criteria;
 import org.springframework.data.relational.core.query.Query;
+import org.springframework.data.relational.core.query.Update;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -53,13 +55,53 @@ public class PlanNewCommonController {
     private CustomCodeServer customCodeServer;
 
     /**
+     * 设置状态
+     * @param type 加群:1 ;听书:2;其他:3
+     * @param isLaunch 0:关闭 1:开启
+     * @param code
+     * @return {@link Mono}<{@link RStatus}<{@link String}>>
+     */
+    @GetMapping("setIsLaunch")
+    public Mono<RStatus<Long>> setIsLaunch(@RequestParam("type") Integer type
+            ,@RequestParam("isLaunch") Integer isLaunch
+            , @RequestParam("code") String code){
+        Update is_launch = Update.update("is_launch", isLaunch);
+        Query code1 = Query.query(Criteria.where("code").is(code));
+        Class<?> objectClass = PlanNewCommon.class;
+        if(type==1){
+            objectClass=PlanNew.class;
+        }
+        if(type==2){
+            objectClass= ListeningPlanNew.class;
+        }
+        Mono<Long> update = getUpdate(is_launch,code1,objectClass);
+        return RStatus.success(update);
+    }
+
+
+    private <T> Mono<Long> getUpdate(Update is_launch, Query code1,Class<T> objClass) {
+        return template.update(code1, is_launch, objClass);
+    }
+
+    /**
      * 保存计划
      * @param saveRequest
      * @return {@link Mono}<{@link RStatus}<{@link String}>>
      */
     @PostMapping("savePlan")
     public Mono<RStatus<String>> savePlan(@RequestBody PlanReq saveRequest) {
-
+        if (Objects.nonNull(saveRequest.getImportCustomer()) && saveRequest.getImportCustomer().contains("，")) {
+            String replace = saveRequest.getImportCustomer().replace("，", ",");
+            saveRequest.setImportCustomer(replace);
+        }
+        if (Objects.nonNull(saveRequest.getReturnCustomer())&& saveRequest.getReturnCustomer().contains("，")) {
+            String replace = saveRequest.getReturnCustomer().replace("，", ",");
+            saveRequest.setReturnCustomer(replace);
+        }
+        if (Objects.nonNull(saveRequest.getLinkCustomer())&& saveRequest.getLinkCustomer().contains("，")) {
+            String replace = saveRequest.getLinkCustomer().replace("，", ",");
+            saveRequest.setLinkCustomer(replace);
+        }
             if (StrUtil.isBlank(saveRequest.getPlanNewId())) {
                 // 新增
                 return this.savePlanCommon(saveRequest);
@@ -105,7 +147,11 @@ public class PlanNewCommonController {
                     userName,
                     userId,
                     ZonedDateTime.now(),
-                    ZonedDateTime.now()
+                    ZonedDateTime.now(),
+                    saveRequest.getImportCustomer(),
+                    saveRequest.getReturnCustomer(),
+                    saveRequest.getLinkCustomer(),
+                    saveRequest.getIsLaunch()
             );
             return template.insert(plan);
         });
@@ -153,7 +199,11 @@ public class PlanNewCommonController {
                     userName,
                     userId,
                     old.createdAt(),
-                    ZonedDateTime.now()
+                    ZonedDateTime.now(),
+                    updateRequest.getImportCustomer(),
+                    updateRequest.getReturnCustomer(),
+                    updateRequest.getLinkCustomer(),
+                    updateRequest.getIsLaunch()
             );
             return Mono.just(plan);
         }).flatMap(template::update);
@@ -295,7 +345,11 @@ public class PlanNewCommonController {
                                 userName,
                                 userId,
                                 ZonedDateTime.now(),
-                                ZonedDateTime.now()
+                                ZonedDateTime.now(),
+                                f.importCustomer(),
+                                f.returnCustomer(),
+                                f.linkCustomer(),
+                                f.isLaunch()
                         );
                         return template.insert(planNewCommon);
                     }));

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

@@ -476,6 +476,18 @@ public class PlanNewController {
      */
     @PostMapping("savePlan")
     public Mono<RStatus<String>> savePlan(@RequestBody PlanReq saveRequest) {
+        if (Objects.nonNull(saveRequest.getImportCustomer()) && saveRequest.getImportCustomer().contains("，")) {
+            String replace = saveRequest.getImportCustomer().replace("，", ",");
+            saveRequest.setImportCustomer(replace);
+        }
+        if (Objects.nonNull(saveRequest.getReturnCustomer())&& saveRequest.getReturnCustomer().contains("，")) {
+            String replace = saveRequest.getReturnCustomer().replace("，", ",");
+            saveRequest.setReturnCustomer(replace);
+        }
+        if (Objects.nonNull(saveRequest.getLinkCustomer())&& saveRequest.getLinkCustomer().contains("，")) {
+            String replace = saveRequest.getLinkCustomer().replace("，", ",");
+            saveRequest.setLinkCustomer(replace);
+        }
         if (2 == saveRequest.getType()) {
             return listeningPlanService.savePlan(saveRequest);
         } else if (1 == saveRequest.getType()) {
@@ -554,7 +566,11 @@ public class PlanNewController {
                         saveRequest.getBackgroupDomain(),
                         listButton,
                         saveRequest.getGroupListDisplay(),
-                        saveRequest.getPressImage()
+                        saveRequest.getPressImage(),
+                        saveRequest.getImportCustomer(),
+                        saveRequest.getReturnCustomer(),
+                        saveRequest.getLinkCustomer(),
+                        saveRequest.getIsLaunch()
                 );
                 return template.insert(plan);
             });
@@ -619,6 +635,18 @@ public class PlanNewController {
 
     @PostMapping("updatePlan")
     public Mono<RStatus<String>> updatePlan(@RequestBody PlanReq saveRequest) {
+        if (Objects.nonNull(saveRequest.getImportCustomer())&& saveRequest.getImportCustomer().contains("，")) {
+            String replace = saveRequest.getImportCustomer().replace("，", ",");
+            saveRequest.setImportCustomer(replace);
+        }
+        if (Objects.nonNull(saveRequest.getReturnCustomer())&& saveRequest.getReturnCustomer().contains("，")) {
+            String replace = saveRequest.getReturnCustomer().replace("，", ",");
+            saveRequest.setReturnCustomer(replace);
+        }
+        if (Objects.nonNull(saveRequest.getLinkCustomer())&& saveRequest.getLinkCustomer().contains("，")) {
+            String replace = saveRequest.getLinkCustomer().replace("，", ",");
+            saveRequest.setLinkCustomer(replace);
+        }
         if (2 == saveRequest.getType()) {
             return listeningPlanService.savePlan(saveRequest);
         } else if (1 == saveRequest.getType()) {
@@ -692,7 +720,11 @@ public class PlanNewController {
                         saveRequest.getBackgroupDomain(),
                         listButton,
                         saveRequest.getGroupListDisplay(),
-                        saveRequest.getPressImage()
+                        saveRequest.getPressImage(),
+                        saveRequest.getImportCustomer(),
+                        saveRequest.getReturnCustomer(),
+                        saveRequest.getLinkCustomer(),
+                        saveRequest.getIsLaunch()
                 );
                 return Mono.just(planNew);
             }).flatMap(template::update);
@@ -790,8 +822,13 @@ public class PlanNewController {
                             saveRequest.backgroupDomain(),
                             saveRequest.listButton(),
                             saveRequest.groupListDisplay(),
-                            saveRequest.pressImage()
+                            saveRequest.pressImage(),
+                            saveRequest.importCustomer(),
+                            saveRequest.returnCustomer(),
+                            saveRequest.linkCustomer(),
+                            saveRequest.isLaunch()
                     )).flatMap(map -> template.insert(map)));
+
             Mono<List<PlanNewBackgroupPoster>> listening_plan_new_id1 =
                     template.select(Query.query(Criteria.where("plan_new_id")
                                     .is(planNewId)), PlanNewBackgroupPoster.class)

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

@@ -162,4 +162,9 @@ public class PlanReq {
     private Integer groupListDisplay;
 
     private String pressImage;
+
+    private String importCustomer;
+    private String returnCustomer;
+    private String linkCustomer;
+    private  Integer isLaunch;
 }

launch-admin/src/main/java/com/webflux/launchadmin/mysql/entity/listening/ListeningPlanNew.java

@@ -27,6 +27,10 @@ public record ListeningPlanNew(
         Long backgroundGroupId,//营销背景组id
         String baiduDot,
        String previewUrl ,//预览url
-        String listButton
+        String listButton,
+        String importCustomer,
+        String returnCustomer,
+        String linkCustomer,
+        Integer isLaunch
 ) {
 }

launch-admin/src/main/java/com/webflux/launchadmin/mysql/entity/planNew/PlanNew.java

@@ -51,7 +51,11 @@ public record PlanNew  (
         String backgroupDomain,//背景组域名
         String listButton,
         Integer groupListDisplay,
-        String pressImage
+        String pressImage,
+        String importCustomer,
+        String returnCustomer,
+        String linkCustomer,
+        Integer isLaunch
 
 ) implements Serializable{
 }

launch-admin/src/main/java/com/webflux/launchadmin/mysql/entity/planNew/PlanNewCommon.java

@@ -35,5 +35,10 @@ public record PlanNewCommon(
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         ZonedDateTime createdAt,
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        ZonedDateTime updateAt) {
+        ZonedDateTime updateAt,
+        String importCustomer,
+        String returnCustomer,
+        String linkCustomer,
+        Integer isLaunch
+        ) {
 }

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/listening/ListeningPlanServiceImpl.java

@@ -170,7 +170,11 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                     saveRequest.getBackgroundGroupId(),
                     saveRequest.getBaiduDot(),
                     f.getT1(),
-                    saveRequest.getListButton()
+                    saveRequest.getListButton(),
+                    saveRequest.getImportCustomer(),
+                    saveRequest.getReturnCustomer(),
+                    saveRequest.getLinkCustomer(),
+                    saveRequest.getIsLaunch()
             );
             return !bl? template.update(plan) : template.insert(plan);
         });
@@ -334,7 +338,6 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
     public Mono<RStatus<String>> copyById(String listeningPlanNewId) {
         String userName = BaseContextHandler.getUserName();
         String userId = BaseContextHandler.getUserId();
-
         Mono<String> code = customCodeServer.getCode();
         Mono<ListeningPlanNew> listening_plan_new_id = code.flatMap(codeN-> template.selectOne(Query.query(Criteria.where("listening_plan_new_id").is(listeningPlanNewId)), ListeningPlanNew.class)
                   .switchIfEmpty(Mono.error(new BaseException("计划错误")))
@@ -358,11 +361,14 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                               f.backgroundGroupId(),
                               f.baiduDot(),
                               null,
-                              f.listButton()
+                              f.listButton(),
+                              f.importCustomer(),
+                              f.returnCustomer(),
+                              f.linkCustomer(),
+                              f.isLaunch()
                       );
                       return Mono.just(listeningPlanNew);
                   }).flatMap(f -> template.insert(f)));
-
         Mono<List<ListeningPlanNewBackgroupPoster>> listening_plan_new_id1 =
                 template.select(Query.query(Criteria.where("listening_plan_new_id")
                         .is(listeningPlanNewId)), ListeningPlanNewBackgroupPoster.class)

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/planNew/goGenerate/GoGenerateService.java

@@ -1177,22 +1177,22 @@ public class GoGenerateService {
     }
 
     private PlanNewCommon setPlanNewCommon(Long groupId, String code, Integer type) {
-        return new PlanNewCommon(null, null, code, type, groupId, null, null, null, null, null, null, null, null, null, null);
+        return new PlanNewCommon(null, null, code, type, groupId, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
     }
 
     private PlanNewCommon getPlanNewCommon() {
-        return new PlanNewCommon(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+        return new PlanNewCommon(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
     }
 
     private PlanNew getPlanNew() {
         return new PlanNew(null, null, null, null, null, null, null, null, null, null, null,
                 null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-                null, null, null, null, null, null, null, null, null, null, null, null, null, null,null,null);
+                null, null, null, null, null, null, null, null, null, null, null, null, null, null,null,null, null, null,null,null);
     }
 
     private ListeningPlanNew getListeningPlanNew() {
         return new ListeningPlanNew(null, null, null, null, null, null, null, null, null, null, null,
-                null, null, null, null, null, null, null, null);
+                null, null, null, null, null, null, null, null, null, null, null, null);
     }
 
     public Mono<StringBuilder> getStringBuilderMonoYx(Mono<PlanNew> code) {