From 30bbec0a251cb33a01f2693b6da3c92bd5802d50 Mon Sep 17 00:00:00 2001 From: liuxiaolong <liuxiaolong@aiotlink.com> Date: 星期一, 10 五月 2021 14:32:40 +0800 Subject: [PATCH] add SyncDevToManager --- cameraRuleApi.go | 80 +++++++++++++++++++++------------------ 1 files changed, 43 insertions(+), 37 deletions(-) diff --git a/cameraRuleApi.go b/cameraRuleApi.go index e6df3b3..8e589d4 100644 --- a/cameraRuleApi.go +++ b/cameraRuleApi.go @@ -12,9 +12,6 @@ func (api CameraRuleApi) FindByCameraId(cameraId string) (bool,interface{}) { url := DATA_URL_PREFIX + "/camera/rule/findByCameraId" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false,nil - } client := NewClient(WithNodes(netNode)) param := map[string]string { "cameraId": cameraId, @@ -36,9 +33,6 @@ func (api CameraRuleApi) Save(reqBody map[string]interface{}) (bool,interface{}) { url := DATA_URL_PREFIX + "/camera/rule/save" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false,nil - } client := NewClient(WithNodes(netNode)) body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil) if err != nil { @@ -57,9 +51,6 @@ func (api CameraRuleApi) PasteRules(reqBody map[string]interface{}) bool { url := DATA_URL_PREFIX + "/camera/pasteRules" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false - } client := NewClient(WithNodes(netNode)) body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil) if err != nil { @@ -78,9 +69,6 @@ func (api CameraRuleApi) SaveLinkRulesByGroup(reqBody map[string]interface{}) (bool, interface{}) { url := DATA_URL_PREFIX + "/camera/rule/saveLinkRulesByGroup" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false,nil - } client := NewClient(WithNodes(netNode)) body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil) if err != nil { @@ -99,9 +87,6 @@ func (api CameraRuleApi) GetLinkRulesByCameraIds(reqBody map[string]interface{}) (bool,interface{}) { url := DATA_URL_PREFIX + "/camera/rule/getLinkRulesByCameraIds" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false,nil - } client := NewClient(WithNodes(netNode)) body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil) if err != nil { @@ -120,9 +105,6 @@ func (api CameraRuleApi) UpdateAlarmLevel(reqBody map[string]interface{}) bool { url := DATA_URL_PREFIX + "/camera/rule/updateAlarmLevel" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false - } client := NewClient(WithNodes(netNode)) body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, reqBody,nil,nil) if err != nil { @@ -141,9 +123,6 @@ func (api CameraRuleApi) DeleteByGroup(groupId string) bool { url := DATA_URL_PREFIX + "/camera/rule/deleteGroup" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false - } client := NewClient(WithNodes(netNode)) body, err := client.DoDeleteRequest(url, CONTENT_TYPE_JSON, nil,nil) if err != nil { @@ -162,9 +141,6 @@ func (api CameraRuleApi) FindAll() (flag bool,allRules []protomsg.CameraAndRules) { url := DATA_URL_PREFIX + "/camera/rule/findAll" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false,nil - } client := NewClient(WithNodes(netNode)) body, err := client.DoGetRequest(url, nil,nil) if err != nil { @@ -196,9 +172,6 @@ func (api CameraRuleApi) FindAllTaskById(camId string) (flag bool, crs protomsg.CameraAndRules) { url := DATA_URL_PREFIX + "/camera/rule/findAllTaskById" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false,crs - } client := NewClient(WithNodes(netNode)) paramQuery := map[string]string { "cameraId": camId, @@ -233,11 +206,11 @@ func (api CameraRuleApi) ExistRunningTask(camId string) bool { url := DATA_URL_PREFIX + "/camera/rule/existRunningTask" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false - } client := NewClient(WithNodes(netNode)) - body, err := client.DoGetRequest(url, nil,nil) + paramQuery := map[string]string { + "cameraId": camId, + } + body, err := client.DoGetRequest(url, paramQuery,nil) if err != nil { logPrint(err) return false @@ -251,15 +224,48 @@ if !res.Success { return false } - return res.Data.(bool) + if v,ok := res.Data.(bool);ok { + return v + } + return false +} + + +func (api CameraRuleApi) FindAllCameraLink() (b bool, list []protomsg.CameraLink) { + url := DATA_URL_PREFIX + "/camera/findAllCameraLink" + netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) + client := NewClient(WithNodes(netNode)) + body, err := client.DoGetRequest(url, nil,nil) + if err != nil { + logPrint(err) + return false, nil + } + + var res Result + if err = json.Unmarshal(body, &res); err != nil { + logPrint(err) + return false, nil + } + if !res.Success { + return false, nil + } else { + bts, e := json.Marshal(res.Data) + if e != nil { + logPrint(e) + return false, nil + } + err = json.Unmarshal(bts, &list) + if err == nil { + return true, list + } else { + return false ,nil + } + } } func (api CameraRuleApi) FindLinksByCameraIds(camIds []string) (b bool,linkList []protomsg.CameraLink) { - url := DATA_URL_PREFIX + "/camera/rule/existRunningTask" + url := DATA_URL_PREFIX + "/camera/rule/findLinksByCameraIds" netNode := getNetNode(url2Topic(Topic_Scene_Service, url)) - if netNode == nil { - return false, nil - } client := NewClient(WithNodes(netNode)) reqBody := map[string]interface{}{ "cameraIds": camIds, @@ -283,7 +289,7 @@ return false, nil } err = json.Unmarshal(bts, &linkList) - if err != nil { + if err == nil { return true, linkList } } -- Gitblit v1.8.0