From 590c075d30a61f9ecb380a908860d6c827526e09 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 22 八月 2019 16:08:24 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.1.14/r/dbapi
---
cameraApi.go | 158 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 137 insertions(+), 21 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 22097b2..8de727a 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -4,6 +4,7 @@
"basic.com/pubsub/protomsg.git"
"encoding/json"
"fmt"
+ "strconv"
)
type CameraApi struct{}
@@ -38,8 +39,28 @@
return res.Success
}
+func (api CameraApi) UpdateSnapshotUrl(cameraId string, snapshot string) bool {
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/updateSnapshot"
+ client := NewClient()
+ paramBody :=make(map[string]interface{},0)
+ paramBody["snapshot"] = snapshot
+ paramBody["cameraId"] = cameraId
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+ if err != nil {
+ return false
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ fmt.Println(err)
+ return false
+ }
+
+ return res.Success
+}
+
func (api CameraApi) CameraDelete(cid string) bool {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/delete/"+cid
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/del/"+cid
client := NewClient()
paramMap := make(map[string]string,0)
paramMap["cid"] = cid
@@ -153,6 +174,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 +249,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 +261,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 +286,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()
@@ -273,4 +302,91 @@
return false,nil
}
return true,res.Data
+}
+
+//鏍规嵁杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
+//runType(0:鑾峰彇杞鍒楄〃锛�1锛氳幏鍙栧疄鏃跺垪琛�)
+func (api CameraApi) GetCamerasByRunType(runType int,cameraName string)(flag bool,cameras []protomsg.Camera){
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/getCamerasByRunType"
+ client := NewClient()
+ paramQuery := make(map[string]string,0)
+ paramQuery["runType"]=strconv.Itoa(runType)
+ paramQuery["cameraName"] = cameraName
+ body, err := client.DoGetRequest(url, paramQuery, nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false,nil
+ }
+ b, err := json.Marshal(res.Data)
+ if err !=nil {
+ fmt.Println("unmarshal GetCamerasByRunType.result err")
+ return false,nil
+ }
+ if err = json.Unmarshal(b, &cameras);err !=nil {
+ return false,nil
+ } else {
+ return true,cameras
+ }
+}
+
+func (api CameraApi) UpdateRunEnable(cameraId string,runEnable bool) (bool,interface{}){
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/updateRunEnable"
+ client := NewClient()
+ paramBody :=make(map[string]interface{},0)
+ paramBody["cameraId"] = cameraId
+ paramBody["runEnable"] = runEnable
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ fmt.Println(err)
+ return false,nil
+ }
+
+ return res.Success,res.Data
+}
+
+func (api CameraApi) UpdateIsRunningState(cameraId string,isRunning bool) (bool,interface{}){
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/updateIsRunningState"
+ client := NewClient()
+ paramBody :=make(map[string]interface{},0)
+ paramBody["cameraId"] = cameraId
+ paramBody["isRunning"] = isRunning
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ fmt.Println(err)
+ return false,nil
+ }
+
+ return res.Success,res.Data
+}
+
+//鎵归噺鍒囨崲鎽勫儚鏈鸿疆璇㈡垨瀹炴椂鐘舵��
+func (api CameraApi) ChangeRunType(paramBody map[string]interface{}) (bool,interface{}){
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/changeRunType"
+ client := NewClient()
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ fmt.Println(err)
+ return false,nil
+ }
+
+ return res.Success,res.Data
}
\ No newline at end of file
--
Gitblit v1.8.0