From 075988e5e4325c40413103f7b177f1ee30eaa6fe Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 29 六月 2019 11:21:45 +0800
Subject: [PATCH] rm fmt log
---
controllers/fileController.go | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index e175f30..a6e6509 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -1,8 +1,10 @@
package controllers
import (
+ "basic.com/pubsub/protomsg.git"
"bytes"
"encoding/base64"
+ "errors"
"fmt"
"github.com/gin-gonic/gin"
"github.com/satori/go.uuid"
@@ -15,6 +17,8 @@
"webserver/extend/esutil"
"webserver/extend/util"
"webserver/models"
+ "webserver/service"
+
)
type FileController struct {
@@ -88,19 +92,26 @@
// @Description 浜哄憳鐓х墖涓婁紶骞惰幏鍙栫壒寰佸��
// @Router /data/api-v/dbperson/fileUploadTest [POST]
func (controller FileController) UploadPersonTest(c *gin.Context) {
- file, header, err := c.Request.FormFile("file") //image杩欎釜鏄痷plaodify鍙傛暟瀹氫箟涓殑 'fileObjName':'image'
+ file, _, err := c.Request.FormFile("file") //image杩欎釜鏄痷plaodify鍙傛暟瀹氫箟涓殑 'fileObjName':'image'
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
- //鏂囦欢鐨勫悕绉�
- filename := header.Filename
- fmt.Println(file, err, filename)
- if err != nil {
- log.Fatal(err)
- filename = uuid.NewV4().String()
- }
+
+ //灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
+
+ faceExtArr, err := getFaceFeaFromSdk(file)
+ if err ==nil && len(faceExtArr) >0 {
+ var faceBase64= ""
+ for _,r := range faceExtArr {
+ faceBase64 = base64.StdEncoding.EncodeToString(r.Feats)//鑾峰彇鎻愬彇鍒扮殑绗竴寮犱汉鑴哥壒寰�
+ break
+ }
+ util.ResponseFormat(c,code.Success,faceBase64)
+ } else {
+ util.ResponseFormat(c,code.ComError,"鏈彁鍙栧埌浜鸿劯")
+ }
}
/*// 瀵逛笂闈㈢殑缂栫爜缁撴灉杩涜base64瑙ｇ爜
@@ -125,6 +136,7 @@
}
if tableId != "" && field != "" {
// 杩斿洖鐗瑰緛鍊� fileInfo["point"] = v.RcFace fileInfo["feature"] = feat
+
/*features := gorun.GetSimpleFaceDetect(picIp+field) // 鐗瑰緛鍊� // linux
if len(features) == 0 { // linux
return field,nil,errors.New("NotFeatureFindError") // linux
@@ -134,15 +146,28 @@
feat := features[0]["feature"].([]byte) // linux
if len(feat) != 2560 { // linux
return field,nil,errors.New("NotFeatureFindError")
- } */ // linux
- feat := []byte("hello world") // windows 娴嬭瘯鏀惧紑
+
+ } */ // linux
+
+ //灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
+ var faceBase64=""
+ faceExtArr, err := getFaceFeaFromSdk(file)
+ if err ==nil && len(faceExtArr) >0 {
+ for _,r := range faceExtArr {
+ faceBase64 = base64.StdEncoding.EncodeToString(r.Feats)//鑾峰彇鎻愬彇鍒扮殑绗竴寮犱汉鑴哥壒寰�
+ break
+ }
+ }
+
+
dbperson := new(models.Dbtablepersons)
dbperson.FaceFeature = picIp + field // 鍥剧墖璺粡
dbperson.TableId = tableId //
dbperson.PersonName = filename // 鍥剧墖鍚�
// 婕旂ずbase64缂栫爜
- encodeString := base64.StdEncoding.EncodeToString(feat)
- dbperson.FaceFeature = encodeString // 鐗瑰緛鍊糱ase64 鐮�
+
+ dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
+
result := addDbPerson(dbperson)
return field, result, nil
} else {
@@ -150,6 +175,27 @@
}
}
+func getFaceFeaFromSdk(file multipart.File) ([]*protomsg.ResultFaceExtCom,error){
+ s := service.NewFaceSdkService(file)
+ i, err := s.ReadFromUploadImg()
+ if err !=nil{
+ fmt.Println("readFromUploadImg err:",err)
+ return nil,err
+ }
+ bc, err := service.ImgCompress(i)
+ if err !=nil {
+ fmt.Println("ImgCompress err:",err)
+ return nil,err
+ }
+ s.PushImgMsg(bc)
+ s.GetFaceFea()
+ if s.Result == nil{
+ return nil,errors.New("no fea")
+ } else {
+ return s.Result,nil
+ }
+}
+
/**涓婁紶鏂规硶**/
// @Summary 鎵归噺娣诲姞搴曞簱浜哄憳
--
Gitblit v1.8.0