From e2c3330eb73157ece61f487e6aa96e222fac63c8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 04 六月 2021 15:45:30 +0800
Subject: [PATCH] fix

---
 syssetApi.go |  205 +++++++++-----------------------------------------
 1 files changed, 38 insertions(+), 167 deletions(-)

diff --git a/syssetApi.go b/syssetApi.go
index 236e5dc..9011bdb 100644
--- a/syssetApi.go
+++ b/syssetApi.go
@@ -1,7 +1,8 @@
-package dbapi
+package bhomedbapi
 
 import (
 	"basic.com/pubsub/protomsg.git"
+	"basic.com/valib/bhshmq.git/proto/source/bhome_msg"
 	"encoding/json"
 )
 
@@ -13,9 +14,6 @@
 func (api SysSetApi) GetServerInfo() (flag bool,sysconf protomsg.LocalConfig){
 	url := DATA_URL_PREFIX + "/sysset/getServerInfo"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,sysconf
-	}
 	client := NewClient(WithNodes(netNode))
 
 	body, err := client.DoGetRequest(url, nil, nil)
@@ -40,137 +38,10 @@
 		}
 	}
 }
-//淇濆瓨杞閰嶇疆
-func (api SysSetApi) SavePollPeriod(period int) (bool,interface{}){
-	url := DATA_URL_PREFIX + "/pollConfig/savePollPeriod"
-	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
-	client := NewClient(WithNodes(netNode))
-	paramBody := make(map[string]interface{},0)
-	paramBody["period"] = period
-	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 {
-		logPrint(err)
-		return false,nil
-	}
-
-	return res.Success,res.Data
-}
-
-func (api SysSetApi) SavePollDelay(delay int) (bool,interface{}){
-	url := DATA_URL_PREFIX + "/pollConfig/savePollDelay"
-	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
-	client := NewClient(WithNodes(netNode))
-	paramBody := make(map[string]interface{},0)
-	paramBody["delay"] = delay
-	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 {
-		logPrint(err)
-		return false,nil
-	}
-
-	return res.Success,res.Data
-}
-
-//鑾峰彇杞閰嶇疆
-func (api SysSetApi) GetPollConfig() (flag bool,config protomsg.PollConfig) {
-	url := DATA_URL_PREFIX + "/pollConfig/getPollConfig"
-	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,config
-	}
-	client := NewClient(WithNodes(netNode))
-
-	body, err := client.DoGetRequest(url, nil, nil)
-	if err != nil {
-		return false, config
-	}
-
-	var res Result
-	if err = json.Unmarshal(body, &res); err != nil {
-		return false, config
-	}
-
-	b, err := json.Marshal(res.Data)
-	if err !=nil {
-		return false,config
-	} else {
-		err = json.Unmarshal(b, &config)
-		if err !=nil {
-			return false,config
-		} else {
-			return true,config
-		}
-	}
-}
-
-//鍒囨崲杞鏄惁寮�鍚拰鍏抽棴
-func (api SysSetApi) UpdatePollEnable(enable bool) bool{
-	url := DATA_URL_PREFIX + "/pollConfig/updateEnable"
-	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false
-	}
-	client := NewClient(WithNodes(netNode))
-	paramBody :=make(map[string]interface{},0)
-	paramBody["enable"] = enable
-	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 SysSetApi) UpdateChannelCount(pollChannelCount int, videoChannelCount int) bool{
-	url := DATA_URL_PREFIX + "/pollConfig/updateChannelCount"
-	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false
-	}
-	client := NewClient(WithNodes(netNode))
-	paramBody :=make(map[string]interface{},0)
-	paramBody["pollChannelCount"] = pollChannelCount
-	paramBody["videoChannelCount"] = videoChannelCount
-	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 SysSetApi) AlarmEdit(paramBody map[string]interface{}) (bool,interface{}){
 	url := DATA_URL_PREFIX + "/sysset/alarmEdit"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
 	if err != nil {
@@ -188,9 +59,6 @@
 func (api SysSetApi) VideoLenShow() (bool,interface{}){
 	url := DATA_URL_PREFIX + "/sysset/videoLenShow"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 
 	body, err := client.DoGetRequest(url, nil, nil)
@@ -208,9 +76,6 @@
 func (api SysSetApi) VideoLenEdit(maxVideoLen string,minVideoLen string) (bool,interface{}){
 	url := DATA_URL_PREFIX + "/sysset/videoLenEdit"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 	paramBody :=make(map[string]interface{},0)
 	paramBody["max_video_len"] = maxVideoLen
@@ -231,9 +96,6 @@
 func (api SysSetApi) SaveServerInfo(paramBody map[string]interface{}) (bool,interface{}){
 	url := DATA_URL_PREFIX + "/sysset/saveServerInfo"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 	body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
 	if err != nil {
@@ -251,9 +113,6 @@
 func (api SysSetApi) Gb28181ConfigShow() (bool,interface{}){
 	url := DATA_URL_PREFIX + "/sysset/gb28181ConfigShow"
 	netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 
 	body, err := client.DoGetRequest(url, nil, nil)
@@ -271,9 +130,6 @@
 func (api SysSetApi) Gb28181ConfigEdit(paramBody map[string]interface{}) (bool,interface{}){
 	url := DATA_URL_PREFIX + "/sysset/gb28181ConfigEdit"
 	netNode := getNetNode(url2Topic(Topic_Gb28181_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 	body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
 	if err != nil {
@@ -292,9 +148,6 @@
 func (api SysSetApi) GetRemoteFullServerInfo(headers map[string]string) (flag bool,d interface{}){
 	url := DATA_URL_PREFIX + "/sysset/getDevInfo"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 
 	body, err := client.DoGetRequest(url, nil, headers)
@@ -313,9 +166,6 @@
 func (api SysSetApi) GetClockInfo(headers map[string]string) (flag bool,d interface{}){
 	url := DATA_URL_PREFIX + "/sysset/clockInfo"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 
 	body, err := client.DoGetRequest(url, nil, headers)
@@ -334,9 +184,6 @@
 func (api SysSetApi) TestNTPServer(query map[string]string,headers map[string]string) (flag bool,d interface{}){
 	url := DATA_URL_PREFIX + "/sysset/ntpTest"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 
 	body, err := client.DoGetRequest(url, query, headers)
@@ -355,9 +202,6 @@
 func (api SysSetApi) SetSysClock(paramBody map[string]interface{},headers map[string]string) (flag bool,d interface{}){
 	url := DATA_URL_PREFIX + "/sysset/updateClock"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 
 	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON,paramBody,nil, headers)
@@ -376,9 +220,6 @@
 func (api SysSetApi) GetSysInfo(headers map[string]string) (flag bool,d interface{}){
 	url := DATA_URL_PREFIX + "/sysset/sysinfo"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 
 	body, err := client.DoGetRequest(url, nil, headers)
@@ -397,9 +238,6 @@
 func (api SysSetApi) GetResourceConfig() (flag bool,rc protomsg.ResourceConfig){
 	url := DATA_URL_PREFIX + "/sysset/getResourceConfig"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false, rc
-	}
 	client := NewClient(WithNodes(netNode))
 
 	body, err := client.DoGetRequest(url, nil, nil)
@@ -427,9 +265,6 @@
 func (api SysSetApi) SaveResourceConfig(paramBody map[string]interface{}) (flag bool,d interface{}){
 	url := DATA_URL_PREFIX + "/sysset/saveResourceConfig"
 	netNode := getNetNode(url2Topic(Topic_System_Service, url))
-	if netNode == nil {
-		return false,nil
-	}
 	client := NewClient(WithNodes(netNode))
 
 	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON,paramBody,nil, nil)
@@ -443,4 +278,40 @@
 	}
 
 	return res.Success,res.Data
+}
+
+//鎺у埗鏈満reboot
+func (api SysSetApi) RebootOS() (bool,interface{}) {
+	url := DATA_URL_PREFIX + "/sysset/reboot"
+	netNode := getNetNode(url2Topic(Topic_System_Service, url))
+	client := NewClient(WithNodes(netNode))
+
+	body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON,nil,nil, 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 SysSetApi) SyncDevToManager(addr []bhome_msg.BHAddress, paramBody map[string]interface{}) (bool, interface{}) {
+	url := DATA_URL_PREFIX + "/device/syncDevToManager"
+	client := NewClient(WithNodes(addr))
+
+	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 {
+		return false, nil
+	}
+
+	return res.Success,res.Data
 }
\ No newline at end of file

--
Gitblit v1.8.0