From 73000facfdc05d2c72d418aa4b7b2cc9c078d695 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 26 六月 2019 19:45:58 +0800
Subject: [PATCH] test
---
controllers/camera.go | 6 +++---
main.go | 3 ++-
service/FaceSdkService.go | 25 ++++++++++++++++++++++++-
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index a639c28..9efc660 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -207,15 +207,15 @@
runTypeStr := c.Query("runType")
cameraName := c.Query("cameraName")
- fmt.Println("runType:",runTypeStr)
- fmt.Println("cameraName:",cameraName)
+ fmt.Println("runType:", runTypeStr)
+ fmt.Println("cameraName:", cameraName)
runType, err := strconv.Atoi(runTypeStr)
if err !=nil || (runType !=0 && runType !=1) {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
var api dbapi.CameraApi
- b,list := api.GetCamerasByRunType(runType)
+ b, list := api.GetCamerasByRunType(runType, cameraName)
if b {
dataBytes, _ := json.Marshal(list)
var cams []CameraVo
diff --git a/main.go b/main.go
index 14eb75e..fb629cd 100644
--- a/main.go
+++ b/main.go
@@ -6,10 +6,11 @@
"webserver/extend/config"
"webserver/models"
"webserver/router"
+ "webserver/service"
)
func main() {
-
+ go service.TestPushImgMsg()
envirment := flag.String("e", "dev", "")
flag.Usage = func() {
glog.Exit("flag parse usage !")
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index bd23acf..2f10210 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -6,6 +6,9 @@
"encoding/json"
"fmt"
"github.com/gogo/protobuf/proto"
+ "github.com/satori/go.uuid"
+ "io/ioutil"
+ "time"
)
const (
@@ -13,6 +16,26 @@
Url_Service_PULL = "tcp:///tmp///webserver-1.ipc"
)
var imgPushChan chan protomsg.Recvmsg
+
+func TestPushImgMsg() {
+ InitService()
+ imgData := readImgFile()
+ for {
+ PushImgMsg(protomsg.Recvmsg{
+ Id:uuid.NewV4().String(),
+ Addr:"",
+ Picdata:imgData,
+ })
+
+ time.Sleep(5*time.Second)
+ }
+}
+
+func readImgFile() []byte{
+ filePath := "/home/user/workspace/timg.jpg"
+ bytes, _ := ioutil.ReadFile(filePath)
+ return bytes
+}
func PushImgMsg(is protomsg.Recvmsg){
imgPushChan <- is
@@ -42,7 +65,7 @@
}
rMsg := protomsg.SdkMessage{}
if err := proto.Unmarshal(resultBytes, &rMsg);err !=nil{
- fmt.Println(rMsg)
+ fmt.Println("recv MSG:",rMsg)
resultMap[rMsg.Cid] = rMsg
}
--
Gitblit v1.8.0