From 5a764f66e05e0a1b53bd6d2fad10e31ad5144db3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 02 三月 2020 18:41:58 +0800
Subject: [PATCH] fix updateProgress
---
syssetApi.go | 192 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 177 insertions(+), 15 deletions(-)
diff --git a/syssetApi.go b/syssetApi.go
index c77f93f..f5260c4 100644
--- a/syssetApi.go
+++ b/syssetApi.go
@@ -3,15 +3,29 @@
import (
"basic.com/pubsub/protomsg.git"
"encoding/json"
- "fmt"
+ "strconv"
)
type SysSetApi struct {
+ Ip string
+ Port int
+}
+func (api SysSetApi) getBasicUrl() string {
+ if api.Ip == "" {
+ return BASIC_URL
+ }
+ if api.Ip == "" {
+ api.Ip = DEFAULT_IP
+ }
+ if api.Port == 0 {
+ api.Port = DEFAULT_PORT
+ }
+ return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
}
//鑾峰彇鏈嶅姟鍣ㄦ湰鏈洪厤缃俊鎭�
func (api SysSetApi) GetServerInfo() (flag bool,sysconf protomsg.LocalConfig){
- url := BASIC_URL + DATA_URL_PREFIX + "/sysset/getServerInfo"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/getServerInfo"
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
@@ -38,7 +52,7 @@
}
//淇濆瓨杞閰嶇疆
func (api SysSetApi) SavePollPeriod(period int) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/pollConfig/savePollPeriod"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/pollConfig/savePollPeriod"
client := NewClient()
paramBody := make(map[string]interface{},0)
paramBody["period"] = period
@@ -49,7 +63,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -57,7 +71,7 @@
}
func (api SysSetApi) SavePollDelay(delay int) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/pollConfig/savePollDelay"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/pollConfig/savePollDelay"
client := NewClient()
paramBody := make(map[string]interface{},0)
paramBody["delay"] = delay
@@ -68,7 +82,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -77,7 +91,7 @@
//鑾峰彇杞閰嶇疆
func (api SysSetApi) GetPollConfig() (flag bool,config protomsg.PollConfig) {
- url := BASIC_URL + DATA_URL_PREFIX + "/pollConfig/getPollConfig"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/pollConfig/getPollConfig"
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
@@ -105,7 +119,7 @@
//鍒囨崲杞鏄惁寮�鍚拰鍏抽棴
func (api SysSetApi) UpdatePollEnable(enable bool) bool{
- url := BASIC_URL + DATA_URL_PREFIX + "/pollConfig/updateEnable"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/pollConfig/updateEnable"
client := NewClient()
paramBody :=make(map[string]interface{},0)
paramBody["enable"] = enable
@@ -122,8 +136,27 @@
return res.Success
}
+func (api SysSetApi) UpdateChannelCount(pollChannelCount int, videoChannelCount int) bool{
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/pollConfig/updateChannelCount"
+ client := NewClient()
+ 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 := BASIC_URL + DATA_URL_PREFIX + "/sysset/alarmEdit"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/alarmEdit"
client := NewClient()
body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
if err != nil {
@@ -139,7 +172,7 @@
}
func (api SysSetApi) VideoLenShow() (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/sysset/videoLenShow"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/videoLenShow"
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
@@ -155,7 +188,7 @@
}
func (api SysSetApi) VideoLenEdit(maxVideoLen string,minVideoLen string) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/sysset/videoLenEdit"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/videoLenEdit"
client := NewClient()
paramBody :=make(map[string]interface{},0)
paramBody["max_video_len"] = maxVideoLen
@@ -174,7 +207,7 @@
}
func (api SysSetApi) SaveServerInfo(paramBody map[string]interface{}) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/sysset/saveServerInfo"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/saveServerInfo"
client := NewClient()
body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
if err != nil {
@@ -190,7 +223,7 @@
}
func (api SysSetApi) Gb28181ConfigShow() (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/sysset/gb28181ConfigShow"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/gb28181ConfigShow"
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
@@ -205,8 +238,8 @@
return res.Success,res.Data
}
-func (api SysSetApi) VSSLocalSettingEdit(paramBody map[string]interface{}) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/sysset/gb28181ConfigEdit"
+func (api SysSetApi) Gb28181ConfigEdit(paramBody map[string]interface{}) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/gb28181ConfigEdit"
client := NewClient()
body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
if err != nil {
@@ -219,4 +252,133 @@
}
return res.Success,res.Data
+}
+
+
+func (api SysSetApi) GetRemoteFullServerInfo(headers map[string]string) (flag bool,d interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/getDevInfo"
+ client := NewClient()
+
+ body, err := client.DoGetRequest(url, nil, headers)
+ 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) GetClockInfo(headers map[string]string) (flag bool,d interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/clockInfo"
+ client := NewClient()
+
+ body, err := client.DoGetRequest(url, nil, headers)
+ 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) TestNTPServer(query map[string]string,headers map[string]string) (flag bool,d interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/ntpTest"
+ client := NewClient()
+
+ body, err := client.DoGetRequest(url, query, headers)
+ 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) SetSysClock(paramBody map[string]interface{},headers map[string]string) (flag bool,d interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/updateClock"
+ client := NewClient()
+
+ body, err := client.DoPostRequest(url, CONTENT_TYPE_JSON,paramBody,nil, headers)
+ 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) GetSysInfo(headers map[string]string) (flag bool,d interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/sysinfo"
+ client := NewClient()
+
+ body, err := client.DoGetRequest(url, nil, headers)
+ 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) GetResourceConfig() (flag bool,rc protomsg.ResourceConfig){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/getResourceConfig"
+ client := NewClient()
+
+ body, err := client.DoGetRequest(url, nil, nil)
+ if err != nil {
+ return false, rc
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false, rc
+ }
+ b, err := json.Marshal(res.Data)
+ if err !=nil {
+ return false,rc
+ } else {
+ err = json.Unmarshal(b, &rc)
+ if err !=nil {
+ return false,rc
+ } else {
+ return true,rc
+ }
+ }
+}
+
+func (api SysSetApi) SaveResourceConfig(paramBody map[string]interface{}) (flag bool,d interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/sysset/saveResourceConfig"
+ 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 {
+ return false, nil
+ }
+
+ return res.Success,res.Data
}
\ No newline at end of file
--
Gitblit v1.8.0