From 5ffec2364a4bb3406e9243fc2d2bbeafa3cdd71c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 17 六月 2019 19:57:11 +0800
Subject: [PATCH] fix url
---
cameraApi.go | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 953b035..c5c9a4b 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -1,7 +1,7 @@
package dbapi
import (
- "analyweb/protomsg"
+ "basic.com/pubsub/protomsg.git"
"encoding/json"
"fmt"
)
@@ -153,6 +153,28 @@
return res.Success,res.Data
}
+func (api CameraApi) FindAllPolygons() ([]protomsg.CameraPolygon) {
+ polygons := make([]protomsg.CameraPolygon,0)
+ url := BASIC_URL + DATA_URL_PREFIX + "/polygon/findAll"
+ client := NewClient()
+
+ body, err := client.DoGetRequest(url, nil, nil)
+ if err != nil {
+ return nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return nil
+ }
+ dataBytes, _ := json.Marshal(res.Data)
+ if err := json.Unmarshal(dataBytes, &polygons);err !=nil {
+ return nil
+ }
+
+ return polygons
+}
+
func (api CameraApi) FindPolygonsByCameraId(cameraId string) (bool,interface{}) {
url := BASIC_URL + DATA_URL_PREFIX + "/polygon/findByCameraId"
client := NewClient()
@@ -206,7 +228,7 @@
}
//鏍规嵁鎽勫儚鏈篿d鏌ユ壘鎵�鏈夌殑鏃堕棿瑙勫垯
-func (api CameraApi) FindAllTimeRules() (flag bool,data interface{}) {
+func (api CameraApi) FindAllTimeRules() (flag bool,rules []protomsg.CameraTimerule) {
url := BASIC_URL + DATA_URL_PREFIX + "/cameraTimerule/findAll"
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
@@ -218,18 +240,13 @@
if err = json.Unmarshal(body, &res); err != nil {
return false,nil
}
- return true,res.Data
+ dataBytes, _ := json.Marshal(res.Data)
+ if err := json.Unmarshal(dataBytes, &rules);err !=nil {
+ return false,nil
+ }
+ return true,rules
}
-// @Summary 鏍规嵁澶氳竟褰d鏇存柊甯冩挙闃茬姸鎬�
-// @Description 鏍规嵁澶氳竟褰d鏇存柊甯冩挙闃茬姸鎬�
-// @Produce json
-// @Tags 鎽勫儚鏈哄杈瑰舰
-// @Param polygonId query string true "澶氳竟褰d"
-// @Param defence_state query int true "甯冩挙闃茬姸鎬�(0:鎾ら攢锛�1锛氬竷闃�)"
-// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
-// @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}"
-// @Router /data/api-v/polygon/updateDefenceStateByPolygonId [get]
func (api CameraApi) UpdateDefenceStateByPolygonId(polygonId string,state string) (bool,interface{}){
url := BASIC_URL + DATA_URL_PREFIX + "/polygon/updateDefenceStateByPolygonId"
client := NewClient()
@@ -248,15 +265,6 @@
return true,res.Data
}
-// @Summary 鏍规嵁鎽勫儚鏈篿d鏇存柊甯冩挙闃茬姸鎬�
-// @Description 鏍规嵁鎽勫儚鏈篿d鏇存柊甯冩挙闃茬姸鎬�
-// @Produce json
-// @Tags 鎽勫儚鏈哄杈瑰舰
-// @Param cameraId query string true "鎽勫儚鏈篿d"
-// @Param defence_state query int true "甯冩挙闃茬姸鎬�(0:鎾ら攢锛�1锛氬竷闃�)"
-// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
-// @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}"
-// @Router /data/api-v/polygon/updateDefenceStateByCameraId [get]
func (api CameraApi) UpdateDefenceStateByCameraId(cameraId string,state string) (bool,interface{}){
url := BASIC_URL + DATA_URL_PREFIX + "/polygon/updateDefenceStateByCameraId"
client := NewClient()
--
Gitblit v1.8.0