From 0981ad3f85d52550436f00ed3c7bd020f1f727b0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 29 六月 2019 15:55:50 +0800
Subject: [PATCH] test
---
controllers/fileController.go | 28 ++++++++++++++++------------
controllers/capture.go | 2 +-
controllers/monitoring.go | 2 +-
service/FaceSdkService.go | 22 ++++++++++------------
4 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/controllers/capture.go b/controllers/capture.go
index 9c784bb..4f07eb7 100644
--- a/controllers/capture.go
+++ b/controllers/capture.go
@@ -39,7 +39,7 @@
prama := "{\"query\":{\"bool\":{\"filter\":[" +
cameraIdStr +
- "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5s\",\"lt\":\"now+8h\"}}}]}}," +
+ "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5000s\",\"lt\":\"now+8h\"}}}]}}," +
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"1000\"," +
"\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 88c0f82..7c4cb92 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -127,15 +127,19 @@
defer file.Close()
field := ""
// weedfs 涓婁紶
- {
- fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", file)
- if e != nil {
- fmt.Println(e.Error())
- return "", nil, e
- } else {
- field = fileInfo[picUrlField].(string) // 鏂囦欢璺緞
- }
+ fileBytes, err := ioutil.ReadAll(file)
+ if err !=nil {
+ return "",nil,err
}
+ fmt.Println("fileBytes.len:",len(fileBytes))
+ fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", file)
+ if e != nil {
+ fmt.Println(e.Error())
+ return "", nil, e
+ } else {
+ field = fileInfo[picUrlField].(string) // 鏂囦欢璺緞
+ }
+
if field != "" {
// 杩斿洖鐗瑰緛鍊� fileInfo["point"] = v.RcFace fileInfo["feature"] = feat
@@ -155,8 +159,8 @@
field = field[idx+1:]
}
fmt.Println("field:",field)
- imgB, _ := ioutil.ReadAll(file)
- fmt.Println("img.length:",len(imgB))
+ //imgB, _ := ioutil.ReadAll(file)
+ //fmt.Println("img.length:",len(imgB))
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
var faceBase64=""
@@ -187,8 +191,8 @@
}
}
-func getFaceFeaFromSdk(file multipart.File) ([]*protomsg.ResultFaceExtCom,error){
- s := service.NewFaceSdkService(file)
+func getFaceFeaFromSdk(fileBytes []byte) ([]*protomsg.ResultFaceExtCom,error){
+ s := service.NewFaceSdkService(fileBytes)
i, err := s.ReadFromUploadImg()
if err !=nil{
fmt.Println("readFromUploadImg err:",err)
diff --git a/controllers/monitoring.go b/controllers/monitoring.go
index 6292953..d42fd60 100644
--- a/controllers/monitoring.go
+++ b/controllers/monitoring.go
@@ -46,7 +46,7 @@
prama := "{\"query\":{\"bool\":{\"filter\":[" +
cameraIdStr +
taskIdStr +
- "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5s\",\"lt\":\"now+8h\"}}}]}}," +
+ "{\"range\":{\"picDate\":{\"gte\":\"now+8h-5000s\",\"lt\":\"now+8h\"}}}]}}," +
"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
"\"size\":\"1000\"," +
"\"_source\":[\"baseInfo\",\"gender\",\"indeviceName\",\"sdkType\",\"ageDescription\",\"content\",\"ID\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"IDCard\",\"videoIp\",\"cameraId\"]}"
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index d47ab83..a062883 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -10,14 +10,12 @@
"github.com/pkg/errors"
"github.com/satori/go.uuid"
"gocv.io/x/gocv"
- "io/ioutil"
- "mime/multipart"
"sync"
"time"
)
type FaceSdkService struct {
- File *multipart.File
+ File []byte
Id string
Result []*protomsg.ResultFaceExtCom
}
@@ -32,9 +30,9 @@
Url_Service_PULL = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Pull_Ext
)
-func NewFaceSdkService(file multipart.File) FaceSdkService{
+func NewFaceSdkService(fileBytes []byte) FaceSdkService{
return FaceSdkService{
- File:&file,
+ File:fileBytes,
Id:uuid.NewV4().String(),
}
}
@@ -60,14 +58,14 @@
}
func (s *FaceSdkService) ReadFromUploadImg() (*protomsg.Image,error){
- defer (*(s.File)).Close()
- imgB, err := ioutil.ReadAll(*(s.File))
- if err !=nil{
- fmt.Println("File.Read err:",err)
- return nil,err
- }
+ //defer (*(s.File)).Close()
+ //imgB, err := ioutil.ReadAll(*(s.File))
+ //if err !=nil{
+ // fmt.Println("File.Read err:",err)
+ // return nil,err
+ //}
- picMat, err := gocv.IMDecode(imgB, gocv.IMReadColor)
+ picMat, err := gocv.IMDecode(s.File, gocv.IMReadColor)
if err !=nil {
fmt.Println("gocv.IMDecode err:",err)
return nil,err
--
Gitblit v1.8.0