|
|
@@ -76,7 +76,12 @@ public class PlanNewCommonController {
|
|
|
String userName = BaseContextHandler.getUserName();
|
|
|
String userId = BaseContextHandler.getUserId();
|
|
|
saveRequest.setCode(IdUtil.fastSimpleUUID());
|
|
|
- Mono<String> previewUrl = this.getPreviewUrl(saveRequest);
|
|
|
+ Mono<String> previewUrl;
|
|
|
+ if (saveRequest.getType() == 8) {//复粉
|
|
|
+ previewUrl = Mono.just("");
|
|
|
+ }else {
|
|
|
+ previewUrl = this.getPreviewUrl(saveRequest);
|
|
|
+ }
|
|
|
Mono<PlanNewCommon> insert = previewUrl.flatMap(f -> {
|
|
|
PlanNewCommon plan = new PlanNewCommon(
|
|
|
IdUtil.fastSimpleUUID(),
|
|
|
@@ -97,14 +102,18 @@ public class PlanNewCommonController {
|
|
|
);
|
|
|
return template.insert(plan);
|
|
|
});
|
|
|
- Mono<String> map = insert.flatMap(f -> {
|
|
|
- Flux<PlanNewBackgroupPoster> just = this.getPlanNewBackGroupPosterFlux(saveRequest, f);
|
|
|
- return Mono.zip(this.batchInsert(just), Mono.just(f)).flatMap(ff -> {
|
|
|
- PlanNewCommon t2 = ff.getT2();
|
|
|
- return Mono.just(t2.id());
|
|
|
+ if(saveRequest.getType()==8){
|
|
|
+ return RStatus.success(Mono.just(""));
|
|
|
+ }else {
|
|
|
+ Mono<String> map = insert.flatMap(f -> {
|
|
|
+ Flux<PlanNewBackgroupPoster> just = this.getPlanNewBackGroupPosterFlux(saveRequest, f);
|
|
|
+ return Mono.zip(this.batchInsert(just), Mono.just(f)).flatMap(ff -> {
|
|
|
+ PlanNewCommon t2 = ff.getT2();
|
|
|
+ return Mono.just(t2.id());
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- return RStatus.success(map);
|
|
|
+ return RStatus.success(map);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -114,7 +123,12 @@ public class PlanNewCommonController {
|
|
|
String userName = BaseContextHandler.getUserName();
|
|
|
String userId = BaseContextHandler.getUserId();
|
|
|
Mono<PlanNewCommon> planNewCommonMono = template.selectOne(Query.query(Criteria.where("id").is(updateRequest.getPlanNewId())), PlanNewCommon.class);
|
|
|
- Mono<String> previewUrl = this.getPreviewUrl(updateRequest);
|
|
|
+ Mono<String> previewUrl ;//= this.getPreviewUrl(updateRequest);
|
|
|
+ if (updateRequest.getType() == 8) {//复粉
|
|
|
+ previewUrl = Mono.just("");
|
|
|
+ }else {
|
|
|
+ previewUrl = this.getPreviewUrl(updateRequest);
|
|
|
+ }
|
|
|
Mono<PlanNewCommon> updateMono = Mono.zip(previewUrl, planNewCommonMono).flatMap(f -> {
|
|
|
PlanNewCommon old = f.getT2();
|
|
|
PlanNewCommon plan = new PlanNewCommon(
|
|
|
@@ -136,17 +150,23 @@ public class PlanNewCommonController {
|
|
|
);
|
|
|
return Mono.just(plan);
|
|
|
}).flatMap(template::update);
|
|
|
- Mono<String> map = updateMono.flatMap(f1 -> {
|
|
|
- Mono<Long> ml = template.delete(Query.query(Criteria.where("plan_new_id").is(f1.id())), PlanNewBackgroupPoster.class);
|
|
|
- return Mono.zip(Mono.just(f1), ml).flatMap(ff -> Mono.just(f1));
|
|
|
- }).flatMap(f -> {
|
|
|
- Flux<PlanNewBackgroupPoster> just = this.getPlanNewBackGroupPosterFlux(updateRequest, f);
|
|
|
- return Mono.zip(this.batchInsert(just), Mono.just(f)).flatMap(ff -> {
|
|
|
- PlanNewCommon t2 = ff.getT2();
|
|
|
- return Mono.just(t2.id());
|
|
|
+ if(updateRequest.getType()==8){
|
|
|
+ return RStatus.success(Mono.just(""));
|
|
|
+ }else {
|
|
|
+ Mono<String> map = updateMono.flatMap(f1 -> {
|
|
|
+ Mono<Long> ml = template.delete(Query.query(Criteria.where("plan_new_id").is(f1.id())), PlanNewBackgroupPoster.class);
|
|
|
+ return Mono.zip(Mono.just(f1), ml).flatMap(ff -> Mono.just(f1));
|
|
|
+ }).flatMap(f -> {
|
|
|
+ Flux<PlanNewBackgroupPoster> just = this.getPlanNewBackGroupPosterFlux(updateRequest, f);
|
|
|
+ return Mono.zip(this.batchInsert(just), Mono.just(f)).flatMap(ff -> {
|
|
|
+ PlanNewCommon t2 = ff.getT2();
|
|
|
+ return Mono.just(t2.id());
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- return RStatus.success(map);
|
|
|
+ return RStatus.success(map);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|