From 45184ccbcb5f787f09b62b0ddf4308004a46d27a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 10 七月 2019 10:28:21 +0800
Subject: [PATCH] 关掉yolo插入es

---
 insertdata/insertDataToEs.go |  160 +++++++++++++-------------
 ruleserver/ruleToformula.go  |    4 
 main.go                      |  152 -------------------------
 3 files changed, 83 insertions(+), 233 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 69f6b82..10cafc5 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -274,86 +274,86 @@
 			}
 		}
 	}
-	if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
-		logger.Info("寰�ES鎻抷olo鏁版嵁")
-		var sdkNames string = ""
-		alarmRules := []AlarmRule{}
-		for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
-			sdkNames = sdkNames + yoloResult.SdkName
-			alarm := ChangeToString(yoloResult.AlarmLevel)
-			alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
-		}
-		isAlarm := 0
-		resp := make(map[string]interface{})
-		if len(alarmRules) > 0 {
-			isAlarm = 1
-			// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
-			bdata, err := util.UnCompress(msg.Data)
-			if err != nil {
-				panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
-			}
-			i := protomsg.Image{}
-			err = proto.Unmarshal(bdata, &i)
-			//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
-			resp, err = util.DrawPolygonOnImage(msg.Cid, i,msg.RuleResult["yolo"].([]ruleserver.Result))
-			if err != nil {
-				logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
-			} else {
-				logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
-			}
-		} else {
-			isAlarm = 0
-			// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
-			return
-		}
-		// logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
-		// 鏌ヨ鏈満淇℃伅
-		localConfig, err := cache.GetServerInfo()
-		if err != nil {
-			logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
-		}
-		// 鏌ヨcameraName
-		camera, err := cache.GetCameraById(msg.Cid)
-		if err != nil {
-			logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
-		}
-		serverIp, err := GetLocalIP()
-		peraction := Personaction{
-			uuid.NewV4().String(),
-			msg.Cid,
-			camera.Name,
-			camera.Addr,
-			msg.Tasklab.Taskid,
-			msg.Tasklab.Taskname,
-			sdkNames,
-			"",
-			alarmRules,
-			localConfig.ServerId,
-			localConfig.ServerName,
-			serverIp,
-			"",
-			[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
-			time.Now().Format("2006-01-02 15:04:05"),
-			"",
-			isAlarm,
-			0,
-			0,
-			0,
-		}
-		requstbody, err := json.Marshal(peraction)
-
-		if err != nil {
-			logger.Info("json parse error ", err)
-			return
-
-		}
-		err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
-		if err != nil {
-			logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
-		} else {
-			logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
-		}
-	}
+	//if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+	//	logger.Info("寰�ES鎻抷olo鏁版嵁")
+	//	var sdkNames string = ""
+	//	alarmRules := []AlarmRule{}
+	//	for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+	//		sdkNames = sdkNames + yoloResult.SdkName
+	//		alarm := ChangeToString(yoloResult.AlarmLevel)
+	//		alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
+	//	}
+	//	isAlarm := 0
+	//	resp := make(map[string]interface{})
+	//	if len(alarmRules) > 0 {
+	//		isAlarm = 1
+	//		// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+	//		bdata, err := util.UnCompress(msg.Data)
+	//		if err != nil {
+	//			panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+	//		}
+	//		i := protomsg.Image{}
+	//		err = proto.Unmarshal(bdata, &i)
+	//		//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+	//		resp, err = util.DrawPolygonOnImage(msg.Cid, i,msg.RuleResult["yolo"].([]ruleserver.Result))
+	//		if err != nil {
+	//			logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+	//		} else {
+	//			logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+	//		}
+	//	} else {
+	//		isAlarm = 0
+	//		// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+	//		return
+	//	}
+	//	// logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
+	//	// 鏌ヨ鏈満淇℃伅
+	//	localConfig, err := cache.GetServerInfo()
+	//	if err != nil {
+	//		logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+	//	}
+	//	// 鏌ヨcameraName
+	//	camera, err := cache.GetCameraById(msg.Cid)
+	//	if err != nil {
+	//		logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+	//	}
+	//	serverIp, err := GetLocalIP()
+	//	peraction := Personaction{
+	//		uuid.NewV4().String(),
+	//		msg.Cid,
+	//		camera.Name,
+	//		camera.Addr,
+	//		msg.Tasklab.Taskid,
+	//		msg.Tasklab.Taskname,
+	//		sdkNames,
+	//		"",
+	//		alarmRules,
+	//		localConfig.ServerId,
+	//		localConfig.ServerName,
+	//		serverIp,
+	//		"",
+	//		[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+	//		time.Now().Format("2006-01-02 15:04:05"),
+	//		"",
+	//		isAlarm,
+	//		0,
+	//		0,
+	//		0,
+	//	}
+	//	requstbody, err := json.Marshal(peraction)
+	//
+	//	if err != nil {
+	//		logger.Info("json parse error ", err)
+	//		return
+	//
+	//	}
+	//	err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
+	//	if err != nil {
+	//		logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+	//	} else {
+	//		logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+	//	}
+	//}
 }
 
 // 鑾峰彇鏈満ip
diff --git a/main.go b/main.go
index 5344d59..ac36ce2 100644
--- a/main.go
+++ b/main.go
@@ -190,158 +190,6 @@
 				continue
 			}
 		}
-		//if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
-		//	arg := ruleserver.SdkData{}
-		//	arg.TaskId = m.Tasklab.Taskid
-		//	arg.SdkId = sdkinfo.Sdkid
-		//	arg.SdkName = sdkinfo.SdkName
-		//	arg.IsYolo = false
-		//	bdata, err := util.UnCompress(m.Data)
-		//	if err != nil {
-		//		panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
-		//	}
-		//	i := protomsg.Image{}
-		//	err = proto.Unmarshal(bdata, &i)
-		//	arg.ImageWidth = int(i.Width)
-		//	arg.ImageHeight = int(i.Height)
-		//	// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
-		//	arg.KeepRight = false
-		//	arg.IsStatic = false
-		//	if len(sdkinfo.Sdkdata) > 1 {
-		//		faceParam := protomsg.ParamFaceFeature{}
-		//		err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
-		//		if err != nil {
-		//			logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
-		//			continue
-		//		}
-		//		for _,faceExtCom := range faceParam.ExtComp  {
-		//			binfos := protomsg.Binfos{}
-		//			err := proto.Unmarshal(faceExtCom.Comp, &binfos)
-		//			if err != nil {
-		//				logger.Info("瑙ｆ瀽浜鸿劯姣斿鏁版嵁鏃跺嚭鐜伴敊璇�", err)
-		//				continue
-		//			}
-		//			logger.Info("_________________________________________________________________瑙ｆ瀽鍑虹殑浜鸿劯鐨勭浉浼肩殑搴曞簱鏁版嵁",binfos.Infos[0].CompareScore)
-		//		}
-		//		logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯鎻愬彇涓湁鍑犱釜鐩爣锛�",len(faceParam.ExtComp))
-		//		for _, extComp := range faceParam.ExtComp {
-		//			baseinfos := protomsg.Binfos{}
-		//			err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
-		//			if err1 != nil {
-		//				logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
-		//				continue
-		//			}
-		//			photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
-		//			arg.Photo = append(arg.Photo, photoMap)
-		//		}
-		//		args.Sdkdata = append(args.Sdkdata,&arg)
-		//	} else {
-		//		continue
-		//	}
-		//}
-
 	}
 	return m
-}
-
-func DrawPolygonOnImage()(maps map[string]interface{}, err0 error){
-	// draw the rook
-	//rook := gocv.NewMatWithSize(w, w, gocv.MatTypeCV8UC3)
-	//imgs := gocv.NewMat()
-	ddd, err := RetrieveROM("./105.jpg")
-	if err != nil {
-		logger.Info("瑙ｇ爜鏈夎",err)
-	}
-	bbb := bytes.NewBuffer(ddd)  // 蹇呴』鍔犱竴涓猙uffer 涓嶇劧娌℃湁read鏂规硶灏变細鎶ラ敊
-	rook, _ := gocv.NewMatFromBytes(500, 500, gocv.MatTypeCV8UC3, bbb.Bytes())
-	defer rook.Close()
-	green := color.RGBA{0, 255, 0, 0}
-	points := [][]image.Point{
-		{
-			image.Pt(100., 100),
-			image.Pt(100., 400),
-			image.Pt(400, 400),
-			image.Pt(400, 100),
-		},
-	}
-	gocv.FillPoly(&rook, points, green)
-	// 涓婁紶
-	//fdata,_ := gocv.IMEncode(".jpg",rook)
-	//body := &bytes.Buffer{}
-	//writer := multipart.NewWriter(body)
-	//_, err1 := writer.CreateFormFile("file", "fasjuierf")
-	//if err1 != nil {
-	//	return nil, err1
-	//}
-	//boundary := writer.Boundary()
-	////close_string := fmt.Sprintf("\r\n--%s--\r\n", boundary)
-	//close_buf := bytes.NewBufferString(fmt.Sprintf("\r\n--%s--\r\n", boundary))
-	//file := bytes.NewBuffer(fdata)
-	//request_reader := io.MultiReader(body, file, close_buf)
-	////_, err = io.Copy(part, file)
-	////writer.WriteField(key, val)
-	//request, err := http.NewRequest("POST", "http://192.168.1.182:6333/submit", request_reader)
-	//request.Header.Add("Content-Type", writer.FormDataContentType())
-	//timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
-	//client := &http.Client{Timeout: timeout}
-	//resp, err := client.Do(request)
-	//if err != nil {
-	//	logger.Fatal(err)
-	//	return nil, err
-	//}
-	//defer func() {
-	//	if r := recover(); r != nil {
-	//		fmt.Printf("panic鐨勫唴瀹�%v\n", r)
-	//		msg := "涓婁紶鍥剧墖鏈嶅姟鍣ㄥ紓甯�"
-	//		if _, ok := r.(error); ok {
-	//			msg = r.(error).Error()
-	//			logger.Info("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
-	//		}
-	//		if _, ok := r.(string); ok {
-	//			msg = r.(string)
-	//			logger.Info("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
-	//		}
-	//		err0 = errors.New(msg)
-	//	}
-	//}()
-	//defer resp.Body.Close()
-	//{
-	//	body := &bytes.Buffer{}
-	//	_, err := body.ReadFrom(resp.Body)
-	//	if err != nil {
-	//		logger.Fatal(err)
-	//	}
-	//	logger.Info(resp.StatusCode)
-	//	//logger.Info(resp.Header)
-	//	logger.Info(body)
-	//	//decoder := json.NewDecoder(strings.NewReader(body.String()))
-	//	decoder := make(map[string]interface{})
-	//	if err := json.Unmarshal([]byte(body.String()), &decoder); err != nil {
-	//		return nil, err
-	//	}
-		return nil, nil
-	//}
-}
-
-// 鎶婂浘鐗囪浆鎴愪簩杩涘埗娴�
-func RetrieveROM(filename string) ([]byte, error) {
-	file, err := os.Open(filename)
-
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	stats, statsErr := file.Stat()
-	if statsErr != nil {
-		return nil, statsErr
-	}
-
-	var size int64 = stats.Size()
-	bytes := make([]byte, size)
-
-	bufr := bufio.NewReader(file)
-	_, err = bufr.Read(bytes)
-
-	return bytes, err
 }
\ No newline at end of file
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 6727423..8951f1d 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -184,7 +184,9 @@
 
 // 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
 func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
-	logger.Info("--------鐪嬬湅瑙ｆ瀽鍑烘潵鐨勬暟鎹�---", *arg)
+	for _,photo := range arg.Photo{
+		logger.Info("--------鐪嬬湅瑙ｆ瀽鍑烘潵鐨勬暟鎹�---", arg.IpcId,photo.Rects,photo.Score)
+	}
 	for _, polygon := range cameraPolygons {
 		//logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
 		areaMap := AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}

--
Gitblit v1.8.0