From 914cf7bf26c100b5af62c55b00c58884fee4cbd0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 26 七月 2019 20:50:45 +0800
Subject: [PATCH] add face-viturl-web-camid

---
 controllers/fileController.go |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/controllers/fileController.go b/controllers/fileController.go
index dae760c..5e0214e 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -153,16 +153,18 @@
 
 type CompareResult struct {
 	Id string `json:"id"`
+	CompareScore float32 `json:"compareScore"`
 	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"`
+	PicSmUrl string `json:"picSmUrl"`
 	Sex string `json:"sex"`
 	AgeDescription string `json:"ageDescription"`
 	Race string `json:"race"`
+	TaskId string `json:"taskId"`
 	TaskName string `json:"taskName"`
 	BaseInfo []DbPersonVo `json:"baseInfo"`
 	VideoUrl string `json:"videoUrl"`
@@ -285,12 +287,13 @@
 			esServerIp := config.EsInfo.Masterip
 			esServerPort := config.EsInfo.Httpport
 			index := config.EsInfo.EsIndex.Dbtablepersons.IndexName
-			dbpersons, e := esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
-			if e !=nil {
-				logger.Debug("Dbpersoninfosbyid.err:",e)
+			var dbpersons []protomsg.Dbperson
+			if len(personIds) >0 {
+				dbpersons, _ = esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
 			}
+
 			logger.Debug("dbpersons:", dbpersons)
-			if e ==nil && dbpersons !=nil {
+			if dbpersons !=nil {
 				for _,p :=range dbpersons {
 					var dbP = DbPersonVo {
 						PersonId: p.Id,
@@ -314,6 +317,48 @@
 					resultList = append(resultList,cr)
 				}
 			}
+			var capturePersons []protomsg.Videopersons
+			if len(captureIds) >0 {
+				logger.Debug("capturePersons:", capturePersons)
+				videopersons, _ := esApi.Videopersonsinfosbyid(captureIds, config.EsInfo.EsIndex.VideoPersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
+				logger.Debug("videoPersons.len:",len(videopersons))
+				for _,vp :=range videopersons {
+					isAlarmInt, _ := strconv.Atoi(vp.IsAlarm)
+					var bi []DbPersonVo
+					for _,p :=range vp.BaseInfo {
+						bi = append(bi, DbPersonVo{
+							PersonId: p.PersonId,
+							IdCard: p.IdCard,
+							CompareScore: util.ParseScore(p.CompareScore),
+							MonitorLevel: p.MonitorLevel,
+							PersonName: p.PersonName,
+							PersonPicUrl: p.PersonPicUrl,
+							PhoneNum: p.PhoneNum,
+							Sex: p.Sex,
+							TableId: p.TableId,
+						})
+					}
+					vpE := CompareResult{
+						Id: vp.Id,
+						CompareScore: util.ParseScore(captureM[vp.Id].CompareScore),
+						CameraId: vp.CameraId,
+						CameraAddr: vp.CameraAddr,
+						PicDate: vp.PicDate,
+						PicMaxUrl: vp.PicMaxUrl,
+						PicSmUrl: vp.PicSmUrl,
+						IsAlarm: isAlarmInt,
+						Sex: vp.Sex,
+						AgeDescription: vp.AgeDescription,
+						Race: vp.Race,
+						TaskName: vp.TaskName,
+						TaskId: vp.TaskId,
+						VideoUrl: vp.VideoUrl,
+						BaseInfo: bi,
+					}
+					resultList = append(resultList,vpE)
+				}
+			}
+
 			logger.Debug("resultList:",resultList)
 		}
 		util.ResponseFormat(c,code.Success,resultList)
@@ -407,6 +452,7 @@
 	dbperson.PersonPicUrl = field //  鍥剧墖璺粡
 	dbperson.TableId = tableId           //
 	dbperson.PersonName = fileNameOnly       // 鍥剧墖鍚�
+	dbperson.Enable = 1 //榛樿鏈夋晥
 	// 婕旂ずbase64缂栫爜
 
 	dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
@@ -487,7 +533,7 @@
 	//addResult["detail"] = details
 	//fields := fdfsclient.UploadFileByBuffer100(bytess, extNames)     //  fastdfs 涓婁紶
 	if len(successList)>0 {
-		util.ResponseFormat(c, code.Success, addResult)
+		util.ResponseFormat(c, code.DbPersonUploadSuccess, addResult)
 	} else {
 		util.ResponseFormat(c, code.ServiceInsideError, err.Error())
 	}

--
Gitblit v1.8.0