From 69267f038f87f411edb92daed0ae67d93ca6c5fd Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期五, 02 八月 2019 10:09:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/dbtablesCon.go | 17 ++++
controllers/fileController.go | 2
discovery/server.go | 111 +++++++++++++--------------
service/EnableStatusControlService.go | 19 ++++
controllers/dbtableperson.go | 56 ++++++++++++++
controllers/sdk.go | 17 ++++
router/router.go | 6 +
7 files changed, 172 insertions(+), 56 deletions(-)
diff --git a/controllers/dbtableperson.go b/controllers/dbtableperson.go
index 6d7d5c7..bad1888 100644
--- a/controllers/dbtableperson.go
+++ b/controllers/dbtableperson.go
@@ -60,6 +60,17 @@
params := string(personbytes)
logger.Debug("璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
data, _ := esutil.PutEsDataReq(url, params)
+ //if data["_id"] !=""{
+ // //閫氱煡姣斿杩涚▼缂撳瓨鏇存柊
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTablePerson,
+ // PersonId: personId,
+ // TableId: []string{ dbperson.TableId },
+ // Feature: dbperson.FaceFeature,
+ // Action: protomsg.DbAction_Insert,
+ // })
+ //}
+
//c.JSON(200, changeEsRespData(data, "娣诲姞浜哄憳鎴愬姛"))
result = changeEsRespData(data, "娣诲姞鎴愬姛")
return result
@@ -97,6 +108,23 @@
result := changeEsRespData(data, "淇敼鎴愬姛")
if result["success"].(bool) {
//code.Success.Message = "淇敼搴曞簱浜哄憳鎴愬姛"
+ //if dbperson.Enable == 1 {
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTablePerson,
+ // PersonId: dbperson.Id,
+ // TableId: []string{ dbperson.TableId },
+ // Feature: "",
+ // Action: protomsg.DbAction_Insert,
+ // })
+ //} else {
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTablePerson,
+ // PersonId: dbperson.Id,
+ // TableId: []string{ dbperson.TableId },
+ // Feature: "",
+ // Action: protomsg.DbAction_Delete,
+ // })
+ //}
util.ResponseFormat(c, code.Success, result["data"])
} else {
//code.ServiceInsideError.Message += result["msg"].(string)
@@ -127,6 +155,20 @@
result := changeEsRespData(data, "鍒犻櫎鎴愬姛")
if result["success"].(bool) {
//code.Success.Message = "鍒犻櫎搴曞簱浜哄憳鎴愬姛"
+ //閫氱煡姣斿杩涚▼锛屾浜哄凡鍒犻櫎
+ //dbperArr, e := esApi.Dbpersoninfosbyid([]string{uuid}, config.EsInfo.EsIndex.Dbtablepersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
+ //if e ==nil && len(dbperArr) > 0{
+ // if dbperArr[0].TableId !=""{
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTablePerson,
+ // PersonId: uuid,
+ // TableId: []string{ dbperArr[0].TableId },
+ // Feature: "",
+ // Action: protomsg.DbAction_Delete,
+ // })
+ // }
+ //}
+
util.ResponseFormat(c, code.Success, result["data"])
} else {
//code.ServiceInsideError.Message += result["msg"].(string)
@@ -158,6 +200,20 @@
//result := changeEsRespData(data, "鍒犻櫎鎴愬姛")
if data["error"] == nil {
//code.Success.Message = "鍒犻櫎搴曞簱浜哄憳鎴愬姛"
+ //dbperArr, e := esApi.Dbpersoninfosbyid(uuids, config.EsInfo.EsIndex.Dbtablepersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
+ //if e ==nil && len(dbperArr) > 0{
+ // for _,esPer :=range dbperArr {
+ // if esPer.TableId !=""{
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTablePerson,
+ // PersonId: esPer.Id,
+ // TableId: []string{ esPer.TableId },
+ // Feature: "",
+ // Action: protomsg.DbAction_Delete,
+ // })
+ // }
+ // }
+ //}
util.ResponseFormat(c, code.Success, "鍒犻櫎搴曞簱浜哄憳鎴愬姛")
} else {
//code.ServiceInsideError.Message += result["msg"].(string)
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index e942fc8..cb21510 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -100,6 +100,23 @@
result := changeEsRespData(data, "淇敼鎴愬姛")
if result["success"].(bool) {
//code.Success.Message = "淇敼搴曞簱鎴愬姛"
+ //if dbtable.Enable ==1 {
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTable,
+ // PersonId: "",
+ // TableId: []string{ dbtable.Id },
+ // Feature: "",
+ // Action: protomsg.DbAction_Insert,
+ // })
+ //} else {
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTable,
+ // PersonId: "",
+ // TableId: []string{ dbtable.Id },
+ // Feature: "",
+ // Action: protomsg.DbAction_Delete,
+ // })
+ //}
util.ResponseFormat(c, code.Success, result["data"])
} else {
//code.ServiceInsideError.Message += result["msg"].(string)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 4ca73fa..b3b4406 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -264,6 +264,8 @@
PhoneNum: p.PhoneNum,
Sex: p.Sex,
TableId: p.TableId,
+ BwType: strconv.Itoa(int(p.BwType)),
+ TableName: p.TableName,
})
}
vpE := CompareResult{
diff --git a/controllers/sdk.go b/controllers/sdk.go
index c91b821..b54307c 100644
--- a/controllers/sdk.go
+++ b/controllers/sdk.go
@@ -100,6 +100,23 @@
}
}
+// @Router /data/api-v/sdkArg/getSdkArgs [get]
+func (sc SdkController) GetSdkArgs(c *gin.Context) {
+ sdkId := c.Query("sdkId")
+ scope := c.Query("scope")
+ if sdkId== "" || scope == ""{
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+ var api dbapi.SdkApi
+ b,d := api.GetSdkArgs(sdkId, scope)
+ if b{
+ util.ResponseFormat(c,code.Success,d)
+ } else {
+ util.ResponseFormat(c,code.ComError,"鏌ヨ澶辫触")
+ }
+}
+
// @Summary 鏍规嵁taskId鑾峰彇绠楁硶淇℃伅
// @Description 鏍规嵁taskId鑾峰彇绠楁硶淇℃伅
// @Produce json
diff --git a/discovery/server.go b/discovery/server.go
index cedfc10..4b37c53 100644
--- a/discovery/server.go
+++ b/discovery/server.go
@@ -1,58 +1,57 @@
package discovery
-import (
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/gopherdiscovery.git"
- "fmt"
- "time"
- "webserver/extend/logger"
- "github.com/gogo/protobuf/proto"
-)
-
-const (
- Discovery_Server = "tcp://0.0.0.0:40008"
- Discovery_UrlPubSub = "tcp://0.0.0.0:50008"
-)
-
-//鍚姩discovery鐨剆erver
-var discoveryServer *gopherdiscovery.DiscoveryServer
-var dbChangeChan chan *protomsg.DbChangeMessage
-func StartServer() {
- var clients []string
- var err error
- var (
- defaultOpts = gopherdiscovery.Options{
- SurveyTime: 3 * time.Second,
- //RecvDeadline: 3 * time.Second,
- PollTime: 5 * time.Second,
- }
- )
-
- discoveryServer, err = gopherdiscovery.Server(Discovery_Server, Discovery_UrlPubSub, defaultOpts)
-
- logger.Debug("server: ", discoveryServer)
- logger.Debug("err:",err)
- logger.Debug("clients: ",clients)
-
- dbChangeChan = make(chan *protomsg.DbChangeMessage)
-
- for {
- select {
- case dbMsg := <-dbChangeChan:
- publishMessage(dbMsg)
- }
- }
-}
-
-//骞挎挱鏁版嵁搴撴敼鍙樼殑msg
-func publishMessage(msg *protomsg.DbChangeMessage) {
- sendBytes,err := proto.Marshal(msg)
- if err ==nil{
- discoveryServer.PublishMsg(string(sendBytes))
- }
-}
-
-func AddDbMessage(msg *protomsg.DbChangeMessage) {
- fmt.Println("MSG In")
- dbChangeChan<-msg
-}
\ No newline at end of file
+//import (
+// "basic.com/pubsub/protomsg.git"
+// "basic.com/valib/gopherdiscovery.git"
+// "github.com/gogo/protobuf/proto"
+// "time"
+// "webserver/extend/logger"
+//)
+//
+//const (
+// Discovery_Server = "tcp://0.0.0.0:40008"
+// Discovery_UrlPubSub = "tcp://0.0.0.0:50008"
+//)
+//
+////鍚姩discovery鐨剆erver
+//var discoveryServer *gopherdiscovery.DiscoveryServer
+//var dbChangeChan chan *protomsg.EsPersonCacheChange
+//func StartServer() {
+// var clients []string
+// var err error
+// var (
+// defaultOpts = gopherdiscovery.Options{
+// SurveyTime: 3 * time.Second,
+// //RecvDeadline: 3 * time.Second,
+// PollTime: 5 * time.Second,
+// }
+// )
+//
+// discoveryServer, err = gopherdiscovery.Server(Discovery_Server, Discovery_UrlPubSub, defaultOpts)
+//
+// logger.Debug("server: ", discoveryServer)
+// logger.Debug("err:",err)
+// logger.Debug("clients: ",clients)
+//
+// dbChangeChan = make(chan *protomsg.EsPersonCacheChange)
+//
+// for {
+// select {
+// case dbMsg := <-dbChangeChan:
+// publishMessage(dbMsg)
+// }
+// }
+//}
+//
+////骞挎挱鏁版嵁搴撴敼鍙樼殑msg
+//func publishMessage(msg *protomsg.EsPersonCacheChange) {
+// sendBytes,err := proto.Marshal(msg)
+// if err ==nil{
+// discoveryServer.PublishMsg(string(sendBytes))
+// }
+//}
+//
+//func AddDbMessage(msg *protomsg.EsPersonCacheChange) {
+// logger.Debug("MSG EsPersonCacheChange In")
+// dbChangeChan<-msg
+//}
\ No newline at end of file
diff --git a/router/router.go b/router/router.go
index 56ff1be..85635d0 100644
--- a/router/router.go
+++ b/router/router.go
@@ -189,6 +189,12 @@
sdkApi.GET("/getById", sdkController.GetById)
}
+ //绠楁硶鍙傛暟
+ sdkArgApi :=r.Group(urlPrefix + "/sdkArg")
+ {
+ sdkArgApi.GET("/getSdkArgs", sdkController.GetSdkArgs)
+ }
+
cameraTimeApi := r.Group(urlPrefix + "/cameraTimerule")
{
cameraTimeApi.POST("/save", cameraTimeRuleController.Save)
diff --git a/service/EnableStatusControlService.go b/service/EnableStatusControlService.go
index 7e0f303..c9e1ff5 100644
--- a/service/EnableStatusControlService.go
+++ b/service/EnableStatusControlService.go
@@ -2,11 +2,13 @@
import (
"basic.com/dbapi.git"
+ "basic.com/pubsub/protomsg.git"
"encoding/json"
"fmt"
"strconv"
"strings"
"time"
+ "webserver/discovery"
"webserver/extend/config"
"webserver/extend/esutil"
"webserver/extend/logger"
@@ -117,6 +119,23 @@
}
if middle > 0 {
logger.Debug("淇敼鎴愬姛")
+ if flag {//鐢熸晥鐨�
+ discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ Type: protomsg.EsCacheChanged_T_DbTable,
+ PersonId: "",
+ TableId: id,
+ Feature: "",
+ Action: protomsg.DbAction_Insert,
+ })
+ } else {//澶辨晥鐨�
+ discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ Type: protomsg.EsCacheChanged_T_DbTable,
+ PersonId: "",
+ TableId: id,
+ Feature: "",
+ Action: protomsg.DbAction_Insert,
+ })
+ }
message = "淇敼鎴愬姛"
}
return message
--
Gitblit v1.8.0