Przeglądaj źródła

plan-java v0.52

(cherry picked from commit ceb15a653530ce1ed27a741f5d266486b9ff1ba9)
MOKASZ\lw12420 2 lat temu
rodzic
commit
1d476e0a9c

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

@@ -250,9 +250,10 @@ public class GoGenerateService {
                 first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
             }
             //封面
-            goRequest.getItem().stream().filter(ff -> "cover".equals(ff.getT()) && ff.getIsRandom()).findFirst()
-                    .ifPresent(item -> item.setV(f.getT5().get(RandomUtil.randomInt(0, f.getT5().size())).image()));
-
+            if( Objects.nonNull(f.getT5()) &&!f.getT5().isEmpty()) {
+                goRequest.getItem().stream().filter(ff -> "cover".equals(ff.getT()) && ff.getIsRandom()).findFirst()
+                        .ifPresent(item -> item.setV(f.getT5().get(RandomUtil.randomInt(0, f.getT5().size())).image()));
+            }
             goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
             Optional<Item> first5 = goRequest.getItem().stream().filter(f1 -> "qrcode".equals(f1.getT())).findFirst();
             if (first5.isPresent()) {
@@ -276,16 +277,19 @@ public class GoGenerateService {
                 }
             }
             //图片
+            if( Objects.nonNull(f.getT2()) &&!f.getT2().isEmpty()){
             Optional.ofNullable(f.getT2().get(RandomUtil.randomInt(0, f.getT2().size()))).ifPresent(image -> goRequest.getItem().stream()
                     .filter(ff -> "image".equals(ff.getT()) && ff.getIsRandom() )
                     .findFirst()
                     .ifPresent(item -> item.setV(image.image())));
+            }
             //文本
-            Optional.ofNullable(f.getT3().get(RandomUtil.randomInt(0,f.getT3().size()))).ifPresent(material -> goRequest.getItem().stream()
-                    .filter(ff -> "text".equals(ff.getT()) && ff.getIsRandom())
-                    .findFirst()
-                    .ifPresent(item -> item.setV(material.content())));
-
+            if( Objects.nonNull(f.getT3()) &&!f.getT3().isEmpty()) {
+                Optional.ofNullable(f.getT3().get(RandomUtil.randomInt(0, f.getT3().size()))).ifPresent(material -> goRequest.getItem().stream()
+                        .filter(ff -> "text".equals(ff.getT()) && ff.getIsRandom())
+                        .findFirst()
+                        .ifPresent(item -> item.setV(material.content())));
+            }
             String s1 = JSONUtil.toJsonStr(goRequest);
             String ret = goGenerateStr(s1);
             String url=ret;