From 1278c1f6b6e79238b520513c80ce26882e805f71 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 27 三月 2024 11:28:32 +0800
Subject: [PATCH] add DayNightActivityQuery

---
 EsApi.go |  687 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 620 insertions(+), 67 deletions(-)

diff --git a/EsApi.go b/EsApi.go
index 487198a..65c6766 100644
--- a/EsApi.go
+++ b/EsApi.go
@@ -22,6 +22,404 @@
 	}
 }
 
+//***********************閲嶅簡Start**********************************//
+
+type activeHourFormat struct {
+	startTime string
+	endTime   string
+	startHour int
+	endHour   int
+}
+
+//鎸夐渶姹�(activeHourFormat缁撴瀯浣�)鏍煎紡鍖栨椂闂存暟鎹�
+func formatActiveHour(activeHour string) (activeHourFormat, error) {
+	hours := strings.Split(activeHour, "-")
+
+	if len(hours) == 2 {
+		startHour := hours[0]
+		endHour := hours[1]
+
+		// 瑙f瀽寮�濮嬫椂闂寸殑灏忔椂鍜屽垎閽�
+		startParts := strings.Split(startHour, ":")
+		startHourInt, _ := strconv.Atoi(startParts[0])
+
+		// 瑙f瀽缁撴潫鏃堕棿鐨勫皬鏃跺拰鍒嗛挓
+		endParts := strings.Split(endHour, ":")
+		endHourInt, _ := strconv.Atoi(endParts[0])
+
+		// 杈撳嚭寮�濮嬫椂闂寸殑灏忔椂
+		fmt.Println("寮�濮嬫椂闂寸殑灏忔椂:", startHourInt)
+
+		// 杈撳嚭缁撴潫鏃堕棿鐨勫皬鏃� + 1
+		endHourPlusOne := (endHourInt + 1) % 24 // 鍙栦綑纭繚涓嶈秴杩�24灏忔椂
+		fmt.Println("缁撴潫鏃堕棿鐨勫皬鏃� + 1:", endHourPlusOne)
+		activeHourFormat := activeHourFormat{startTime: startHour, endTime: endHour, startHour: startHourInt, endHour: endHourPlusOne}
+		return activeHourFormat, nil
+	}
+	return activeHourFormat{}, errors.New("閿欒锛氭棤娉曡В鏋愬紑濮嬫椂闂村拰缁撴潫鏃堕棿")
+
+}
+
+//鍒ゆ柇鏃堕棿鏄惁鍐嶈寖鍥翠箣鍐�
+func isTimeInRange(timeStr, startStr, endStr string) bool {
+	layout := "15:04:05"
+
+	timeStamp, err := time.Parse(layout, timeStr)
+	if err != nil {
+		fmt.Println("Error parsing timestamp:", err)
+		return false
+	}
+
+	startTime, err := time.Parse(layout, startStr)
+	if err != nil {
+		fmt.Println("Error parsing start time:", err)
+		return false
+	}
+
+	endTime, err := time.Parse(layout, endStr)
+	if err != nil {
+		fmt.Println("Error parsing end time:", err)
+		return false
+	}
+
+	if startTime.After(endTime) {
+		// 璺ㄨ秺鏃ユ湡鐨勬儏鍐�
+		return timeStamp.After(startTime) || timeStamp.Before(endTime)
+	} else {
+		// 涓嶈法瓒婃棩鏈熺殑鎯呭喌
+		return timeStamp.After(startTime) && timeStamp.Before(endTime)
+	}
+}
+
+//鍒ゆ柇涓や釜鏃堕棿鍏堝悗
+func compareTimes(time1Str, time2Str string) int {
+	layout := "15:04:05"
+
+	time1, err := time.Parse(layout, time1Str)
+	if err != nil {
+		fmt.Println("Error parsing time 1:", err)
+		return 0
+	}
+
+	time2, err := time.Parse(layout, time2Str)
+	if err != nil {
+		fmt.Println("Error parsing time 2:", err)
+		return 0
+	}
+
+	if time1.Before(time2) {
+		return -1 // time1 鍦� time2 涔嬪墠
+	} else if time1.After(time2) {
+		return 1 // time1 鍦� time2 涔嬪悗
+	} else {
+		return 0 // time1 鍜� time2 鐩哥瓑
+	}
+}
+
+//鍒ゆ柇鏃ユ湡鐩稿樊鍑犲ぉ
+func daysBetweenDates(date1Str, date2Str string) int {
+	layout := "2006-01-02"
+
+	date1, err := time.Parse(layout, date1Str)
+	if err != nil {
+		fmt.Println("Error parsing date 1:", err)
+		return 0
+	}
+
+	date2, err := time.Parse(layout, date2Str)
+	if err != nil {
+		fmt.Println("Error parsing date 2:", err)
+		return 0
+	}
+
+	duration := date2.Sub(date1)
+	days := int(duration.Hours() / 24)
+
+	return days
+}
+
+//璁$畻鏃堕棿闃堝��
+func checkTimeDifference(timestampStr1 string, timestampStr2 string, intervalInMinutes int) bool {
+	layout := "2006-01-02 15:04:05"
+	timestampStr1 = timestampStr1[:19]
+	timestampStr2 = timestampStr2[:19]
+	// 灏嗗瓧绗︿覆瑙f瀽涓烘椂闂�
+	time1, err := time.Parse(layout, timestampStr1)
+	if err != nil {
+		fmt.Println("鏃堕棿瑙f瀽澶辫触:", err)
+		return false
+	}
+	time2, err := time.Parse(layout, timestampStr2)
+	if err != nil {
+		fmt.Println("鏃堕棿瑙f瀽澶辫触:", err)
+		return false
+	}
+
+	// 璁$畻鏃堕棿宸�
+	diff := time2.Sub(time1)
+
+	// 妫�鏌ユ椂闂村樊鏄惁灏忎簬绛変簬鎸囧畾鐨勯棿闅�
+	if diff.Minutes() <= float64(intervalInMinutes) {
+		return true
+	} else {
+		return false
+	}
+}
+
+////鏍煎紡鍖栨椂闂磆h:mm:ss:zzz to hh:mm:ss
+//func formatTime(inputTime string) (string, error) {
+//	parsedTime, err := time.Parse("15:04:05:000", inputTime)
+//	if err != nil {
+//		return "", err
+//	}
+//
+//	formattedTime := parsedTime.Format("15:04:05")
+//	return formattedTime, nil
+//}
+func resetDataId(dataId []string, id, dDate, dTime string, sDate *string, sTime *string) []string {
+	dataId = make([]string, 0)
+	*sDate = dDate
+	*sTime = dTime
+	dataId = append(dataId, id)
+	return dataId
+}
+
+func decodeActivityId(aHFormat activeHourFormat, frequency int, intervalInMinutes int, source []map[string]interface{}) ([]map[string]interface{}, error) {
+	docInfo := make([]map[string]interface{}, 0)
+	for _, info := range source {
+		tmpInfo := make(map[string]interface{})
+		activeId := make([]string, 0)
+		sDate := ""
+		sTime := ""
+		documentNumber := info["key"].(string)
+		tmpInfo["documentNumber"] = documentNumber
+		//fmt.Println("documentNumber: ", documentNumber)
+		topHits := info["top_hits"].(map[string]interface{})
+		hits := topHits["hits"].(map[string]interface{})
+		hitsResult := hits["hits"].([]interface{})
+		dataId := make([]string, 0)
+		for sIndex, sourceInfo := range hitsResult {
+			rSourceInfo := sourceInfo.(map[string]interface{})
+			source := rSourceInfo["_source"].(map[string]interface{})
+			captureTime := source["picDate"].(string)
+			dDate := strings.Split(captureTime, " ")[0]
+			dTime := strings.Split(captureTime[:19], " ")[1]
+			//fmt.Println(captureTime, dDate, dTime)
+			id := source["id"].(string)
+			//fmt.Println("sindex: ", sIndex, "documentNumber", tmpInfo["documentNumber"], "id: ", id, "captureTime: ", captureTime)
+			if !isTimeInRange(dTime, aHFormat.startTime, aHFormat.endTime) {
+				if sDate != "" && len(dataId) >= frequency {
+					activeId = append(activeId, dataId...)
+					dataId = resetDataId(dataId, id, dDate, dTime, &sDate, &sTime)
+				}
+				continue
+			}
+			if sDate == "" {
+				sDate = dDate
+				sTime = dTime
+				dataId = append(dataId, id)
+				if len(dataId) >= frequency {
+					activeId = append(activeId, dataId...)
+					dataId = resetDataId(dataId, id, dDate, dTime, &sDate, &sTime)
+				}
+				continue
+			}
+			if checkTimeDifference(sDate+" "+sTime, captureTime[:19], intervalInMinutes) {
+				if len(dataId) >= frequency {
+					activeId = append(activeId, dataId...)
+					dataId = resetDataId(dataId, id, dDate, dTime, &sDate, &sTime)
+				}
+				continue
+			}
+			//fmt.Println(daysBetweenDates(sDate, dDate))
+			if aHFormat.startHour < aHFormat.endHour && daysBetweenDates(sDate, dDate) == 0 {
+				dataId = append(dataId, id)
+			} else if aHFormat.startHour > aHFormat.endHour {
+				if daysBetweenDates(sDate, dDate) == 0 {
+					if compareTimes(dTime, aHFormat.startTime) == compareTimes(sTime, aHFormat.startTime) {
+						//	||compareTimes(dTime,aHFormat.endTime) == compareTimes(sTime, aHFormat.endTime){
+						dataId = append(dataId, id)
+					}
+				} else if daysBetweenDates(sDate, dDate) == 1 {
+					//鍒濆鏃堕棿鎴冲湪缁撴潫鑼冨洿涔嬪墠
+					if compareTimes(sTime, aHFormat.endTime) == -1 {
+						if len(dataId) >= frequency {
+							activeId = append(activeId, dataId...)
+							dataId = resetDataId(dataId, id, dDate, dTime, &sDate, &sTime)
+						}
+						//鍒濆鏃堕棿鎴冲湪寮�濮嬭寖鍥翠箣鍚�
+					} else if compareTimes(sTime, aHFormat.endTime) == 1 {
+						//next鏃堕棿鎴冲湪缁撴潫鑼冨洿涔嬪墠
+						if compareTimes(dTime, aHFormat.endTime) == -1 {
+							dataId = append(dataId, id)
+							//next鏃堕棿鎴冲湪寮�濮嬭寖鍥翠箣鍚�
+						} else if compareTimes(dTime, aHFormat.startTime) == 1 {
+							if len(dataId) >= frequency {
+								activeId = append(activeId, dataId...)
+								dataId = resetDataId(dataId, id, dDate, dTime, &sDate, &sTime)
+							}
+						}
+					}
+				} else if daysBetweenDates(sDate, dDate) >= 1 {
+					//fmt.Println(len(dataId))
+					if len(dataId) >= frequency {
+						activeId = append(activeId, dataId...)
+						dataId = resetDataId(dataId, id, dDate, dTime, &sDate, &sTime)
+					}
+				}
+			}
+			if sIndex == len(hitsResult)-1 {
+				if len(dataId) >= frequency {
+					activeId = append(activeId, dataId...)
+				}
+			}
+		}
+		if len(activeId) > 0 {
+			tmpInfo["id"] = activeId
+			docInfo = append(docInfo, tmpInfo)
+		}
+	}
+	return docInfo, nil
+}
+
+func DayNightActivityQuery(communityId string, documentNumber string,startTime string, endTime string, activeHour string, frequency int,
+	intervalInMinutes int, indexName string, serverIp string, serverPort string) (map[string]interface{}, error) {
+	esURL := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
+
+	aHFormat, err := formatActiveHour(activeHour)
+	if err != nil {
+		return nil, err
+	}
+	filterDocIdAttr := ""
+	if documentNumber != ""{
+		filterDocIdAttr = "{\"term\": {\""+documentNumber+"\": \"\"}},"
+	}
+	queryDSL := `
+	{
+	    "size": 0,
+	    "query": {
+	        "bool": {
+	            "filter": [
+	                {
+	                    "range": {
+	                        "picDate": {
+	                            "gte": "` + startTime + `",
+	                            "lt": "` + endTime + `"
+	                        }
+	                    }
+	                },
+					`+filterDocIdAttr+`
+	                {
+	                    "term": {
+	                        "communityId": "` + communityId + `"
+	                    }
+	                },
+	                {
+	                    "script": {
+	                        "script": {
+	                            "source": "doc['picDate'].value.hourOfDay >= ` + strconv.Itoa(aHFormat.startHour) + ` || doc['picDate'].value.hourOfDay < ` + strconv.Itoa(aHFormat.endHour) + `",
+	                            "lang": "painless"
+	                        }
+	                    }
+	                }
+	            ],
+	            "must_not": [
+	                {
+	                    "term": {
+	                        "documentNumber": ""
+	                    }
+	                }
+	            ]
+	        }
+	    },
+	    "aggs": {
+	        "group_by_documentnumber": {
+	            "terms": {
+	                "field": "documentNumber",
+	                "size": 100000
+	            },
+				"aggs": {
+					"top_hits": {
+	                	"top_hits": {
+	                    	"_source": [
+								"id",
+	                        	"picDate"
+							],
+	                        "size": 100000,
+	                        "sort": [
+	                            {
+	                                "picDate": {
+	                                    "order": "asc"
+	                                }
+	                            }
+	                        ]
+						}
+					}
+	            }
+	        }
+	    }
+	}`
+	//fmt.Println(esURL)
+	//fmt.Println(queryDSL)
+	var result = make(map[string]interface{})
+	buf, err := EsReq("POST", esURL, []byte(queryDSL))
+	if err != nil {
+		return nil, err
+	}
+	source, err := SourceAggregationList(buf)
+	if err != nil {
+		return nil, err
+	}
+	//fmt.Println(source)
+	docResult, err := decodeActivityId(aHFormat, frequency, intervalInMinutes, source)
+	if err != nil {
+		return nil, err
+	}
+	//result, _ := decodeDocumentInfos(source)
+	//return result, nil
+	if len(docResult) ==0 {
+		return result,nil
+	}
+	DataInfos, err := GetInfosByIds(docResult[0]["id"].([]string), indexName, serverIp, serverPort)
+	result["documentNumbers"] = docResult
+	result["datalist"] = DataInfos
+	return result, nil
+}
+
+func GetInfosByIds(ids []string, indexName string, serverIp string, serverPort string) ([]map[string]interface{}, error) {
+	captureIds := strings.Replace(strings.Trim(fmt.Sprint(ids), "[]"), " ", "\",\"", -1)
+	esURL := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
+	queryDSL := `
+            {
+            	"query": {
+            		"bool": {
+            			"filter": [{
+            				"terms": {
+            					"id": [
+            						"` + captureIds + `"
+            					]
+            				}
+            			}]
+            		}
+            	},
+                "size":1000000,
+				"sort":[{"picDate":{"order":"desc"}}],
+				"_source": {"includes":[],"excludes":["*.feature"]}
+            }
+`
+	buf, err := EsReq("POST", esURL, []byte(queryDSL))
+	if err != nil {
+		return nil, err
+	}
+	sources, err := Sourcelist(buf)
+	if err != nil {
+		return nil, err
+	}
+
+	return sources, nil
+}
+
+// ***********************閲嶅簡End************************************//
 // 鏍规嵁鎶撴媿浜哄憳id鏌ヨ鎶撴媿浜哄憳淇℃伅
 func AIOceaninfosbyid(id []string, indexName string, serverIp string, serverPort string) ([]protomsg.AIOcean, error) {
 	var aIOceanInfo []protomsg.AIOcean
@@ -56,7 +454,43 @@
 	return aIOcean, nil
 }
 
-//鏍规嵁鎶撴媿搴撲汉鍛榠d鏌ヨ鐗瑰緛鍊�
+// 鏍规嵁鎶撴媿浜哄憳id鏌ヨ瑙嗛鍦板潃
+func AIOceanVideoUrlbyid(id string, indexName string, serverIp string, serverPort string) (string, error) {
+	//var aIOceanInfo []protomsg.AIOcean
+	//videopersonsPersonId := strings.Replace(strings.Trim(fmt.Sprint(id), "[]"), " ", "\",\"", -1)
+	var dbinfoRequest = `
+		{
+    		"query": {
+        		"bool": {
+            		"filter": [
+                		{
+                    		"term": {
+                       			"id": "` + id + `"
+                    		}
+                		}
+            		]
+        		}
+    		},
+    		"_source": [
+        		"videoUrl"
+    		]
+		}
+        `
+	buf, err := EsReq("POST", "http://"+serverIp+":"+serverPort+"/"+indexName+"/_search", []byte(dbinfoRequest))
+	if err != nil {
+		return "", err
+	}
+
+	sources, err := Sourcelist(buf)
+	if err != nil {
+		return "", err
+	}
+	videoUrl := sources[0]["videoUrl"].(string)
+	//aIOcean := AIOceanAnalysis(sources)
+	return videoUrl, nil
+}
+
+// 鏍规嵁鎶撴媿搴撲汉鍛榠d鏌ヨ鐗瑰緛鍊�
 func GetVideoPersonFaceFeatureById(id string, indexName string, serverIp string, serverPort string) (string, error) {
 	var jsonDSL = `
             {
@@ -86,7 +520,7 @@
 	return feature, nil
 }
 
-//鏍规嵁鐩爣id鏌ヨ宸茶拷鍔犳潯鏁�
+// 鏍规嵁鐩爣id鏌ヨ宸茶拷鍔犳潯鏁�
 func GetLinkTagInfoSize(id string, indexName string, serverIp string, serverPort string) (size int, err error) {
 	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
 	queryDSL := `{
@@ -112,7 +546,7 @@
 	return size, nil
 }
 
-//鏍规嵁鐩爣id杩藉姞璺熻釜淇℃伅
+// 鏍规嵁鐩爣id杩藉姞璺熻釜淇℃伅
 func AppendTargetInfo(id string, targetInfo string, indexName string, serverIp string, serverPort string, updateTime string) (string, error) {
 	if targetInfo == "" {
 		return "", errors.New("append data is nil")
@@ -180,7 +614,7 @@
 
 /*******************sort []map util*******************/
 //鏍规嵁鏃堕棿鑼冨洿鑱氬悎鎵�鏈夊尯鍩熶汉淇℃伅锛岃繑鍥炲浐瀹氭潯鏁�
-func GetFaceDataByTimeAndTotal(startTime string, total int, thresholdTime int, thresholdStayTime int, serverIp string, serverPort string, indexName string) (resData []map[string]interface{}, err error) {
+func GetFaceDataByTimeAndTotal(startTime string, endTime string, total int, thresholdTime int, thresholdStayTime int, serverIp string, serverPort string, indexName string) (resData []map[string]interface{}, err error) {
 	var requestUrl = "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
 	var requestBody = `{
     "query": {
@@ -189,7 +623,8 @@
                 {
                     "range": {
                         "picDate": {
-                            "gte": "` + startTime + `"
+                            "gte": "` + startTime + `",
+							"lte": "` + endTime + `"
                         }
                     }
                 },
@@ -256,23 +691,26 @@
 	if err != nil {
 		return nil, err
 	}
+	if len(source) == 0 {
+		return source, nil
+	}
 	faceSource := make([]map[string]interface{}, 0)
 	for index, info := range source {
 		if int(info["stayTime"].(float64)) > thresholdStayTime {
 			faceSource = append(faceSource, source[index])
 		}
 	}
+	mapsSort := MapsSort{}
+	mapsSort.Key = "endTime"
+	mapsSort.MapList = faceSource
+	sort.Sort(&mapsSort)
 	if len(faceSource) > total {
-		mapsSort := MapsSort{}
-		mapsSort.Key = "endTime"
-		mapsSort.MapList = faceSource
-		sort.Sort(&mapsSort)
 		return mapsSort.MapList[:total], nil
 	}
-	return faceSource, nil
+	return mapsSort.MapList, nil
 }
 
-func GetFaceDataByTimeAndIds(startTime string, endTime string, id string, thresholdTime int, thresholdStayTime int, serverIp string, serverPort string, indexName string) (resData []map[string]interface{}, err error) {
+func GetFaceDataByTimeAndId(startTime string, endTime string, id string, thresholdTime int, thresholdStayTime int, serverIp string, serverPort string, indexName string) (resData []map[string]interface{}, err error) {
 	var requestUrl = "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
 	var requestBody = `{
     "query": {
@@ -354,16 +792,23 @@
 	if err != nil {
 		return nil, err
 	}
+	if len(source) == 0 {
+		return source, nil
+	}
 	faceSource := make([]map[string]interface{}, 0)
 	for index, info := range source {
 		if int(info["stayTime"].(float64)) > thresholdStayTime {
 			faceSource = append(faceSource, source[index])
 		}
 	}
-	return faceSource, nil
+	mapsSort := MapsSort{}
+	mapsSort.Key = "startTime"
+	mapsSort.MapList = faceSource
+	sort.Sort(&mapsSort)
+	return mapsSort.MapList, nil
 }
 
-func GetFaceIdDeduplication(startTime string, endTime string, serverIp string, serverPort string, indexName string) (ids []string, err error) {
+func GetFaceIdDeduplication(startTime string, endTime string, serverIp string, serverPort string, indexName string) (ids []map[string]interface{}, err error) {
 	var requestUrl = "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
 	var requestBody = `{
     "query": {
@@ -399,7 +844,27 @@
                     }
                 ],
                 "size": 10000000
-            }
+            },
+            	"aggs": {
+                	"top_attention_hits": {
+                    	"top_hits": {
+                        	"size": 1,
+                        	"sort": [
+                            	{
+                                	"picDate": {
+                                    	"order": "desc"
+                                	}
+                            	}
+                        	],
+                        	"_source": {
+                            	"includes": [
+                                	"picDate"
+                            	]
+                        	}
+                    	}
+             	   	}
+          	  	}
+        	}
         }
     }
 }`
@@ -413,11 +878,18 @@
 	if err1 != nil {
 		return nil, err1
 	}
+	if len(ids) > 1 {
+		mapsSort := MapsSort{}
+		mapsSort.Key = "lastTime"
+		mapsSort.MapList = ids
+		sort.Sort(&mapsSort)
+		return mapsSort.MapList, nil
+	}
 	return ids, nil
 }
 
-//缁熻鍚勪釜鍖哄煙浜烘暟
-func StatisticsEveryAreaPersonsNumber(startTime string, endTime string, serverIp string, serverPort string, indexName string) ([]map[string]interface{},error){
+// 缁熻鍚勪釜鍖哄煙浜烘暟
+func StatisticsEveryAreaPersonsNumber(startTime string, endTime string, serverIp string, serverPort string, indexName string) ([]map[string]interface{}, error) {
 	var requestUrl = "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
 	var requestBody = `{
     "query": {
@@ -457,15 +929,15 @@
         }
     }
 }`
-	buf,err := EsReq("POST",requestUrl,[]byte(requestBody))
-	if err != nil{
-		return nil,err
+	buf, err := EsReq("POST", requestUrl, []byte(requestBody))
+	if err != nil {
+		return nil, err
 	}
-	result,err := SourceStatistics(buf)
-	if err != nil{
-		return nil,err
+	result, err := SourceStatistics(buf)
+	if err != nil {
+		return nil, err
 	}
-	return result,nil
+	return result, nil
 }
 
 /**************************************customer analysis util end**************************************/
@@ -543,7 +1015,7 @@
 
 }
 
-//鏍规嵁鏃堕棿鑼冨洿锛屾憚鍍忔満鍒楄〃锛屽垎缁勮仛鍚堜汉鑴稿垪琛�,杩斿洖鍒嗙粍鏁版嵁
+// 鏍规嵁鏃堕棿鑼冨洿锛屾憚鍍忔満鍒楄〃锛屽垎缁勮仛鍚堜汉鑴稿垪琛�,杩斿洖鍒嗙粍鏁版嵁
 func GetFaceDataBucketsByCameraIdAndTimeReturnByGrouped(cameraId []string, personId []string, startTime string, endTime string, thresholdTime float64, serverIp string, ServerPort string, indexName string) (buckersDate map[string]interface{}, err error) {
 	var filterArr []string
 	if cameraId != nil && len(cameraId) > 0 {
@@ -649,7 +1121,7 @@
 	return sources, nil
 }
 
-//鏍规嵁鏃堕棿鑼冨洿锛屾憚鍍忔満鍒楄〃锛屽垎缁勮仛鍚堜汉鑴稿垪琛�
+// 鏍规嵁鏃堕棿鑼冨洿锛屾憚鍍忔満鍒楄〃锛屽垎缁勮仛鍚堜汉鑴稿垪琛�
 func GetFaceDataBucketsByCameraIdAndTime(cameraId []string, personId []string, startTime string, endTime string, thresholdTime float64, serverIp string, ServerPort string, indexName string) (buckersDate map[string]interface{}, err error) {
 	var filterArr []string
 	if cameraId != nil && len(cameraId) > 0 {
@@ -750,7 +1222,7 @@
 	return sources, nil
 }
 
-//鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坧icurl锛夊浘鐗囧湴鍧�
+// 鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坧icurl锛夊浘鐗囧湴鍧�
 func UpdatePicUrlById(id string, picUrl string, indexName string, serverIp string, serverPort string) (err error) {
 	updateTime := time.Now().Format("2006-01-02 15:04:05")
 	tRes, err := AIOceaninfosbyid([]string{id}, indexName, serverIp, serverPort)
@@ -813,7 +1285,7 @@
 	return nil
 }
 
-//鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坴ideourl锛夋憚鍍忔満鍦板潃
+// 鏍规嵁鎶撴媿浜哄憳id鏇存柊锛坴ideourl锛夋憚鍍忔満鍦板潃
 func UpdateVideourlById(id string, videoUrl string, indexName string, serverIp string, serverPort string, command int) (statu int, err error) {
 
 	var info interface{}
@@ -850,23 +1322,30 @@
 		return statu, errors.New("http response interface can not change map[string]interface{}")
 	}
 	middle, ok := out["updated"].(float64)
-	if !ok {
+	batches, ok1 := out["batches"].(float64)
+	if !ok || !ok1 {
 		logPrint("first updated change error!")
 		statu = 500
 		return statu, errors.New("first updated change error!")
 	}
-	if middle == 1 {
-		statu = 200
-		return statu, nil
-	}
-	if middle == 0 {
-		statu = 201
-		return statu, errors.New("宸茬粡淇敼")
+	if batches == 0 {
+		logPrint("no such doc in database")
+		statu = 400
+		return statu, errors.New("鐩爣鏁版嵁涓嶅瓨鍦�")
+	} else {
+		if middle == 1 {
+			statu = 200
+			return statu, nil
+		}
+		if middle == 0 {
+			statu = 201
+			return statu, errors.New("宸茬粡淇敼")
+		}
 	}
 	return statu, nil
 }
 
-//鑾峰彇褰撳墠鑺傜偣鎶撴媿搴撴墍鏈変汉鍛業D*缂撳瓨*
+// 鑾峰彇褰撳墠鑺傜偣鎶撴媿搴撴墍鏈変汉鍛業D*缂撳瓨*
 func GetAllLocalVideopersonsId(compareArgs protomsg.CompareArgs, indexName string, serverIp string, serverPort string, alarmLevelTypes string) (capturetable []string) {
 	queryStr := ""
 	queryBody := compareArgs.InputValue
@@ -906,7 +1385,12 @@
 	isCollectStr := ""
 	isCollect := compareArgs.Collection
 	if isCollect != "" {
-		isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
+		//isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}},"
+		if isCollect == "1" {
+			isCollectStr = "{\"term\":{\"isCollect\":true}},"
+		} else if isCollect == "0" {
+			isCollectStr = "{\"term\":{\"isCollect\":false}},"
+		}
 	}
 
 	//鍒ゆ柇甯冮槻绛夌骇
@@ -1030,7 +1514,7 @@
 	return capturetable
 }
 
-//鍒濆鍖栧疄鏃舵姄鎷�
+// 鍒濆鍖栧疄鏃舵姄鎷�
 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 +
@@ -1047,7 +1531,7 @@
 	if category != "all" {
 		filterArr = append(filterArr, `				{
 					"term":{
-						"targetInfo.targetType":"`+category+`"
+						"targetInfo.targetType.raw":"`+category+`"
 					}
 				}`)
 
@@ -1067,7 +1551,7 @@
 	"sort":[{"picDate":{"order":"desc"}}],
 	"_source": {"includes":[],"excludes":["*.feature"]}
 	}`
-	logPrint(DSLJson)
+	//logPrint(DSLJson)
 	buf, err := EsReq("POST", url, []byte(DSLJson))
 	if err != nil {
 		return aIOceanInfo, err
@@ -1083,7 +1567,7 @@
 	return aIOcean, nil
 }
 
-//瀹炴椂鎶撴媿
+// 瀹炴椂鎶撴媿
 func RealTimeCapture(serverIp string, serverPort string, indexName string, isAlarm bool) ([]protomsg.AIOcean, error) {
 	var aIOceanInfo []protomsg.AIOcean
 	url := "http://" + serverIp + ":" + serverPort +
@@ -1127,7 +1611,7 @@
 	return aIOcean, nil
 }
 
-//缁煎悎缁熻
+// 缁煎悎缁熻
 func StatisticsComprehensive(serverIp string, serverPort string, indexName string, isAlarm string) (total int, err error) {
 	url := "http://" + serverIp + ":" + serverPort +
 		"/" + indexName + "/_search"
@@ -1157,7 +1641,6 @@
 			}
 		}
 	}`
-	//logPrint(DSLJson)
 	buf, err := EsReq("POST", url, []byte(DSLJson))
 	if err != nil {
 		return total, err
@@ -1177,7 +1660,7 @@
 	return total, nil
 }
 
-//瀹炴椂鎶ヨ浠诲姟姣旂巼
+// 瀹炴椂鎶ヨ浠诲姟姣旂巼
 func RealTimeAlarmTaskRate(serverIp string, serverPort string, indexName string) (sources []map[string]interface{}, err error) {
 	url := "http://" + serverIp + ":" + serverPort +
 		"/" + indexName + "/_search"
@@ -1195,9 +1678,9 @@
 		}
 	},
 	"aggs":{
-		"sdkName_status":{
+		"taskName_status":{
 			"terms":{
-				"field":"sdkName.raw"
+				"field":"taskName.raw"
 			}
 		}
 	}
@@ -1216,11 +1699,11 @@
 	if !ok {
 		return nil, errors.New("first hits change error!")
 	}
-	sdkName_status, ok := middle["sdkName_status"].(map[string]interface{})
+	sdkName_status, ok := middle["taskName_status"].(map[string]interface{})
 	if !ok {
 		return nil, errors.New("first hits change error!")
 	}
-
+	//fmt.Println(sdkName_status)
 	for _, in := range sdkName_status["buckets"].([]interface{}) {
 		var source = make(map[string]interface{}, 0)
 		tmpbuf, ok := in.(map[string]interface{})
@@ -1238,11 +1721,20 @@
 	return sources, nil
 }
 
-//鑱氬悎浠诲姟鍒楄〃锛宼askId+taskName
-func AggregateTaskList(serverIp string, serverPort string, indexName string, analyServerId string) (sources []map[string]interface{}, err error) {
+// 鑱氬悎浠诲姟鍒楄〃锛宼askId+taskName
+func AggregateTaskList(serverIp string, serverPort string, indexName string, analyServerId string, cameraIds []string) (sources []map[string]interface{}, err error) {
 	url := "http://" + serverIp + ":" + serverPort +
 		"/" + indexName + "/_search"
 	serverFilterStr := ""
+	cameIdFilterStr := ""
+	if cameraIds != nil && len(cameraIds) > 0 {
+		cameIdsStr := strings.Replace(strings.Trim(fmt.Sprint(cameraIds), "[]"), " ", "\",\"", -1)
+		cameIdFilterStr = `,{
+				"term": {
+				"cameraId": "` + cameIdsStr + `"
+					}
+                }`
+	}
 	if analyServerId != "" {
 		serverFilterStr = `,
 			"query": {
@@ -1251,8 +1743,9 @@
 				{
 				"term": {
 				"analyServerId": "` + analyServerId + `"
+					}
 				}
-				}
+ 				` + cameIdFilterStr + `
 			]
 			}
 		}`
@@ -1324,7 +1817,7 @@
 
 }
 
-//娣诲姞鍗冲皢鍒犻櫎淇″彿
+// 娣诲姞鍗冲皢鍒犻櫎淇″彿
 func AddDeleteSignal() {
 
 }
@@ -1365,7 +1858,7 @@
 
 }
 
-//鏌ヨ鏃堕棿娈垫暟鎹� *缂撳瓨*
+// 鏌ヨ鏃堕棿娈垫暟鎹� *缂撳瓨*
 func GetPeriodInfos(serverIp string, serverPort string, startTime string, endTime string, indexName string, shards string, targetType string) ([]*protomsg.MultiFeaCache, error) {
 	var capdbinfo []*protomsg.MultiFeaCache
 	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search?preference=_shards:" + shards + "|_only_local"
@@ -1543,8 +2036,8 @@
 	return dbinfos, nil
 }
 
-//************************CORN TASK*******************************
-//鏌ヨ鏃ユ湡鑼冨洿鍐呮槸鍚﹁繕瀛樺湪鏁版嵁
+// ************************CORN TASK*******************************
+// 鏌ヨ鏃ユ湡鑼冨洿鍐呮槸鍚﹁繕瀛樺湪鏁版嵁
 func QueryAnalyServerData(serverIp string, serverPort string, indexName string, startTime string, endTime string, analyServerId string) (result bool, err error) {
 	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_search"
 	deleteJson := `{
@@ -1583,8 +2076,8 @@
 	return result, nil
 }
 
-//鎸夋棩鏈熻寖鍥达紝鏈嶅姟鍣↖d鍒犻櫎鏁版嵁
-func DeleteAnalyServerData(serverIp string, serverPort string, indexName string, startTime string, endTime string, analyServerId string) (result bool, err error) {
+// 鎸夋棩鏈熻寖鍥达紝鏈嶅姟鍣↖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"
 	deleteJson := `{
 	"query":{
@@ -1606,23 +2099,20 @@
 		}
 	}
 }	`
+	fmt.Println(url)
+	fmt.Println(deleteJson)
 	buf, err := EsReq("POST", url, []byte(deleteJson))
 	if err != nil {
-		return false, errors.New("璇锋眰澶辫触")
+		return -1, errors.New("璇锋眰澶辫触")
 	}
 	deleteRes, err := SourceDeleted(buf)
 	if err != nil {
-		return false, errors.New("瑙g爜澶辫触")
+		return -1, errors.New("瑙g爜澶辫触")
 	}
-	if deleteRes == -1 {
-		result = false
-	} else {
-		result = true
-	}
-	return result, nil
+	return deleteRes, nil
 }
 
-//缁欐墍鏈夎妭鐐硅拷鍔犲垹闄や换鍔′俊鎭�
+// 缁欐墍鏈夎妭鐐硅拷鍔犲垹闄や换鍔′俊鎭�
 func AddDelTask(serverIp string, serverPort string, indexName string, startTime string, endTime string, analyServerId string) (result bool, err error) {
 	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_update_by_query"
 	addJson := `{
@@ -1665,7 +2155,7 @@
 	return result, nil
 }
 
-//绉婚櫎宸叉墽琛屽畬鐨勫垹闄や换鍔�
+// 绉婚櫎宸叉墽琛屽畬鐨勫垹闄や换鍔�
 func DeleteDelTask(serverIp string, serverPort string, indexName string, analyServerId string) (result bool, err error) {
 	url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_update_by_query"
 	deleteJson := `{
@@ -1698,3 +2188,66 @@
 	}
 	return result, nil
 }
+
+type ShardInfo struct {
+	ShardIndex string `json:"shardIndex"` //鍒嗙墖鎵�灞炵储寮曞悕绉�
+	ShardNum   int    `json:"shardNum"`   //鍒嗙墖鍙�
+	ShardRole  string `json:"shardRole"`  //鍒嗙墖瑙掕壊(涓诲垎鐗囷細primary 鍓湰鍒嗙墖锛歳eplica)
+	ShardState string `json:"shardState"` //鍒嗙墖鐘舵��(鍚敤锛歋TARTED 鏈惎鐢細UNASSIGNED)
+	ShardDocs  int    `json:"shardDocs"`  //鍒嗙墖宸蹭繚瀛樻枃妗f暟
+	ShardStore string `json:"shardStore"` //鍒嗙墖褰撳墠瀛樺偍鏁版嵁澶у皬
+	ShardIp    string `json:"shardIp"`    //鍒嗙墖鎵�鍦ㄨ妭鐐筰p
+	ShardNode  string `json:"shardNode"`  //鍒嗙墖鎵�鍦ㄨ妭鐐瑰悕绉�
+}
+
+// 鑾峰彇绱㈠紩鍒嗙墖淇℃伅
+func GetShardsByIndex(serverIp string, serverPort string, indexName string) ([]ShardInfo, error) {
+	url := "http://" + serverIp + ":" + serverPort + "/_cat/shards?v"
+	buf, err := EsReq("GET", url, []byte(""))
+	if err != nil {
+		return nil, err
+	}
+	var inf = []ShardInfo{}
+	res := strings.Split(string(buf), "\n")[1:]
+	for _, r := range res {
+		if r != "" {
+
+			inx := strings.Fields(r)
+			index := inx[0]
+			shard, _ := strconv.Atoi(inx[1])
+			prired := inx[2]
+			if prired == "r" {
+				prired = "replica"
+			}
+			if prired == "p" {
+				prired = "primary"
+			}
+			state := inx[3]
+			docs := 0
+			store := ""
+			ip := ""
+			node := ""
+			if state == "STARTED" {
+				docs, _ = strconv.Atoi(inx[4])
+				store = inx[5]
+				ip = inx[6]
+				node = inx[7]
+			}
+			if index == indexName {
+				inf = append(inf, ShardInfo{
+					ShardIndex: index,
+					ShardNum:   shard,
+					ShardRole:  prired,
+					ShardState: state,
+					ShardDocs:  docs,
+					ShardStore: store,
+					ShardIp:    ip,
+					ShardNode:  node,
+				})
+
+			}
+		}
+
+	}
+	return inf, nil
+}

--
Gitblit v1.8.0