From 04f05c8ca762ea5d971e67a7b71bf635605df18a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 03 八月 2019 15:48:05 +0800
Subject: [PATCH] fix taskSdkAdd
---
sdkApi.go | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/sdkApi.go b/sdkApi.go
index ec1bb75..8b4709d 100644
--- a/sdkApi.go
+++ b/sdkApi.go
@@ -1,7 +1,7 @@
package dbapi
import (
- "analyweb/protomsg"
+ "basic.com/pubsub/protomsg.git"
"encoding/json"
"fmt"
)
@@ -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鑾峰彇绠楁硶淇℃伅
@@ -94,4 +120,24 @@
bytes, _ := json.Marshal(res.Data)
err = json.Unmarshal(bytes, &sdks)
return true,sdks
+}
+
+func (api SdkApi) GetSdkArgs(sdkId string, scope string) (b bool,args []protomsg.SdkArg) {
+ url := BASIC_URL + DATA_URL_PREFIX + "/sdkArg/getSdkArgs"
+ client := NewClient()
+ paramMap := make(map[string]string)
+ paramMap["sdkId"] = sdkId
+ paramMap["scope"] = scope
+ respBody, err := client.DoGetRequest(url, paramMap, nil)
+ if err !=nil {
+ return false,nil
+ }
+ var res Result
+ if err = json.Unmarshal(respBody, &res); err != nil {
+ fmt.Println(err)
+ return false,nil
+ }
+ bytes, _ := json.Marshal(res.Data)
+ err = json.Unmarshal(bytes, &args)
+ return true,args
}
\ No newline at end of file
--
Gitblit v1.8.0