From 46c52105684a65d7737d2c6a964d19a3cad28ab5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 22 六月 2019 18:32:22 +0800
Subject: [PATCH] es也过滤数据长度

---
 insertdata/insertDataToEs.go |  203 ++++++++++++++++++++++++++------------------------
 1 files changed, 107 insertions(+), 96 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index a1c8c97..310f7b4 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -95,128 +95,139 @@
 
 	for _, sdkinfo := range msg.Tasklab.Sdkinfos {
 		if sdkinfo.Sdktype == "FaceDetect" {
-			faceParam := protomsg.ParamFacePos{}
-			err1 := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
-			if err1 != nil {
-				fmt.Println("瑙f瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err1)
+			if len(sdkinfo.Sdkdata) > 1 {
+
+				faceParam := protomsg.ParamFacePos{}
+				err1 := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+				if err1 != nil {
+					fmt.Println("瑙f瀽FACE sdk鏈夎", err1)
+					continue
+				}
+				for _, face := range faceParam.Faces {
+					pervideo := PerVideoPicture{
+						uuid.NewV4().String(),
+						msg.Cid,
+						msg.Caddr,
+						time.Now().Format("2006-01-02 15:04:05"),
+						"",
+						msg.Tasklab.Taskid,
+						msg.Tasklab.Taskname,
+						sdkinfo.SdkName,
+						"",
+						"",
+						face.Result.Gender,
+						face.Result.Age,
+						"",
+						face.Result.Race,
+						face.Result.Smile,
+						face.Result.Beauty,
+						"涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
+						"---",
+						"",
+						"",
+						"",
+						"",
+						"",
+						"",
+						"",
+						"",
+						0,
+						Base{
+							"鏄瘡涓汉鑴哥畻娉曢兘鏈夊悧",
+							"",
+							0,
+							"",
+							"",
+							"",
+							"",
+							"",
+							"",
+							"",
+							"",
+						},
+					}
+					requstbody, err := json.Marshal(pervideo)
+
+					if err != nil {
+						fmt.Println("json parse error ", err)
+						return
+
+					}
+					err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
+					if err != nil {
+						fmt.Println("es can not execute right.")
+					}
+				}
+			} else {
 				continue
 			}
-			for _, face := range faceParam.Faces {
-				pervideo := PerVideoPicture{
+		}
+		if sdkinfo.Sdktype == "Yolo" {
+			if len(sdkinfo.Sdkdata) > 1 {
+
+				yoloObj := protomsg.ParamYoloObj{}
+				err1 := proto.Unmarshal(sdkinfo.Sdkdata, &yoloObj)
+				if err1 != nil {
+					fmt.Println("瑙f瀽YOLO sdk鏈夎", err1)
+					//continue
+				}
+				alarmRules := []AlarmRule{}
+				for _,result := range msg.RuleResult {
+					alarmRules = append(alarmRules,AlarmRule{result.RuleGroupId,result.AlarmLevel,result.RuleText})
+				}
+				isAlarm := ""
+				if len(alarmRules) > 0 {
+					isAlarm = "1"
+				}else {
+					isAlarm = "0"
+					continue
+				}
+				// 鏌ヨ鏈満淇℃伅
+				flag,localConfig := dbapi.SysSetApi{}.GetServerInfo()
+				if !flag {
+					fmt.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
+				}
+				// 鏌ヨcameraName
+				camera,err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
+				if err == nil {
+					fmt.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+				}
+				serverIp,err := GetLocalIP()
+				peraction := Personaction{
 					uuid.NewV4().String(),
 					msg.Cid,
+					camera.Name,
 					msg.Caddr,
-					time.Now().Format("2006-01-02 15:04:05"),
-					"",
 					msg.Tasklab.Taskid,
 					msg.Tasklab.Taskname,
 					sdkinfo.SdkName,
 					"",
-					"",
-					face.Result.Gender,
-					face.Result.Age,
-					"",
-					face.Result.Race,
-					face.Result.Smile,
-					face.Result.Beauty,
-					"涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
-					"---",
+					alarmRules,
+					localConfig.ServerId,
+					localConfig.ServerName,
+					serverIp,
 					"",
 					"",
+					time.Now().Format("2006-01-02 15:04:05"),
 					"",
-					"",
-					"",
-					"",
+					isAlarm,
 					"",
 					"",
 					0,
-					Base{
-						"鏄瘡涓汉鑴哥畻娉曢兘鏈夊悧",
-						"",
-						0,
-						"",
-						"",
-						"",
-						"",
-						"",
-						"",
-						"",
-						"",
-					},
 				}
-				requstbody, err := json.Marshal(pervideo)
+				requstbody, err := json.Marshal(peraction)
 
 				if err != nil {
 					fmt.Println("json parse error ", err)
 					return
 
 				}
-				err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
+				err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
 				if err != nil {
 					fmt.Println("es can not execute right.")
 				}
-			}
-		}
-		if sdkinfo.Sdktype == "Yolo" {
-			yoloObj := protomsg.ParamYoloObj{}
-			err1 := proto.Unmarshal(sdkinfo.Sdkdata, &yoloObj)
-			if err1 != nil {
-				fmt.Println("瑙f瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err1)
+			} else {
 				continue
-			}
-			alarmRules := []AlarmRule{}
-			for _,result := range msg.RuleResult {
-				alarmRules = append(alarmRules,AlarmRule{result.RuleGroupId,result.AlarmLevel,result.RuleText})
-			}
-			isAlarm := ""
-			if len(alarmRules) > 0 {
-				isAlarm = "1"
-			}else {
-				isAlarm = "0"
-			}
-			// 鏌ヨ鏈満淇℃伅
-			flag,localConfig := dbapi.SysSetApi{}.GetServerInfo()
-			if !flag {
-				fmt.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
-			}
-			// 鏌ヨcameraName
-			camera,err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
-			if err == nil {
-				fmt.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
-			}
-			serverIp,err := GetLocalIP()
-			peraction := Personaction{
-				uuid.NewV4().String(),
-				msg.Cid,
-				camera.Name,
-				msg.Caddr,
-				msg.Tasklab.Taskid,
-				msg.Tasklab.Taskname,
-				sdkinfo.SdkName,
-				"",
-				alarmRules,
-				localConfig.ServerId,
-				localConfig.ServerName,
-				serverIp,
-				"",
-				"",
-				time.Now().Format("2006-01-02 15:04:05"),
-				"",
-				isAlarm,
-				"",
-				"",
-				0,
-			}
-			requstbody, err := json.Marshal(peraction)
-
-			if err != nil {
-				fmt.Println("json parse error ", err)
-				return
-
-			}
-			err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
-			if err != nil {
-				fmt.Println("es can not execute right.")
 			}
 		}
 

--
Gitblit v1.8.0