保存so方便切换分支

liuxiaolong

2019-09-12 f3c4acf5257a0500e8fe24f68cfd16e70fa8d89e

 insertdata/insertDataToEs.go

@@ -17,6 +17,7 @@
   "github.com/satori/go.uuid"
   "ruleprocess/ruleserver"
   "ruleprocess/util"
   "ruleprocess/structure"
)

var weedfsUrl, videoPersonUrl, personAction string
@@ -452,46 +453,9 @@
            }
            requstbody, err := json.Marshal(peraction)

//<<<<<<< HEAD
//         url = append(url, resp["fileUrl"].(string))
//         esDataId := uuid.NewV4().String()
//         linksId := ""
//         if linkId != "" {
//            linksId = linkId
//         }
//         peraction := Personaction{
//            esDataId,
//            msg.Cid,
//            camera.Name,
//            camera.Addr,
//            msg.Tasklab.Taskid,
//            msg.Tasklab.Taskname,
//            sdkNames,
//            "",
//            alarmRules,
//            localConfig.ServerId,
//            localConfig.ServerName,
//            serverIp,
//            "",
//            url,
//            i.Timestamp,
//            linksId,
//            "",
//            isAlarm,
//            0,
//            0,
//            0,
//         }
//         requstbody, err := json.Marshal(peraction)
//
//         if err != nil {
//            logger.Info("json parse error ", err)
//            return
//=======
            if err != nil {
               logger.Info("json parse error ", err)
               return
//>>>>>>> labelFilter

            }
            resp1, err2 := EsReq("POST", personAction, requstbody)