Procházet zdrojové kódy

data-v0.04

(cherry picked from commit ec52d0f05552ff43aa50484e3d9bea9e2cde307d)
MOKASZ\lw12420 před 1 rokem
rodič
revize
1a7ca07a01

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

@@ -203,7 +203,7 @@ public class PlanNewCommonController {
                     updateRequest.getImportCustomer(),
                     updateRequest.getReturnCustomer(),
                     updateRequest.getLinkCustomer(),
-                    updateRequest.getIsLaunch()
+                    old.isLaunch()
             );
             return Mono.just(plan);
         }).flatMap(template::update);

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

@@ -724,7 +724,7 @@ public class PlanNewController {
                         saveRequest.getImportCustomer(),
                         saveRequest.getReturnCustomer(),
                         saveRequest.getLinkCustomer(),
-                        saveRequest.getIsLaunch()
+                        map.isLaunch()
                 );
                 return Mono.just(planNew);
             }).flatMap(template::update);

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

@@ -150,14 +150,21 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                      return stringMono;
                  }));
         Mono<StringBuilder> link=Mono.just(new StringBuilder(saveRequest.getLink()));
-        Mono<ListeningPlanNew> insert = Mono.zip(stringMono1, link).flatMap(f->{
-
+        Mono<ListeningPlanNew> planNewMono;
+        if(bl){
+            planNewMono=Mono.just( new ListeningPlanNew(null, null, null, null, null, null, null, null, null, null, null,
+                    null, null, null, null, null, null, null, null, null,
+                    null, null, null));
+        }else {
+           planNewMono = template.selectOne(Query.query(Criteria.where("listening_plan_new_id").is(saveRequest.getPlanNewId())), ListeningPlanNew.class);
+        }
+        Mono<ListeningPlanNew> insert = Mono.zip(stringMono1,link,planNewMono).flatMap(f->{
             ListeningPlanNew plan = new ListeningPlanNew(
                     bl  ?IdUtil.fastSimpleUUID():saveRequest.getPlanNewId(),
                     saveRequest.getName(),
-                    userName,
-                    userId,
-                    ZonedDateTime.now(),
+                    bl?userName:f.getT3().createUser(),
+                    bl?userId:f.getT3().createId(),
+                    bl?ZonedDateTime.now():f.getT3().createdAt(),
                     ZonedDateTime.now(),
                     null,
                     saveRequest.getType(),
@@ -175,7 +182,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
                     saveRequest.getImportCustomer(),
                     saveRequest.getReturnCustomer(),
                     saveRequest.getLinkCustomer(),
-                    saveRequest.getIsLaunch()
+                    bl?0: f.getT3().isLaunch()
             );
             return !bl? template.update(plan) : template.insert(plan);
         });