From 514f2fb736939adbe3cebba4f33f881c26a7d512 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 11:08:04 +0800
Subject: [PATCH] 把人脸数据先注释掉

---
 insertdata/insertDataToEs.go |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index db93ac7..b636b18 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -2,7 +2,6 @@
 
 import (
 	"errors"
-	"fmt"
 	"encoding/json"
 	"log"
 	"net"
@@ -93,7 +92,7 @@
 }
 // 寰�ES鎻掓暟鎹�
 func InsertToEs(msg ruleserver.ResultMsg) {
-	fmt.Println("寰�ES鎻掓暟鎹�")
+	log.Println("寰�ES鎻掓暟鎹�")
 
 	for _, sdkinfo := range msg.Tasklab.Sdkinfos {
 		if sdkinfo.Sdktype == "FaceDetect" {
@@ -102,7 +101,7 @@
 				faceParam := protomsg.ParamFacePos{}
 				err1 := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
 				if err1 != nil {
-					fmt.Println("瑙f瀽FACE sdk鏈夎", err1)
+					log.Println("瑙f瀽FACE sdk鏈夎", err1)
 					continue
 				}
 				for _, face := range faceParam.Faces {
@@ -151,13 +150,13 @@
 					requstbody, err := json.Marshal(pervideo)
 
 					if err != nil {
-						fmt.Println("json parse error ", err)
+						log.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.")
+						log.Println("es can not execute right.")
 					}
 				}
 			} else {
@@ -170,7 +169,7 @@
 				yoloObj := protomsg.ParamYoloObj{}
 				err1 := proto.Unmarshal(sdkinfo.Sdkdata, &yoloObj)
 				if err1 != nil {
-					fmt.Println("瑙f瀽YOLO sdk鏈夎", err1)
+					log.Println("瑙f瀽YOLO sdk鏈夎", err1)
 					//continue
 				}
 				alarmRules := []AlarmRule{}
@@ -179,6 +178,7 @@
 				}
 				isAlarm := ""
 				resp := make(map[string]interface{})
+				resp["fileUrl"] = ""
 				if len(alarmRules) > 0 {
 					isAlarm = "1"
 					// 瑙e帇缂╁苟涓婁紶鍥剧墖
@@ -189,6 +189,7 @@
 					i := protomsg.Image{}
 					err = proto.Unmarshal(bdata, &i)
 					resp,err = util.PostFormBufferData(weedfsUrl,i.Data,uuid.NewV4().String())
+					log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
 				}else {
 					isAlarm = "0"
 					//continue
@@ -197,12 +198,12 @@
 				// 鏌ヨ鏈満淇℃伅
 				flag,localConfig := dbapi.SysSetApi{}.GetServerInfo()
 				if !flag {
-					fmt.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
+					log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
 				}
 				// 鏌ヨcameraName
 				camera,err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
-				if err == nil {
-					fmt.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+				if err != nil {
+					log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
 				}
 				serverIp,err := GetLocalIP()
 				peraction := Personaction{
@@ -230,13 +231,13 @@
 				requstbody, err := json.Marshal(peraction)
 
 				if err != nil {
-					fmt.Println("json parse error ", err)
+					log.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.")
+					log.Println("es can not execute right.")
 				}
 			} else {
 				continue

--
Gitblit v1.8.0