---

liuxiaolong

2019-07-26 4dbe25d1cd7f25cc5562db2ca393437cae1a9a8a

---

 controllers/esSearch.go

@@ -5,6 +5,7 @@
    "fmt"
    "strconv"
    "strings"
    "webserver/extend/logger"

    "github.com/gin-gonic/gin"
    "webserver/extend/code"
@@ -37,19 +38,19 @@
    d := dbapi.DicApi{}
        res,data := d.FindByType("ALARMLEVEL")
        if data == nil {
                fmt.Println("data is nil")
                logger.Debug("data is nil")
        }
    fmt.Println(res)
        // fmt.Println(data)
    logger.Debug(res)
        // logger.Debug(data)
    alarmLevel := make(map[int]string)
    tmp := data.(map[string]interface{})
        for _,value := range tmp["ALARMLEVEL"].([]interface{}) {
            // fmt.Println(value.(map[string]interface{})["value"],"        ",value.(map[string]interface{})["name"]) 
            // logger.Debug(value.(map[string]interface{})["value"],"        ",value.(map[string]interface{})["name"]) 
            val := value.(map[string]interface{})["value"].(string)
            name := value.(map[string]interface{})["name"].(string)
            vl,err := strconv.Atoi(val)
            if err != nil {
                fmt.Println(err)
                logger.Debug(err)
            }
            alarmLevel[vl] = name
        }
@@ -144,7 +145,7 @@
        "\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]" +
        "}"
    fmt.Println(prama)
    logger.Debug(prama)
    //数据解析
    tokenRes := esutil.GetEsDataReq(url, prama, true)
    return tokenRes
@@ -165,7 +166,7 @@

    tokenRes := esutil.GetEsDataReq(url, prama, true)
    personRes := make(map[string]string)
    //fmt.Println(tokenRes["datalist"].([]interface{}))
    //logger.Debug(tokenRes["datalist"].([]interface{}))
    result := tokenRes["datalist"].([]interface{})
    for _, value := range result {
        userMap := value.(map[string]interface{})
@@ -187,7 +188,7 @@
        // personRes["phoneNum"] = value.(map[string]interface{})["phoneNum"].(string)
        // personRes["sex"] = value.(map[string]interface{})["sex"].(string)
    }
    //fmt.Println(personRes)
    //logger.Debug(personRes)
    if len(personRes) < 1 {
        personRes["personName"] = ""
        personRes["phoneNum"] = ""

 controllers/fileController.go

@@ -314,6 +314,7 @@
                    resultList = append(resultList,cr)
                }
            }

            logger.Debug("resultList:",resultList)
        }
        util.ResponseFormat(c,code.Success,resultList)
@@ -407,6 +408,7 @@
    dbperson.PersonPicUrl = field //  图片路经
    dbperson.TableId = tableId           //
    dbperson.PersonName = fileNameOnly       // 图片名
    dbperson.Enable = 1 //默认有效
    // 演示base64编码

    dbperson.FaceFeature = faceBase64 // 特征值base64 码
@@ -487,7 +489,7 @@
    //addResult["detail"] = details
    //fields := fdfsclient.UploadFileByBuffer100(bytess, extNames)     //  fastdfs 上传
    if len(successList)>0 {
        util.ResponseFormat(c, code.Success, addResult)
        util.ResponseFormat(c, code.DbPersonUploadSuccess, addResult)
    } else {
        util.ResponseFormat(c, code.ServiceInsideError, err.Error())
    }

 controllers/initForData.go

@@ -8,6 +8,7 @@
    "webserver/extend/code"
    "webserver/extend/config"
    "webserver/extend/esutil"
    "webserver/extend/logger"
    "webserver/extend/util"
)

@@ -38,7 +39,7 @@
        "]}},\"size\":\"20\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"isAlarm\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]" +
        "}"
    fmt.Println(prama)
    logger.Debug("InitForCaptureData:", prama)
    tokenRes := esutil.GetEsDataReq(url, prama, true)
    util.ResponseFormat(c, code.Success, tokenRes)
}
@@ -86,7 +87,7 @@
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"20\"," +
        "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]}"
    fmt.Println(prama)
    logger.Debug("InitForMonitoringData:", prama)
    tokenRes := esutil.GetEsDataReq(url, prama, true)
    util.ResponseFormat(c, code.Success, tokenRes)
}

 extend/code/code.go

@@ -48,6 +48,7 @@
    HasChildNodeError = &Code{http.StatusInternalServerError, false, "数据节点存在子节点 无法删除"}

    NotLogin = &Code{ http.StatusUnauthorized, false, "登录失效，请重新登录"}

    DbPersonUploadSuccess = &Code{ http.StatusOK, true, "人员上传成功"}
    DbPersonUpdateSuccess = &Code{ http.StatusOK, true, "人员更新成功"}
    ComError = &Code{http.StatusInternalServerError, false, ""}
)