Merge remote-tracking branch 'origin/master'

sunty

2019-08-02 69267f038f87f411edb92daed0ae67d93ca6c5fd

Merge remote-tracking branch 'origin/master'

 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)

 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)

 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{

 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

 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的server
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
}
//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的server
//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
//}

 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)

 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