From a06945a8759b65aa653073cc83254f9c7f1ccf11 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 26 七月 2019 14:04:08 +0800
Subject: [PATCH] fix esData

---
 controllers/fileController.go |  151 ++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 127 insertions(+), 24 deletions(-)

diff --git a/controllers/fileController.go b/controllers/fileController.go
index e7e9381..dae760c 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"basic.com/dbapi.git"
 	"basic.com/pubsub/protomsg.git"
 	"basic.com/fileServer/WeedFSClient.git"
 	"basic.com/valib/deliver.git"
@@ -25,6 +26,7 @@
 	"webserver/extend/code"
 	"webserver/extend/config"
 	"webserver/extend/esutil"
+	"webserver/extend/logger"
 	"webserver/extend/util"
 	"webserver/models"
 	"webserver/service"
@@ -139,7 +141,7 @@
 				urlArr = append(urlArr, weedFilePath)
 			}
 		}
-		//2.澶у浘鐢绘
+		//2.澶у浘鐢绘,鏍囪瘑浜鸿劯浣嶇疆
 		originFilePath, _ := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", fileBytes)
 		resultMap["uploadImage"] = originFilePath
 		resultMap["smImage"] = urlArr
@@ -149,69 +151,170 @@
 	}
 }
 
+type CompareResult struct {
+	Id string `json:"id"`
+	CameraId string `json:"cameraId"`
+	CameraAddr string `json:"cameraAddr"`
+	PicDate string `json:"picDate"`
+	Content string `json:"content"`
+	IsAlarm int `json:"isAlarm"`
+	PicMaxUrl string `json:"picMaxUrl"`
+	PicSmUrl []string `json:"picSmUrl"`
+	Sex string `json:"sex"`
+	AgeDescription string `json:"ageDescription"`
+	Race string `json:"race"`
+	TaskName string `json:"taskName"`
+	BaseInfo []DbPersonVo `json:"baseInfo"`
+	VideoUrl string `json:"videoUrl"`
+}
+type DbPersonVo struct {
+	BwType string `json:"bwType"`
+	CompareScore float32 `json:"compareScore"`
+	IdCard string `json:"idCard"`
+	MonitorLevel string `json:"monitorLevel"`
+	PersonId string `json:"personId"`
+	PersonName string `json:"personName"`
+	PersonPicUrl string `json:"personPicUrl"`
+	PhoneNum string `json:"phoneNum"`
+	Sex string `json:"sex"`
+	TableId string `json:"tableId"`
+	TableName string `json:"tableName"`
+}
+
+var captureTable = "capturetable" // 鎶撴媿搴�
 // @Summary 浠ュ浘鎼滃浘
 // @Description  浠ュ浘鎼滃浘
+// @Accept json
 // @Produce json
 // @Tags 浠ュ浘鎼滃浘
-// @Param url formData string true "url"
-// @Param tableId formData string true "搴曞簱id"
-// @Param compThreshold formData string true "姣斿闃堝��"
+// @Param condition body models.EsSearch true "鎼滅储鍙傛暟"
 // @Success 200 {string} json "{"code":200, msg:"", data:"", success:true}"
 // @Failure 500 {string} json "{"code":500, msg:"", data:"", success:false}"
 // @Router /data/api-v/dbperson/searchByPhoto [POST]
 func (controller FileController) SearchByPhoto(c *gin.Context) {
-	photoUrl := c.Request.FormValue("url")
-	tableId := c.Request.FormValue("tableId")//搴曞簱id
-	compThresholdStr := c.Request.FormValue("compThreshold")//姣斿闃堝��
-	compThreshold, err := strconv.Atoi(compThresholdStr)
-	if photoUrl == "" || err != nil {
+	var searchBody models.EsSearch
+	err := c.BindJSON(&searchBody)
+	if err !=nil || searchBody.PicUrl == "" || len(searchBody.DataBases) == 0 {
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
-	if face,ok := faceExtractedMap[photoUrl];!ok{
-		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+	var sysSetApi dbapi.SysSetApi
+	analyServerId := ""
+	flag, sysconf := sysSetApi.GetServerInfo()
+	if flag {
+		analyServerId = sysconf.ServerId
+	} else {
+		util.ResponseFormat(c, code.ComError, "analyServerId涓虹┖锛岄厤缃湁璇�")
+		return
+	}
+	if face,ok := faceExtractedMap[searchBody.PicUrl];!ok{
+		util.ResponseFormat(c, code.RequestParamError, "璇烽噸鏂颁笂浼犲浘鐗�")
 		return
 	} else {
 		arg := protomsg.CompareArgs{
-			TableIds:[]string{ tableId },
-			FaceFeature:face.FaceBytes,
-			CompareThreshold:float32(compThreshold),
+			FaceFeature: face.FaceBytes,
+			CompareThreshold: searchBody.Threshold,
 		}
+
+		if searchBody.DataBases !=nil {
+			for idx,tableId :=range searchBody.DataBases {
+				if tableId == "esData" {
+					searchBody.DataBases = append(searchBody.DataBases[:idx], searchBody.DataBases[idx+1:]...)
+					searchBody.DataBases = append(searchBody.DataBases,captureTable)
+					break
+				}
+			}
+			arg.TableIds = searchBody.DataBases
+		}
+		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 = analyServerId
+
+		logger.Debug("arg.TableIds:", arg.TableIds, ",alarmLevel:",arg.AlarmLevel,",treeNodes:",arg.TreeNodes,",searchTime:",arg.SearchTime,
+			",inputValue:",arg.InputValue,",tasks:",arg.Tasks,",compThreshold:",arg.CompareThreshold)
 		b, err := proto.Marshal(&arg)
 		if err !=nil{
 			util.ResponseFormat(c, code.ComError, "璇锋眰marshal澶辫触")
 			return
 		}
 		compServerList := config.CompServerInfo.Url
-		fmt.Println("compServerList:", compServerList)
-		resultList :=make([]protomsg.Dbperson,0)
+		logger.Debug("compServerList:", compServerList)
+		resultList :=make([]CompareResult,0)
 		for _,str :=range compServerList{
 			reqUrl := "tcp://"+str
 			reqClient := deliver.NewClient(deliver.ReqRep, reqUrl)
 			err = reqClient.Send(b)
 			if err !=nil{
+				logger.Debug("reqClient.Send err:",err)
 				continue
 			}
 			resultB, err := reqClient.Recv()
 			if err !=nil{
+				logger.Debug("reqClient.Recv err:",err)
 				continue
 			}
-			m :=make(map[string]float32,0)
-			err = json.Unmarshal(resultB, &m)
+			rList :=make([]protomsg.Esinfo,0)
+			err = json.Unmarshal(resultB, &rList)
 			if err !=nil{
+				logger.Debug("recv result Unmarshal err:", err)
 				continue
 			}
-			personIds := make([]string,len(m))
-			for k,_ :=range m{
-				personIds = append(personIds,k)
+			logger.Debug("rList:", rList)
+
+			dbPersonM := make(map[string]*protomsg.Esinfo,0)
+			captureM := make(map[string]*protomsg.Esinfo,0)
+			personIds :=make([]string,0)
+			captureIds := make([]string,0)
+			for _,v :=range rList{
+				if v.Tableid == captureTable {
+					captureM[v.Id] = &v
+					captureIds = append(captureIds,v.Id)
+				} else {
+					dbPersonM[v.Id] = &v
+					personIds = append(personIds,v.Id)
+				}
 			}
+			logger.Debug("personIds:", personIds)
+			logger.Debug("captureIds:",captureIds)
 			esServerIp := config.EsInfo.Masterip
 			esServerPort := config.EsInfo.Httpport
 			index := config.EsInfo.EsIndex.Dbtablepersons.IndexName
-			dbpeople, e := esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
-			if e ==nil{
-				resultList = append(resultList,dbpeople...)
+			dbpersons, e := esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
+			if e !=nil {
+				logger.Debug("Dbpersoninfosbyid.err:",e)
 			}
+			logger.Debug("dbpersons:", dbpersons)
+			if e ==nil && dbpersons !=nil {
+				for _,p :=range dbpersons {
+					var dbP = DbPersonVo {
+						PersonId: p.Id,
+						IdCard: p.IdCard,
+						CompareScore: util.ParseScore(dbPersonM[p.Id].CompareScore),
+						MonitorLevel: p.MonitorLevel,
+						PersonName: p.PersonName,
+						PersonPicUrl: p.PersonPicUrl,
+						PhoneNum: p.PhoneNum,
+						Sex: p.Sex,
+						TableId: p.TableId,
+					}
+					dbTableInfos, _ := esApi.Dbtablefosbyid([]string{p.TableId}, config.EsInfo.EsIndex.DbTables.IndexName, esServerIp, esServerPort)
+					if dbTableInfos !=nil{
+						dbP.BwType = dbTableInfos[0].BwType
+						dbP.TableName = dbTableInfos[0].TableName
+					}
+					var cr = CompareResult{
+						BaseInfo:[]DbPersonVo{ dbP },
+					}
+					resultList = append(resultList,cr)
+				}
+			}
+			logger.Debug("resultList:",resultList)
 		}
 		util.ResponseFormat(c,code.Success,resultList)
 	}

--
Gitblit v1.8.0