From 8a9676731a654165e1610a41c867e8be8dc5d696 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 09 七月 2019 15:05:22 +0800
Subject: [PATCH] add TaskSdkRun and SdkRun
---
sdkApi.go | 34 +++++++++++++++--
taskApi.go | 24 ++++++++++++
api_test.go | 33 +++++++++++++++-
3 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/api_test.go b/api_test.go
index 4d88455..bbf192e 100644
--- a/api_test.go
+++ b/api_test.go
@@ -45,6 +45,7 @@
ret := Call("add", "hello", "world")
fmt.Println("NewUUID:",PseudoUuid())
+
fmt.Println(ret)
}
@@ -114,8 +115,18 @@
}
-func TestMangosReqClient(t *testing.T){
+type Point struct {
+ X float64 `json:"x"`
+ Y float64 `json:"y"`
+}
+func TestMangosReqClient(t *testing.T){
+ location := make([]Point, 0)
+ if err := json.Unmarshal([]byte(""), &location); err == nil {
+ fmt.Println("location:",location)
+ } else {
+ fmt.Println("unmarshal err:",err)
+ }
}
func TestSdkApi_FindAll(t *testing.T) {
@@ -135,6 +146,18 @@
fmt.Println("sdk Unmarshal err",err)
}
fmt.Println(sdkInfo.Args)
+}
+
+func TestTaskApi_FindAllForIpc(t *testing.T) {
+ var api TaskApi
+ taskSdks := api.FindAllTaskSdkRun()
+ fmt.Println(taskSdks)
+}
+
+func TestSdkApi_FindAllSdkRun(t *testing.T) {
+ var api SdkApi
+ sdkRuns := api.FindAllSdkRun()
+ fmt.Println(sdkRuns)
}
func TestSdkApi_GetAllSdkIds(t *testing.T) {
@@ -185,7 +208,13 @@
func TestCameraApi_GetCamerasByRunType(t *testing.T) {
var api CameraApi
- flag, cameras := api.GetCamerasByRunType(0,"")
+ flag, cameras := api.GetCamerasByRunType(1,"")
fmt.Println("flag:",flag)
fmt.Println("cameras:",cameras)
+}
+
+func TestSysSetApi_GetPollConfig(t *testing.T) {
+ var api SysSetApi
+ _, config := api.GetPollConfig()
+ fmt.Println("config:",config)
}
\ No newline at end of file
diff --git a/sdkApi.go b/sdkApi.go
index 7512efd..043e346 100644
--- a/sdkApi.go
+++ b/sdkApi.go
@@ -47,16 +47,42 @@
return sdkArr
}
-//鏌ユ壘绠楁硶id鐨剆lice
-func (api SdkApi) GetAllSdkIds() (sdkIds []string){
+func (api SdkApi) FindAllSdkRun()(sdkRuns []protomsg.SdkRun){
sdkArr := api.FindAll("")
if len(sdkArr) == 0 {
return nil
}
+ idMap :=make(map[string]string,0)
for _,sdk := range sdkArr{
- sdkIds = append(sdkIds, sdk.Id)
+ if sdk.IpcId !=""{
+ if _,ok :=idMap[sdk.IpcId];!ok{
+ idMap[sdk.IpcId] = sdk.IpcId
+ sdkRuns = append(sdkRuns,protomsg.SdkRun{
+ IpcId:sdk.IpcId,
+ SdkType:sdk.SdkType,
+ })
+ }
+ }
}
- return sdkIds
+ return sdkRuns
+}
+
+//鏌ユ壘绠楁硶id鐨剆lice
+func (api SdkApi) GetAllSdkIds() (ipcIds []string){
+ sdkArr := api.FindAll("")
+ if len(sdkArr) == 0 {
+ return nil
+ }
+ idMap :=make(map[string]string,0)
+ for _,sdk := range sdkArr{
+ if sdk.IpcId !=""{
+ if _,ok :=idMap[sdk.IpcId];!ok{
+ idMap[sdk.IpcId] = sdk.IpcId
+ ipcIds = append(ipcIds,sdk.IpcId)
+ }
+ }
+ }
+ return ipcIds
}
//閫氳繃id鑾峰彇绠楁硶淇℃伅
diff --git a/taskApi.go b/taskApi.go
index 2be4791..f3e89bb 100644
--- a/taskApi.go
+++ b/taskApi.go
@@ -27,6 +27,30 @@
return taskInfos
}
+func (api TaskApi) FindAllTaskSdkRun() (taskSdks []protomsg.TaskSdkRun) {
+ taskInfos := api.FindAll()
+ if taskInfos !=nil {
+ for _,ti :=range taskInfos{
+ tsr := protomsg.TaskSdkRun{
+ Task:ti.Task,
+ }
+ m := make(map[string]string,0)
+ for _,s := range ti.Sdks{
+ if _,ok :=m[s.IpcId];!ok{
+ m[s.IpcId] = s.IpcId
+ tsr.Sdks = append(tsr.Sdks,&protomsg.SdkRun{
+ IpcId:s.IpcId,
+ SdkType:s.SdkType,
+ })
+ }
+ }
+
+ taskSdks = append(taskSdks,tsr)
+ }
+ }
+ return taskSdks
+}
+
func (api TaskApi) Add(paramBody map[string]interface{}) (bool,interface{}) {
url := BASIC_URL + DATA_URL_PREFIX + "/task/add"
client := NewClient()
--
Gitblit v1.8.0