From 0646ffa55a7a75d1a6f64d254fb97acf18bc4c1b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 12 九月 2019 11:12:20 +0800
Subject: [PATCH] fix 规则组可能为空的bug
---
insertdata/insertDataToEs.go | 37 -------------------------------------
1 files changed, 0 insertions(+), 37 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 843a54c..b3196e1 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -453,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)
--
Gitblit v1.8.0