github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

Fix KbsTopicCommentRepositoryImpl's dependencies injection

Browse Source
This commit is contained in:
dengchao@xgtl 2020-04-17 17:36:22 +08:00
parent 96a7e6c596
commit 9208dcfa9e
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contact-center/app/src/main/java/com/chatopera/cc/persistence/es/KbsTopicCommentRepositoryImpl.java
View File

@ -18,7 +18,6 @@ package com.chatopera.cc.persistence.es;
import com.chatopera.cc.model.KbsTopicComment; import com.chatopera.cc.model.KbsTopicComment;
import com.chatopera.cc.model.Topic; import com.chatopera.cc.model.Topic;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.elasticsearch.index.query.Operator; import org.elasticsearch.index.query.Operator;
import org.elasticsearch.index.query.QueryStringQueryBuilder; import org.elasticsearch.index.query.QueryStringQueryBuilder;
@ -28,8 +27,12 @@ import org.elasticsearch.search.sort.SortOrder;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
import org.springframework.data.elasticsearch.core.EntityMapper;
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
import org.springframework.data.elasticsearch.core.query.SearchQuery; import org.springframework.data.elasticsearch.core.query.SearchQuery;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.lang.NonNull; import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -38,7 +41,6 @@ import java.util.List;
import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery;
@Component @Component
@RequiredArgsConstructor
public class KbsTopicCommentRepositoryImpl implements KbsTopicCommentEsCommonRepository { public class KbsTopicCommentRepositoryImpl implements KbsTopicCommentEsCommonRepository {
@NonNull @NonNull
@ -50,6 +52,13 @@ public class KbsTopicCommentRepositoryImpl implements KbsTopicCommentEsCommonRep
@NonNull @NonNull
private final UKAggTopResultExtractor ukAggTopResultExtractor; private final UKAggTopResultExtractor ukAggTopResultExtractor;
public KbsTopicCommentRepositoryImpl(@NonNull UKResultMapper resultMapper, @NonNull ElasticsearchTemplate elasticsearchTemplate, @NonNull EntityMapper entityMapper, @NonNull MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
this.resultMapper = resultMapper;
this.elasticsearchTemplate = elasticsearchTemplate;
ukAggTopResultExtractor = new UKAggTopResultExtractor(entityMapper, mappingContext);
ukAggResultExtractor = new UKAggResultExtractor(entityMapper, mappingContext);
}
@Override @Override
public Page<KbsTopicComment> findByDataid(String id, int p, int ps) { public Page<KbsTopicComment> findByDataid(String id, int p, int ps) {
Page<KbsTopicComment> pages = null; Page<KbsTopicComment> pages = null;

2
contact-center/app/src/main/java/com/chatopera/cc/persistence/es/UKAggResultExtractor.java
View File

@ -31,12 +31,10 @@ import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersiste
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty; import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.mapping.context.MappingContext;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Component
public class UKAggResultExtractor extends UKResultMapper { public class UKAggResultExtractor extends UKResultMapper {
@Nullable @Nullable

2
contact-center/app/src/main/java/com/chatopera/cc/persistence/es/UKAggTopResultExtractor.java
View File

@ -31,12 +31,10 @@ import org.springframework.data.elasticsearch.core.aggregation.impl.AggregatedPa
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity; import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty; import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.mapping.context.MappingContext;
import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Component
public class UKAggTopResultExtractor extends UKResultMapper { public class UKAggTopResultExtractor extends UKResultMapper {
@Setter @Setter