From 54cd528105b8ef861a793fb8e79c442ff6aa9735 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 01 四月 2024 14:03:23 +0800
Subject: [PATCH] add DSL must not base documentNumber findAnalyzeCoordinatedMovementsInfos
---
EsApi.go | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/EsApi.go b/EsApi.go
index a1c8502..62493f5 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -506,7 +506,7 @@
return result
}
-func findAnalyzeCoordinatedMovementsInfos(infos []acmInfo, beforeTime int, afterTime int, frequency int,
+func findAnalyzeCoordinatedMovementsInfos(infos []acmInfo, docNumber string, beforeTime int, afterTime int, frequency int,
indexName string, serverIp string, serverPort string) (map[string]interface{}, error) {
//baseAddResultIds := make([]addResultIds, 0)
targetAddResultIds := make([]addResultIds, 0)
@@ -541,7 +541,14 @@
"cameraId": "` + cInfo.cameraId + `"
}
}
- ]
+ ],
+ "must_not": [
+ {
+ "term": {
+ "documentNumber": "` + docNumber + `"
+ }
+ }
+ ]
}
},
"aggs": {
@@ -605,11 +612,11 @@
rdbaseIds := removeDuplicates(baseIds)
rdtargetIds := removeDuplicates(targetIds)
baseInfos, err := GetInfosByIds(rdbaseIds, indexName, serverIp, serverPort)
- if err != nil{
+ if err != nil {
return nil, err
}
targetInfos, err := GetInfosByIds(rdtargetIds, indexName, serverIp, serverPort)
- if err != nil{
+ if err != nil {
return nil, err
}
result := make(map[string]interface{})
@@ -701,7 +708,7 @@
return nil, err
}
//fmt.Println(docResult)
- result, err := findAnalyzeCoordinatedMovementsInfos(docResult, beforeTime, afterTime, frequency, indexName, serverIp, serverPort)
+ result, err := findAnalyzeCoordinatedMovementsInfos(docResult, docNumber, beforeTime, afterTime, frequency, indexName, serverIp, serverPort)
if err != nil {
return nil, err
}
@@ -2431,6 +2438,11 @@
return deleteRes, nil
}
+//func GetCaptureDaysByDocumentNumber(docNumber string, comId string, indexName string, serverIp string, serverPort string){
+// url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
+// queryDSL := ``
+//}
+
// 鎸夋棩鏈熻寖鍥达紝鏈嶅姟鍣↖d鍒犻櫎鏁版嵁
func DeleteAnalyServerData(serverIp string, serverPort string, indexName string, startTime string, endTime string, analyServerId string) (total int, err error) {
url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_delete_by_query"
--
Gitblit v1.8.0