From 8ba736b00a482ab531f96b8047c23934e45f2d27 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 24 七月 2019 18:04:36 +0800
Subject: [PATCH] query db person list
---
controllers/fileController.go | 127 ++++++++++++++++++++++++++++++++++++------
1 files changed, 109 insertions(+), 18 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 8ca674f..8f97e3e 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -2,11 +2,15 @@
import (
"basic.com/pubsub/protomsg.git"
+ "basic.com/fileServer/WeedFSClient.git"
+ "basic.com/valib/deliver.git"
"bytes"
"encoding/base64"
+ "encoding/json"
"errors"
"fmt"
"github.com/gin-gonic/gin"
+ "github.com/gogo/protobuf/proto"
"github.com/satori/go.uuid"
"image"
"image/jpeg"
@@ -24,6 +28,7 @@
"webserver/extend/util"
"webserver/models"
"webserver/service"
+ esApi "basic.com/pubsub/esutil.git"
)
type FileController struct {
@@ -93,6 +98,102 @@
}
}
+
+type FaceExtract struct {
+ Url string `json:"url"`
+ FaceBytes []byte `json:"faceBytes"`
+}
+var faceExtractedMap = make(map[string]FaceExtract,0)
+
+// @Description 浜鸿劯鎻愬彇
+// @Router /data/api-v/dbperson/faceExtract [POST]
+func (controller FileController) FaceExtract(c *gin.Context) {
+ file, _, err := c.Request.FormFile("file") //image杩欎釜鏄痷plaodify鍙傛暟瀹氫箟涓殑 'fileObjName':'image'
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
+
+ //灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
+ fileBytes, _ := ioutil.ReadAll(file)
+ faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*60)
+ if err ==nil && len(faceArr) >0 {
+ urlArr := make([]string,0)
+ for _,r := range faceArr {
+ rcFace := r.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:r.Feats,
+ }
+ urlArr = append(urlArr, weedFilePath)
+ }
+ }
+ if len(urlArr) == 0{
+ util.ResponseFormat(c,code.ComError,"鏈彁鍙栧埌浜鸿劯")
+ } else {
+ util.ResponseFormat(c,code.Success,urlArr)
+ }
+ } else {
+ util.ResponseFormat(c,code.ComError,"鏈彁鍙栧埌浜鸿劯")
+ }
+}
+
+// @Description 浠ュ浘鎼滃浘
+// @Router /data/api-v/dbperson/searchByPhoto [POST]
+func (controller FileController) SearchByPhoto(c *gin.Context) {
+ photoUrl := c.Request.FormValue("url")
+ if photoUrl == "" {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ if face,ok := faceExtractedMap[photoUrl];!ok{
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ } else {
+ reqUrl := "tcp://192.168.1.66:40010"
+ reqClient := deliver.NewClient(deliver.ReqRep, reqUrl)
+ arg := protomsg.CompareArgs{
+ FaceFeature:face.FaceBytes,
+ CompareThreshold:0.2,
+ }
+ b, err := proto.Marshal(&arg)
+ if err !=nil{
+ util.ResponseFormat(c, code.ComError, "璇锋眰marshal澶辫触")
+ return
+ }
+ err = reqClient.Send(b)
+ if err !=nil{
+ util.ResponseFormat(c, code.ComError, "姣斿鏈嶅姟璇锋眰澶辫触")
+ return
+ }
+ resultB, err := reqClient.Recv()
+ if err !=nil{
+ util.ResponseFormat(c, code.ComError, "姣斿鏈嶅姟鍝嶅簲澶辫触")
+ return
+ }
+ m :=make(map[string]float32,0)
+ err = json.Unmarshal(resultB, &m)
+ if err !=nil{
+ util.ResponseFormat(c, code.ComError, "result Unmarshal err")
+ return
+ }
+ personIds := make([]string,len(m))
+ for k,_ :=range m{
+ personIds = append(personIds,k)
+ }
+ dbpeople, e := esApi.Dbpersoninfosbyid(personIds, "dbtablepersons", "192.168.1.182", "9200")
+ if e !=nil{
+ util.ResponseFormat(c, code.ComError, "result es query err")
+ } else {
+ util.ResponseFormat(c,code.Success,dbpeople)
+ }
+ }
+}
+
// @Description 浜哄憳鐓х墖涓婁紶骞惰幏鍙栫壒寰佸��
// @Router /data/api-v/dbperson/fileUploadTest [POST]
func (controller FileController) UploadPersonTest(c *gin.Context) {
@@ -108,7 +209,6 @@
faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*5)
if err ==nil && len(faceArr) >0 {
var faceBase64= ""
- var field = ""
var rcFace *protomsg.Rect
for _,r := range faceArr {
rcFace = r.Pos.RcFace
@@ -117,19 +217,12 @@
}
//鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
- fileInfo, e := esutil.PostFormData(weedfsUri, "娴嬭瘯浜鸿劯鍒囧浘", "file", cutFaceImgData)
- if e != nil {
- fmt.Println(e.Error())
-
+ weedFilePath, e := WeedFSClient.UploadFile(weedfsUri, "testCutFace", cutFaceImgData)
+ if e !=nil{
+ util.ResponseFormat(c,code.ComError,"鏂囦欢涓婁紶澶辫触")
} else {
- field = fileInfo[picUrlField].(string) // 鏂囦欢璺緞
+ util.ResponseFormat(c,code.Success,weedFilePath + ";" + faceBase64)
}
- if strings.Contains(field,"/"){
- idx := strings.Index(field, "/")
- field = field[idx+1:]
- }
- fmt.Println("field:",field)
- util.ResponseFormat(c,code.Success,field + ";" + faceBase64)
} else {
util.ResponseFormat(c,code.ComError,"鏈彁鍙栧埌浜鸿劯")
}
@@ -256,12 +349,10 @@
field, _, err1 := uploadFileReturnAddr(file, filename, tableId)
//extNames = append(extNames, field)
- if err1 != nil {
- if field == "" {
- failList = append(failList, filename+"涓婁紶澶辫触,"+err1.Error())
- } else {
- successList = append(successList, filename+"鍔犲叆搴曞簱澶辫触,"+err1.Error())
- }
+ if err1 != nil || field == "" {
+ failList = append(failList, filename)
+ } else {
+ successList = append(successList, filename)
}
}
addResult["successList"] = successList
--
Gitblit v1.8.0