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

---
 cameraRuleApi.go |  123 ++++++++++++++++------------------------
 1 files changed, 50 insertions(+), 73 deletions(-)

diff --git a/cameraRuleApi.go b/cameraRuleApi.go
index f219df5..ead5089 100644
--- a/cameraRuleApi.go
+++ b/cameraRuleApi.go
@@ -2,51 +2,46 @@
 
 import (
 	"basic.com/pubsub/protomsg.git"
-	"encoding/json"
+	jsoniter "github.com/json-iterator/go"
 )
 
-type CameraRuleApi struct{
-
+type CameraRuleApi struct {
 }
 
-func (api CameraRuleApi) FindByCameraId(cameraId string) (bool,interface{}) {
+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 {
+	param := map[string]string{
 		"cameraId": cameraId,
 	}
-	body, err := client.DoGetRequest(url,param,nil)
+	body, err := client.DoGetRequest(url, param, nil)
 	if err != nil {
 		logPrint(err)
-		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
 }
 
-func (api CameraRuleApi) Save(reqBody map[string]interface{}) (bool,interface{}) {
+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)
+	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
 	if err != nil {
 		logPrint(err)
 		return false, err.Error()
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
 		logPrint("result:", res, "err:", err, "body:", string(body))
 		return false, err.Error()
@@ -57,17 +52,15 @@
 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)
+	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
 	if err != nil {
 		logPrint(err)
 		return false
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
 		logPrint(err)
 		return false
@@ -78,17 +71,15 @@
 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)
+	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
 	if err != nil {
 		logPrint(err)
 		return false, err.Error()
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
 		logPrint(err)
 		return false, err.Error()
@@ -96,23 +87,21 @@
 	return res.Success, res.Data
 }
 
-func (api CameraRuleApi) GetLinkRulesByCameraIds(reqBody map[string]interface{}) (bool,interface{}) {
+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)
+	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
 	if err != nil {
 		logPrint(err)
-		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
 }
@@ -120,17 +109,15 @@
 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)
+	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
 	if err != nil {
 		logPrint(err)
 		return false
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
 		logPrint(err)
 		return false
@@ -141,17 +128,15 @@
 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)
+	body, err := client.DoDeleteRequest(url, CONTENT_TYPE_JSON, nil, nil)
 	if err != nil {
 		logPrint(err)
 		return false
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
 		logPrint(err, "body:", string(body))
 		return false
@@ -159,23 +144,21 @@
 	return res.Success
 }
 
-func (api CameraRuleApi) FindAll() (flag bool,allRules []protomsg.CameraAndRules) {
+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)
+	body, err := client.DoGetRequest(url, nil, nil)
 	if err != nil {
 		logPrint(err)
-		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 {
 		return false, nil
@@ -196,23 +179,21 @@
 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 {
+	paramQuery := map[string]string{
 		"cameraId": camId,
 	}
-	body, err := client.DoGetRequest(url, paramQuery,nil)
+	body, err := client.DoGetRequest(url, paramQuery, nil)
 	if err != nil {
 		logPrint(err)
-		return false,crs
+		return false, crs
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
 		logPrint(err)
-		return false,crs
+		return false, crs
 	}
 	if !res.Success {
 		return false, crs
@@ -233,20 +214,18 @@
 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))
-	paramQuery := map[string]string {
+	paramQuery := map[string]string{
 		"cameraId": camId,
 	}
-	body, err := client.DoGetRequest(url, paramQuery,nil)
+	body, err := client.DoGetRequest(url, paramQuery, nil)
 	if err != nil {
 		logPrint(err)
 		return false
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
 		logPrint(err)
 		return false
@@ -254,24 +233,24 @@
 	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))
-	if netNode == nil {
-		return false, nil
-	}
 	client := NewClient(WithNodes(netNode))
-	body, err := client.DoGetRequest(url, nil,nil)
+	body, err := client.DoGetRequest(url, nil, nil)
 	if err != nil {
 		logPrint(err)
 		return false, nil
 	}
 
 	var res Result
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 	if err = json.Unmarshal(body, &res); err != nil {
 		logPrint(err)
 		return false, nil
@@ -288,32 +267,30 @@
 		if err == nil {
 			return true, list
 		} else {
-			return false ,nil
+			return false, nil
 		}
 	}
 }
 
-func (api CameraRuleApi) FindLinksByCameraIds(camIds []string) (b bool,linkList []protomsg.CameraLink) {
+func (api CameraRuleApi) FindLinksByCameraIds(camIds []string) (b bool, linkList []protomsg.CameraLink) {
 	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,
 	}
 
-	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody,nil, nil)
+	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, reqBody, nil, nil)
 	if err != nil {
 		logPrint(err)
-		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 {
 		bts, err := json.Marshal(res.Data)
@@ -327,4 +304,4 @@
 		}
 	}
 	return false, nil
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0