From fa8338c2bfbf7999a380cb5fc4e234be786b0d89 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 11:04:37 +0800
Subject: [PATCH] 调整引用配置文件的位置
---
insertdata/insertDataToEs.go | 136 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 109 insertions(+), 27 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 64f2754..7591b60 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -4,6 +4,7 @@
"encoding/json"
"errors"
"fmt"
+ "io/ioutil"
"net"
"ruleprocess/cache"
"ruleprocess/logger"
@@ -15,9 +16,30 @@
"github.com/satori/go.uuid"
"ruleprocess/ruleserver"
"ruleprocess/util"
+ "github.com/go-yaml/yaml"
)
+var weedfsUrl string
+type conf struct {
+ PhotoUrl string
+}
+func init() {
+ logger.Info("_________________________________________鑰佸瓙鎯崇湅浣犳墽琛屼簡娌�")
+ fmt.Println("_________________________________________鑰佸瓙鎯崇湅浣犳墽琛屼簡娌�")
+ data, err := ioutil.ReadFile("../config/conf.yml")
+ if err != nil {
+ fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--",err)
+ logger.Error("璇诲彇閰嶇疆鏂囦欢鍑洪敊--",err)
+ }
+ fmt.Println("浠庨厤缃枃浠朵腑璇诲彇鐨勫�间负锛�",string(data))
+ c := conf{}
+ //鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
+ yaml.Unmarshal(data, &c)
+ fmt.Println("c.PhotoUrl鐨勫�间负锛�",c.PhotoUrl)
+ weedfsUrl = c.PhotoUrl
+ fmt.Println("weedfsUrl鐨勫�间负锛�",weedfsUrl)
+ logger.Info("weedfsUrl鐨勫�间负锛�",weedfsUrl)
+}
-var weedfsUrl = "http://192.168.1.182:6333/submit"
// 浜鸿劯鐨勬暟鎹粨鏋�
type PerVideoPicture struct {
Id string `json:"id"`
@@ -47,21 +69,7 @@
IsAckAlarm int `json:"isAckAlarm"`
IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
- BaseInfo []Base `json:"baseInfo"`
-}
-
-type Base struct {
- TableId string `json:"tableId"`
- TableName string `json:"tableName"`
- CompareScore float64 `json:"compareScore"`
- PersonId string `json:"personId"`
- PersonName string `json:"personName"`
- PersonPicUrl string `json:"personPicUrl"`
- PhoneNum string `json:"phoneNum"`
- Sex string `json:"sex"`
- IdCard string `json:"idCard"`
- MonitorLevel string `json:"monitorLevel"`
- Content string `json:"content"`
+ BaseInfo []*protomsg.Baseinfo `json:"baseInfo"`
}
// yolo琛屼负鐨勬暟鎹粨鏋�
@@ -98,6 +106,7 @@
func InsertToEs(msg ruleserver.ResultMsg) {
// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
+ logger.Info("------------------------------------浠庨厤缃枃浠惰鍙栫殑鍊硷細",weedfsUrl)
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
@@ -116,7 +125,7 @@
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
localConfig, err := cache.GetServerInfo()
if err != nil {
- logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
serverIp, err := GetLocalIP()
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -127,16 +136,17 @@
// 鏌ヨcameraName
camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
- logger.Info("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- logger.Info("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.Height)
+ //logger.Info("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.Height)
bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
if err != nil {
- logger.Info("涓婁紶灏忓浘鍑洪敊")
+ logger.Error("涓婁紶灏忓浘鍑洪敊")
}
+ logger.Info("================灏忓浘鍦板潃:",resp["fileUrl"].(string))
sex := ""
if face.ThftRes.Gender == 1 {
sex = "鐢�"
@@ -163,7 +173,7 @@
race,
face.ThftRes.Smile,
face.ThftRes.Beauty,
- "涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
+ string(face.Feature),
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
"鏆傛棤闆嗙兢",
localConfig.ServerId,
@@ -174,7 +184,7 @@
0,
0,
0,
- []Base{},
+ []*protomsg.Baseinfo{},
}
requstbody, err := json.Marshal(pervideo)
@@ -184,9 +194,81 @@
}
err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- logger.Info(err.Error())
+ //logger.Info(err.Error())
} else {
+ // 浜鸿劯鎻愬彇
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
+ logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ serverIp, err := GetLocalIP()
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ // 鏌ヨcameraName
+ camera, err := cache.GetCameraById(msg.Cid)
+ if err != nil {
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ //logger.Info("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.Height)
+ bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
+ resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
+ if err != nil {
+ logger.Error("涓婁紶灏忓浘鍑洪敊")
+ }
+ logger.Info("================灏忓浘鍦板潃:",resp["fileUrl"].(string))
+ sex := ""
+ if face.ThftRes.Gender == 1 {
+ sex = "鐢�"
+ } else {
+ sex = "濂�"
+ }
+ race := getRaceString(face.ThftRes.Race)
+ ageDescription := getDescription(face.ThftRes.Age)
+ pervideo := PerVideoPicture{
+ uuid.NewV4().String(),
+ msg.Cid,
+ camera.Addr,
+ time.Now().Format("2006-01-02 15:04:05"),
+ strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ "浜鸿劯",
+ "",
+ time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ sex,
+ face.ThftRes.Age,
+ ageDescription,
+ race,
+ face.ThftRes.Smile,
+ face.ThftRes.Beauty,
+ "",
+ []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+ "鏆傛棤闆嗙兢",
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ 1,
+ 0,
+ 0,
+ 0,
+ face.Liker,
+ }
+ requstbody, err := json.Marshal(pervideo)
+
+ if err != nil {
+ logger.Error("json parse error ", err)
+ return
+
+ }
+ err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
logger.Info("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�", face.Liker)
+
fmt.Println("------------------------------------------鍝堝搱鍝堝搱锛屽簳搴撴湁浜�")
}
@@ -215,7 +297,7 @@
//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.Info("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
}
@@ -228,12 +310,12 @@
// 鏌ヨ鏈満淇℃伅
localConfig, err := cache.GetServerInfo()
if err != nil {
- logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
- logger.Info("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
serverIp, err := GetLocalIP()
peraction := Personaction{
@@ -267,7 +349,7 @@
}
err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
if err != nil {
- logger.Info("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
}
--
Gitblit v1.8.0