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 -------------------------------------
 ruleserver/readyDataForRule.go |   10 +++++++---
 2 files changed, 7 insertions(+), 40 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)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index e926d88..5859d9b 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -81,10 +81,14 @@
 		}
 	}
 	logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------","鎽勫儚鏈篿d:",cameraId,"浠诲姟id",taskId)
-	for _,ruleGroup := range taskGroup.GroupRules{
-		logger.Info(ruleGroup.GroupText)
+	if taskGroup == nil  {
+		return nil
+	} else {
+		for _,ruleGroup := range taskGroup.GroupRules{
+			logger.Info(ruleGroup.GroupText)
+		}
+		return taskGroup
 	}
-	return taskGroup
 }
 
 // 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�

--
Gitblit v1.8.0