From f88a44f58396fb36a979cfe5640a36d6ac2d7289 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 25 七月 2019 14:50:56 +0800
Subject: [PATCH] add discovery
---
controllers/fileController.go | 188 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 153 insertions(+), 35 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 7dbc615..fd631e1 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"
@@ -14,14 +18,17 @@
"log"
"mime/multipart"
"net/http"
+ "path"
"strconv"
"strings"
+ "time"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
"webserver/extend/util"
"webserver/models"
"webserver/service"
+ esApi "basic.com/pubsub/esutil.git"
)
type FileController struct {
@@ -71,7 +78,7 @@
// fastdfs 涓婁紶 鏆傚簾寮�
//field := fdfsclient.UploadFileByBuffer(data, fileSuffix)
}
- field, result, err := uploadFileReturnAddr(file, filename, tableId)
+ fileNameOnly, result, err := uploadFileReturnAddr(file, filename, tableId)
if err != nil {
if err.Error() == "NotFeatureFindError" {
util.ResponseFormat(c, code.NotFeatureFindError, filename)
@@ -87,7 +94,128 @@
util.ResponseFormat(c, code.ServiceInsideError, result["data"])
}
} else {
- util.ResponseFormat(c, code.Success, field)
+ util.ResponseFormat(c, code.Success, fileNameOnly)
+ }
+}
+
+
+type FaceExtract struct {
+ Url string `json:"url"`
+ FaceBytes []byte `json:"faceBytes"`
+}
+var faceExtractedMap = make(map[string]FaceExtract,0)
+
+// @Summary 浜鸿劯鎻愬彇
+// @Description 浜鸿劯鎻愬彇
+// @Produce json
+// @Tags 浠ュ浘鎼滃浘
+// @Param file formData file 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/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"
+ resultMap :=make(map[string]interface{},0)
+ //灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
+ fileBytes, _ := ioutil.ReadAll(file)
+ faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*60)
+ if err ==nil && len(faceArr) >0 {
+ //1.鎻愬彇姣忎竴寮犱汉鑴稿皬鍥�
+ 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)
+ }
+ }
+ //2.澶у浘鐢绘,鏍囪瘑浜鸿劯浣嶇疆
+ originFilePath, _ := WeedFSClient.UploadFile(weedfsUri, "FaceUrl", fileBytes)
+ resultMap["uploadImage"] = originFilePath
+ resultMap["smImage"] = urlArr
+ util.ResponseFormat(c,code.Success, resultMap)
+ } else {
+ util.ResponseFormat(c,code.ComError,"鏈彁鍙栧埌浜鸿劯")
+ }
+}
+
+// @Summary 浠ュ浘鎼滃浘
+// @Description 浠ュ浘鎼滃浘
+// @Produce json
+// @Tags 浠ュ浘鎼滃浘
+// @Param url formData string true "url"
+// @Param tableId formData string true "搴曞簱id"
+// @Param compThreshold formData string 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.ParseFloat(compThresholdStr,32)
+ if photoUrl == "" || err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ if face,ok := faceExtractedMap[photoUrl];!ok{
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ } else {
+ arg := protomsg.CompareArgs{
+ FaceFeature:face.FaceBytes,
+ CompareThreshold:float32(compThreshold),
+ }
+ if tableId !=""{
+ arg.TableIds = []string{ tableId }
+ }
+ 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)
+ for _,str :=range compServerList{
+ reqUrl := "tcp://"+str
+ reqClient := deliver.NewClient(deliver.ReqRep, reqUrl)
+ err = reqClient.Send(b)
+ if err !=nil{
+ continue
+ }
+ resultB, err := reqClient.Recv()
+ if err !=nil{
+ continue
+ }
+ m :=make(map[string]float32,0)
+ err = json.Unmarshal(resultB, &m)
+ if err !=nil{
+ continue
+ }
+ personIds := make([]string,len(m))
+ for k,_ :=range m{
+ personIds = append(personIds,k)
+ }
+ 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...)
+ }
+ }
+ util.ResponseFormat(c,code.Success,resultList)
}
}
@@ -103,10 +231,9 @@
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
fileBytes, _ := ioutil.ReadAll(file)
- faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes)
+ 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
@@ -115,19 +242,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,"鏈彁鍙栧埌浜鸿劯")
}
@@ -150,7 +270,7 @@
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
var faceBase64=""
- faceArr, err,pI := service.GetFaceFeaFromSdk(fileBytes)
+ faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*5)
if faceArr ==nil {
return "",nil,errors.New("NotFeatureFindError")
}
@@ -179,17 +299,19 @@
field = field[idx+1:]
}
fmt.Println("field:",field)
+ ext := path.Ext(filename)
+ fileNameOnly := strings.TrimSuffix(filename, ext)
dbperson := new(models.Dbtablepersons)
dbperson.PersonPicUrl = field // 鍥剧墖璺粡
dbperson.TableId = tableId //
- dbperson.PersonName = filename // 鍥剧墖鍚�
+ dbperson.PersonName = fileNameOnly // 鍥剧墖鍚�
// 婕旂ずbase64缂栫爜
dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
result := addDbPerson(dbperson)
- return field, result, nil
+ return fileNameOnly, result, nil
}
@@ -237,9 +359,9 @@
return
}
extNames := make([]string, 0)
- isAllFiald := true
addResult := make(map[string]interface{}, 0)
- details := make([]string, 0)
+ successList := make([]string, 0)
+ failList := make([]string,0)
for _, head := range fileHeaders {
//鏂囦欢鐨勫悕绉�
filename := head.Filename
@@ -248,26 +370,22 @@
if err != nil {
log.Fatal(err)
}
- //data, _ := ioutil.ReadAll(file)
- // weedfs 涓婁紶
+
field, _, err1 := uploadFileReturnAddr(file, filename, tableId)
- extNames = append(extNames, field)
- if isAllFiald && err1 == nil {
- isAllFiald = false
- }
- if err1 != nil {
- if field == "" {
- details = append(details, filename+"涓婁紶澶辫触,"+err1.Error())
- } else {
- details = append(details, filename+"鍔犲叆搴曞簱澶辫触,"+err1.Error())
- }
+ //extNames = append(extNames, field)
+
+ if err1 != nil || field == "" {
+ failList = append(failList, filename)
+ } else {
+ successList = append(successList, filename)
}
}
- addResult["isAllFiald"] = isAllFiald
+ addResult["successList"] = successList
+ addResult["failList"] = failList
addResult["fields"] = extNames
- addResult["detail"] = details
+ //addResult["detail"] = details
//fields := fdfsclient.UploadFileByBuffer100(bytess, extNames) // fastdfs 涓婁紶
- if !isAllFiald {
+ if len(successList)>0 {
util.ResponseFormat(c, code.Success, addResult)
} else {
util.ResponseFormat(c, code.ServiceInsideError, err.Error())
--
Gitblit v1.8.0