From 40dad23a110592e05e0845d0b6b76bf5588e0826 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 18:25:06 +0800
Subject: [PATCH] faces传值改为指针传值
---
insertdata/insertDataToEs.go | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 3c77b8e..600c65f 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -6,10 +6,10 @@
"fmt"
"log"
"net"
+ "ruleprocess/cache"
"strings"
"time"
- "basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"github.com/golang/protobuf/proto"
"github.com/satori/go.uuid"
@@ -90,7 +90,7 @@
type AlarmRule struct {
GroupId string `json:"groupId"`
- AlarmLevel int32 `json:"alarmLevel"`
+ AlarmLevel string `json:"alarmLevel"`
RuleText string `json:"ruleText"`
}
@@ -114,8 +114,8 @@
fmt.Println(bigPhotoUrl)
if len(face.Liker) == 0 {
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
- flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
- if !flag {
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
serverIp, err := GetLocalIP()
@@ -150,7 +150,7 @@
face.ThftRes.Smile,
face.ThftRes.Beauty,
"涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
- resp["fileUrl"].(string),
+ strings.Split(resp["fileUrl"].(string), "/")[1],
"鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
@@ -172,6 +172,8 @@
err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
if err != nil {
log.Println("es can not execute right.")
+ } else {
+ log.Println("___________________________________寰�ES鎻掑叆浜鸿劯鏁版嵁鎴愬姛")
}
}else {
log.Println("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�",face.Liker)
@@ -184,7 +186,8 @@
alarmRules := []AlarmRule{}
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
sdkNames = sdkNames + yoloResult.SdkName
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, yoloResult.AlarmLevel, yoloResult.RuleText})
+ alarm := ChangeToString(yoloResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
}
isAlarm := ""
resp := make(map[string]interface{})
@@ -197,8 +200,13 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ //resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ resp, err =util.DrawPolygonOnImage(msg.Cid,i)
+ if err != nil {
+ log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊",err)
+ }else{
+ log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ }
} else {
isAlarm = "0"
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
@@ -206,12 +214,12 @@
}
// log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
- flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
- if !flag {
+ localConfig, err := cache.GetServerInfo()
+ if err !=nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
- camera, err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
+ camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
@@ -220,7 +228,7 @@
uuid.NewV4().String(),
msg.Cid,
camera.Name,
- msg.Caddr,
+ camera.Addr,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkNames,
@@ -249,7 +257,7 @@
if err != nil {
log.Println("寰�ES鎻掑叆鏁版嵁澶辫触",err)
} else {
- log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁鎴愬姛")
+ log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁yolo鎴愬姛")
}
}
}
@@ -281,3 +289,24 @@
err = errors.New("ipv4 not found")
return
}
+
+// 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
+func ChangeToString(i int32) string{
+ alarm := ""
+ if i == 1 {
+ alarm = "涓�绾�"
+ }
+ if i == 2 {
+ alarm = "浜岀骇"
+ }
+ if i == 3 {
+ alarm = "涓夌骇"
+ }
+ if i == 4 {
+ alarm = "鍥涚骇"
+ }
+ if i == 5 {
+ alarm = "浜旂骇"
+ }
+ return alarm
+}
\ No newline at end of file
--
Gitblit v1.8.0