From 5d78b36e851a5862302f2e40c99a4477020c79bc Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 20 九月 2019 13:46:52 +0800
Subject: [PATCH] 查找此人时先切图

---
 controllers/fileController.go |  235 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 179 insertions(+), 56 deletions(-)

diff --git a/controllers/fileController.go b/controllers/fileController.go
index c5a1c8b..99cce1b 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -10,7 +10,9 @@
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/satori/go.uuid"
+	"gocv.io/x/gocv"
 	"image"
+	"image/color"
 	"image/jpeg"
 	"io/ioutil"
 	"log"
@@ -22,10 +24,11 @@
 	"strings"
 	"sync"
 	"time"
+	"webserver/cache"
 	"webserver/extend/code"
 	"webserver/extend/config"
 	"webserver/extend/esutil"
-	"webserver/extend/logger"
+	"basic.com/valib/logger.git"
 	"webserver/extend/util"
 	"webserver/models"
 	"webserver/service"
@@ -120,7 +123,13 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
-	var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
+	localConf, err2 := cache.GetServerInfo()
+	if err2 !=nil || localConf.WebPicIp == "" {
+		logger.Debug("localConfig is wrong!!!")
+		return
+	}
+	var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
+	logger.Debug("weedfsUri:",weedfsUri)
 	resultMap :=make(map[string]interface{},0)
 	//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
 	fileBytes, _ := ioutil.ReadAll(file)
@@ -141,13 +150,31 @@
 			}
 		}
 		//2.澶у浘鐢绘,鏍囪瘑浜鸿劯浣嶇疆
-		originFilePath, _ := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", fileBytes)
+		drawedB, _ := drawPolygonOnImg(pI, &faceArr)
+
+		originFilePath, _ := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", *drawedB)
 		resultMap["uploadImage"] = originFilePath
 		resultMap["smImage"] = urlArr
 		util.ResponseFormat(c,code.Success, resultMap)
 	} else {
 		util.ResponseFormat(c,code.ComError,"鏈彁鍙栧埌浜鸿劯")
 	}
+}
+
+func drawPolygonOnImg(i *protomsg.Image,faceArr *[]*protomsg.ResultFaceDetect) (*[]byte,error) {
+	rook, _ := gocv.NewMatFromBytes(int(i.Height), int(i.Width), gocv.MatTypeCV8UC3, i.Data)
+	defer rook.Close()
+	//yellow := color.RGBA{255, 255, 0, 0}
+	red := color.RGBA{255, 0, 0, 0}
+	for _,faceResult := range *faceArr {
+		left := int(faceResult.Pos.RcFace.Left)
+		top := int(faceResult.Pos.RcFace.Top)
+		right := int(faceResult.Pos.RcFace.Right)
+		bottom := int(faceResult.Pos.RcFace.Bottom)
+		gocv.Rectangle(&rook, image.Rect(left,top,right,bottom), red, 1)
+	}
+	fData,err := gocv.IMEncode(".jpg", rook)
+	return &fData,err
 }
 
 type CompareResult struct {
@@ -214,15 +241,15 @@
 	}
 	logger.Debug("comp len(personIds):", len(personIds))
 	logger.Debug("comp len(captureIds):", len(captureIds))
-	esServerIp := config.EsInfo.Masterip
-	esServerPort := config.EsInfo.Httpport
-	index := config.EsInfo.EsIndex.Dbtablepersons.IndexName
+
 	var dbpersons []protomsg.Dbperson
 	if len(personIds) >0 {
-		dbpersons, _ = esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
+		var dbpApi dbapi.DbPersonApi
+		dbpersons, _ = dbpApi.Dbpersoninfosbyid(personIds)
 	}
 
 	if len(dbpersons) >0 {
+		var dtApi dbapi.DbTableApi
 		for _,p :=range dbpersons {
 			var dbP = DbPersonVo {
 				PersonId: p.Id,
@@ -236,7 +263,7 @@
 				TableId: p.TableId,
 				Enable: p.Enable,
 			}
-			dbTableInfos, _ := esApi.Dbtablefosbyid([]string{p.TableId}, config.EsInfo.EsIndex.DbTables.IndexName, esServerIp, esServerPort)
+			dbTableInfos, _ := dtApi.DbtablesById([]string{ p.TableId })
 			if dbTableInfos !=nil{
 				dbP.BwType = dbTableInfos[0].BwType
 				dbP.TableName = dbTableInfos[0].TableName
@@ -248,7 +275,12 @@
 		}
 	}
 	if len(captureIds) >0 {
-		videopersons, _ := esApi.Videopersonsinfosbyid(captureIds, config.EsInfo.EsIndex.VideoPersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
+		localConf, err2 := cache.GetServerInfo()
+		if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+			logger.Debug("localConfig is wrong!!!")
+			return nil
+		}
+		videopersons, _ := esApi.Videopersonsinfosbyid(captureIds, config.EsInfo.EsIndex.VideoPersons.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
 		logger.Debug("comp videoPersons.len:",len(videopersons))
 		for _,vp :=range videopersons {
 			isAlarmInt, _ := strconv.Atoi(vp.IsAlarm)
@@ -305,6 +337,36 @@
 	return level
 }
 
+func GetFeaFromOneFaceImg(fileBytes []byte) (faceB []byte,oriImg string,smImgs []string, err error){
+	localConf, err2 := cache.GetServerInfo()
+	if err2 !=nil || localConf.WebPicIp == "" {
+		logger.Debug("localConfig is wrong!!!")
+		return nil,"",nil,errors.New("localConf err")
+	}
+	var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
+	logger.Debug("weedfsUri:",weedfsUri)
+	faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*60)
+	if err ==nil && len(faceArr) ==1 {
+		rcFace := faceArr[0].Pos.RcFace
+		cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
+		weedFilePath, e := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", cutFaceImgData)
+		if e == nil{
+			faceExtractedMap[weedFilePath] = FaceExtract{
+				Url:weedFilePath,
+				FaceBytes:faceArr[0].Feats,
+			}
+			smImgs = append(smImgs, weedFilePath)
+		}
+		//2.澶у浘鐢绘,鏍囪瘑浜鸿劯浣嶇疆
+		drawedB, _ := drawPolygonOnImg(pI, &faceArr)
+
+		originFilePath, _ := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", *drawedB)
+		return faceArr[0].Feats,originFilePath,smImgs,nil
+	} else {
+		return nil,"",nil,errors.New("no face")
+	}
+}
+
 // @Summary 浠ュ浘鎼滃浘
 // @Description  浠ュ浘鎼滃浘
 // @Accept json
@@ -314,49 +376,70 @@
 // @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) {
+func (fc FileController) SearchByPhoto(c *gin.Context) {
 	var searchBody models.EsSearch
 	err := c.BindJSON(&searchBody)
 	if err !=nil{
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
+	localConf, err2 := cache.GetServerInfo()
+	if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+		logger.Debug("localConfig is wrong!!!")
+		util.ResponseFormat(c,code.ComError,"localConf wrong")
+		return
+	}
 	var faceB []byte
-	if searchBody.CaptureId != "" {//鍋氭煡鎵炬浜�,鎼滄墍鏈夋姄鎷嶅拰搴曞簱
-		searchBase64Fea, err := esApi.GetVideoPersonFaceFeatureById(searchBody.CaptureId, config.EsInfo.EsIndex.VideoPersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
+	var uploadImage string
+	var smImages []string
+	//if searchBody.CaptureId != "" {//鍋氭煡鎵炬浜�,鎼滄墍鏈夋姄鎷嶅拰搴曞簱
+	//	searchBase64Fea, err := esApi.GetVideoPersonFaceFeatureById(searchBody.CaptureId, config.EsInfo.EsIndex.VideoPersons.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
+	//	if err !=nil {
+	//		util.ResponseFormat(c, code.ComError, "鎶撴媿鏁版嵁涓嶅瓨鍦紝璇锋鏌�")
+	//		return
+	//	}
+	//	if searchBase64Fea !=""{
+	//		decodeF, err := base64.StdEncoding.DecodeString(searchBase64Fea)
+	//		if err !=nil {
+	//			util.ResponseFormat(c, code.ComError, "鏈潯鎶撴�曠壒寰佷笉鏄痓ase64锛岃妫�鏌�")
+	//			return
+	//		}
+	//		faceB = decodeF
+	//	}
+	//} else {//鍋氫互鍥炬悳鍥�
+	//
+	//}
+
+	if searchBody.PicUrl == "" || len(searchBody.DataBases) == 0 {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+		return
+	}
+	if face,ok := faceExtractedMap[searchBody.PicUrl];!ok{
+		httpPicUrl := ""
+		idx := strings.LastIndex(searchBody.PicUrl, ":")
+		if idx>-1 {
+			httpPicUrl = "http://"+localConf.WebPicIp+searchBody.PicUrl[idx:]
+		} else {
+			util.ResponseFormat(c, code.RequestParamError, "璇烽噸鏂颁笂浼犲浘鐗�")
+			return
+		}
+		logger.Debug("httpPicUrl:",httpPicUrl)
+		rb,err := util.ReadImgData(httpPicUrl)
 		if err !=nil {
-			util.ResponseFormat(c, code.ComError, "鎶撴媿鏁版嵁涓嶅瓨鍦紝璇锋鏌�")
+			util.ResponseFormat(c, code.RequestParamError, "璇烽噸鏂颁笂浼犲浘鐗�")
 			return
 		}
-		if searchBase64Fea !=""{
-			decodeF, err := base64.StdEncoding.DecodeString(searchBase64Fea)
-			if err !=nil {
-				util.ResponseFormat(c, code.ComError, "鏈潯鎶撴�曠壒寰佷笉鏄痓ase64锛岃妫�鏌�")
-				return
-			}
-			faceB = decodeF
-		}
-	} else {//鍋氫互鍥炬悳鍥�
-		if searchBody.PicUrl == "" || len(searchBody.DataBases) == 0 {
-			util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
-			return
-		}
-		if face,ok := faceExtractedMap[searchBody.PicUrl];!ok{
+		feaB, oriImg, smImgs, e := GetFeaFromOneFaceImg(rb)
+		if e !=nil {
 			util.ResponseFormat(c, code.RequestParamError, "璇烽噸鏂颁笂浼犲浘鐗�")
 			return
 		} else {
-			faceB = face.FaceBytes
+			uploadImage = oriImg
+			smImages = smImgs
+			faceB = feaB
 		}
-	}
-
-	var sysSetApi dbapi.SysSetApi
-	analyServerId := ""
-	flag, sysconf := sysSetApi.GetServerInfo()
-	if flag {
-		analyServerId = sysconf.ServerId
 	} else {
-		util.ResponseFormat(c, code.ComError, "analyServerId涓虹┖锛岄厤缃湁璇�")
-		return
+		faceB = face.FaceBytes
 	}
 
 	if faceB == nil {
@@ -368,11 +451,12 @@
 		CompareThreshold: searchBody.Threshold,
 	}
 
+	var hasCompEsPerson = false
 	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,service.CaptureTable)
+				hasCompEsPerson = true
 				break
 			}
 		}
@@ -388,29 +472,47 @@
 	arg.SearchTime = searchBody.SearchTime
 	arg.InputValue = searchBody.InputValue
 	arg.Collection = searchBody.Collection
-	arg.AnalyServerId = analyServerId
+	arg.AnalyServerId = localConf.ServerId
 
 	logger.Debug("arg.TableIds:", arg.TableIds, ",alarmLevel:",arg.AlarmLevel,",treeNodes:",arg.TreeNodes,",searchTime:",arg.SearchTime,
 		",inputValue:",arg.InputValue,",tasks:",arg.Tasks,",compThreshold:",arg.CompareThreshold)
 	timeStart := time.Now()
 
 	compareService := service.NewFaceCompareService(arg)
-	compareOnce := compareService.Compare()
-	totalData := compareOnce.CompareData
+	var totalData service.CompareList
+	if len(arg.TableIds) >0 {//鏈夋瘮瀵瑰簳搴�
+		dbPersonTargets := compareService.CompareDbPersons()
+		if dbPersonTargets !=nil {
+			totalData = append(totalData,*dbPersonTargets...)
+		}
+	}
+	if hasCompEsPerson {//鏈夋瘮瀵笶s鎶撴媿
+		esPersons := compareService.CompareVideoPersons()
+		if esPersons !=nil {
+			totalData = append(totalData, *esPersons...)
+		}
+	}
 
 	logger.Debug("comp 姣斿缁撴潫锛岀敤鏃讹細",time.Since(timeStart))
-	m := make(map[string]interface{},3)
+	service.SetCompResultByNum(&service.CompareOnce{
+		CompareNum: compareService.CompareNum,
+		CompareData: &totalData,
+	})
+
+	m := make(map[string]interface{},5)
+	m["uploadImage"] = uploadImage
+	m["smImage"] = smImages
 	if totalData != nil && totalData.Len() > 0{
 		sort.Sort(totalData)
 		total := totalData.Len()
 
-		m["compareNum"] = compareOnce.CompareNum
+		m["compareNum"] = compareService.CompareNum
 		m["total"] = total
 		var sCompResult protomsg.SdkCompareResult
 		if total <= searchBody.Size {
-			sCompResult.CompareResult = *totalData
+			sCompResult.CompareResult = totalData
 		} else {
-			sCompResult.CompareResult = (*totalData)[0:searchBody.Size]
+			sCompResult.CompareResult = totalData[0:searchBody.Size]
 		}
 		resultList := FillDataToCompareResult(&sCompResult)
 		m["totalList"] = resultList
@@ -418,7 +520,7 @@
 
 	} else {
 		m["total"] = 0
-		m["compareNum"] = searchBody.CompareNum
+		m["compareNum"] = compareService.CompareNum
 		m["totalList"] = []CompareResult{}
 	}
 	util.ResponseFormat(c,code.Success,m)
@@ -514,7 +616,12 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
 		return
 	}
-	var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
+	localConf, err2 := cache.GetServerInfo()
+	if err2 !=nil || localConf.WebPicIp == "" {
+		logger.Debug("localConfig is wrong!!!")
+		return
+	}
+	var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
 
 	//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
 	fileBytes, _ := ioutil.ReadAll(file)
@@ -548,7 +655,6 @@
 
 func uploadFileReturnAddr(file multipart.File, filename string, tableId string) (string, map[string]interface{}, error) {
 	defer file.Close()
-	field := ""
 	// weedfs 涓婁紶
 	fileBytes, err := ioutil.ReadAll(file)
 	if err !=nil {
@@ -574,7 +680,12 @@
 			break
 		}
 	}
-	var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
+	localConf, err2 := cache.GetServerInfo()
+	if err2 !=nil || localConf.WebPicIp == "" {
+		logger.Debug("localConfig is wrong!!!")
+		return "",nil,err2
+	}
+	var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
 	//鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
 	t1 := time.Now()
 	cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
@@ -584,7 +695,7 @@
 	logger.Debug("涓婁紶鍒皐eedfs鐢ㄦ椂:", time.Since(t1))
 	t1 = time.Now()
 	if e != nil {
-		fmt.Println(e.Error())
+		logger.Debug("WeedFSClient.UploadFile err:", e)
 		return "", nil, e
 	}
 
@@ -639,8 +750,15 @@
 			defer wg.Done()
 			tIStart := time.Now()
 			filename := head.Filename
+			fileExt := path.Ext(filename)
+			fileExt = strings.ToLower(fileExt)
+			if fileExt !=".jpg" && fileExt != ".jpeg" && fileExt != ".png" {
+				lock.Lock()
+				failList = append(failList, filename)
+				lock.Unlock()
+				return
+			}
 			file, err := head.Open()
-			fmt.Println(file, err, filename)
 			if err != nil {
 				lock.Lock()
 				failList = append(failList, filename)
@@ -664,11 +782,11 @@
 	addResult["failList"] = failList
 	addResult["fields"] = extNames
 
-	if len(successList)>0 {
+	//if len(successList)>0 {
 		util.ResponseFormat(c, code.DbPersonUploadSuccess, addResult)
-	} else {
-		util.ResponseFormat(c, code.DbPersonUploadFail, addResult)
-	}
+	//} else {
+	//	util.ResponseFormat(c, code.DbPersonUploadFail, addResult)
+	//}
 }
 
 type EsPersonSave struct {
@@ -710,7 +828,12 @@
 		util.ResponseFormat(c, code.UploadFileError, err2.Error())
 		return
 	}
-	var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
+	localConf, err2 := cache.GetServerInfo()
+	if err2 !=nil || localConf.WebPicIp == "" {
+		logger.Debug("localConfig is wrong!!!")
+		return
+	}
+	var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
 	{
 		uri := weedfsUri
 		fileInfo, e := esutil.PostFormBufferData(uri, filename, "file", uploadData)

--
Gitblit v1.8.0