plan-java v0.26

(cherry picked from commit 6fc12b0502c557f0b8a33c5cfe1d5cf8a63cf4ac)

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

@@ -358,7 +358,7 @@ public class PlanNewController {
                 ZonedDateTime.now(),
                 null,
                 saveRequest.getType(),
-                IdUtil.fastUUID(),
+                IdUtil.fastSimpleUUID(),
                 saveRequest.getGroupId(),
                 saveRequest.getPosterTemplateId(),
                 saveRequest.getPageShow(),
@@ -501,16 +501,18 @@ public class PlanNewController {
      */
     @GetMapping("copyById/{planNewId}")
     public Mono<RStatus<PlanNew>> copyById (@PathVariable("planNewId")  @NotNull Long planNewId){
+        String userName = BaseContextHandler.getUserName();
+        String userId = BaseContextHandler.getUserId();
         Mono<PlanNew> plan_new_id = template.selectOne(Query.query(Criteria.where("plan_new_id").is(planNewId)), PlanNew.class)
                 .map(saveRequest -> new PlanNew(null,
                         saveRequest.name(),
-                        BaseContextHandler.getUserName(),
-                        BaseContextHandler.getUserId(),
+                        userName,
+                        userId,
                         ZonedDateTime.now(),
                         ZonedDateTime.now(),
                         null,
                         saveRequest.type(),
-                        IdUtil.fastUUID(),
+                        IdUtil.fastSimpleUUID(),
                         saveRequest.groupId(),
                         saveRequest.posterTemplateId(),
                         saveRequest.pageShow(),
@@ -532,7 +534,11 @@ public class PlanNewController {
                         saveRequest.groupIdQs(),
                         saveRequest.baiduDot(),
                         saveRequest.backgroundGroupIdNewAdd()
-                )).flatMap(map -> template.insert(map));
+                )).flatMap(map -> {
+                    System.out.println(map.createUser());
+                    System.out.println(JSONUtil.toJsonStr(map));
+                    return template.insert(map);
+                });
         return RStatus.success(plan_new_id);
     }
 

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

@@ -185,14 +185,14 @@ public class GoGenerateService {
             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));
+            Mono<Poster> posterMono1 = posterMono.flatMap(f -> template.update(f));
             return RStatus.success(posterMono1);
         }else {
             String s = goGenerate(JSONUtil.toJsonStr(goRequest));
             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));
+            Mono<Poster> posterMono1 = posterMono.flatMap(f -> template.update(f));
             return RStatus.success(posterMono1);
         }
     }