From 01dfd9dc8de7b19f9dfa4284722e01bbd5837801 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 19 一月 2024 09:10:30 +0800
Subject: [PATCH] replace json to json-iterator
---
cameraApi.go | 227 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 124 insertions(+), 103 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index daf2c02..e0b3e5c 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -2,40 +2,41 @@
import (
"basic.com/pubsub/protomsg.git"
- json "github.com/json-iterator/go"
+ jsoniter "github.com/json-iterator/go"
"strconv"
)
-type CameraApi struct{
-
+type CameraApi struct {
}
-func (api CameraApi) CameraAdd(paramBody map[string]interface{}) (bool,interface{}) {
+func (api CameraApi) CameraAdd(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/add"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON,paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
func (api CameraApi) CameraUpdate(paramBody map[string]interface{}) bool {
url := DATA_URL_PREFIX + "/camera/update"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- body, err := client.DoPutRequest(url,CONTENT_TYPE_JSON,paramBody,nil)
+ body, err := client.DoPutRequest(url, CONTENT_TYPE_JSON, paramBody, nil)
if err != nil {
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false
}
@@ -46,15 +47,16 @@
url := DATA_URL_PREFIX + "/camera/updateSnapshot"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["snapshot"] = snapshot
paramBody["cameraId"] = cameraId
- body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -67,14 +69,15 @@
url := DATA_URL_PREFIX + "/camera/del"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramMap := make(map[string]string,0)
+ paramMap := make(map[string]string, 0)
paramMap["id"] = cid
- body, err := client.DoGetRequest(url,paramMap,nil)
+ body, err := client.DoGetRequest(url, paramMap, nil)
if err != nil {
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
return false
}
@@ -86,7 +89,7 @@
url := DATA_URL_PREFIX + "/camera/show"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"id": cameraId,
}
body, err := client.DoGetRequest(url, paramQuery, nil)
@@ -95,8 +98,9 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return camera,err
+ return camera, err
}
bytes, _ := json.Marshal(res.Data)
@@ -108,33 +112,34 @@
func (api CameraApi) UpdateCameraArea(cameraId string, areaId string) bool {
url := DATA_URL_PREFIX + "/camera/updateCameraArea"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
- client := NewClient(WithNodes(netNode))
- paramBody := map[string]interface{} {
- "cameraId": cameraId,
- "areaId": areaId,
- }
- body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil,nil)
- if err !=nil {
- return false
- }
+ client := NewClient(WithNodes(netNode))
+ paramBody := map[string]interface{}{
+ "cameraId": cameraId,
+ "areaId": areaId,
+ }
+ 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 {
- return false
- }
+ var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false
+ }
- return res.Success
+ return res.Success
}
func (api CameraApi) FindAll(cameraName string, runType string, cameraId string, areaId string) (cameras []protomsg.Camera) {
url := DATA_URL_PREFIX + "/camera/showAll"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"cameraName": cameraName,
- "runType": runType,
- "cameraId": cameraId,
- "areaId": areaId,
+ "runType": runType,
+ "cameraId": cameraId,
+ "areaId": areaId,
}
body, err := client.DoGetRequest(url, paramQuery, nil)
@@ -143,6 +148,7 @@
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return nil
@@ -154,27 +160,28 @@
return cameras
}
-func (api CameraApi) GetAllCamerasByServer(serverId string,cameraName string) (b bool,cams []protomsg.Camera) {
+func (api CameraApi) GetAllCamerasByServer(serverId string, cameraName string) (b bool, cams []protomsg.Camera) {
url := DATA_URL_PREFIX + "/camera/getAllCamerasByServer"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := make(map[string]string,0)
+ paramQuery := make(map[string]string, 0)
paramQuery["serverId"] = serverId
paramQuery["cameraName"] = cameraName
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
dataBytes, _ := json.Marshal(res.Data)
- if err := json.Unmarshal(dataBytes, &cams);err !=nil {
- return false,nil
+ if err := json.Unmarshal(dataBytes, &cams); err != nil {
+ return false, nil
}
- return res.Success,cams
+ return res.Success, cams
}
////鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
@@ -188,7 +195,8 @@
// }
//
// var res Result
-// if err = json.Unmarshal(body, &res); err != nil {
+// var json = jsoniter.ConfigCompatibleWithStandardLibrary
+// if err = json.Unmarshal(body, &res); err != nil {
// logPrint(err)
// return nil
// }
@@ -201,196 +209,205 @@
//鏍规嵁杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
//runType(0:鑾峰彇杞鍒楄〃锛�1锛氳幏鍙栧疄鏃跺垪琛�)
-func (api CameraApi) GetCamerasByRunType(runType int,cameraName string)(flag bool,cameras []protomsg.Camera){
+func (api CameraApi) GetCamerasByRunType(runType int, cameraName string) (flag bool, cameras []protomsg.Camera) {
url := DATA_URL_PREFIX + "/camera/getCamerasByRunType"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := make(map[string]string,2)
- paramQuery["runType"]=strconv.Itoa(runType)
+ paramQuery := make(map[string]string, 2)
+ paramQuery["runType"] = strconv.Itoa(runType)
paramQuery["cameraName"] = cameraName
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
b, err := json.Marshal(res.Data)
- if err !=nil {
+ if err != nil {
logPrint("unmarshal GetCamerasByRunType.result err")
- return false,nil
+ return false, nil
}
- if err = json.Unmarshal(b, &cameras);err !=nil {
- return false,nil
+ if err = json.Unmarshal(b, &cameras); err != nil {
+ return false, nil
} else {
- return true,cameras
+ return true, cameras
}
}
-func (api CameraApi) UpdateRunEnable(cameraId string,runEnable bool) (bool,interface{}){
+func (api CameraApi) UpdateRunEnable(cameraId string, runEnable bool) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/updateRunEnable"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["cameraId"] = cameraId
paramBody["runEnable"] = runEnable
- body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api CameraApi) UpdateIsRunningState(cameraId string,isRunning bool) (bool,interface{}){
+func (api CameraApi) UpdateIsRunningState(cameraId string, isRunning bool) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/updateIsRunningState"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["cameraId"] = cameraId
paramBody["isRunning"] = isRunning
- body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api CameraApi) UpdateIsRunningAll(cameraIds []string) (bool,interface{}){
+func (api CameraApi) UpdateIsRunningAll(cameraIds []string) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/updateIsRunningAll"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody :=make(map[string]interface{},0)
+ paramBody := make(map[string]interface{}, 0)
paramBody["cameraIds"] = cameraIds
- body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
//鎵归噺鍒囨崲鎽勫儚鏈鸿疆璇㈡垨瀹炴椂鐘舵��
-func (api CameraApi) ChangeRunType(paramBody map[string]interface{}) (bool,interface{}){
+func (api CameraApi) ChangeRunType(paramBody map[string]interface{}) (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/changeRunType"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
- return res.Success,res.Data
+ return res.Success, res.Data
}
-func (api CameraApi) StatisticRunInfo() (bool,interface{}){
+func (api CameraApi) StatisticRunInfo() (bool, interface{}) {
url := DATA_URL_PREFIX + "/camera/statisticRunInfo"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
- return true,res.Data
+ return true, res.Data
}
-func (api CameraApi) FindAllCameraLink() (b bool,list []protomsg.CameraLink){
+func (api CameraApi) FindAllCameraLink() (b bool, list []protomsg.CameraLink) {
url := DATA_URL_PREFIX + "/camera/findAllCameraLink"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
dataBytes, _ := json.Marshal(res.Data)
- if err := json.Unmarshal(dataBytes, &list);err !=nil {
- return false,nil
+ if err := json.Unmarshal(dataBytes, &list); err != nil {
+ return false, nil
}
- return true,list
+ return true, list
}
func (api CameraApi) FindOnMap(isOnMap bool, floor int, cameraName string) (b bool, cams []protomsg.Camera) {
url := DATA_URL_PREFIX + "/camera/findOnMap"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody:= map[string]interface{}{
+ paramBody := map[string]interface{}{
"isOnMap": isOnMap,
"floor": floor,
"cameraName": cameraName,
}
- body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
- return false,nil
+ return false, nil
}
if res.Success {
- if bts, e := json.Marshal(res.Data);e == nil {
- if e = json.Unmarshal(bts, &cams);e ==nil {
+ if bts, e := json.Marshal(res.Data); e == nil {
+ if e = json.Unmarshal(bts, &cams); e == nil {
return true, cams
}
}
}
- return false,nil
+ return false, nil
}
func (api CameraApi) UpdatePos(id string, floor int, longitude float32, latitude float32) bool {
url := DATA_URL_PREFIX + "/camera/updatePos"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramBody:= map[string]interface{}{
- "id": id,
- "floor": floor,
+ paramBody := map[string]interface{}{
+ "id": id,
+ "floor": floor,
"longitude": longitude,
- "latitude": latitude,
+ "latitude": latitude,
}
- body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -405,12 +422,13 @@
client := NewClient(WithNodes(netNode))
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
return res.Success, res.Data
}
@@ -419,17 +437,18 @@
url := DATA_URL_PREFIX + "/camera/coord"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- paramQuery := map[string]string {
+ paramQuery := map[string]string{
"cameraId": cameraId,
}
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
- return false,nil
+ return false, nil
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
- return false,nil
+ return false, nil
}
return res.Success, res.Data
}
@@ -438,12 +457,13 @@
url := DATA_URL_PREFIX + "/camera/updateCoord"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
@@ -456,12 +476,13 @@
url := DATA_URL_PREFIX + "/camera/saveNotExistOrUpdate"
netNode := getNetNode(url2Topic(Topic_Camera_Service, url))
client := NewClient(WithNodes(netNode))
- body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
return false
}
var res Result
+ var json = jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(body, &res); err != nil {
logPrint(err)
return false
--
Gitblit v1.8.0