From 5bc1834adc6d6fe1b49f6cf54e2383d69311b113 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 21 七月 2020 09:47:18 +0800
Subject: [PATCH] update protomsg,sdk active add sdkId arg and fix camera show
---
controllers/camera.go | 2 ++
go.sum | 4 ++--
service/SdkInstall.go | 25 +++++++++++++------------
go.mod | 2 +-
controllers/sdk.go | 10 ++++++----
5 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index 56a2ad4..fc7a82c 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -165,6 +165,8 @@
//2019-11-02鏂板闇�姹傦紝鏄剧ず姣忎釜鎽勫儚鏈虹殑澶勭悊鏈嶅姟鍣ㄤ俊鎭�,褰掑睘鐨勮妭鐐规湇鍔″櫒鍚嶇О
m := util.Struct2Map(camera)
m["runServerName"] = ""
+ m["voiceEnable"] = camera.VoiceEnable
+ m["voiceId"] = camera.VoiceId
m["resolution_width"] = camera.ResolutionWidth
m["resolution_height"] = camera.ResolutionHeight
//鎽勫儚鏈哄垎杈ㄧ巼
diff --git a/controllers/sdk.go b/controllers/sdk.go
index d236603..d51c02c 100644
--- a/controllers/sdk.go
+++ b/controllers/sdk.go
@@ -327,19 +327,21 @@
// @Produce json
// @Tags 绠楁硶
// @Param code query string true "婵�娲荤爜"
+// @Param sdkId query string true "绠楁硶id"
// @Success 200 {string} json "{"code":200, msg:"", success:true}"
// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
// @Router /data/api-v/sdk/active [get]
func (sc SdkController) Active(c *gin.Context) {
cod := c.GetString("code")
- if cod == "" {
- util.ResponseFormat(c, code.RequestParamError, "婵�娲荤爜涓嶈兘涓虹┖")
+ sdkId := c.GetString("sdkId")
+ if cod == "" || sdkId == "" {
+ util.ResponseFormat(c, code.RequestParamError, "婵�娲荤爜鍜岀畻娉昳d涓嶈兘涓虹┖")
return
}
var sv service.SdkInstallService
- err := sv.Active(cod)
+ d, err := sv.Active(cod, sdkId)
if err == nil {
- util.ResponseFormat(c,code.Success, "婵�娲绘垚鍔�")
+ util.ResponseFormat(c,code.Success, d)
} else {
util.ResponseFormat(c,code.ComError, err.Error())
}
diff --git a/go.mod b/go.mod
index 15e1a60..a411eb3 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48
basic.com/pubsub/esutil.git v0.0.0-20200114073900-ad9de8362777
- basic.com/pubsub/protomsg.git v0.0.0-20200714032739-19aa932d8628 // indirect
+ basic.com/pubsub/protomsg.git v0.0.0-20200717053920-8abba8d57185 // indirect
basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
basic.com/valib/godraw.git v0.0.0-20191122082247-26e9987cd183
diff --git a/go.sum b/go.sum
index d83add9..420ebc4 100644
--- a/go.sum
+++ b/go.sum
@@ -10,8 +10,8 @@
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
basic.com/pubsub/esutil.git v0.0.0-20200114073900-ad9de8362777 h1:gTeuhepfLgOchD6bqydsGGV6KCj/UaseQQgo4DFyhGQ=
basic.com/pubsub/esutil.git v0.0.0-20200114073900-ad9de8362777/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
-basic.com/pubsub/protomsg.git v0.0.0-20200714032739-19aa932d8628 h1:f3pB0TavNjC5nmxg/FAIFBnVd373MoRhp7+l8yo3BT0=
-basic.com/pubsub/protomsg.git v0.0.0-20200714032739-19aa932d8628/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20200717053920-8abba8d57185 h1:+VNHJFYU7Y3fYP7nWC3r/1FOGZIo/rVG+RmClqbAW1k=
+basic.com/pubsub/protomsg.git v0.0.0-20200717053920-8abba8d57185/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe h1:uh3u7DuSOw6AwzvPC1EM19sw1Skks1EUJddcbHDKI9M=
basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe/go.mod h1:y+h7VUnoSQ3jOtf2K3twXNA8fYDfyUsifSswcyKLgNw=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
diff --git a/service/SdkInstall.go b/service/SdkInstall.go
index dee8b18..edd704b 100644
--- a/service/SdkInstall.go
+++ b/service/SdkInstall.go
@@ -22,16 +22,17 @@
}
-func (sv SdkInstallService) Active(cod string) error {
+func (sv SdkInstallService) Active(cod string, sdkId string) (interface{},error) {
//浣跨敤婵�娲荤爜婵�娲荤畻娉�
url := "http://"+config.ShopConf.Url+"/data/api-s/sdk/activeByAINode"
machineCode := licence.GetMachineCode()
if machineCode == "" {
logger.Debug("鑾峰彇鏈哄櫒鐮佸け璐�")
- return errors.New("鑾峰彇鏈哄櫒鐮佸け璐�")
+ return nil, errors.New("鑾峰彇鏈哄櫒鐮佸け璐�")
}
paramBody := map[string]interface{}{
"code": cod,
+ "sdkId": sdkId,
"machineCode": machineCode,
}
header := map[string]string {
@@ -40,19 +41,19 @@
respBody, err := reqUtil.DoPostRequest(url, reqUtil.CONTENT_TYPE_JSON, paramBody, nil, header)
if err != nil {
logger.Debug("DoPostRequest err:", err)
- return err
+ return nil, err
}
var res dbapi.Result
if err = json.Unmarshal(respBody, &res); err != nil {
logger.Debug("unmarshal err:", err)
- return err
+ return nil, err
}
if !res.Success {
logger.Debug("res.Data:", res.Data)
- return errors.New("璇锋眰鍟嗗煄澶辫触")
+ return nil, errors.New("璇锋眰鍟嗗煄澶辫触")
}
- return nil
+ return res.Data, nil
}
//绠楁硶瀹夎鍖呭畨瑁�
@@ -281,26 +282,26 @@
}
} else {
logger.Debug("鍙嶅簭鍒楀寲绠楁硶瀹氫箟淇℃伅澶辫触")
- return false, errors.New("涓嶆槸姝ｇ‘鐨勫畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
} else {
logger.Debug("璇诲彇绠楁硶瀹氫箟淇℃伅澶辫触")
- return false, errors.New("涓嶆槸姝ｇ‘鐨勫畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
} else {
logger.Debug("绠楁硶瀹氫箟淇℃伅涓㈠け")
- return false, errors.New("涓嶆槸姝ｇ‘鐨勭畻娉曞畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
} else {
logger.Debug("鍙嶅簭鍒楀寲鎺堟潈淇℃伅澶辫触")
- return false, errors.New("涓嶆槸姝ｇ‘鐨勭畻娉曞畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
} else {
logger.Debug("璇诲彇鎺堟潈鏂囦欢澶辫触")
- return false, errors.New("涓嶆槸姝ｇ‘鐨勭畻娉曞畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
} else {
- return false, errors.New("涓嶆槸姝ｇ‘鐨勭畻娉曞畨瑁呭寘鏂囦欢")
+ return false, errors.New("閿欒鐨勫畨瑁呭寘")
}
return true, nil
--
Gitblit v1.8.0