From 6fd3413cfa70086864216c59718f7f4fc58b1acc Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期四, 27 六月 2019 14:19:31 +0800
Subject: [PATCH] add web interface
---
go.sum | 2
test | 0
go.mod | 2
sdk/sdk.go | 73 +++++++++++++++--------
camera/camera.go | 94 +++++++++++++++---------------
5 files changed, 97 insertions(+), 74 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index b24b337..750b1ae 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -7,6 +7,7 @@
"github.com/long/test/sdk"
"github.com/long/test/util"
+ "github.com/gogo/protobuf/proto"
"basic.com/pubsub/protomsg.git"
"context"
@@ -15,10 +16,7 @@
// "time"
)
-//var SocketManage = make(map[string]SocketContext)
var SocketManage sync.Map
-
-var Initchannel = make(chan protomsg.Camera )
type SocketContext struct {
Sock deliver.Deliver
@@ -27,39 +25,37 @@
}
func Init() {
-
fmt.Println("============ camera info ====================")
for _, cd := range util.CameraIds {
fmt.Println(cd)
fmt.Println()
}
- go CreateCamera(Initchannel)
- go AutoDelCamera(util.Cameraflag)
-
+ // 鎽勫儚鏈哄垵濮嬪寲
for _, cam := range util.CameraIds {
- Initchannel <- cam
+ CreateCamera(cam.Id, "camera")
}
+
+ // web绔垵濮嬪寲
+ CreateCamera("virtual-faceextract-sdk-pull_2" , "web")
+
+
+
+// go AutoDelCamera(util.Cameraflag)
}
-func CreateCamera(camera chan protomsg.Camera) {
- for cam := range camera {
- camid := cam.Id
- caddr := cam.Addr
- if _, ok := SocketManage.Load(camid); !ok {
- url := fmt.Sprintf("ipc:///tmp/%s.ipc", camid)
+// camera 鎺ュ彈鏁版嵁
+func CreateCamera(id string, remote string) {
+ if _, ok := SocketManage.Load(id); !ok {
+ url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
- id, socketlisten, err := NewCamerSocketListen(deliver.PushPull, camid, url)
+ socketlisten, err := NewCamerSocketListen(deliver.PushPull, id, url)
if err != nil {
fmt.Println("create socket error")
- continue
+ return
}
-
- go func(cid string, cameraaddr string, sock SocketContext) {
- Recv(cid, cameraaddr, sock)
- }(id, caddr, socketlisten)
+ go Recv(socketlisten, remote)
}
- }
}
//鍔ㄦ�佸鐞�
@@ -76,22 +72,15 @@
return true
})
- var newcamera []string
-
- for _, value := range util.CameraIds {
- newcamera = append(newcamera, value.Id)
- }
+ var newcamera []string
+ newcamera = append(newcamera, util.Sdklist...)
cameraChanDel := util.Difference(oldcamera, newcamera)
fmt.Println(cameraChanDel)
for key, op := range cameraChanDel {
if op == "add" {
- for _, value := range util.CameraIds {
- if key == value.Id{
- Initchannel <- value
- }
- }
+ CreateCamera(key, "camera")
} else {
if sock, ok := SocketManage.Load(key); ok {
if socket, sok := sock.(SocketContext); sok {
@@ -106,7 +95,7 @@
}
// create server
-func NewCamerSocketListen(mode int, cameraid string, url string) (cid string, socket SocketContext, err error) {
+func NewCamerSocketListen(mode int, cameraid string, url string) (socket SocketContext, err error) {
ctx, cancel := context.WithCancel(context.Background())
socket.Context = ctx
@@ -116,33 +105,42 @@
fmt.Println("new socket.Sock: ", socket.Sock)
if socket.Sock == nil {
- return cameraid, socket, errors.New("create listen error")
+ return socket, errors.New("create listen error")
}
SocketManage.Store(cameraid, socket)
- return cameraid, socket, nil
+ return socket, nil
}
-func Recv(cameraid string, caddr string , socket SocketContext) {
- var msg []byte
- var err error
+func Recv(socket SocketContext, remote string ) {
+
+ var recvmsg protomsg.Recvmsg
for {
select {
case <-socket.Context.Done():
fmt.Println("listen recv quit")
return
default:
- if msg, err = socket.Sock.Recv(); err != nil {
- fmt.Println("err is: ", cameraid, err)
+ if msg, err := socket.Sock.Recv(); err != nil {
+ fmt.Println("err is: ", err)
continue
} else {
- fmt.Println()
- fmt.Println("============== one msg input ==========")
- for _, taskid := range GetAlltask(cameraid) {
- // time.Sleep(5 * time.Second)
- fmt.Println("cameraid: ", cameraid, " taskid: ", taskid)
- Taskdolist(cameraid, caddr, taskid, msg)
- }
- }
+ if err := proto.Unmarshal(msg,&recvmsg); err != nil {
+ fmt.Println("recv msg is not protomsg.Recvmg")
+ continue
+ }
+ }
+ fmt.Println("============== one msg input ==========")
+ switch remote {
+ case "camera":
+ for _, taskid := range GetAlltask(recvmsg.Id) {
+ // time.Sleep(5 * time.Second)
+ fmt.Println("id: ", recvmsg.Id , " taskid: ", taskid)
+ Taskdolist(recvmsg.Id, recvmsg.Addr, taskid, recvmsg.Picdata)
+ }
+ case "web":
+ fmt.Println("id: ", recvmsg.Id , " taskid: ", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2")
+ Taskdolist(recvmsg.Id, recvmsg.Addr, "92496BDF-2BFA-98F2-62E8-96DD9866ABD2", recvmsg.Picdata)
+ }
}
}
}
@@ -171,8 +169,10 @@
// 璁＄畻鍒嗗彂鐨勪富棰�
SendTopic := sdk.SdkSendTopic(sdkmsg)
+ fmt.Println(SendTopic)
if _, ok := sdk.SdkMap[SendTopic]; ok {
sdk.SdkMap[SendTopic] <- sdkmsg
+ fmt.Println("dispute sendtopic success", SendTopic)
} else {
fmt.Println("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
}
diff --git a/go.mod b/go.mod
index 42e398d..8eab7a8 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@
require (
basic.com/dbapi.git v0.0.0-20190620073851-30a7d0574bbc
- basic.com/pubsub/protomsg.git v0.0.0-20190621090107-c5cf390e19bb
+ basic.com/pubsub/protomsg.git v0.0.0-20190626081036-01b33da00793
basic.com/valib/deliver.git v0.0.0-20190529080650-3e64847c9bce
github.com/ajg/form v1.5.1 // indirect
github.com/gogo/protobuf v1.2.1
diff --git a/go.sum b/go.sum
index 4a4fa0d..fb4a64c 100644
--- a/go.sum
+++ b/go.sum
@@ -4,6 +4,8 @@
basic.com/dbapi.git v0.0.0-20190620073851-30a7d0574bbc/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/pubsub/protomsg.git v0.0.0-20190621090107-c5cf390e19bb h1:TCo2Oo2ZqHn+/WvfVCyQFSKHHps9gJZkC0D8MtTVcRs=
basic.com/pubsub/protomsg.git v0.0.0-20190621090107-c5cf390e19bb/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20190626081036-01b33da00793 h1:dy4DnHRIcQf5DaiLl/IwE3fqZ6a21MXqMTFUmmVAG1c=
+basic.com/pubsub/protomsg.git v0.0.0-20190626081036-01b33da00793/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/deliver.git v0.0.0-20190529080650-3e64847c9bce h1:/D6k+FVN1sMqLz6tMlsIl9bKwE2Mpc5d4QfPh0y4DSQ=
basic.com/valib/deliver.git v0.0.0-20190529080650-3e64847c9bce/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 7a1c554..07da4f6 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -4,13 +4,11 @@
"context"
"errors"
"fmt"
- "os"
// "github.com/long/test/httpclient"
"github.com/long/test/tasktag"
"github.com/long/test/util"
-
- "github.com/golang/protobuf/proto"
+ "github.com/gogo/protobuf/proto"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
@@ -38,35 +36,57 @@
fmt.Println()
}
+ // 鎵嬪姩杈撳叆鐨勪富棰�
SdkMap["es"] = make(chan protomsg.SdkMessage)
- fmt.Println("create es channel: ")
- go es(SdkMap["es"])
+ fmt.Println("create es channel: ")
+
+ SdkMap["virtual-faceextract-sdk-pull"] = make(chan protomsg.SdkMessage)
+ fmt.Println("create virtual-faceextract-sdk-pull")
+
+ Createwebserver("virtual-faceextract-sdk-pull")
+
+ go Dealextern()
go AutoDelSdk(util.Sdkflag)
}
func CreatesdkTopicandServer(sdkid string) {
+
SdkMap[sdkid] = make(chan protomsg.SdkMessage)
fmt.Println("create sdk channel: ", sdkid)
url := fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPull)
- sdkidser, socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
+ socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
if err != nil {
- delete(SdkMap, sdkid)
+ delete(SdkMap, sdkid)
fmt.Println(sdkid, "create server error!")
return
}
- go Send(sdkidser, socketser, SdkMap[sdkid])
+
+
+ go Send(sdkid, socketser, SdkMap[sdkid])
url = fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPush)
- _, socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
+ socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
if err != nil {
- delete(SdkMap, sdkid)
+ delete(SdkMap, sdkid)
fmt.Println(sdkid, "create dial error!")
return
}
go Recv(socketdial)
}
+
+// web 鎺ュ彈绔鐞�
+func Createwebserver(webid string ){
+ url := fmt.Sprintf("ipc:///tmp/%s%s", webid, postPull)
+ socketser, err := NewSdkSocketListen(deliver.PushPull, webid, url)
+ if err != nil {
+ fmt.Println(webid, "create server error!")
+ return
+ }
+ go Send(webid, socketser, SdkMap[webid])
+}
+
func DeletesdkTopicandServer(sdkid string) {
close(SdkMap[sdkid])
delete(SdkMap, sdkid)
@@ -78,10 +98,13 @@
}
//鍗曠嫭澶勭悊 es 涓婚鐨勬儏鍐�
-func es(sdkmsgchan chan protomsg.SdkMessage) {
- for _ = range sdkmsgchan {
- fmt.Println("this data is finish all sdk! ")
- }
+func Dealextern() {
+ for {
+ select {
+ case esmsg:= <-SdkMap["es"]:
+ fmt.Println(esmsg)
+ }
+ }
}
//鍔ㄦ�佸鐞�
@@ -94,6 +117,7 @@
oldSdk = append(oldSdk, key)
}
util.Sdklist = append(util.Sdklist, "es")
+ util.Sdklist = append(util.Sdklist, "virtual-faceextract-sdk-pull")
sdkChanDel := util.Difference(oldSdk, util.Sdklist)
fmt.Println(sdkChanDel)
@@ -140,7 +164,7 @@
}
// create server
-func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
+func NewSdkSocketListen(mode int, sdkid string, url string) (socket SocketContext, err error) {
fmt.Println("url is: ", url)
ctx, cancel := context.WithCancel(context.Background())
@@ -150,11 +174,11 @@
socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
if socket.Sock == nil {
- return sdkid, socket, errors.New("create listen error")
+ return socket, errors.New("create listen error")
}
SocketManage[sdkid] = socket
- return sdkid, socket, nil
+ return socket, nil
}
func NewSdkSocketDial(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
@@ -175,7 +199,6 @@
}
func Recv(socket SocketContext) {
-
var repsdkmsg = protomsg.SdkMessage{}
for {
select {
@@ -191,13 +214,12 @@
fmt.Println("receive len: ", len(msg))
if err != nil {
fmt.Println("unmarshal error: ", err)
- os.Exit(1)
continue
- }
+ }
repsdkmsg.Tasklab.Index++
- //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
- nexttopic := SdkSendTopic(repsdkmsg)
- SdkMap[nexttopic] <- repsdkmsg
+ //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
+ nexttopic := SdkSendTopic(repsdkmsg)
+ SdkMap[nexttopic] <- repsdkmsg
}
}
}
@@ -218,11 +240,10 @@
if err != nil {
fmt.Println("proto marshal error ", err)
continue
- }
+
fmt.Printf("浠庣閬搒dkid=%s 鎺ュ彈鏁版嵁 %d\n", sdkid, len(data))
fmt.Println()
- fmt.Println("send len of data: ", len(data))
if err := socket.Sock.Send(data); err != nil {
fmt.Println(socket.Sock)
fmt.Println("failed send")
@@ -233,7 +254,7 @@
fmt.Println(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
return
}
-
}
}
}
+}
diff --git a/test b/test
index 451b075..d95b9d8 100755
--- a/test
+++ b/test
Binary files differ
--
Gitblit v1.8.0