|
|
@@ -12,6 +12,7 @@ import com.tzld.piaoquan.api.model.po.contentplatform.*;
|
|
|
import com.tzld.piaoquan.api.service.CgiReplyService;
|
|
|
import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformPlanService;
|
|
|
import com.tzld.piaoquan.growth.common.dao.mapper.CgiReplyBucketDataMapper;
|
|
|
+import com.tzld.piaoquan.growth.common.dao.mapper.ext.CgiReplyBucketDataMapperExt;
|
|
|
import com.tzld.piaoquan.growth.common.model.po.CgiReplyBucketData;
|
|
|
import com.tzld.piaoquan.growth.common.model.po.CgiReplyBucketDataExample;
|
|
|
import com.tzld.piaoquan.growth.common.utils.RedisUtils;
|
|
|
@@ -60,6 +61,9 @@ public class ExternalChannelProcessJob {
|
|
|
@Autowired
|
|
|
private CgiReplyBucketDataMapper cgiReplyBucketDataMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private CgiReplyBucketDataMapperExt cgiReplyBucketDataMapperExt;
|
|
|
+
|
|
|
@Autowired
|
|
|
private CgiReplyService cgiReplyService;
|
|
|
|
|
|
@@ -887,7 +891,7 @@ public class ExternalChannelProcessJob {
|
|
|
break;
|
|
|
case GZH_COOPERATE_JIZHUAN:
|
|
|
// 公众号合作-即转:从cgi_reply_bucket_data查询dyyjs_开头的rootSourceId
|
|
|
- //rootSourceIds = queryRootSourceIdsFromCgiReply(PREFIX_DYYJS, startDate);
|
|
|
+ rootSourceIds = queryRootSourceIdsFromCgiReply(PREFIX_DYYJS, startDate);
|
|
|
break;
|
|
|
case QW_COOPERATE:
|
|
|
// 群/企微合作:从content_platform_qw_plan查询
|
|
|
@@ -1009,15 +1013,15 @@ public class ExternalChannelProcessJob {
|
|
|
private List<String> queryRootSourceIdsFromCgiReply(String prefix, Date startDate) {
|
|
|
List<String> result = new ArrayList<>();
|
|
|
try {
|
|
|
- CgiReplyBucketDataExample example = new CgiReplyBucketDataExample();
|
|
|
- example.createCriteria()
|
|
|
- .andRootSourceIdLike(prefix + "%")
|
|
|
- .andCreateTimeGreaterThanOrEqualTo(startDate);
|
|
|
- example.setDistinct(true);
|
|
|
- List<CgiReplyBucketData> list = cgiReplyBucketDataMapper.selectByExample(example);
|
|
|
- if (!CollectionUtils.isEmpty(list)) {
|
|
|
- result = list.stream().map(CgiReplyBucketData::getRootSourceId).collect(Collectors.toList());
|
|
|
- }
|
|
|
+ //CgiReplyBucketDataExample example = new CgiReplyBucketDataExample();
|
|
|
+ //example.createCriteria()
|
|
|
+ // .andCreateTimeGreaterThanOrEqualTo(startDate)
|
|
|
+ // .andRootSourceIdLike(prefix + "%");
|
|
|
+ //List<CgiReplyBucketData> list = cgiReplyBucketDataMapper.selectByExample(example);
|
|
|
+ //if (!CollectionUtils.isEmpty(list)) {
|
|
|
+ // result = list.stream().map(CgiReplyBucketData::getRootSourceId).collect(Collectors.toList());
|
|
|
+ //}
|
|
|
+ result = cgiReplyBucketDataMapperExt.getRootSourceIdByPrefix(prefix, startDate);
|
|
|
} catch (Exception e) {
|
|
|
log.error("从cgi_reply_bucket_data查询历史数据失败, prefix={}", prefix, e);
|
|
|
}
|