plan-java v0.71

(cherry picked from commit 89a948ef0720ecc36be679d6b4b742e11abc440e)

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

@@ -85,8 +85,24 @@ public class GoGenerateService {
         if (firstImage.isPresent() && Objects.nonNull(firstImage.get().getGroupTypeIdSc())) {
             imageGroupId=firstImage.get().getGroupTypeIdSc();
         }
+        Optional<Item> firstImage1 = goRequest.getItem().stream().filter(ft -> "text".equals(ft.getT())).findFirst();
+        Long imageGroupId1=0L;
+        if (firstImage1.isPresent() && Objects.nonNull(firstImage1.get().getGroupTypeIdSc())) {
+            imageGroupId1=firstImage1.get().getGroupTypeIdSc();
+        }
+        Optional<Item> firstImage2 = goRequest.getItem().stream().filter(ft -> "cover".equals(ft.getT())).findFirst();
+        Long imageGroupId2=0L;
+        if (firstImage2.isPresent() && Objects.nonNull(firstImage2.get().getGroupTypeIdSc())) {
+            imageGroupId2=firstImage2.get().getGroupTypeIdSc();
+        }
         Mono<Poster> posterMono1 = getPosterResMono1(Mono.just(posterRequset),
-                getStringMono(goRequest, stringBuilderMono, getBgImage(), getImageSaveOrUpdatePoster(imageGroupId), getTextListsPoster(imageGroupId),getImageType1Poster(imageGroupId),getTextListsTitleSaveOrUpdatePoster(posterRequset)))
+                getStringMono(goRequest,
+                        stringBuilderMono,
+                        getBgImage(),
+                        getImageSaveOrUpdatePoster(imageGroupId),
+                        getTextListsPoster(imageGroupId1),
+                        getImageType1Poster(imageGroupId2),
+                        getTextListsTitleSaveOrUpdatePoster(posterRequset)))
                 .switchIfEmpty(Mono.error(new BaseException(" 操作失败")))
                 .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage())))
                 .flatMap(f -> template.insert(f));
@@ -182,7 +198,7 @@ public class GoGenerateService {
      * @return
      */
     public Mono<String> getOutTemPosterYx(GoRequest goRequest,Mono<List<StringBuilder>> stringBuilderMono,Long groupId){
-        Optional<Item> first = goRequest.getItem().stream().filter(ft -> "title".equals(ft.getT())).findFirst();
+       // Optional<Item> first = goRequest.getItem().stream().filter(ft -> "title".equals(ft.getT())).findFirst();
 //        Long groupId;
 //        if (first.isPresent() && Objects.nonNull(first.get().getGroupTypeIdSc())) {
 //            groupId= first.get().getGroupTypeIdSc();
@@ -193,7 +209,7 @@ public class GoGenerateService {
     }
 
     public Mono<String> getOutTemPosterQs(GoRequest goRequest,Mono<List<StringBuilder>> stringBuilderMono, Long groupId){
-        Optional<Item> first = goRequest.getItem().stream().filter(ft -> "title".equals(ft.getT())).findFirst();
+    //    Optional<Item> first = goRequest.getItem().stream().filter(ft -> "title".equals(ft.getT())).findFirst();
 //        Long groupId;
 //        if (first.isPresent() && Objects.nonNull(first.get().getGroupTypeIdQs())) {
 //            groupId= first.get().getGroupTypeIdQs();
@@ -371,11 +387,21 @@ public class GoGenerateService {
         if (firstImage.isPresent() && Objects.nonNull(firstImage.get().getGroupTypeIdSc())) {
             imageGroupId=firstImage.get().getGroupTypeIdSc();
         }
+        Optional<Item> firstImage1 = goRequest.getItem().stream().filter(ft -> "text".equals(ft.getT())).findFirst();
+        Long imageGroupId1=0L;
+        if (firstImage1.isPresent() && Objects.nonNull(firstImage1.get().getGroupTypeIdSc())) {
+            imageGroupId1=firstImage1.get().getGroupTypeIdSc();
+        }
+        Optional<Item> firstImage2 = goRequest.getItem().stream().filter(ft -> "cover".equals(ft.getT())).findFirst();
+        Long imageGroupId2=0L;
+        if (firstImage2.isPresent() && Objects.nonNull(firstImage2.get().getGroupTypeIdSc())) {
+            imageGroupId2=firstImage2.get().getGroupTypeIdSc();
+        }
         return    saveAndUpdatePlanGenerateImage1(goRequest, stringBuilderMono,
                                                     getBgImage(),
                                                     getImageSaveOrUpdatePlan(imageGroupId),
-                                                    getTextListsPlan(imageGroupId),
-                                                    getImageType1Plan(imageGroupId),
+                                                    getTextListsPlan(imageGroupId1),
+                                                    getImageType1Plan(imageGroupId2),
                                                     qsSetting,
                                                     saveRequest,
                                                     getTextListsTitleSaveOrUpdatePlan( goRequest));
@@ -837,11 +863,21 @@ public class GoGenerateService {
         if (firstImage.isPresent() && Objects.nonNull(firstImage.get().getGroupTypeIdSc())) {
             imageGroupId=firstImage.get().getGroupTypeIdSc();
         }
+        Optional<Item> firstImage1 = goRequest.getItem().stream().filter(ft -> "text".equals(ft.getT())).findFirst();
+        Long imageGroupId1=0L;
+        if (firstImage1.isPresent() && Objects.nonNull(firstImage1.get().getGroupTypeIdSc())) {
+            imageGroupId1=firstImage1.get().getGroupTypeIdSc();
+        }
+        Optional<Item> firstImage2 = goRequest.getItem().stream().filter(ft -> "cover".equals(ft.getT())).findFirst();
+        Long imageGroupId2=0L;
+        if (firstImage2.isPresent() && Objects.nonNull(firstImage2.get().getGroupTypeIdSc())) {
+            imageGroupId2=firstImage2.get().getGroupTypeIdSc();
+        }
         Mono<Poster> posterMono1 = getPosterResMonoUpdate(Mono.just(posterRequset),
                 getStringMono(goRequest, stringBuilderMono, getBgImage(),
                         getImageSaveOrUpdatePoster(imageGroupId),
-                        getTextListsPoster(imageGroupId),
-                        getImageType1Poster(imageGroupId),
+                        getTextListsPoster(imageGroupId1),
+                        getImageType1Poster(imageGroupId2),
                         getTextListsTitleSaveOrUpdatePoster(posterRequset)),
                 posterRequset)
                 .switchIfEmpty(Mono.error(new BaseException(" 操作失败")))