plan-java v0.010

(cherry picked from commit 88a66a0a366ea71091ef9fae5e0fb2cd82f31b94)

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

@@ -1,5 +1,6 @@
 package com.webflux.launchadmin.mysql.controller.planNew;
 
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.webflux.launchadmin.config.BaseContextHandler;
@@ -170,7 +171,7 @@ public class PlanNewController {
      * @return {@link Mono}<{@link RStatus}<{@link PlanNew}>>
      */
     @PostMapping("savePoster")
-    public Mono<RStatus<PosterRes>> savePoster(@RequestBody PosterRequest posterRequset){
+    public Mono<RStatus<Poster>> savePoster(@RequestBody PosterRequest posterRequset){
 
         return goGenerateService.savePoster(posterRequset);
 //        Poster poster = new Poster(null, posterRequset.getPosterTemplateId()
@@ -187,7 +188,7 @@ public class PlanNewController {
      * @return {@link Mono}<{@link RStatus}<{@link PlanNew}>>
      */
     @PostMapping("updatePoster")
-    public Mono<RStatus<PosterRes>> updatePoster(@RequestBody PosterRequest posterRequset){
+    public Mono<RStatus<Poster>> updatePoster(@RequestBody PosterRequest posterRequset){
         return goGenerateService.updatePoster(posterRequset);
 //        Criteria empty = Criteria.where("poster_id").is(posterRequset.getPosterId());
 //        Update update = Update.update("updated_at", ZonedDateTime.now());
@@ -337,7 +338,6 @@ public class PlanNewController {
         Mono<Paged<PosterTemplateRes>> zip = Mono.zip(count, listMono, (fm, list) -> new Paged<PosterTemplateRes>(fm, list, request.getPage(), request.getSize())
         );
         return RStatus.successList(zip);
-
     }
 
 
@@ -356,7 +356,7 @@ public class PlanNewController {
                 ZonedDateTime.now(),
                 null,
                 saveRequest.getType(),
-                saveRequest.getCode(),
+                IdUtil.fastUUID(),
                 saveRequest.getGroupId(),
                 saveRequest.getPosterTemplateId(),
                 saveRequest.getPageShow(),
@@ -434,7 +434,7 @@ public class PlanNewController {
                         ZonedDateTime.now(),
                         map.deletedAt(),
                         saveRequest.getType(),
-                        saveRequest.getCode(),
+                        map.code(),
                         saveRequest.getGroupId(),
                         saveRequest.getPosterTemplateId(),
                         saveRequest.getPageShow(),

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

@@ -60,14 +60,11 @@ public class GoGenerateService {
 
     }
 
-    public Mono<RStatus<PosterRes>> savePoster(PosterRequest posterRequset){
-        Poster poster = new Poster(null, posterRequset.getPosterTemplateId()
-                ,posterRequset.getPosterTemplate(), BaseContextHandler.getUserName(),
-                BaseContextHandler.getUserId(), ZonedDateTime.now(),
-                ZonedDateTime.now(),null,null);
-        Mono<Poster> insert = template.insert(poster)
-                .switchIfEmpty(Mono.error(new BaseException(" 操作失败")))
-                .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage())));;
+    public Mono<RStatus<Poster>> savePoster(PosterRequest posterRequset){
+
+//        Mono<Poster> insert = template.insert(poster)
+//                .switchIfEmpty(Mono.error(new BaseException(" 操作失败")))
+//                .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage())));
 
         String posterTemplate = posterRequset.getPosterTemplate();
         JSONObject jsonObject = JSONUtil.parseObj(posterTemplate);
@@ -97,14 +94,38 @@ public class GoGenerateService {
                 String s = GoGenerate(s1);
                 return Mono.just(s);
             });
-            Mono<PosterRes> zip = getPosterResMono(insert, stringMono);
-            return RStatus.success(zip);
+            Mono<Poster> zip = getPosterResMono1(Mono.just(posterRequset), stringMono);
+            Mono<Poster> posterMono = zip.switchIfEmpty(Mono.error(new BaseException(" 操作失败")))
+                    .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage())));
+            Mono<Poster> posterMono1 = posterMono.flatMap(f -> template.insert(f));
+            return RStatus.success(posterMono1);
         }else {
             String s = GoGenerate(JSONUtil.toJsonStr(goRequest));
-            Mono<PosterRes> zip = getPosterResMono(insert, Mono.just(s));
-            return RStatus.success(zip);
+            Mono<Poster> zip = getPosterResMono1(Mono.just(posterRequset), Mono.just(s));
+            Mono<Poster> posterMono = zip.switchIfEmpty(Mono.error(new BaseException(" 操作失败")))
+                    .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage())));
+            Mono<Poster> posterMono1 = posterMono.flatMap(f -> template.insert(f));
+            return RStatus.success(posterMono1);
         }
     }
+    private Mono<Poster> getPosterResMono1(Mono<PosterRequest> insert, Mono<String> stringMono) {
+        Mono<Poster> zip = Mono.zip(insert, stringMono, (entry, ret) -> {
+            JSONObject jsonObject1 = JSONUtil.parseObj(ret);
+            if (jsonObject1.containsKey("code") && jsonObject1.get("code", Integer.class) == 0 && jsonObject1.containsKey("data")) {
+                JSONObject data = jsonObject1.get("data", JSONObject.class);
+                if (data.containsKey("Url")) {
+                    String url = data.get("Url", String.class);
+                    Poster poster = new Poster(null, entry.getPosterTemplateId()
+                            ,entry.getPosterTemplate(), BaseContextHandler.getUserName(),
+                            BaseContextHandler.getUserId(), ZonedDateTime.now(),
+                            ZonedDateTime.now(),url,ret);
+                    return poster;
+                }
+            }
+            return null;
+        });
+        return zip;
+    }
 
     private Mono<PosterRes> getPosterResMono(Mono<Poster> insert, Mono<String> stringMono) {
         Mono<PosterRes> zip = Mono.zip(insert, stringMono, (entry, ret) -> {
@@ -120,7 +141,7 @@ public class GoGenerateService {
                 if (data.containsKey("Url")) {
                     String url = data.get("Url", String.class);
                     update.set("generate_images_url", url);
-                    update.set("generate_images_Jjson", ret);
+                    update.set("generate_images_json", ret);
                     posterRes.setGenerateImagesUrl(url);
                     template.update(Query.query(empty), update, Poster.class)
                             .switchIfEmpty(Mono.error(new BaseException(" 操作失败")))
@@ -132,7 +153,7 @@ public class GoGenerateService {
         return zip;
     }
 
-    public Mono<RStatus<PosterRes>> updatePoster(@RequestBody PosterRequest posterRequset){
+    public Mono<RStatus<Poster>> updatePoster(@RequestBody PosterRequest posterRequset){
 
         String posterTemplate = posterRequset.getPosterTemplate();
         JSONObject jsonObject = JSONUtil.parseObj(posterTemplate);
@@ -161,38 +182,36 @@ public class GoGenerateService {
                 String s = GoGenerate(JSONUtil.toJsonStr(goRequest));
                 return Mono.just(s);
             });
-            Mono<PosterRes> zip = getPosterResMono2(Mono.just(posterRequset), stringMono);
-            return RStatus.success(zip);
+            Mono<Poster> zip = getPosterResMono2(Mono.just(posterRequset), stringMono);
+            Mono<Poster> posterMono = zip.switchIfEmpty(Mono.error(new BaseException(" 操作失败")))
+                    .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage())));
+            Mono<Poster> posterMono1 = posterMono.flatMap(f -> template.insert(f));
+            return RStatus.success(posterMono1);
         }else {
             String s = GoGenerate(JSONUtil.toJsonStr(goRequest));
-            Mono<PosterRes> zip = getPosterResMono2(Mono.just(posterRequset), Mono.just(s));
-            return RStatus.success(zip);
+            Mono<Poster> zip = getPosterResMono2(Mono.just(posterRequset), Mono.just(s));
+            Mono<Poster> posterMono = zip.switchIfEmpty(Mono.error(new BaseException(" 操作失败")))
+                    .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage())));
+            Mono<Poster> posterMono1 = posterMono.flatMap(f -> template.insert(f));
+            return RStatus.success(posterMono1);
         }
     }
 
-    private Mono<PosterRes> getPosterResMono2(Mono<PosterRequest> insert, Mono<String> stringMono) {
-        Mono<PosterRes> zip = Mono.zip(insert, stringMono, (entry, ret) -> {
-            PosterRes posterRes = new PosterRes();
-            posterRes.setPosterId(entry.getPosterId());
-            posterRes.setPosterTemplate(entry.getPosterTemplate());
-            posterRes.setPosterTemplateId(entry.getPosterTemplateId());
+    private Mono<Poster> getPosterResMono2(Mono<PosterRequest> insert, Mono<String> stringMono) {
+        Mono<Poster> zip = Mono.zip(insert, stringMono, (entry, ret) -> {
             JSONObject jsonObject1 = JSONUtil.parseObj(ret);
-            Criteria empty = Criteria.where("poster_id").is(entry.getPosterId());
-            Update update = Update.update("updated_at", ZonedDateTime.now());
-            update.set("poster_template",entry.getPosterTemplate());
             if (jsonObject1.containsKey("code") && jsonObject1.get("code", Integer.class) == 0 && jsonObject1.containsKey("data")) {
                 JSONObject data = jsonObject1.get("data", JSONObject.class);
-                if (data.containsKey("url")) {
-                    String url = data.get("url", String.class);
-                    update.set("generate_images_url", url);
-                    update.set("generate_images_Jjson", ret);
-                    posterRes.setGenerateImagesUrl(url);
-                    template.update(Query.query(empty), update, Poster.class)
-                            .switchIfEmpty(Mono.error(new BaseException(" 操作失败")))
-                            .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage())));
+                if (data.containsKey("Url")) {
+                    String url = data.get("Url", String.class);
+                    Poster poster = new Poster(null, entry.getPosterTemplateId()
+                            ,entry.getPosterTemplate(), BaseContextHandler.getUserName(),
+                            BaseContextHandler.getUserId(), ZonedDateTime.now(),
+                            ZonedDateTime.now(),url,ret);
+                    return poster;
                 }
             }
-            return posterRes;
+            return null;
         });
         return zip;
     }