plan-java v0.03

(cherry picked from commit 6b355a6a974c87b26c5ae8f3081717f6609de637)

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

@@ -4,6 +4,7 @@ import com.webflux.launchadmin.config.BaseContextHandler;
 import com.webflux.launchadmin.mysql.controller.planNew.req.*;
 import com.webflux.launchadmin.mysql.controller.planNew.res.BackgroupImageRes;
 import com.webflux.launchadmin.mysql.controller.planNew.res.DataLists;
+import com.webflux.launchadmin.mysql.controller.planNew.res.PosterTemplateRes;
 import com.webflux.launchadmin.mysql.entity.planNew.*;
 import com.webflux.launchcommon.returnObj.Paged;
 import com.webflux.launchcommon.returnObj.RStatus;
@@ -19,6 +20,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -81,44 +83,60 @@ public class PlanNewController {
         return RStatus.successList(status);
 
     }
+
+    /**
+     * 素材、清水--分类下拉（groupType）名称模糊查询
+     * @param name
+     * @return {@link Mono}<{@link RStatus}<{@link Long}>>
+     */
+    @GetMapping("groupTypeSlt")
+    public Mono<RStatus<List<GroupType>>> groupTypeSlt (String name,String groupType){
+        Criteria criteria= Criteria.where("group_type").is(groupType);
+        if (Objects.nonNull(name) && "" != name) {
+            criteria = criteria.and("name").like("%"+name+"%");
+        }
+        Mono<List<GroupType>> listMono = template.select(Query.query(criteria), GroupType.class).collectList();
+        return RStatus.success(listMono);
+    }
     /**
      * 返回广告下拉名称模糊查询
-     * @param request
+     * @param name
      * @return {@link Mono}<{@link RStatus}<{@link Long}>>
      */
     @GetMapping("retrunloopSlt")
-    public Mono<RStatus<List<ReturnLoop>>> retrunloopSlt (@RequestBody ReturnLoopRequest request){
+    public Mono<RStatus<List<ReturnLoop>>> retrunloopSlt (String name){
         Criteria criteria= Criteria.empty() ; //poster_template_id
-        if (Objects.nonNull(request.getName()) && "" != request.getName()) {
-            criteria = criteria.and("name").like(request.getName());
+        if (Objects.nonNull(name) && "" != name) {
+            criteria = criteria.and("name").like("%"+name+"%");
         }
         Mono<List<ReturnLoop>> listMono = template.select(Query.query(criteria), ReturnLoop.class).collectList();
         return RStatus.success(listMono);
     }
     /**
      * （分享/清水）背景组设置下拉名称模糊查询
-     * @param backgroupRequest
+     * @param name groupType
      * @return {@link Mono}<{@link RStatus}<{@link Long}>>
      */
     @GetMapping("backgroupSlt")
-    public Mono<RStatus<List<BackgroupImage>>> backgroupSlt (@RequestBody BackgroupRequest backgroupRequest){
-        Criteria criteria= Criteria.where("group_type").is(backgroupRequest.getGroupType()) ; //poster_template_id
-        if (Objects.nonNull(backgroupRequest.getName()) && "" != backgroupRequest.getName()) {
-            criteria = criteria.and("name").like(backgroupRequest.getName());
+    public Mono<RStatus<List<BackgroupImage>>> backgroupSlt ( String name,String groupType){
+
+        Criteria criteria= Criteria.where("group_type").is(groupType) ; //poster_template_id
+        if (Objects.nonNull(name) && "" != name) {
+            criteria = criteria.and("name").like("%"+name+"%");
         }
         Mono<List<BackgroupImage>> listMono = template.select(Query.query(criteria), BackgroupImage.class).collectList();
         return RStatus.success(listMono);
     }
     /**
      * 音频下拉名称模糊查询
-     * @param audioRequest
+     * @param name
      * @return {@link Mono}<{@link RStatus}<{@link Long}>>
      */
     @GetMapping("audioSlt")
-    public Mono<RStatus<List<Audio>>> audio (@RequestBody AudioRequest audioRequest){
+    public Mono<RStatus<List<Audio>>> audio (String name){
         Criteria criteria= Criteria.empty() ; //poster_template_id
-        if (Objects.nonNull(audioRequest.getName()) && "" != audioRequest.getName()) {
-            criteria = criteria.and("name").like(audioRequest.getName());
+        if (Objects.nonNull(name) && "" != name) {
+            criteria = criteria.and("name").like("%"+name+"%");
         }
         Mono<List<Audio>> listMono = template.select(Query.query(criteria), Audio.class).collectList();
         return RStatus.success(listMono);
@@ -265,7 +283,7 @@ public class PlanNewController {
      * @return {@link Mono}<{@link RStatus}<{@link Paged}<{@link PosterTemplate}>>>
      */
     @PostMapping("posterTemList")
-    public Mono<RStatus<Paged<PosterTemplate>>> posterTemList(@RequestBody PosterTemPage request)   {
+    public Mono<RStatus<Paged<PosterTemplateRes>>> posterTemList(@RequestBody PosterTemPage request)   {
         Criteria criteria= Criteria.empty() ; //poster_template_id
         if (Objects.nonNull(request.getName()) && "" != request.getName()) {
             criteria = criteria.and("name").is(request.getName());
@@ -274,13 +292,30 @@ public class PlanNewController {
         Criteria finalCriteria = criteria;
         int skip  = (request.getPage() - 1) * request.getSize();
         int limit = request.getPage() * request.getSize();
-        Mono<Paged<PosterTemplate>> pagedMono = template.count(query, PosterTemplate.class).flatMap(fm ->
+        Mono<Paged<PosterTemplateRes>> pagedMono = template.count(query, PosterTemplate.class).flatMap(fm ->
                 template.select(Query.query(finalCriteria)
                         .offset(skip)
                         .limit(limit)
                         .sort(Sort.by(Sort.Order.desc("created_at"))),PosterTemplate.class)
                         .collectList()
-                        .map(list -> new Paged<>(fm, list,request.getPage(),request.getSize()))
+                        .map(list -> {
+                            ArrayList<PosterTemplateRes> posterTemplateRes = new ArrayList<>();
+                            list.forEach(f->{
+                                Long aLong = f.posterTemplateId();
+                                template.count(Query.query(Criteria.where("poster_template_id").is(aLong)),Poster.class).subscribe(n->{
+                                    PosterTemplateRes posterTemplateRes1 = new PosterTemplateRes();
+                                    posterTemplateRes1.setPosterTemplateId(f.posterTemplateId());
+                                    posterTemplateRes1.setPosterTemplateName(f.posterTemplateName());
+                                    posterTemplateRes1.setCreatedAt(f.createdAt());
+                                    posterTemplateRes1.setNum(n);
+                                    posterTemplateRes1.setCreateId(f.createId());
+                                    posterTemplateRes1.setCreateUser(f.createUser());
+                                    posterTemplateRes1.setUpdatedAt(f.updatedAt());
+                                    posterTemplateRes.add(posterTemplateRes1);
+                                });
+                            });
+                          return   new Paged<>(fm, posterTemplateRes,request.getPage(),request.getSize());
+                        })
         );
         return RStatus.successList(pagedMono);
     }

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

@@ -0,0 +1,17 @@
+package com.webflux.launchadmin.mysql.controller.planNew.res;
+
+import lombok.Data;
+
+import java.time.ZonedDateTime;
+
+@Data
+public class PosterTemplateRes {
+
+   private Long posterTemplateId;
+    private  String posterTemplateName;//海报模板名称
+    private String createUser;
+    private String createId;
+    private ZonedDateTime createdAt;
+    private ZonedDateTime updatedAt;
+    private Long num;
+}

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

@@ -0,0 +1,12 @@
+package com.webflux.launchadmin.mysql.entity.planNew;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Table;
+
+@Table("group_type")
+public record GroupType(
+        @Id Long id,
+        String name,
+        String groupType
+) {
+}

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/planNew/structure/GoRequest.java

@@ -0,0 +1,14 @@
+package com.webflux.launchadmin.mysql.service.planNew.structure;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GoRequest {
+   private  Integer width;
+   private  Integer height;
+   private  String bg_img_src;
+   private List<Item> item;
+
+}

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/planNew/structure/Item.java

@@ -0,0 +1,46 @@
+package com.webflux.launchadmin.mysql.service.planNew.structure;
+
+import lombok.Data;
+
+@Data
+public class Item {
+
+    private String   t;
+
+    private Integer h;
+
+    private Integer w;
+
+    private Integer x;
+
+    private Integer y;
+
+    private String   c;
+
+    private String   bgc;
+
+    private String   fn;
+
+    private String   name;
+
+    private String  v;
+
+    private String  rm;
+
+    private String  uuid;
+
+    private String  a;
+
+    private Boolean wrap;
+
+    private Integer weight;
+
+    private Integer s;
+
+    private String  r;
+
+    private String  g;
+
+    private String  b;
+
+}