mirror of
https://github.com/chatopera/cosin.git
synced 2025-08-01 16:38:02 +08:00
Replace Operator's package path
This commit is contained in:
parent
33b41ed395
commit
d0d85ead52
@ -32,11 +32,7 @@ import com.chatopera.cc.persistence.blob.JpaBlobHelper;
|
|||||||
import com.chatopera.cc.persistence.repository.StreamingFileRepository;
|
import com.chatopera.cc.persistence.repository.StreamingFileRepository;
|
||||||
import com.chatopera.cc.persistence.repository.TenantRepository;
|
import com.chatopera.cc.persistence.repository.TenantRepository;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.elasticsearch.index.query.BoolQueryBuilder;
|
import org.elasticsearch.index.query.*;
|
||||||
import org.elasticsearch.index.query.QueryBuilders;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder.Operator;
|
|
||||||
import org.elasticsearch.index.query.RangeQueryBuilder;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
@ -20,11 +20,7 @@ import com.chatopera.cc.model.Contacts;
|
|||||||
import com.chatopera.cc.model.User;
|
import com.chatopera.cc.model.User;
|
||||||
import com.chatopera.cc.persistence.repository.UserRepository;
|
import com.chatopera.cc.persistence.repository.UserRepository;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.elasticsearch.index.query.BoolQueryBuilder;
|
import org.elasticsearch.index.query.*;
|
||||||
import org.elasticsearch.index.query.QueryBuilders;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder.Operator;
|
|
||||||
import org.elasticsearch.index.query.RangeQueryBuilder;
|
|
||||||
import org.elasticsearch.search.sort.FieldSortBuilder;
|
import org.elasticsearch.search.sort.FieldSortBuilder;
|
||||||
import org.elasticsearch.search.sort.SortOrder;
|
import org.elasticsearch.search.sort.SortOrder;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
@ -20,11 +20,7 @@ import com.chatopera.cc.model.EntCustomer;
|
|||||||
import com.chatopera.cc.model.User;
|
import com.chatopera.cc.model.User;
|
||||||
import com.chatopera.cc.persistence.repository.UserRepository;
|
import com.chatopera.cc.persistence.repository.UserRepository;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.elasticsearch.index.query.BoolQueryBuilder;
|
import org.elasticsearch.index.query.*;
|
||||||
import org.elasticsearch.index.query.QueryBuilders;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder.Operator;
|
|
||||||
import org.elasticsearch.index.query.RangeQueryBuilder;
|
|
||||||
import org.elasticsearch.search.sort.FieldSortBuilder;
|
import org.elasticsearch.search.sort.FieldSortBuilder;
|
||||||
import org.elasticsearch.search.sort.SortOrder;
|
import org.elasticsearch.search.sort.SortOrder;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -44,7 +40,7 @@ import static org.elasticsearch.index.query.QueryBuilders.termQuery;
|
|||||||
@Repository
|
@Repository
|
||||||
public class EntCustomerRepositoryImpl implements EntCustomerEsCommonRepository {
|
public class EntCustomerRepositoryImpl implements EntCustomerEsCommonRepository {
|
||||||
|
|
||||||
private SimpleDateFormat dateFromate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") ;
|
private final SimpleDateFormat dateFromate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private UserRepository userRes;
|
private UserRepository userRes;
|
||||||
|
@ -19,8 +19,8 @@ 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 org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
|
import org.elasticsearch.index.query.Operator;
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder;
|
import org.elasticsearch.index.query.QueryStringQueryBuilder;
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder.Operator;
|
|
||||||
import org.elasticsearch.search.highlight.HighlightBuilder;
|
import org.elasticsearch.search.highlight.HighlightBuilder;
|
||||||
import org.elasticsearch.search.sort.FieldSortBuilder;
|
import org.elasticsearch.search.sort.FieldSortBuilder;
|
||||||
import org.elasticsearch.search.sort.SortOrder;
|
import org.elasticsearch.search.sort.SortOrder;
|
||||||
|
@ -18,11 +18,7 @@ package com.chatopera.cc.persistence.es;
|
|||||||
|
|
||||||
import com.chatopera.cc.model.KbsTopic;
|
import com.chatopera.cc.model.KbsTopic;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.elasticsearch.index.query.BoolQueryBuilder;
|
import org.elasticsearch.index.query.*;
|
||||||
import org.elasticsearch.index.query.QueryBuilder;
|
|
||||||
import org.elasticsearch.index.query.QueryBuilders;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder.Operator;
|
|
||||||
import org.elasticsearch.search.highlight.HighlightBuilder;
|
import org.elasticsearch.search.highlight.HighlightBuilder;
|
||||||
import org.elasticsearch.search.sort.FieldSortBuilder;
|
import org.elasticsearch.search.sort.FieldSortBuilder;
|
||||||
import org.elasticsearch.search.sort.SortOrder;
|
import org.elasticsearch.search.sort.SortOrder;
|
||||||
|
@ -19,11 +19,7 @@ package com.chatopera.cc.persistence.es;
|
|||||||
import com.chatopera.cc.basic.MainContext;
|
import com.chatopera.cc.basic.MainContext;
|
||||||
import com.chatopera.cc.model.QuickReply;
|
import com.chatopera.cc.model.QuickReply;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.elasticsearch.index.query.BoolQueryBuilder;
|
import org.elasticsearch.index.query.*;
|
||||||
import org.elasticsearch.index.query.QueryBuilder;
|
|
||||||
import org.elasticsearch.index.query.QueryBuilders;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder.Operator;
|
|
||||||
import org.elasticsearch.search.highlight.HighlightBuilder;
|
import org.elasticsearch.search.highlight.HighlightBuilder;
|
||||||
import org.elasticsearch.search.sort.FieldSortBuilder;
|
import org.elasticsearch.search.sort.FieldSortBuilder;
|
||||||
import org.elasticsearch.search.sort.SortOrder;
|
import org.elasticsearch.search.sort.SortOrder;
|
||||||
|
@ -19,11 +19,7 @@ package com.chatopera.cc.persistence.es;
|
|||||||
import com.chatopera.cc.model.Topic;
|
import com.chatopera.cc.model.Topic;
|
||||||
import com.chatopera.cc.persistence.repository.XiaoEUKResultMapper;
|
import com.chatopera.cc.persistence.repository.XiaoEUKResultMapper;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.elasticsearch.index.query.BoolQueryBuilder;
|
import org.elasticsearch.index.query.*;
|
||||||
import org.elasticsearch.index.query.QueryBuilder;
|
|
||||||
import org.elasticsearch.index.query.QueryBuilders;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder;
|
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder.Operator;
|
|
||||||
import org.elasticsearch.search.highlight.HighlightBuilder;
|
import org.elasticsearch.search.highlight.HighlightBuilder;
|
||||||
import org.elasticsearch.search.sort.FieldSortBuilder;
|
import org.elasticsearch.search.sort.FieldSortBuilder;
|
||||||
import org.elasticsearch.search.sort.SortOrder;
|
import org.elasticsearch.search.sort.SortOrder;
|
||||||
|
@ -24,9 +24,9 @@ import com.chatopera.cc.model.MetadataTable;
|
|||||||
import com.chatopera.cc.persistence.impl.ESDataExchangeImpl;
|
import com.chatopera.cc.persistence.impl.ESDataExchangeImpl;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.elasticsearch.index.query.BoolQueryBuilder;
|
import org.elasticsearch.index.query.BoolQueryBuilder;
|
||||||
|
import org.elasticsearch.index.query.Operator;
|
||||||
import org.elasticsearch.index.query.QueryBuilder;
|
import org.elasticsearch.index.query.QueryBuilder;
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder;
|
import org.elasticsearch.index.query.QueryStringQueryBuilder;
|
||||||
import org.elasticsearch.index.query.QueryStringQueryBuilder.Operator;
|
|
||||||
import org.springframework.data.domain.PageImpl;
|
import org.springframework.data.domain.PageImpl;
|
||||||
import org.springframework.data.domain.PageRequest;
|
import org.springframework.data.domain.PageRequest;
|
||||||
import org.springframework.data.domain.Sort;
|
import org.springframework.data.domain.Sort;
|
||||||
@ -177,8 +177,8 @@ public class SearchTools {
|
|||||||
|
|
||||||
return search(queryBuilder, metadataTable, false, p, ps);
|
return search(queryBuilder, metadataTable, false, p, ps);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* @param orgi
|
* @param orgi
|
||||||
* @param agent
|
* @param agent
|
||||||
* @param p
|
* @param p
|
||||||
@ -238,7 +238,6 @@ public class SearchTools {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param orgi
|
* @param orgi
|
||||||
@ -276,6 +275,7 @@ public class SearchTools {
|
|||||||
public static PageImpl<UKDataBean> search(BoolQueryBuilder queryBuilder, int p, int ps){
|
public static PageImpl<UKDataBean> search(BoolQueryBuilder queryBuilder, int p, int ps){
|
||||||
return search(queryBuilder, null, true, p, ps);
|
return search(queryBuilder, null, true, p, ps);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param queryBuilder
|
* @param queryBuilder
|
||||||
|
Loading…
x
Reference in New Issue
Block a user