|
|
@@ -612,6 +612,13 @@ public class ChannelDemandMatchJob {
|
|
|
}
|
|
|
ChannelDemandMatchResult row = copyDemandFields(demand);
|
|
|
// 填充匹配结果
|
|
|
+ if (StringUtils.hasText(row.getDemandType())) {
|
|
|
+ if ("特征点".equals(row.getDemandType())) {
|
|
|
+ row.setDemandType("聚类特征点");
|
|
|
+ } else if ("特征点泛化".equals(row.getDemandType())) {
|
|
|
+ row.setDemandType("tree泛化特征点");
|
|
|
+ }
|
|
|
+ }
|
|
|
row.setMatchVideoId(item.getVideoId());
|
|
|
row.setMatchConfigCode(item.getConfigCode());
|
|
|
row.setMatchScore(item.getScore());
|
|
|
@@ -756,7 +763,7 @@ public class ChannelDemandMatchJob {
|
|
|
* 从缓存的中间结果构建 ChannelDemandMatchResult 列表
|
|
|
*/
|
|
|
private List<ChannelDemandMatchResult> buildLibraryRecallRows(ChannelDemandMatchResult demand,
|
|
|
- int topN, List<CachedPost> cachedPosts) {
|
|
|
+ int topN, List<CachedPost> cachedPosts) {
|
|
|
List<ChannelDemandMatchResult> batchRows = new ArrayList<>();
|
|
|
String elementName = demand.getMatchGeneralizedElement();
|
|
|
|
|
|
@@ -784,6 +791,13 @@ public class ChannelDemandMatchJob {
|
|
|
|
|
|
ChannelDemandMatchResult row = copyDemandFields(demand);
|
|
|
row.setMatchMethod(MATCH_METHOD_RECOMMEND_LIB_EXACT);
|
|
|
+ if (StringUtils.hasText(row.getDemandType())) {
|
|
|
+ if ("特征点".equals(row.getDemandType())) {
|
|
|
+ row.setDemandType("聚类特征点");
|
|
|
+ } else if ("特征点泛化".equals(row.getDemandType())) {
|
|
|
+ row.setDemandType("tree泛化特征点");
|
|
|
+ }
|
|
|
+ }
|
|
|
row.setMatchVideoId(postId);
|
|
|
row.setMatchConfigCode("LIBRARY_TOPIC_ELEMENT");
|
|
|
row.setMatchRov(cp.getRov());
|
|
|
@@ -886,8 +900,8 @@ public class ChannelDemandMatchJob {
|
|
|
fullKey.append("|").append(nullToEmpty(demand.getCategoryName()));
|
|
|
fullKey.append("|").append(nullToEmpty(demand.getChannelLevel3()));
|
|
|
fullKey.append("|").append(nullToEmpty(demand.getElementDimension()));
|
|
|
- // 特征点泛化类型才拼接泛化元素信息
|
|
|
- if ("特征点泛化".equals(demand.getDemandType())) {
|
|
|
+ // tree泛化特征点 类型才拼接泛化元素信息
|
|
|
+ if ("tree泛化特征点".equals(demand.getDemandType())) {
|
|
|
fullKey.append("|").append(nullToEmpty(demand.getMatchGeneralizedElement()));
|
|
|
fullKey.append("|").append(nullToEmpty(demand.getMatchGeneralizedPointType()));
|
|
|
}
|