|
@@ -52,6 +52,8 @@ public class GhDetailServiceImpl implements GhDetailService {
|
|
|
|
|
|
|
|
@Value("${small_page_url}")
|
|
@Value("${small_page_url}")
|
|
|
private String GET_SMALL_PAGE_URL;
|
|
private String GET_SMALL_PAGE_URL;
|
|
|
|
|
+ @Value("${rootSourceConfig:{}}")
|
|
|
|
|
+ private String rootSourceConfig;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public CommonResponse<Page<GhDetailVo>> getGhDetailList(Integer pageNum, Integer pageSize,
|
|
public CommonResponse<Page<GhDetailVo>> getGhDetailList(Integer pageNum, Integer pageSize,
|
|
@@ -183,7 +185,8 @@ public class GhDetailServiceImpl implements GhDetailService {
|
|
|
GhDetailExt ghDetailExt = new GhDetailExt();
|
|
GhDetailExt ghDetailExt = new GhDetailExt();
|
|
|
ghDetailExt.setGhDetailId(ghDetail.getId());
|
|
ghDetailExt.setGhDetailId(ghDetail.getId());
|
|
|
ghDetailExt.setVideoId(videoDetail.getVideoId());
|
|
ghDetailExt.setVideoId(videoDetail.getVideoId());
|
|
|
- ghDetailExt.setPage(getVideoPageUrl(videoDetail.getVideoId(), ghDetailVo.getChannel(), ghDetailVo.getAccountId(), videoDetail.getSort()));
|
|
|
|
|
|
|
+ ghDetailExt.setPage(getVideoPageUrl(videoDetail.getVideoId(), ghDetailVo.getChannel(),
|
|
|
|
|
+ ghDetailVo.getAccountId(), videoDetail.getSort(), ghDetailVo.getType()));
|
|
|
ghDetailExt.setTitle(videoDetail.getTitle());
|
|
ghDetailExt.setTitle(videoDetail.getTitle());
|
|
|
ghDetailExt.setCover(videoDetail.getCover());
|
|
ghDetailExt.setCover(videoDetail.getCover());
|
|
|
ghDetailExt.setSort(videoDetail.getSort());
|
|
ghDetailExt.setSort(videoDetail.getSort());
|
|
@@ -193,21 +196,42 @@ public class GhDetailServiceImpl implements GhDetailService {
|
|
|
ghDetailMapperExt.batchInsertGhDetailExt(ghDetailExts);
|
|
ghDetailMapperExt.batchInsertGhDetailExt(ghDetailExts);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private String getVideoPageUrl(Long videoId, String channel, String ghId, Integer sort) {
|
|
|
|
|
|
|
+ private String getVideoPageUrl(Long videoId, String channel, String ghId, Integer sort, Integer accountType) {
|
|
|
// 查询库里是否存在,如果存在即复用
|
|
// 查询库里是否存在,如果存在即复用
|
|
|
- CgiReplyBucketDataExample cgiReplyBucketDataExample = new CgiReplyBucketDataExample();
|
|
|
|
|
- cgiReplyBucketDataExample.createCriteria().andIsDeleteEqualTo(0).andMiniVideoIdEqualTo(videoId).andGhIdEqualTo(ghId);
|
|
|
|
|
- List<CgiReplyBucketData> cgiReplyBucketData = cgiReplyBucketDataMapper.selectByExample(cgiReplyBucketDataExample);
|
|
|
|
|
- if (!CollectionUtils.isEmpty(cgiReplyBucketData)) {
|
|
|
|
|
- return cgiReplyBucketData.get(0).getPagePathUrlId().toString();
|
|
|
|
|
- }
|
|
|
|
|
- String response = touLiuHttpClient.sendAdFlowAddRequest(GET_SMALL_PAGE_URL, String.valueOf(videoId), "dyyjs", channel, "自动", "公众号", "自动回复小程序", "位置" + sort, ghId);
|
|
|
|
|
- JSONObject jsonObject = JSON.parseObject(response);
|
|
|
|
|
- if (jsonObject != null && jsonObject.containsKey("data")) {
|
|
|
|
|
- JSONObject data = jsonObject.getJSONObject("data");
|
|
|
|
|
- if (data != null && data.containsKey("url")) {
|
|
|
|
|
- return data.getString("url");
|
|
|
|
|
|
|
+ try {
|
|
|
|
|
+ CgiReplyBucketDataExample cgiReplyBucketDataExample = new CgiReplyBucketDataExample();
|
|
|
|
|
+ cgiReplyBucketDataExample.createCriteria().andIsDeleteEqualTo(0).andMiniVideoIdEqualTo(videoId).andGhIdEqualTo(ghId);
|
|
|
|
|
+ List<CgiReplyBucketData> cgiReplyBucketData = cgiReplyBucketDataMapper.selectByExample(cgiReplyBucketDataExample);
|
|
|
|
|
+ if (!CollectionUtils.isEmpty(cgiReplyBucketData)) {
|
|
|
|
|
+ return cgiReplyBucketData.get(0).getPagePathUrlId().toString();
|
|
|
}
|
|
}
|
|
|
|
|
+ String response;
|
|
|
|
|
+ if (accountType.equals(GhTypeEnum.GH.type)) {
|
|
|
|
|
+ String putScene = "touliu";
|
|
|
|
|
+ channel = "tencentgzh";
|
|
|
|
|
+ JSONObject rootSourceConfigs = JSON.parseObject(rootSourceConfig);
|
|
|
|
|
+ JSONObject jsonObject1 = rootSourceConfigs.getJSONObject(ghId);
|
|
|
|
|
+ if (jsonObject1 != null) {
|
|
|
|
|
+ if (StringUtils.isNotEmpty(jsonObject1.getString("putScene"))) {
|
|
|
|
|
+ putScene = jsonObject1.getString("putScene");
|
|
|
|
|
+ }
|
|
|
|
|
+ if (StringUtils.isNotEmpty(jsonObject1.getString("channel"))) {
|
|
|
|
|
+ channel = jsonObject1.getString("channel");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ response = touLiuHttpClient.sendAdFlowAddRequest(GET_SMALL_PAGE_URL, String.valueOf(videoId), putScene, channel, "自动", "公众号", "自动回复小程序", "位置" + sort, ghId);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ response = touLiuHttpClient.sendAdFlowAddRequest(GET_SMALL_PAGE_URL, String.valueOf(videoId), "dyyjs", channel, "自动", "公众号", "自动回复小程序", "位置" + sort, ghId);
|
|
|
|
|
+ }
|
|
|
|
|
+ JSONObject jsonObject = JSON.parseObject(response);
|
|
|
|
|
+ if (jsonObject != null && jsonObject.containsKey("data")) {
|
|
|
|
|
+ JSONObject data = jsonObject.getJSONObject("data");
|
|
|
|
|
+ if (data != null && data.containsKey("url")) {
|
|
|
|
|
+ return data.getString("url");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ log.error("getVideoPageUrl error", e);
|
|
|
}
|
|
}
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|