|
|
@@ -20,6 +20,7 @@ import com.webflux.launchadmin.mysql.entity.listening.ListeningAudio;
|
|
|
import com.webflux.launchadmin.mysql.entity.listening.ListeningPlanNew;
|
|
|
import com.webflux.launchadmin.mysql.entity.listening.ListeningPlanNewBackgroupPoster;
|
|
|
import com.webflux.launchadmin.mysql.entity.planNew.*;
|
|
|
+import com.webflux.launchadmin.mysql.service.customCode.CustomCodeServer;
|
|
|
import com.webflux.launchadmin.mysql.service.planNew.PlanServiceInterface;
|
|
|
import com.webflux.launchadmin.mysql.service.planNew.goGenerate.GoGenerateService;
|
|
|
import com.webflux.launchadmin.mysql.service.planNew.structure.GoRequest;
|
|
|
@@ -32,6 +33,7 @@ import com.webflux.launchcommon.returnObj.RStatus;
|
|
|
import jakarta.annotation.Resource;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.data.domain.Sort;
|
|
|
import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
|
|
|
@@ -62,6 +64,8 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
|
|
|
private SyncListeningAudioToRedis syncListeningAudioToRedis;
|
|
|
@Resource
|
|
|
private SyncPlanNewListenToRedis syncPlanNewListenToRedis;
|
|
|
+ @Autowired
|
|
|
+ private CustomCodeServer customCodeServer;
|
|
|
@Override
|
|
|
public Mono<RStatus<Paged<ListeningPlanNewRes2>>> page(PlanReqPage request, Criteria criteria) {
|
|
|
Query query = Query.query(criteria);
|
|
|
@@ -116,29 +120,34 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
|
|
|
String userId = BaseContextHandler.getUserId();
|
|
|
//save
|
|
|
boolean bl=Objects.isNull(saveRequest.getPlanNewId()) || "".equals(saveRequest.getPlanNewId().trim());
|
|
|
+ Mono<String> code =Mono.just("");
|
|
|
if(bl){
|
|
|
- saveRequest.setCode(IdUtil.fastSimpleUUID());
|
|
|
+ // saveRequest.setCode(IdUtil.fastSimpleUUID());
|
|
|
+ code = customCodeServer.getCode().flatMap(newCode->{
|
|
|
+ saveRequest.setCode(newCode);
|
|
|
+ return Mono.just(newCode);
|
|
|
+ });
|
|
|
}
|
|
|
Long posterTemplateId = saveRequest.getPosterTemplateId();
|
|
|
//预览Url
|
|
|
- Mono<String> stringMono1 = template
|
|
|
- .select(Query.query(Criteria.where("poster_template_id")
|
|
|
- .is(posterTemplateId)).sort(Sort.by(Sort.Order.asc("created_at"))), Poster.class)
|
|
|
- .collectList().flatMap(f -> {
|
|
|
- Poster poster = f.get(0);
|
|
|
- String posterTemplate = poster.posterTemplate();
|
|
|
- JSONObject jsonObject = JSONUtil.parseObj(posterTemplate);
|
|
|
- GoRequest goRequest = new GoRequest();
|
|
|
- BeanUtil.copyProperties(jsonObject, goRequest);
|
|
|
- ServiceGroupSettingItemRequest serviceGroupSettingItemRequest = saveRequest.getBackgroupFxSetting().get(0);
|
|
|
- System.out.println(goRequest);
|
|
|
- Mono<String> stringMono = saveAndUpdatePlanGenerateImage0(goRequest,
|
|
|
- //setCusqrcodeRtUrl(goRequest),
|
|
|
- goGenerateService.setCusqrcodeSetV(goRequest),
|
|
|
- serviceGroupSettingItemRequest,
|
|
|
- saveRequest);
|
|
|
- return stringMono;
|
|
|
- });
|
|
|
+ Mono<String> stringMono1 = code.then(template
|
|
|
+ .select(Query.query(Criteria.where("poster_template_id")
|
|
|
+ .is(posterTemplateId)).sort(Sort.by(Sort.Order.asc("created_at"))), Poster.class)
|
|
|
+ .collectList().flatMap(f -> {
|
|
|
+ Poster poster = f.get(0);
|
|
|
+ String posterTemplate = poster.posterTemplate();
|
|
|
+ JSONObject jsonObject = JSONUtil.parseObj(posterTemplate);
|
|
|
+ GoRequest goRequest = new GoRequest();
|
|
|
+ BeanUtil.copyProperties(jsonObject, goRequest);
|
|
|
+ ServiceGroupSettingItemRequest serviceGroupSettingItemRequest = saveRequest.getBackgroupFxSetting().get(0);
|
|
|
+ System.out.println(goRequest);
|
|
|
+ Mono<String> stringMono = saveAndUpdatePlanGenerateImage0(goRequest,
|
|
|
+ //setCusqrcodeRtUrl(goRequest),
|
|
|
+ goGenerateService.setCusqrcodeSetV(goRequest),
|
|
|
+ serviceGroupSettingItemRequest,
|
|
|
+ saveRequest);
|
|
|
+ return stringMono;
|
|
|
+ }));
|
|
|
Mono<StringBuilder> link=Mono.just(new StringBuilder(saveRequest.getLink()));
|
|
|
Mono<ListeningPlanNew> insert = Mono.zip(stringMono1, link).flatMap(f->{
|
|
|
|
|
|
@@ -239,7 +248,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
|
|
|
stringBuilder.append("/index.html?code=");
|
|
|
stringBuilder.append(a.code());
|
|
|
stringBuilder.append("&sk=");
|
|
|
- stringBuilder.append(IdUtil.fastSimpleUUID());
|
|
|
+ stringBuilder.append(RandomStr.generateUseSk());
|
|
|
}else {
|
|
|
throw new BaseException("通过计划id3:"+a.listeningPlanNewId() +"的营销类型查询域名为空");
|
|
|
}
|
|
|
@@ -574,7 +583,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
|
|
|
stringBuilder.append("/index.html?code=");
|
|
|
stringBuilder.append(a.code());
|
|
|
stringBuilder.append("&sk=");
|
|
|
- stringBuilder.append(IdUtil.fastSimpleUUID());
|
|
|
+ stringBuilder.append(RandomStr.generateUseSk());
|
|
|
}else {
|
|
|
throw new BaseException("二维码链接:::通过计划id4:"+a.listeningPlanNewId() +"的营销类型查询域名为空");
|
|
|
}
|
|
|
@@ -821,7 +830,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
|
|
|
stringBuilder.append("/index.html?code=");
|
|
|
stringBuilder.append(a.code());
|
|
|
stringBuilder.append("&sk=");
|
|
|
- stringBuilder.append(IdUtil.fastSimpleUUID());
|
|
|
+ stringBuilder.append(RandomStr.generateUseSk());
|
|
|
}else {
|
|
|
throw new BaseException("通过计划id5:"+a.listeningPlanNewId() +"的营销类型查询域名为空");
|
|
|
}
|
|
|
@@ -1179,7 +1188,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
|
|
|
stringBuilder.append("/index.html?code=");
|
|
|
stringBuilder.append(a.code());
|
|
|
stringBuilder.append("&sk=");
|
|
|
- stringBuilder.append(IdUtil.fastSimpleUUID());
|
|
|
+ stringBuilder.append(RandomStr.generateUseSk());
|
|
|
}else {
|
|
|
throw new BaseException("通过计划id1:"+a.listeningPlanNewId() +"的营销类型查询域名为空");
|
|
|
}
|
|
|
@@ -1194,7 +1203,7 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
|
|
|
stringBuilder.append("/index.html?code=");
|
|
|
stringBuilder.append(saveRequest.getCode());
|
|
|
stringBuilder.append("&sk=");
|
|
|
- stringBuilder.append(IdUtil.fastSimpleUUID());
|
|
|
+ stringBuilder.append(RandomStr.generateUseSk());
|
|
|
}else {
|
|
|
throw new BaseException("通过计划id2:"+saveRequest.getPlanNewId() +"的营销类型查询域名为空");
|
|
|
}
|