plan-java v0.51

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

@@ -126,15 +126,13 @@ public class GoGenerateService {
 
     private Mono<List<Material>> getTextLists() {
         return template.select(Query.query(Criteria.where("type").is(14)), Material.class)
-                .switchIfEmpty(Mono.error(new BaseException("查询素材文本内容为空")))
-                .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()))).collectList();
+               .collectList();
     }
 
     //背景
     private Mono<List<Image>> getBgImage() {
         return template.select(Query.query(Criteria.where("type").is(2)), Image.class)
-                .switchIfEmpty(Mono.error(new BaseException("查询背景图片素材为空")))
-                .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()))).collectList();
+                .collectList();
     }
 
 
@@ -404,19 +402,24 @@ public class GoGenerateService {
             }
             goRequest.getItem().stream().filter(fc->"cusqrcode".equals(fc.getT())).forEach(fe->fe.setName("H5二维码"));
             //封面
-            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()));
+            }
             //图片
-           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())));
+            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())));
+            }
+            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())));
+            }
            //文本
-            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 s = goGenerateStr(s1);
             return Mono.just(s);
@@ -606,8 +609,7 @@ public class GoGenerateService {
 
     private Mono<List<Image>> getFmImageLists0() {
         return template.select(Query.query(Criteria.where("type").is(10)), Image.class)
-                .switchIfEmpty(Mono.error(new BaseException("查询图片素材为空")))
-                .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()))).collectList();
+               .collectList();
     }
 
 }