From 06cfa3a6a024de4c67e9b0ec631e2a2720f76256 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 16 八月 2019 13:40:27 +0800
Subject: [PATCH] 地址存全路径
---
insertdata/insertDataToEs.go | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 1c2f8e2..30d4117 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -9,7 +9,6 @@
"net"
"ruleprocess/cache"
"ruleprocess/logger"
- "strings"
"time"
"basic.com/pubsub/protomsg.git"
@@ -111,6 +110,7 @@
RuleText string `json:"ruleText"`
DefenceState bool `json:"defenceState"`
IsLink bool `json:"isLink"`
+ LinkInfo string `json:"linkInfo"`
}
// 涓�涓猣ace瀵瑰涓鍒欑粍鐨勫綊缃汉鑴哥殑缁撴瀯浣�
@@ -181,7 +181,7 @@
//os.Exit(1)
for _,faceResult := range face.rules {
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState,faceResult.IsLink})
+ alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState,faceResult.IsLink,""})
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
@@ -204,7 +204,7 @@
if err != nil {
logger.Error("涓婁紶灏忓浘鍑洪敊")
}
- logger.Info("================灏忓浘鍦板潃:", resp["fileUrl"].(string))
+ //logger.Info("================灏忓浘鍦板潃:", resp["fileUrl"].(string))
sex := ""
if face.ThftRes.Gender == 1 {
sex = "鐢�"
@@ -223,7 +223,7 @@
msg.Cid,
camera.Addr,
i.Timestamp,
- strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
+ bigPhotoUrl["fileUrl"].(string),
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
"浜鸿劯",
@@ -237,7 +237,7 @@
face.ThftRes.Smile,
face.ThftRes.Beauty,
base64.StdEncoding.EncodeToString(face.Feature),
- []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+ []string{resp["fileUrl"].(string)},
"鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
@@ -337,7 +337,11 @@
//logger.Info("搴旇杩涙潵鎵嶅鐨�")
sdkNames = sdkNames + yoloResult.SdkName
alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState,yoloResult.IsLink})
+ linkInfo := ""
+ if yoloResult.IsLink {
+ linkInfo = "鑱斿姩浠诲姟"
+ }
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState,yoloResult.IsLink,linkInfo})
// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
if yoloResult.Others.CacheData != nil {
//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
@@ -357,7 +361,7 @@
} else {
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
}
- url = append(url, strings.Split(resp1["fileUrl"].(string), "/")[1])
+ url = append(url, resp1["fileUrl"].(string))
}
}
}
@@ -416,7 +420,7 @@
}
serverIp, err := GetLocalIP()
- url = append(url, strings.Split(resp["fileUrl"].(string), "/")[1])
+ url = append(url, resp["fileUrl"].(string))
esDataId := uuid.NewV4().String()
linksId := ""
if linkId != "" {
@@ -511,7 +515,7 @@
localConfig.ServerName,
serverIp,
"",
- []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+ []string{resp["fileUrl"].(string)},
i.Timestamp,
"",
"",
@@ -569,7 +573,7 @@
msg.Cid,
camera.Addr,
i.Timestamp,
- strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
+ bigPhotoUrl["fileUrl"].(string),
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
"浜鸿劯",
--
Gitblit v1.8.0