panlei
2019-07-13 a45592706eb49497bda7e69e27cd76bd2da28ae7
缓存数据空指针控制
1个文件已修改
29 ■■■■ 已修改文件
insertdata/insertDataToEs.go 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
insertdata/insertDataToEs.go
@@ -6,7 +6,6 @@
    "fmt"
    "io/ioutil"
    "net"
    "os"
    "ruleprocess/cache"
    "ruleprocess/logger"
    "strings"
@@ -170,7 +169,7 @@
                uuid.NewV4().String(),
                msg.Cid,
                camera.Addr,
                time.Now().Format("2006-01-02 15:04:05"),
                i.Timestamp,
                strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
                msg.Tasklab.Taskid,
                msg.Tasklab.Taskname,
@@ -239,7 +238,7 @@
            uuid.NewV4().String(),
            msg.Cid,
            camera.Addr,
            time.Now().Format("2006-01-02 15:04:05"),
            i.Timestamp,
            strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
            msg.Tasklab.Taskid,
            msg.Tasklab.Taskname,
@@ -292,15 +291,15 @@
        }
        isAlarm := 0
        resp := make(map[string]interface{})
        // 解压缩并上传图片
        bdata, err := util.UnCompress(msg.Data)
        if err != nil {
            panic("解压缩图片时出现错误")
        }
        i := protomsg.Image{}
        err = proto.Unmarshal(bdata, &i)
        if len(alarmRules) > 0 {
            isAlarm = 1
            // 解压缩并上传图片
            bdata, err := util.UnCompress(msg.Data)
            if err != nil {
                panic("解压缩图片时出现错误")
            }
            i := protomsg.Image{}
            err = proto.Unmarshal(bdata, &i)
            //resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
            resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result))
            if err != nil {
@@ -340,7 +339,7 @@
            serverIp,
            "",
            []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
            time.Now().Format("2006-01-02 15:04:05"),
            i.Timestamp,
            "",
            isAlarm,
            0,
@@ -361,9 +360,9 @@
            logger.Warn("__________________________________________往ES插入yolo数据成功")
            //os.Exit(1)
        }
        logger.Debug("============瞅瞅缓存数据:",msg.RuleResult["cacheData"].(ruleserver.ResultMsg).RuleResult)
        InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
        os.Exit(1)
        if msg.RuleResult["cacheData"] != nil {
            InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
        }
    }
}
func ChangeStatusYolo(msg ruleserver.ResultMsg) {
@@ -410,7 +409,7 @@
        serverIp,
        "",
        []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
        time.Now().Format("2006-01-02 15:04:05"),
        i.Timestamp,
        "",
        0,
        0,