Procházet zdrojové kódy

群列表展示按钮v0.01

(cherry picked from commit 6f4edd677277665a9929636b9b4809262ee2fa35)
MOKASZ\lw12420 před 2 roky
rodič
revize
36a3c5c36f

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

@@ -498,7 +498,8 @@ public class PlanNewController {
                         saveRequest.getTransferPageDomain(),
                         saveRequest.getTransferPageBl(),
                         saveRequest.getBackgroupDomain(),
-                        listButton
+                        listButton,
+                        saveRequest.getGroupListDisplay()
                 );
                 return template.insert(plan);
             });
@@ -634,7 +635,8 @@ public class PlanNewController {
                         saveRequest.getTransferPageDomain(),
                         saveRequest.getTransferPageBl(),
                         saveRequest.getBackgroupDomain(),
-                        listButton
+                        listButton,
+                        saveRequest.getGroupListDisplay()
                 );
                 return Mono.just(planNew);
             }).flatMap(template::update);
@@ -729,7 +731,8 @@ public class PlanNewController {
                             saveRequest.transferPageDomain(),
                             saveRequest.transferPageBl(),
                             saveRequest.backgroupDomain(),
-                            saveRequest.listButton()
+                            saveRequest.listButton(),
+                            saveRequest.groupListDisplay()
                     )).flatMap(map -> template.insert(map));
             Mono<List<PlanNewBackgroupPoster>> listening_plan_new_id1 =
                     template.select(Query.query(Criteria.where("plan_new_id")
@@ -858,7 +861,8 @@ public class PlanNewController {
 
                                         // saveRequest.transferPageDomain(),
                                         saveRequest.transferPageBl(),
-                                        Objects.nonNull(saveRequest.backgroupDomain()) && !"".equals(saveRequest.backgroupDomain().trim()) ? Integer.valueOf(saveRequest.backgroupDomain()) : null
+                                        Objects.nonNull(saveRequest.backgroupDomain()) && !"".equals(saveRequest.backgroupDomain().trim()) ? Integer.valueOf(saveRequest.backgroupDomain()) : null,
+                                        saveRequest.groupListDisplay()
 
                                         // saveRequest.backgroupDomain()
                                 );
@@ -910,6 +914,7 @@ public class PlanNewController {
                                         null,
                                         null,
                                         null,
+                                        null,
                                         null
 
                                 );

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

@@ -541,6 +541,7 @@ public class PlanNewOutController {
                 dataLists0.setSpare(f.getT5().toString());
                 dataLists0.setRedirectType(f.getT1().redirectType());
                 dataLists0.setPlanNew(f.getT1());
+                dataLists0.setGroupListDisplay(f.getT1().groupListDisplay());
                 dataLists0.setPosterTemplate(f.getT2());
                 List<Poster> t3 = f.getT3();
                 if(t3.size()!=0){
@@ -621,6 +622,14 @@ public class PlanNewOutController {
                 PlanNewBackgroupPoster fxSetting = fm.getFxSetting();
                 goRequest = setNameVal(posterTemplate, fxSetting,fm.getSpare());
             }
+            if (Objects.nonNull(goRequest) && Objects.nonNull(goRequest.getItem())) {
+                Optional<Item> first = goRequest.getItem().stream()
+                        .filter(ff -> "title".equals(ff.getT()) && ff.getIsRandom())
+                        .findFirst();
+                first.ifPresent(item -> fm.setGroupTitle(item.getV()));
+                Optional<Item> first1 = goRequest.getItem().stream().filter(ff -> "cover".equals(ff.getT()) && ff.getIsRandom()).findFirst();
+                first1.ifPresent(item -> fm.setGroupHeadUrl(item.getV()));
+            }
             String ret;
             if (Objects.nonNull(goRequest)) {
                 ret = goGenerateService.goGenerate(JSONUtil.toJsonStr(goRequest));
@@ -670,6 +679,7 @@ public class PlanNewOutController {
             //JSONObject jsonObject = JSONUtil.parseObj(posterTemplate);
             GoRequest goRequest = new GoRequest();
             BeanUtil.copyProperties(jsonObject, goRequest);
+
             Mono<String> outTemPoster;
             if (Objects.nonNull(request.getWx_user_id()) && !"".equals(request.getWx_user_id())) {
                 Long aLong = fm.getPlanNew().groupIdQs();

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

@@ -155,4 +155,9 @@ public class PlanReq {
 
     /** 配置json */
     private String configJson;
+
+    /**
+     * 群列表展示
+     */
+    private Integer groupListDisplay;
 }

+ 10 - 0
launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/res/DataLists0.java

@@ -55,6 +55,16 @@ public class DataLists0 {
     private String limitTimeRemark;
 
     private String spare;
+    /**
+     * 群头像
+     */
+    private String groupHeadUrl;
+    /**
+     * 群名称
+     */
+    private String groupTitle;
+
+    private Integer groupListDisplay;
 
 //
 //    /**

+ 1 - 0
launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/res/PlanNewAllRs.java

@@ -69,4 +69,5 @@ public class PlanNewAllRs {
     private Integer backgroupDomain;//背景组域名
 
 
+    private Integer groupListDisplay;
 }

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

@@ -48,7 +48,8 @@ public record PlanNew(
         String transferPageDomain,//中转页域名
         Integer transferPageBl, //中转页开关 1:true 0:F
         String backgroupDomain,//背景组域名
-        String listButton
+        String listButton,
+        Integer groupListDisplay
 
 ) {
 }

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

@@ -1012,7 +1012,7 @@ public class GoGenerateService {
     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);
     }
 
     private ListeningPlanNew getListeningPlanNew() {