From 178d9ac11afc4dddb447805d6e11c4e3045c95bb Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 26 十月 2019 16:57:20 +0800
Subject: [PATCH] searchPhoto search again

---
 controllers/fileController.go |  133 +++++++++++++++++++++++++-------------------
 1 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/controllers/fileController.go b/controllers/fileController.go
index f46d244..decd866 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -525,52 +525,61 @@
 	util.ResponseFormat(c,code.Success,m)
 }
 
-func GetCompareDataTwice(co *service.CompareOnce,arg *models.EsSearch) map[string]interface{} {
-	//camIds := arg.TreeNodes
-	//tabIds := arg.Tabs
-	//taskIds := arg.Tasks
-	//alarmLevels := arg.AlarmLevel
-	//timeArr := arg.SearchTime
-	//input := arg.InputValue
-	//resultList := make([]CompareResult,0)
-	//for _,each :=range *co.CompareData {
-	//	if each.Id !=""{
-	//		n :=0
-	//		if len(camIds) == 0 || isInArr(each.CameraId,camIds) {
-	//			n++
-	//		}
-	//		if len(tabIds) == 0 {
-	//			n++
-	//		}
-	//		if len(taskIds) == 0 || isInArr(each.TaskId, taskIds) {
-	//			n++
-	//		}
-	//		//鍒ゆ柇鎶ヨ绛夌骇
-	//		if len(alarmLevels) == 0 {
-	//
-	//		}
-	//		n++
-	//		//鍒ゆ柇鏃堕棿
-	//		if len(timeArr) == 0 {
-	//
-	//		}
-	//		n++
-	//		if input == ""{
-	//
-	//		}
-	//		n++
-	//		if n == 6 {
-	//			resultList = append(resultList,cr)
-	//		}
-	//	} else {
-	//		resultList = append(resultList,cr)
-	//	}
-	//}
+func GetCompareDataTwice(co *service.CompareOnce,searchBody *models.EsSearch) map[string]interface{} {
+	m := make(map[string]interface{},0)
 
-	//logger.Debug("GetCompareDataTwice.data:",resultList)
-	//service.SortByScore(resultList)
-	from := (arg.Page-1)*arg.Size
-	to := from + arg.Size
+	from := (searchBody.Page-1)*searchBody.Size
+	to := from + searchBody.Size
+
+	var hasCompEsPerson = false
+	if searchBody.DataBases !=nil {
+		for _,tableId :=range searchBody.DataBases {
+			if tableId == "esData" {
+				hasCompEsPerson = true
+				break
+			}
+		}
+	}
+	if hasCompEsPerson {//浜屾妫�绱S姣斿缁撴灉
+		arg := protomsg.CompareArgs{
+			CompareThreshold: searchBody.Threshold,
+		}
+		localConf, err := cache.GetServerInfo()
+		if err ==nil && localConf.AlarmIp != "" && localConf.ServerId != "" {
+			arg.Source = true // 鏍囪瘑鏉ユ簮鏄痺eb
+			arg.AlarmLevel = searchBody.AlarmLevel
+			arg.Tasks = searchBody.Tasks
+			arg.TreeNodes = searchBody.TreeNodes
+			arg.Tabs = searchBody.Tabs
+			arg.SearchTime = searchBody.SearchTime
+			arg.InputValue = searchBody.InputValue
+			arg.Collection = searchBody.Collection
+			arg.AnalyServerId = localConf.ServerId
+			captureIds := esApi.GetAllLocalVideopersonsId(arg, config.EsInfo.EsIndex.VideoPersons.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
+			if captureIds !=nil {
+				var aResult protomsg.SdkCompareResult
+				aList := getTwiceSearchResult(co, &captureIds)
+				aTotal := aList.Len()
+				if aTotal <= to {
+					aResult.CompareResult = (*aList)[from:aTotal]
+				} else {
+					aResult.CompareResult = (*aList)[from:to]
+				}
+				out := FillDataToCompareResult(&aResult)
+				m["total"] = aTotal
+				m["compareNum"] = searchBody.CompareNum
+				m["totalList"] = out
+				return m
+			} else {
+				m["total"] = 0
+				m["compareNum"] = searchBody.CompareNum
+				m["totalList"] = []interface{}{}
+				return m
+			}
+		}
+	}
+
+
 	var sCompResult protomsg.SdkCompareResult
 	total := len(*co.CompareData)
 	if total <= to {
@@ -580,23 +589,33 @@
 	}
 	resultList := FillDataToCompareResult(&sCompResult)
 
-	m := make(map[string]interface{},0)
+
 	m["total"] = total
-	m["compareNum"] = arg.CompareNum
+	m["compareNum"] = searchBody.CompareNum
 	m["totalList"] = resultList
-	//if from < len(resultList) {
-	//	if to <= len(resultList) {
-	//		m["totalList"] = resultList[from:to]
-	//	} else {
-	//		lte := len(resultList)
-	//		m["totalList"] = resultList[from:lte]
-	//	}
-	//} else {
-	//	m["totalList"] = []CompareResult{}
-	//}
+
 	return m
 }
 
+func getTwiceSearchResult(co *service.CompareOnce, captureIds *[]string) *service.CompareList{
+	m := make(map[string]string)
+	for _,capId :=range *captureIds {
+		m[capId] = capId
+	}
+	var totalData service.CompareList
+	for _,each :=range *co.CompareData {
+		if _,ok :=m[each.Id];ok{
+			totalData = append(totalData, each)
+		}
+	}
+
+	if totalData != nil && totalData.Len() > 0{
+		sort.Sort(totalData)
+	}
+
+	return &totalData
+}
+
 func isInArr(id string,arr []string) bool {
 	for _,v :=range arr {
 		if v == id {

--
Gitblit v1.8.0