wol/radar
1
0
Fork 0
mirror of https://gitee.com/freshday/radar.git synced 2026-03-22 04:37:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

opts: 优化命中查询.

Browse Source 
feihu wang
This commit is contained in:
feihu.wang
2020-11-19 20:36:23 +08:00
parent cbde44b9eb
commit ab5943a8e4
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/model/RuleServiceImpl.java
View File

@@ -17,6 +17,7 @@ import com.pgmmers.radar.service.search.SearchEngineService;
import com.pgmmers.radar.util.GroovyScriptUtil;
import com.pgmmers.radar.vo.model.*;
import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -146,6 +147,12 @@ public class RuleServiceImpl extends BaseLocalCacheService implements RuleServic
@Override
public CommonResult getHitSorts(Long modelId) {
Calendar now = Calendar.getInstance();
now.add(Calendar.MONTH , -1);
return getHitSorts(modelId, now.getTimeInMillis(), Calendar.getInstance().getTimeInMillis());
}
public CommonResult getHitSorts(Long modelId, Long beginTime, Long endTime) {
CommonResult result = new CommonResult();
Set<RuleHitsVO> treeSet = new TreeSet<>();
ModelVO model = modelDal.getModelById(modelId);
@@ -168,8 +175,11 @@ public class RuleServiceImpl extends BaseLocalCacheService implements RuleServic
keyStr = keyStr.replace("${ruleId}", rule.getId() + "");
long qty = 0;
try {
QueryBuilder filter = QueryBuilders
.rangeQuery("fields." + model.getReferenceDate())
.from(beginTime).to(endTime);
qty = searchService.count(model.getGuid().toLowerCase(),
QueryBuilders.termQuery(keyStr,rule.getId() + ""), null);
QueryBuilders.termQuery(keyStr,rule.getId() + ""), filter);
} catch (Exception e) {
logger.error("search error", e);
}