add gbCloud

liuxiaolong

2019-10-31 718bcd41127a8c5c93a20ca6dfce6e5c5fcbc4e1

add gbCloud

 controllers/dbtablesCon.go

@@ -92,29 +92,11 @@
func (dbt DbTableController) UpdateDbTables(c *gin.Context) {
    dbtable := new(models.Dbtables)
    err := c.BindJSON(&dbtable)
    if err !=nil || dbtable.Id == "" || dbtable.TableName == "" {
    if err !=nil || dbtable.Id == "" || dbtable.TableName == "" || (dbtable.Enable !=0 && dbtable.Enable !=1) {
        util.ResponseFormat(c,code.RequestParamError,"参数有误")
        return
    }
    currentTime := time.Now()
    startTime := dbtable.StartTime
    endTime := ""
    if dbtable.EndTime != "" {
        endTime = dbtable.EndTime
    }
    st, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local)
    if endTime != "" {
        et, _ := time.ParseInLocation("2006-01-02 15:04:05", endTime, time.Local)
        if et.After(currentTime) && st.Before(currentTime) {
            dbtable.Enable = 1
        } else {
            dbtable.Enable = 0
        }
    } else if st.Before(currentTime) && endTime == "" {
        dbtable.Enable = 1
    } else {
        dbtable.Enable = 0
    }

    paramBody := util.Struct2Map(dbtable)
    var tApi dbapi.DbTableApi
    b, data := tApi.UpdateDbTables(paramBody)

 controllers/fileController.go

@@ -827,8 +827,10 @@
    }
    extNames := make([]string, 0)
    addResult := make(map[string]interface{}, 0)
    successList := make([]string, 0)
    failList := make([]string,0)
    var successList []string
    var failList []string
    var noFaceList []string
    var multiFaceList []string
    tAllStart := time.Now()
    var wg sync.WaitGroup
    var lock sync.Mutex
@@ -856,7 +858,13 @@
            field, _, err1 := uploadFileReturnAddr(file, filename, tableId)
            lock.Lock()
            if err1 != nil || field == "" {
                if err1 !=nil && err1.Error() == "NotFeatureFindError" {
                    noFaceList = append(noFaceList, filename)
                } else if err1 !=nil && err1.Error() == "TooManyFaces" {
                    multiFaceList = append(multiFaceList, filename)
                } else {
                failList = append(failList, filename)
                }
            } else {
                successList = append(successList, filename)
            }
@@ -868,13 +876,15 @@
    logger.Debug("切",len(fileHeaders),"张人脸用时：", time.Since(tAllStart))
    addResult["successList"] = successList
    addResult["failList"] = failList
    addResult["noFaceList"] = noFaceList
    addResult["multiFaceList"] = multiFaceList
    addResult["fields"] = extNames

    //if len(successList)>0 {
    if len(successList)>0 {
        util.ResponseFormat(c, code.DbPersonUploadSuccess, addResult)
    //} else {
    //    util.ResponseFormat(c, code.DbPersonUploadFail, addResult)
    //}
    } else {
        util.ResponseFormat(c, code.DbPersonUploadFail, addResult)
    }
}

type EsPersonSave struct {

 controllers/gb28181Cloud.go

New file
@@ -0,0 +1,18 @@
package controllers

import (
    "basic.com/gb28181api.git"
    "github.com/gin-gonic/gin"
)

type Gb28181CloudController struct {

}

func (gb *Gb28181CloudController) Left(c *gin.Context) {
    cameraId := c.Query("cameraId")

    var gbApi gb28181api.Gb28181Api
    gbApi.SetCameraPtz(cameraId,"",3)

}

 go.mod

@@ -5,6 +5,7 @@
require (
    basic.com/dbapi.git v0.0.0-20191030074447-274be55f401a // indirect
    basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb // indirect
    basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b // indirect
    basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect
    basic.com/pubsub/esutil.git v0.0.0-20191031013312-2128f2f89a4b // indirect
    basic.com/pubsub/protomsg.git v0.0.0-20191031013101-edd40582998e // indirect

 go.sum

@@ -2,6 +2,8 @@
basic.com/dbapi.git v0.0.0-20191030074447-274be55f401a/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb h1:fM6DojeInFSCFO+wkba1jtyPiSDqw0jYKi4Tk+e+ka4=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb/go.mod h1:FTryK8BsVLfUplx8a3+l8hJWub6VbAWZCUH7sPRZaso=
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b h1:Qh7x2PY3HA9B404Llq+olY5/YlGYrM58bpOHa2CGcro=
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b/go.mod h1:iKnzuRRqUEgt17894pX3oYcOG2fLYFVcXiZbPoMK7+4=
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 h1:BBA30Rgljn6MRieC4gUncETJDyna3ObyubTo9HEQ2M0=
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/esutil.git v0.0.0-20191031013312-2128f2f89a4b h1:Zou6YQlkM5lgeZ2p0XYQuVC4dUS9fONDBu2sc/Q4OW8=