From 44441d5439df4e81d641b115c94b079ace31a5c6 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 30 七月 2019 16:00:28 +0800
Subject: [PATCH] 加一个req，持续时间两帧图片画框问题
---
insertdata/insertDataToEs.go | 500 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 322 insertions(+), 178 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 9884a1a..9b1e92f 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,69 +1,82 @@
package insertdata
import (
- "ruleprocess/logger"
+ "encoding/base64"
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net"
"ruleprocess/cache"
+ "ruleprocess/logger"
"strings"
"time"
"basic.com/pubsub/protomsg.git"
+ "github.com/go-yaml/yaml"
"github.com/golang/protobuf/proto"
"github.com/satori/go.uuid"
"ruleprocess/ruleserver"
"ruleprocess/util"
- "github.com/go-yaml/yaml"
)
-var weedfsUrl string
+
+var weedfsUrl, videoPersonUrl, personAction string
+
type conf struct {
- PhotoUrl string `yaml:"photoUrl"`
+ PhotoUrl string `yaml:"photoUrl"`
+ VideoPersons string `yaml:"videoPersons"`
+ PersonAction string `yaml:"personAction"`
+ ServerIp string `yaml:"serverIp"`
+ ServerPort string `yaml:"serverPort"`
+ DbTablePersons string `yaml:"dbTablePersons"`
}
+
func init() {
data, err := ioutil.ReadFile("./config/conf.yml")
if err != nil {
- fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--",err)
- logger.Error("璇诲彇閰嶇疆鏂囦欢鍑洪敊--",err)
+ fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
+ logger.Error("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
}
c := conf{}
//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
yaml.Unmarshal(data, &c)
weedfsUrl = c.PhotoUrl
+ videoPersonUrl = c.VideoPersons
+ personAction = c.PersonAction
}
// 浜鸿劯鐨勬暟鎹粨鏋�
type PerVideoPicture struct {
- Id string `json:"id"`
- CameraId string `json:"cameraId"`
- CameraAddr string `json:"cameraAddr"`
- PicDate string `json:"picDate"`
- PicMaxUrl string `json:"picMaxUrl"`
- TaskId string `json:"taskId"`
- TaskName string `json:"taskName"`
- SdkName string `json:"sdkName"`
- Content string `json:"content"`
- LikeDate string `json:"likeDate"`
- Sex string `json:"sex"`
- Age int32 `json:"age"`
- AgeDescription string `json:"ageDescription"`
- Race string `json:"race"`
- SmileLevel int32 `json:"smileLevel"`
- BeautyLevel int32 `json:"beautyLevel"`
- FaceFeature string `json:"faceFeature"`
- PicSmUrl []string `json:"picSmUrl"`
- VideoUrl string `json:"videoUrl"`
- AnalyServerId string `json:"analyServerId"`
- AnalyServerName string `json:"analyServerName"`
- AnalyServerIp string `json:"analyServerIp"`
- ClusterId string `json:"clusterId"`
- IsAlarm int `json:"isAlarm"`
- IsAckAlarm int `json:"isAckAlarm"`
- IsCollect int `json:"isCollect"`
- IsDelete int `json:"isDelete"`
- BaseInfo []*protomsg.Baseinfo `json:"baseInfo"`
+ Id string `json:"id"`
+ CameraId string `json:"cameraId"`
+ CameraAddr string `json:"cameraAddr"`
+ PicDate string `json:"picDate"`
+ PicMaxUrl string `json:"picMaxUrl"`
+ TaskId string `json:"taskId"`
+ TaskName string `json:"taskName"`
+ SdkName string `json:"sdkName"`
+ Content string `json:"content"`
+ AlarmRules []AlarmRule `json:"alarmRules"`
+ LikeDate string `json:"likeDate"`
+ Sex string `json:"sex"`
+ Age int32 `json:"age"`
+ AgeDescription string `json:"ageDescription"`
+ Race string `json:"race"`
+ SmileLevel int32 `json:"smileLevel"`
+ BeautyLevel int32 `json:"beautyLevel"`
+ FaceFeature string `json:"faceFeature"`
+ PicSmUrl []string `json:"picSmUrl"`
+ VideoUrl string `json:"videoUrl"`
+ AnalyServerId string `json:"analyServerId"`
+ AnalyServerName string `json:"analyServerName"`
+ AnalyServerIp string `json:"analyServerIp"`
+ ClusterId string `json:"clusterId"`
+ DetectScore float64 `json:"detectScore"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
+ IsDelete int `json:"isDelete"`
+ BaseInfo []*ruleserver.BaseInfo `json:"baseInfo"`
}
// yolo琛屼负鐨勬暟鎹粨鏋�
@@ -91,56 +104,74 @@
}
type AlarmRule struct {
- GroupId string `json:"groupId"`
- AlarmLevel string `json:"alarmLevel"`
- RuleText string `json:"ruleText"`
+ GroupId string `json:"groupId"`
+ AlarmLevel string `json:"alarmLevel"`
+ RuleText string `json:"ruleText"`
+ DefenceState bool `json:"defenceState"`
}
// 寰�ES鎻掓暟鎹�
func InsertToEs(msg ruleserver.ResultMsg) {
-
+ var timeLabel string
// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
- logger.Info("------------------------------------浠庨厤缃枃浠惰鍙栫殑鍊硷細",weedfsUrl)
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
+ if msg.RuleResult["timeLabel"] != nil {
+ timeLabel = msg.RuleResult["timeLabel"].(string)
+ }
+ logger.Debug("鎻掑叆鏁版嵁鍓嶇湅鐪嬫姤璀︽爣蹇椾綅锛�", timeLabel)
+ if timeLabel == "01" { // 鏃犲畾鏃跺櫒鐘舵�佽鎻掑叆鐨勬姤璀︽暟鎹�
+ InsertFace(msg)
+ flag := ruleserver.BodyIsSame(msg.SdkMessage)
+ if !flag {
+ InsertYolo(msg)
+ }
+ }
+ if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
+ InsertFace(msg)
+ InsertYolo(msg)
+ }
+ //if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
+ // //ChangeStatusFace(msg)
+ // ChangeStatusYolo(msg)
+ //}
+}
+
+// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
+func InsertFace(msg ruleserver.ResultMsg) {
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
- for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
- // 涓婁紶澶у浘
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- bigPhotoUrl := make(map[string]interface{})
- bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- logger.Info(bigPhotoUrl)
- if len(face.Liker) == 0 {
+ for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
+ for _, face := range faceResult.Args {
+ // 涓婁紶澶у浘
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ alarmRules := []AlarmRule{}
+ alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText,faceResult.DefenceState})
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ bigPhotoUrl := make(map[string]interface{})
+ bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
localConfig, err := cache.GetServerInfo()
if err != nil {
logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
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))
+ logger.Info("================灏忓浘鍦板潃:", resp["fileUrl"].(string))
sex := ""
if face.ThftRes.Gender == 1 {
sex = "鐢�"
@@ -149,17 +180,18 @@
}
race := getRaceString(face.ThftRes.Race)
ageDescription := getDescription(face.ThftRes.Age)
-
+ esDataId := uuid.NewV4().String()
pervideo := PerVideoPicture{
- uuid.NewV4().String(),
+ esDataId,
msg.Cid,
camera.Addr,
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
"浜鸿劯",
"",
+ alarmRules,
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
sex,
face.ThftRes.Age,
@@ -167,86 +199,14 @@
race,
face.ThftRes.Smile,
face.ThftRes.Beauty,
- string(face.Feature),
+ base64.StdEncoding.EncodeToString(face.Feature),
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
"鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
serverIp,
"",
- 1,
- 0,
- 0,
- 0,
- []*protomsg.Baseinfo{},
- }
- requstbody, err := json.Marshal(pervideo)
-
- if err != nil {
- logger.Info("json parse error ", err)
- return
-
- }
- err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- //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,
- "",
+ face.Score,
1,
0,
0,
@@ -256,44 +216,127 @@
requstbody, err := json.Marshal(pervideo)
if err != nil {
- logger.Error("json parse error ", err)
+ logger.Info("json parse error ", err)
return
-
}
- err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- logger.Info("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�", face.Liker)
-
- fmt.Println("------------------------------------------鍝堝搱鍝堝搱锛屽簳搴撴湁浜�")
-
+ resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
+ if err1 != nil {
+ logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+ } else {
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
+ // 鍙戝嚭褰曞儚淇″彿
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 1})
+ }
}
}
}
+}
+func ChangeStatusFace(msg ruleserver.ResultMsg) {
+ logger.Info("寰�ES鎻掑叆浜鸿劯闈炴姤璀︿絾鏄姸鎬佽浆鎹㈡暟鎹�")
+ // 涓婁紶澶у浘
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ bigPhotoUrl := make(map[string]interface{})
+ bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+ // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ serverIp, err := GetLocalIP()
+ // 鏌ヨcameraName
+ camera, err := cache.GetCameraById(msg.Cid)
+ if err != nil {
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
+
+ esDataId := uuid.NewV4().String()
+ pervideo := PerVideoPicture{
+ esDataId,
+ msg.Cid,
+ camera.Addr,
+ i.Timestamp,
+ strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ "浜鸿劯",
+ "鐘舵�佽浆鎹㈡暟鎹紝闈炴姤璀︽暟鎹�",
+ []AlarmRule{},
+ time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ "",
+ 0,
+ "",
+ "",
+ 0,
+ 0,
+ "",
+ []string{""},
+ "鏆傛棤闆嗙兢",
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ []*ruleserver.BaseInfo{},
+ }
+ requstbody, err := json.Marshal(pervideo)
+
+ if err != nil {
+ logger.Info("json parse error ", err)
+ return
+ }
+ resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
+
+ if err1 != nil {
+ logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+ } else {
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
+ // 鍙戝嚭褰曞儚淇″彿
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 1})
+ }
+ //if msg.RuleResult["cacheData"] != nil {
+ // InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ //}
+}
+
+// 寰�es涓彃鍏olo鏁版嵁
+func InsertYolo(msg ruleserver.ResultMsg) {
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})
+ alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText,yoloResult.DefenceState})
}
isAlarm := 0
resp := make(map[string]interface{})
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
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))
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
- logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
}
} else {
isAlarm = 0
@@ -312,8 +355,30 @@
logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
serverIp, err := GetLocalIP()
+ url := []string{}
+ if msg.RuleResult["cacheData"] != nil {
+ //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ // 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ msg1 := msg.RuleResult["cacheData"].(ruleserver.ResultMsg)
+ bdata, err := util.UnCompress(msg1.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ resp1, err1 := util.DrawPolygonOnImage(msg1.Cid, i, msg1.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+ if err1 != nil {
+ logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ } else {
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+ }
+ url = append(url, strings.Split(resp1["fileUrl"].(string), "/")[1])
+ }
+ url = append(url, strings.Split(resp["fileUrl"].(string), "/")[1])
+ esDataId := uuid.NewV4().String()
peraction := Personaction{
- uuid.NewV4().String(),
+ esDataId,
msg.Cid,
camera.Name,
camera.Addr,
@@ -326,8 +391,8 @@
localConfig.ServerName,
serverIp,
"",
- []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- time.Now().Format("2006-01-02 15:04:05"),
+ url,
+ i.Timestamp,
"",
isAlarm,
0,
@@ -341,12 +406,86 @@
return
}
- err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
- if err != nil {
+ resp1, err2 := EsReq("POST", personAction, requstbody)
+ if err2 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
- logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ logger.Debug("鎻掑叆es杩斿洖鐨勬暟鎹俊鎭槸锛�", resp1)
+ // 鍙戝嚭褰曞儚淇″彿
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 2})
+ logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ //os.Exit(1)
}
+ }
+}
+func ChangeStatusYolo(msg ruleserver.ResultMsg) {
+ logger.Info("寰�ES鎻抷olo闈炴姤璀︾姸鎬佹敼鍙樻暟鎹�")
+ var sdkNames string = ""
+ alarmRules := []AlarmRule{}
+ 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), weedfsUrl)
+ if err != nil {
+ logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ } else {
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
+ }
+ // 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()
+ esDataId := uuid.NewV4().String()
+ peraction := Personaction{
+ esDataId,
+ msg.Cid,
+ camera.Name,
+ camera.Addr,
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ sdkNames,
+ "yolo闈炴姤璀︾姸鎬佹敼鍙樻暟鎹�",
+ alarmRules,
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+ i.Timestamp,
+ "",
+ 0,
+ 0,
+ 0,
+ 0,
+ }
+ requstbody, err := json.Marshal(peraction)
+
+ if err != nil {
+ logger.Info("json parse error ", err)
+ return
+
+ }
+ resp1, err1 := EsReq("POST", personAction, requstbody)
+ if err1 != nil {
+ logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ } else {
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
+ // 鍙戝嚭褰曞儚淇″彿
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 2})
+ logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ //os.Exit(1)
}
}
@@ -379,23 +518,28 @@
}
// 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
-func ChangeToString(i int32) string {
+func ChangeToString(defenceState bool, i int32) string {
alarm := ""
- if i == 1 {
- alarm = "涓�绾�"
+ if defenceState {
+ if i == 1 {
+ alarm = "涓�绾�"
+ }
+ if i == 2 {
+ alarm = "浜岀骇"
+ }
+ if i == 3 {
+ alarm = "涓夌骇"
+ }
+ if i == 4 {
+ alarm = "鍥涚骇"
+ }
+ if i == 5 {
+ alarm = "浜旂骇"
+ }
+ } else {
+ alarm = "鎾ら槻"
}
- if i == 2 {
- alarm = "浜岀骇"
- }
- if i == 3 {
- alarm = "涓夌骇"
- }
- if i == 4 {
- alarm = "鍥涚骇"
- }
- if i == 5 {
- alarm = "浜旂骇"
- }
+
return alarm
}
--
Gitblit v1.8.0