From 7183fd16c435d2aaf85e24d3608c5c43645ee608 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 10 七月 2019 09:42:27 +0800
Subject: [PATCH] remove sdkname, sdkid, add ipc_id
---
go.sum | 6 ++++++
test | 0
tasktag/tasktag.go | 5 +++--
go.mod | 4 ++--
sdk/sdk.go | 2 +-
util/sqlite.go | 7 ++++---
camera/camera.go | 3 ++-
7 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index d1cc7e0..db904fc 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -136,7 +136,8 @@
continue
}
- fmt.Println("============== one msg input ==========")
+ // fmt.Println("============== one msg input ==========")
+ // fmt.Println(imagemsg.Cid)
switch remote {
case "camera":
for _, taskid := range GetAlltask(imagemsg.Cid) {
diff --git a/go.mod b/go.mod
index c6f5ccd..8a26d74 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20190620073851-30a7d0574bbc
- basic.com/pubsub/protomsg.git v0.0.0-20190628022108-13a4fccc509f
+ basic.com/dbapi.git v0.0.0-20190709070522-8a9676731a65
+ basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2
basic.com/valib/deliver.git v0.0.0-20190529080650-3e64847c9bce
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
github.com/ajg/form v1.5.1 // indirect
diff --git a/go.sum b/go.sum
index 29ce63f..9c009ab 100644
--- a/go.sum
+++ b/go.sum
@@ -2,12 +2,18 @@
basic.com/dbapi.git v0.0.0-20190531051326-e49473afa5e9/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/dbapi.git v0.0.0-20190620073851-30a7d0574bbc h1:Dd4aSg+S8E1Kj49kTtHkRZpTeIJiM521i8wCkWMAmOg=
basic.com/dbapi.git v0.0.0-20190620073851-30a7d0574bbc/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+basic.com/dbapi.git v0.0.0-20190709070522-8a9676731a65 h1:lVS4U8ASXzPwAOUPH7WaoeNTJQNUD6s9Wfd1b4KdreQ=
+basic.com/dbapi.git v0.0.0-20190709070522-8a9676731a65/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/pubsub/protomsg.git v0.0.0-20190628022108-13a4fccc509f h1:mBsaoP1YlsFkgBwxm2KQ9U80Lj2b2wf3gowPlxf5ifQ=
basic.com/pubsub/protomsg.git v0.0.0-20190628022108-13a4fccc509f/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20190705101637-65381a182a3c h1:gVWzsRxEiQ7oqx0xHDHKbk1LF1hj32Xjp9n65K5Q3mI=
+basic.com/pubsub/protomsg.git v0.0.0-20190705101637-65381a182a3c/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2 h1:ygh9CQPS48KmXv+PNUrOcrMqIiDZOs11apnQdu9oGEY=
+basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2/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=
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28 h1:3hejanzPEBvZSSvjIqayB83/6/6SLLrX9oNZAdiYELg=
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 7c4b4f6..adee5ee 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -155,7 +155,7 @@
//sdk鏁版嵁鍒嗗彂鍣�
func SdkSendTopic(sdkmsg protomsg.SdkMessage) (sdksend string) {
if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkinfos) {
- sdksend = sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdkid
+ sdksend = sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Ipcid
} else {
sdksend = "es"
}
diff --git a/tasktag/tasktag.go b/tasktag/tasktag.go
index 8afacbb..d8a7540 100644
--- a/tasktag/tasktag.go
+++ b/tasktag/tasktag.go
@@ -26,14 +26,15 @@
func GenTaskMap() {
var tls []protomsg.TaskLabel
for _, taskSdk := range util.TaskSdks {
+
var tl protomsg.TaskLabel
tl.Taskid = taskSdk.Task.Taskid
tl.Taskname = taskSdk.Task.Taskname
+
for _, sdkinfo := range taskSdk.Sdks {
sdkinfowithtask := new(protomsg.SdkmsgWithTask)
- sdkinfowithtask.Sdkid = sdkinfo.Id
+ sdkinfowithtask.Ipcid = sdkinfo.IpcId
sdkinfowithtask.Sdktype = sdkinfo.SdkType
- sdkinfowithtask.SdkName = sdkinfo.SdkName
sdkinfowithtask.Sdkdata = make([]byte, 1)
tl.Sdkinfos = append(tl.Sdkinfos, sdkinfowithtask)
}
diff --git a/test b/test
index 346e4e7..fa84cee 100755
--- a/test
+++ b/test
Binary files differ
diff --git a/util/sqlite.go b/util/sqlite.go
index 04d4b84..e9b9021 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -24,7 +24,8 @@
var CameraIds []protomsg.Camera
var CameraTasks []protomsg.CameraAndTaskInfo
-var TaskSdks []protomsg.TaskSdkInfo
+//var TaskSdks []protomsg.TaskSdkInfo
+var TaskSdks []protomsg.TaskSdkRun
var Sdklist []string
var Sdkinfos []protomsg.Sdk
@@ -50,7 +51,7 @@
CameraTasks = camval.FindAllCameraAndTask()
fmt.Println(CameraTasks)
- TaskSdks = taskapi.FindAll()
+ TaskSdks = taskapi.FindAllTaskSdkRun()
Sdklist = sdkapi.GetAllSdkIds()
Sdkinfos = sdkapi.FindAll("")
@@ -76,7 +77,7 @@
case protomsg.TableChanged_T_TaskSdk:
fmt.Println("update tasksdk")
- TaskSdks = taskapi.FindAll()
+ TaskSdks = taskapi.FindAllTaskSdkRun()
TaskSdkflag <- true
case protomsg.TableChanged_T_Sdk:
--
Gitblit v1.8.0