From 7634a28117e94e3031251bbffa21f843acb196cb Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 13 六月 2019 14:14:24 +0800
Subject: [PATCH] fix bugs
---
cameraApi.go | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 209 insertions(+), 6 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index c2a742f..22097b2 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -8,26 +8,72 @@
type CameraApi struct{}
+func (api CameraApi) CameraAdd(paramBody map[string]interface{}) bool {
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/add"
+ client := NewClient()
+ body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON,paramBody,nil,nil)
+ if err != nil {
+ return false
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false
+ }
+ return res.Success
+}
+
+func (api CameraApi) CameraUpdate(paramBody map[string]interface{}) bool {
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/update"
+ client := NewClient()
+ body, err := client.DoPutRequest(url,CONTENT_TYPE_JSON,paramBody,nil)
+ if err != nil {
+ return false
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false
+ }
+ return res.Success
+}
+
+func (api CameraApi) CameraDelete(cid string) bool {
+ url := BASIC_URL + DATA_URL_PREFIX + "/camera/delete/"+cid
+ client := NewClient()
+ paramMap := make(map[string]string,0)
+ paramMap["cid"] = cid
+ body, err := client.DoDeleteRequest(url,CONTENT_TYPE_FORM,nil,paramMap)
+ if err != nil {
+ return false
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false
+ }
+ return res.Success
+}
+
//閫氳繃cameraId鑾峰彇鎽勫儚鏈轰俊鎭�
-func (api CameraApi) GetCameraById(cameraId string) (result protomsg.Camera, err error) {
+func (api CameraApi) GetCameraById(cameraId string) (camera protomsg.Camera, err error) {
url := BASIC_URL + DATA_URL_PREFIX + "/camera/show/" + cameraId
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return result, err
+ return camera, err
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
- return result,err
+ return camera,err
}
bytes, _ := json.Marshal(res.Data)
- err = json.Unmarshal(bytes, &result)
+ err = json.Unmarshal(bytes, &camera)
- return result, err
+ return camera, err
}
func (api CameraApi) FindAll() (cameras []protomsg.Camera) {
@@ -51,6 +97,7 @@
return cameras
}
+//鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
func (api CameraApi) FindAllCameraAndTask() (cameraTasks []protomsg.CameraAndTaskInfo){
url := BASIC_URL + DATA_URL_PREFIX + "/camera/queryCameraAndTaskInfo"
client := NewClient()
@@ -70,4 +117,160 @@
err = json.Unmarshal(bytes, &cameraTasks)
return cameraTasks
+}
+
+func (api CameraApi) SaveCameraPolygon(paramBody map[string]interface{}) (bool,interface{}) {
+ url := BASIC_URL + DATA_URL_PREFIX + "/polygon/save"
+ 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
+}
+
+func (api CameraApi) DeleteCameraPolygon(id string) (bool,interface{}){
+ url := BASIC_URL + DATA_URL_PREFIX + "/polygon/delete"
+ client := NewClient()
+ paramQuery := make(map[string]string,0)
+ paramQuery["id"]=id
+ 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
+ }
+ return res.Success,res.Data
+}
+
+func (api CameraApi) FindPolygonsByCameraId(cameraId string) (bool,interface{}) {
+ url := BASIC_URL + DATA_URL_PREFIX + "/polygon/findByCameraId"
+ client := NewClient()
+ paramQuery := make(map[string]string,0)
+ paramQuery["cameraId"] = cameraId
+ 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
+ }
+ return true,res.Data
+}
+
+//鏂板鎴栨洿鏂版椂闂磋鍒�
+func (api CameraApi) SaveCameraTimerule(paramBody map[string]interface{}) (bool,interface{}) {
+ url := BASIC_URL + DATA_URL_PREFIX + "/cameraTimerule/save"
+ 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
+}
+
+func (api CameraApi) DeleteCameraTimerule (id string) bool {
+ url := BASIC_URL + DATA_URL_PREFIX + "/cameraTimerule/delete"
+ client := NewClient()
+ paramQuery := make(map[string]string,0)
+ paramQuery["id"]=id
+ body, err := client.DoGetRequest(url, paramQuery, nil)
+ if err != nil {
+ return false
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false
+ }
+ return res.Success
+}
+
+//鏍规嵁鎽勫儚鏈篿d鏌ユ壘鎵�鏈夌殑鏃堕棿瑙勫垯
+func (api CameraApi) FindAllTimeRules() (flag bool,data interface{}) {
+ url := BASIC_URL + DATA_URL_PREFIX + "/cameraTimerule/findAll"
+ client := NewClient()
+ body, err := client.DoGetRequest(url, nil, nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false,nil
+ }
+ return true,res.Data
+}
+
+// @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()
+ paramQuery :=make(map[string]string,0)
+ paramQuery["polygonId"] = polygonId
+ paramQuery["defence_state"]=state
+ 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
+ }
+ 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()
+ paramQuery :=make(map[string]string,0)
+ paramQuery["cameraId"] = cameraId
+ paramQuery["defence_state"]=state
+ 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
+ }
+ return true,res.Data
}
\ No newline at end of file
--
Gitblit v1.8.0