From f8d06b644c67921ec0729879bc3ac6288931428c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 17 十二月 2019 11:26:38 +0800
Subject: [PATCH] ---

---
 ruleserver/server.go                   |    2 
 algorithm/middleware/insertDataToEs.go |   89 ++++++++++++++++++++++----------------------
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/algorithm/middleware/insertDataToEs.go b/algorithm/middleware/insertDataToEs.go
index f835b99..8ef4ffb 100644
--- a/algorithm/middleware/insertDataToEs.go
+++ b/algorithm/middleware/insertDataToEs.go
@@ -237,51 +237,52 @@
 					if id == "" {
 						// 姣斿埌浜嗙浉浼肩殑浜轰絾鍦ㄦ鎽勫儚鏈轰笅宸茬粡鍑虹幇杩囷紝鏈�鍚庝笉鑳芥彃鍏ユ暟鎹簱
 						logger.Info("鍐椾綑鏁版嵁锛屽苟涓嶅叆搴�")
-						continue
-					}
-					pervideo := PerVideoPicture{LinkInfo{
-						id,
-						msg.Cid,
-						msg.Push.Cam.Addr,
-						msg.Push.Cam.Name,
-						picTime,
-						imgMaxUrl,
-						msg.Tasklab.Taskid,
-						msg.Tasklab.Taskname,
-						sdkname,
-						"",
-						alarmRules,
-						time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
-						lable,
-						lableAttach,
-						"",
-						msg.Push.ServerId,
-						msg.Push.ServerName,
-						msg.Push.LocalIp,
-						"",
-						true,
-						false,
-						false,
-						false,
-						face.Liker,
-						targetInfos,
-					},
-						"",
-						[]*LinkInfo{},
-					}
-					requstbody, err := json.Marshal(pervideo)
-
-					if err != nil {
-						logger.Info("json parse error ", err)
-						return
-					}
-					resp1, err1 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
-					if err1 != nil {
-						logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
 					} else {
-						logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
-						// 鍙戝嚭褰曞儚淇″彿
-						ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
+						logger.Info("鏂板鏁版嵁")
+						pervideo := PerVideoPicture{LinkInfo{
+							id,
+							msg.Cid,
+							msg.Push.Cam.Addr,
+							msg.Push.Cam.Name,
+							picTime,
+							imgMaxUrl,
+							msg.Tasklab.Taskid,
+							msg.Tasklab.Taskname,
+							sdkname,
+							"",
+							alarmRules,
+							time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+							lable,
+							lableAttach,
+							"",
+							msg.Push.ServerId,
+							msg.Push.ServerName,
+							msg.Push.LocalIp,
+							"",
+							true,
+							false,
+							false,
+							false,
+							face.Liker,
+							targetInfos,
+						},
+							"",
+							[]*LinkInfo{},
+						}
+						requstbody, err := json.Marshal(pervideo)
+
+						if err != nil {
+							logger.Info("json parse error ", err)
+							return
+						}
+						resp1, err1 := insertdata.EsReq("POST", videoPersonUrl, requstbody)
+						if err1 != nil {
+							logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+						} else {
+							logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
+							// 鍙戝嚭褰曞儚淇″彿
+							ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
+						}
 					}
 				}
 			}
diff --git a/ruleserver/server.go b/ruleserver/server.go
index ab54f90..37a1b30 100644
--- a/ruleserver/server.go
+++ b/ruleserver/server.go
@@ -52,7 +52,7 @@
 //骞挎挱鏁版嵁搴撴敼鍙樼殑msg
 func publishMessage(msg *protomsg.VideotapeInfo) {
 	sendBytes,err := proto.Marshal(msg)
-	if err ==nil{
+	if err == nil{
 		discoveryServer.PublishMsg(string(sendBytes))
 	}
 }

--
Gitblit v1.8.0