From d36b669d795731432da8674a4485d1da3347b67c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 21 十一月 2019 17:37:57 +0800
Subject: [PATCH] -
---
EsApi.go | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index 99fd9e9..7bb04ff 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -294,28 +294,37 @@
}
//鍒濆鍖栧疄鏃舵姄鎷�
-func InitRealTimeCapture(serverIp string, serverPort string, indexName string, isAlarm bool, category string, quantity int) ([]protomsg.AIOcean, error) {
+func InitRealTimeCapture(serverIp string, serverPort string, indexName string, isAlarm string, category string, quantity int) ([]protomsg.AIOcean, error) {
var aIOceanInfo []protomsg.AIOcean
url := "http://" + serverIp + ":" + serverPort +
"/" + indexName + "/_search"
+ isAlarmStr := ""
+ if isAlarm != "all" {
+ isAlarmStr = ` {
+ "term":{
+ "isAlarm":"` + isAlarm + `"
+ }
+ }`
+
+ }
+
categoryStr := ""
- if category != "" {
+ if category != "all" {
categoryStr = ` {
"term":{
"targetInfo.targetType":"` + category + `"
}
- },`
+ }`
}
- queryStr := `"query":{
+ if categoryStr != "" && isAlarmStr != "" {
+ isAlarmStr = isAlarmStr+","
+ }
+ queryStr := `"query":{
"bool":{
"filter":[
+ ` + isAlarmStr + `
` + categoryStr + `
- {
- "term":{
- "isAlarm":` + strconv.FormatBool(isAlarm) + `
- }
- }
]
}
},`
@@ -390,20 +399,26 @@
func StatisticsComprehensive(serverIp string, serverPort string, indexName string, isAlarm bool) (total int, err error) {
url := "http://" + serverIp + ":" + serverPort +
"/" + indexName + "/_search"
+ alarmJson := ""
+ if !isAlarm {
+ alarmJson = `
+ {
+ "term":{
+ "isAlarm":` + strconv.FormatBool(isAlarm) + `
+ }
+ },`
+ }
DSLJson := `{
"size":0,
"query":{
"bool":{
- "filter":[{
+ "filter":[
+ ` + alarmJson + `
+ {
"range":{
"picDate":{
"gte":"now+8h/d"
}
- }
- },
- {
- "term":{
- "isAlarm":` + strconv.FormatBool(isAlarm) + `
}
}
]
--
Gitblit v1.8.0