code sk v0.03

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

@@ -277,12 +277,13 @@ public class PlanNewCommonController {
             // 交友计划
             String userName = BaseContextHandler.getUserName();
             String userId = BaseContextHandler.getUserId();
-            Mono<PlanNewCommon> planNewCommonMono = template.selectOne(Query.query(Criteria.where("id").is(planId)), PlanNewCommon.class)
+        Mono<String> code = customCodeServer.getCode();
+            Mono<PlanNewCommon> planNewCommonMono = code.flatMap(codeN-> template.selectOne(Query.query(Criteria.where("id").is(planId)), PlanNewCommon.class)
                     .flatMap(f -> {
                         PlanNewCommon planNewCommon = new PlanNewCommon(
                                 IdUtil.fastSimpleUUID(),
                                 f.name(),
-                                IdUtil.fastSimpleUUID(),
+                                codeN,
                                 f.type(),
                                 f.groupId(),
                                 f.posterTemplateId(),
@@ -297,7 +298,7 @@ public class PlanNewCommonController {
                                 ZonedDateTime.now()
                         );
                         return template.insert(planNewCommon);
-                    });
+                    }));
             Mono<List<PlanNewBackgroupPoster>> poster = template.select(Query.query(Criteria.where("plan_new_id")
                             .is(planId)), PlanNewBackgroupPoster.class)
                     .collectList();

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

@@ -748,7 +748,8 @@ public class PlanNewController {
         } else if (1 == type) {
             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)
+            Mono<String> code = customCodeServer.getCode();
+            Mono<PlanNew> plan_new_id = code.flatMap(codeN-> template.selectOne(Query.query(Criteria.where("plan_new_id").is(planNewId)), PlanNew.class)
                     .map(saveRequest -> new PlanNew(IdUtil.fastSimpleUUID(),
                             saveRequest.name(),
                             userName,
@@ -757,7 +758,7 @@ public class PlanNewController {
                             ZonedDateTime.now(),
                             null,
                             saveRequest.type(),
-                            IdUtil.fastSimpleUUID(),
+                            codeN,
                             saveRequest.groupId(),
                             saveRequest.posterTemplateId(),
                             saveRequest.pageShow(),
@@ -790,7 +791,7 @@ public class PlanNewController {
                             saveRequest.listButton(),
                             saveRequest.groupListDisplay(),
                             saveRequest.pressImage()
-                    )).flatMap(map -> template.insert(map));
+                    )).flatMap(map -> template.insert(map)));
             Mono<List<PlanNewBackgroupPoster>> listening_plan_new_id1 =
                     template.select(Query.query(Criteria.where("plan_new_id")
                                     .is(planNewId)), PlanNewBackgroupPoster.class)

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/listening/ListeningPlanServiceImpl.java

@@ -334,33 +334,35 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
     public Mono<RStatus<String>> copyById(String listeningPlanNewId) {
         String userName = BaseContextHandler.getUserName();
         String userId = BaseContextHandler.getUserId();
-        Mono<ListeningPlanNew> listening_plan_new_id = template
-                .selectOne(Query.query(Criteria.where("listening_plan_new_id").is(listeningPlanNewId)), ListeningPlanNew.class)
-                .switchIfEmpty(Mono.error(new BaseException("计划错误")))
-                .onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage())))
-                .flatMap(f -> {
-                    ListeningPlanNew listeningPlanNew = new ListeningPlanNew(IdUtil.fastSimpleUUID(),
-                            f.name(),
-                            userName,
-                            userId,
-                            ZonedDateTime.now(),
-                            ZonedDateTime.now(),
-                            null,
-                            f.type(),
-                            IdUtil.fastSimpleUUID(),
-                            f.groupId(),
-                            f.groupName(),
-                            f.posterTemplateId(),
-                            f.pageShow(),
-                            f.pageLine(),
-                            f.link(),
-                            f.backgroundGroupId(),
-                            f.baiduDot(),
-                            null,
-                            f.listButton()
-                    );
-                    return Mono.just(listeningPlanNew);
-                }).flatMap(f -> template.insert(f));
+
+        Mono<String> code = customCodeServer.getCode();
+        Mono<ListeningPlanNew> listening_plan_new_id = code.flatMap(codeN-> template.selectOne(Query.query(Criteria.where("listening_plan_new_id").is(listeningPlanNewId)), ListeningPlanNew.class)
+                  .switchIfEmpty(Mono.error(new BaseException("计划错误")))
+                  .onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage())))
+                  .flatMap(f -> {
+                      ListeningPlanNew listeningPlanNew = new ListeningPlanNew(IdUtil.fastSimpleUUID(),
+                              f.name(),
+                              userName,
+                              userId,
+                              ZonedDateTime.now(),
+                              ZonedDateTime.now(),
+                              null,
+                              f.type(),
+                              codeN,
+                              f.groupId(),
+                              f.groupName(),
+                              f.posterTemplateId(),
+                              f.pageShow(),
+                              f.pageLine(),
+                              f.link(),
+                              f.backgroundGroupId(),
+                              f.baiduDot(),
+                              null,
+                              f.listButton()
+                      );
+                      return Mono.just(listeningPlanNew);
+                  }).flatMap(f -> template.insert(f)));
+
         Mono<List<ListeningPlanNewBackgroupPoster>> listening_plan_new_id1 =
                 template.select(Query.query(Criteria.where("listening_plan_new_id")
                         .is(listeningPlanNewId)), ListeningPlanNewBackgroupPoster.class)