From 10094361e04705f3d81a5cbd2f0868467fc9c784 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 29 六月 2019 16:37:44 +0800
Subject: [PATCH] rm log
---
extend/esutil/EsClient.go | 8
controllers/fileController.go | 3
service/CamraUpdatesnashot.go | 241 +++++++++++++++++++++++------------------------
service/FaceSdkService.go | 43 ++++----
4 files changed, 146 insertions(+), 149 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 038ae87..c21b53f 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -131,8 +131,7 @@
if err !=nil {
return "",nil,err
}
- fmt.Println("fileBytes.len:",len(fileBytes))
- fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", file)
+ fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", fileBytes)
if e != nil {
fmt.Println(e.Error())
return "", nil, e
diff --git a/extend/esutil/EsClient.go b/extend/esutil/EsClient.go
index 79ece4f..6bd550c 100644
--- a/extend/esutil/EsClient.go
+++ b/extend/esutil/EsClient.go
@@ -98,7 +98,7 @@
return dat, nil
}
-func PostFormData(uri string, filename, paramName string, file multipart.File) (maps map[string]interface{}, err0 error) {
+func PostFormData(uri string, filename, paramName string, fileBytes []byte) (maps map[string]interface{}, err0 error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
_, err := writer.CreateFormFile(paramName, filename)
@@ -106,11 +106,11 @@
return nil, err
}
boundary := writer.Boundary()
- //close_string := fmt.Sprintf("\r\n--%s--\r\n", boundary)
close_buf := bytes.NewBufferString(fmt.Sprintf("\r\n--%s--\r\n", boundary))
+ fmt.Println("PostFormData.fileLen:",len(fileBytes))
+ file := bytes.NewBuffer(fileBytes)
request_reader := io.MultiReader(body, file, close_buf)
- //_, err = io.Copy(part, file)
- //writer.WriteField(key, val)
+
request, err := http.NewRequest("POST", uri, request_reader)
request.Header.Add("Content-Type", writer.FormDataContentType())
timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
diff --git a/service/CamraUpdatesnashot.go b/service/CamraUpdatesnashot.go
index adbd955..f99f35e 100644
--- a/service/CamraUpdatesnashot.go
+++ b/service/CamraUpdatesnashot.go
@@ -1,145 +1,142 @@
package service
import (
- "fmt"
- "time"
- "flag"
- "os/exec"
+ "fmt"
+ "time"
+ "flag"
+ "os/exec"
- "bytes"
- "encoding/json"
- "errors"
- "io"
- "log"
- "mime/multipart"
- "net/http"
- "gocv.io/x/gocv"
- "path/filepath"
+ "bytes"
+ "encoding/json"
+ "errors"
+ "io"
+ "log"
+ "mime/multipart"
+ "net/http"
+ "gocv.io/x/gocv"
+ "path/filepath"
- "basic.com/dbapi.git"
- )
-
+ "basic.com/dbapi.git"
+)
func PostFormBufferData(uri string, filepath string, fileName string) (maps map[string]interface{}, err0 error) {
- // 瑕佹寚瀹氳浆byte鐨勬牸寮�
- picMat := gocv.IMRead(filepath, gocv.IMReadColor)
- defer picMat.Close()
- if picMat.Empty() {
- return nil, errors.New("file not exist")
- }
+ // 瑕佹寚瀹氳浆byte鐨勬牸寮�
+ picMat := gocv.IMRead(filepath, gocv.IMReadColor)
+ defer picMat.Close()
+ if picMat.Empty() {
+ return nil, errors.New("file not exist")
+ }
- pheight := picMat.Rows()
- pwidth := picMat.Cols()
- pdata := picMat.ToBytes()
+ pheight := picMat.Rows()
+ pwidth := picMat.Cols()
+ pdata := picMat.ToBytes()
- imgs := gocv.NewMat()
- imgs, _ = gocv.NewMatFromBytes(pheight, pwidth, gocv.MatTypeCV8UC3, pdata)
- fdata,_ := gocv.IMEncode(".jpg",imgs)
- body := &bytes.Buffer{}
- writer := multipart.NewWriter(body)
- _, err := writer.CreateFormFile("file", fileName)
- if err != nil {
- return nil, err
- }
- boundary := writer.Boundary()
- //close_string := fmt.Sprintf("\r\n--%s--\r\n", boundary)
- close_buf := bytes.NewBufferString(fmt.Sprintf("\r\n--%s--\r\n", boundary))
- file := bytes.NewBuffer(fdata)
- request_reader := io.MultiReader(body, file, close_buf)
- //_, err = io.Copy(part, file)
- //writer.WriteField(key, val)
- request, err := http.NewRequest("POST", uri, request_reader)
- request.Header.Add("Content-Type", writer.FormDataContentType())
- timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
- client := &http.Client{Timeout: timeout}
- resp, err := client.Do(request)
- if err != nil {
- log.Fatal(err)
- return nil, err
- }
- defer func() {
- if r := recover(); r != nil {
- fmt.Printf("panic鐨勫唴瀹�%v\n", r)
- msg := "涓婁紶鍥剧墖鏈嶅姟鍣ㄥ紓甯�"
- if _, ok := r.(error); ok {
- msg = r.(error).Error()
- fmt.Println("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
- }
- if _, ok := r.(string); ok {
- msg = r.(string)
- fmt.Println("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
- }
- err0 = errors.New(msg)
- }
- }()
- defer resp.Body.Close()
- {
- body := &bytes.Buffer{}
- _, err := body.ReadFrom(resp.Body)
- if err != nil {
- log.Fatal(err)
- }
- fmt.Println(resp.StatusCode)
- //fmt.Println(resp.Header)
- fmt.Println(body)
- //decoder := json.NewDecoder(strings.NewReader(body.String()))
- decoder := make(map[string]interface{})
- if err := json.Unmarshal([]byte(body.String()), &decoder); err != nil {
- return nil, err
- }
- return decoder, nil
- }
+ imgs := gocv.NewMat()
+ imgs, _ = gocv.NewMatFromBytes(pheight, pwidth, gocv.MatTypeCV8UC3, pdata)
+ fdata, _ := gocv.IMEncode(".jpg", imgs)
+ body := &bytes.Buffer{}
+ writer := multipart.NewWriter(body)
+ _, err := writer.CreateFormFile("file", fileName)
+ if err != nil {
+ return nil, err
+ }
+ boundary := writer.Boundary()
+ //close_string := fmt.Sprintf("\r\n--%s--\r\n", boundary)
+ close_buf := bytes.NewBufferString(fmt.Sprintf("\r\n--%s--\r\n", boundary))
+ file := bytes.NewBuffer(fdata)
+ request_reader := io.MultiReader(body, file, close_buf)
+ //_, err = io.Copy(part, file)
+ //writer.WriteField(key, val)
+ request, err := http.NewRequest("POST", uri, request_reader)
+ request.Header.Add("Content-Type", writer.FormDataContentType())
+ timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
+ client := &http.Client{Timeout: timeout}
+ resp, err := client.Do(request)
+ if err != nil {
+ log.Fatal(err)
+ return nil, err
+ }
+ defer func() {
+ if r := recover(); r != nil {
+ fmt.Printf("panic鐨勫唴瀹�%v\n", r)
+ msg := "涓婁紶鍥剧墖鏈嶅姟鍣ㄥ紓甯�"
+ if _, ok := r.(error); ok {
+ msg = r.(error).Error()
+ fmt.Println("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
+ }
+ if _, ok := r.(string); ok {
+ msg = r.(string)
+ fmt.Println("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
+ }
+ err0 = errors.New(msg)
+ }
+ }()
+ defer resp.Body.Close()
+ {
+ body := &bytes.Buffer{}
+ _, err := body.ReadFrom(resp.Body)
+ if err != nil {
+ log.Fatal(err)
+ }
+ fmt.Println(resp.StatusCode)
+ //fmt.Println(resp.Header)
+ fmt.Println(body)
+ //decoder := json.NewDecoder(strings.NewReader(body.String()))
+ decoder := make(map[string]interface{})
+ if err := json.Unmarshal([]byte(body.String()), &decoder); err != nil {
+ return nil, err
+ }
+ return decoder, nil
+ }
}
-
-
func processphoto(cid string) (local string, err error) {
- var camApi dbapi.CameraApi
- caminfo, err := camApi.GetCameraById(cid)
- _ = caminfo
- if err != nil {
- return "", err
- }
+ var camApi dbapi.CameraApi
+ caminfo, err := camApi.GetCameraById(cid)
+ _ = caminfo
+ if err != nil {
+ return "", err
+ }
- _, err = exec.LookPath("ffmpeg")
- if err != nil {
- return "", nil
- }
+ _, err = exec.LookPath("ffmpeg")
+ if err != nil {
+ return "", nil
+ }
- piclocal := fmt.Sprintf("%s%s.jpg",*storelocal,time.Now().String())
- cmd := exec.Command("ffmpeg", "-i",caminfo.Rtsp, "-y", "-f", "image2","-t", "0.001","-vf","select='eq(pict_type\\,I)',setpts='N/(25*TB)'", "-s","1920*1080", piclocal)
+ piclocal := fmt.Sprintf("%s%s.jpg", *storelocal, time.Now().String())
+ cmd := exec.Command("ffmpeg", "-i", caminfo.Rtsp, "-y", "-f", "image2", "-t", "0.001", "-vf", "select='eq(pict_type\\,I)',setpts='N/(25*TB)'", "-s", "1920*1080", piclocal)
- err = cmd.Run()
- if err != nil {
- return "", err
- }
- return piclocal, nil
+ err = cmd.Run()
+ if err != nil {
+ return "", err
+ }
+ return piclocal, nil
}
-var storelocal = flag.String("storelcoal","/home/user/workspace/gitblit/", "address of picture produce.")
-var fileurl = flag.String("fileurl","http://192.168.1.182:6333/submit", "url of file server.")
+var storelocal = flag.String("storelcoal", "/home/user/workspace/gitblit/", "address of picture produce.")
+var fileurl = flag.String("fileurl", "http://192.168.1.182:6333/submit", "url of file server.")
-func UpdateSnapshotUrl(cid string)(filename string, err error) {
- var camApi dbapi.CameraApi
+func UpdateSnapshotUrl(cid string) (filename string, err error) {
+ var camApi dbapi.CameraApi
- flag.Parse()
+ flag.Parse()
- piclocal, err := processphoto(cid)
- if err != nil {
- return "", err
- }
+ piclocal, err := processphoto(cid)
+ if err != nil {
+ return "", err
+ }
- resp, err := PostFormBufferData(*fileurl, piclocal, piclocal )
- if err != nil {
- fmt.Println(err)
- return "", err
- }
+ resp, err := PostFormBufferData(*fileurl, piclocal, piclocal)
+ if err != nil {
+ fmt.Println(err)
+ return "", err
+ }
- fileurl := resp["fileUrl"].(string)
- filename = filepath.Base(fileurl)
- ok := camApi.UpdateSnapshotUrl(cid, filename)
- if !ok {
- return "",errors.New("update filelocal to camera fail")
- }
- return filename, nil
+ fileurl := resp["fileUrl"].(string)
+ filename = filepath.Base(fileurl)
+ ok := camApi.UpdateSnapshotUrl(cid, filename)
+ if !ok {
+ return "", errors.New("update filelocal to camera fail")
+ }
+ return filename, nil
}
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index a062883..8275437 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -3,7 +3,6 @@
import (
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
- "encoding/base64"
"fmt"
"github.com/gogo/protobuf/proto"
"github.com/pierrec/lz4"
@@ -244,21 +243,23 @@
fmt.Println("Len(sdkInfos)=",len(sdkInfos))
for _,swt :=range sdkInfos{
- if swt.Sdktype =="FaceDetect"{
- fmt.Println("浜鸿劯妫�娴嬬粨鏋滈暱搴︼細",len(swt.Sdkdata))
- if len(swt.Sdkdata)>1{
- var pfp protomsg.ParamFacePos
- err := proto.Unmarshal(swt.Sdkdata, &pfp)
- if err !=nil {
- fmt.Println("faceDetect result unmarshal err:",err)
- } else {
- for _,face :=range pfp.Faces{
- fmt.Println("FacePos:",face.Pos)
- fmt.Println("ThftResult:",face.Result)
- }
- }
- }
- }
+ //浜鸿劯妫�娴嬬殑缁撴灉
+ //if swt.Sdktype =="FaceDetect"{
+ // fmt.Println("浜鸿劯妫�娴嬬粨鏋滈暱搴︼細",len(swt.Sdkdata))
+ // if len(swt.Sdkdata)>1{
+ // var pfp protomsg.ParamFacePos
+ // err := proto.Unmarshal(swt.Sdkdata, &pfp)
+ // if err !=nil {
+ // fmt.Println("faceDetect result unmarshal err:",err)
+ // } else {
+ // for _,face :=range pfp.Faces{
+ // fmt.Println("FacePos:",face.Pos)
+ // fmt.Println("ThftResult:",face.Result)
+ // }
+ // }
+ // }
+ //}
+ //浜鸿劯鎻愬彇鐨勭粨鏋�
if swt.Sdktype == "FaceExtract"{
fmt.Println("浜鸿劯鎻愬彇缁撴灉闀垮害:",len(swt.Sdkdata))
if len(swt.Sdkdata) > 1{
@@ -270,11 +271,11 @@
if len(pff.ExtComp) >0 {
resultMap.Write(perId,pff.ExtComp)
- for _,fea :=range pff.ExtComp{
- base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
- fmt.Println("perId:",perId)
- fmt.Println("faceFeature:",base64Fea)
- }
+ //for _,fea :=range pff.ExtComp{
+ // base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
+ // fmt.Println("perId:",perId)
+ // fmt.Println("faceFeature:",base64Fea)
+ //}
}
}
break
--
Gitblit v1.8.0