---
panlei
2019-12-17 f8d06b644c67921ec0729879bc3ac6288931428c
---
2个文件已修改
91 ■■■■ 已修改文件
algorithm/middleware/insertDataToEs.go 89 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruleserver/server.go 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
algorithm/middleware/insertDataToEs.go
@@ -237,51 +237,52 @@
                    if id == "" {
                        // 比到了相似的人但在此摄像机下已经出现过,最后不能插入数据库
                        logger.Info("冗余数据,并不入库")
                        continue
                    }
                    pervideo := PerVideoPicture{LinkInfo{
                        id,
                        msg.Cid,
                        msg.Push.Cam.Addr,
                        msg.Push.Cam.Name,
                        picTime,
                        imgMaxUrl,
                        msg.Tasklab.Taskid,
                        msg.Tasklab.Taskname,
                        sdkname,
                        "",
                        alarmRules,
                        time.Now().Format("2006-01-02 15:04:05"), // 只检测,没有比对时间
                        lable,
                        lableAttach,
                        "",
                        msg.Push.ServerId,
                        msg.Push.ServerName,
                        msg.Push.LocalIp,
                        "",
                        true,
                        false,
                        false,
                        false,
                        face.Liker,
                        targetInfos,
                    },
                        "",
                        []*LinkInfo{},
                    }
                    requstbody, err := json.Marshal(pervideo)
                    if err != nil {
                        logger.Info("json parse error ", err)
                        return
                    }
                    resp1, err1 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
                    if err1 != nil {
                        logger.Error("上传ES出错!---", err1)
                    } else {
                        logger.Info("插入es返回的信息:", resp1)
                        // 发出录像信号
                        ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
                        logger.Info("新增数据")
                        pervideo := PerVideoPicture{LinkInfo{
                            id,
                            msg.Cid,
                            msg.Push.Cam.Addr,
                            msg.Push.Cam.Name,
                            picTime,
                            imgMaxUrl,
                            msg.Tasklab.Taskid,
                            msg.Tasklab.Taskname,
                            sdkname,
                            "",
                            alarmRules,
                            time.Now().Format("2006-01-02 15:04:05"), // 只检测,没有比对时间
                            lable,
                            lableAttach,
                            "",
                            msg.Push.ServerId,
                            msg.Push.ServerName,
                            msg.Push.LocalIp,
                            "",
                            true,
                            false,
                            false,
                            false,
                            face.Liker,
                            targetInfos,
                        },
                            "",
                            []*LinkInfo{},
                        }
                        requstbody, err := json.Marshal(pervideo)
                        if err != nil {
                            logger.Info("json parse error ", err)
                            return
                        }
                        resp1, err1 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
                        if err1 != nil {
                            logger.Error("上传ES出错!---", err1)
                        } else {
                            logger.Info("插入es返回的信息:", resp1)
                            // 发出录像信号
                            ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
                        }
                    }
                }
            }
ruleserver/server.go
@@ -52,7 +52,7 @@
//广播数据库改变的msg
func publishMessage(msg *protomsg.VideotapeInfo) {
    sendBytes,err := proto.Marshal(msg)
    if err ==nil{
    if err == nil{
        discoveryServer.PublishMsg(string(sendBytes))
    }
}